Fix an ICE on diagnostics originating in external macros