Remove grammar stuff
Throw out old macro system, add parser rules for macros