Cosemtic touch-ups only.
Get rid of macros, use mixins for visitors.
Switch to new mixins in expression class hierarchy.