fix uses of `Callable`