untyped macros, part I: parser changes
fixup part I
untyped macros, part II: untyped-aware macro engine