fixup step II
fixup step II
fixup tests for untyped macros