Minor DiagnosticMode refactor

Minor improvements to the messages produced in DiagnosticMode.