cosmetic
make macros referentially transparent