Use injected class name to simplify macros
2 files changed