use 'callable' instead of typechecking to inject context
3 files changed