Even less macros/A few less classes.
This is easier to understand, although it does make the binary a fraction
of a percent larger.