more macro expansion fixes