WYCS: working on splitting out macro expansion from axiom instantiation.