Fix macro expansion for recursive macros