macroexpansion bug fixes.