fixup too few argument lists
fixup untyped macro tests
fixup untyped macro tests
fixup named and/or default
macro type, not type macro!