reform macro defns
appease the compiler gods