Adjustments to get macros sorta working.  Recursive macros and deep macros don't work properly yet.