Added support for macros (but they don't do anything yet).
Added macro invocations. No parameters (yet).
More support for macros.