Improved macroexpansion, plus cleanup