I didn't move that other stuff (only the callable check) yet. Can happen in separate PR later.