Minor cleanup: simpler constructor
Add addMacro(), macro() functions