Refactoring: accept `callable` everywhere instead of `Closure` only before