Some more fixes to macro expansions