Remove extra whitespace from macro invocations