better support for `@grant`