Greatly simplified the grammar
Macro examples