consistent use of make_invokable