Refactor macro invocation.