The macros generate some dead code.

[Doikor]

The macros generate some dead code (evident by multiple warnings about this when running the tests for example). The macros should be cleaned up.