Reified: dead code
Reified: refactoring of generic macros + less noise in tests