PR11143: Save the old diagnostic handler and call it when munging diagnostics for...