Used MacroExpansion for better macro detection