Macro hygiene
Merge pull request #4 from cmr/patch-1

Macro hygiene