WYRL: ok, macro expansion is now working.  Need to fix axiom instantiation next.