Diagnostics: Use command-line option forms in messages

Tweak how we include the diagnostic category name in diagnostic messages
to use the 'command-line option form' (i.e. lower case with hyphens)
rather than the 'identifier form' (upper case with underscores). This
looks nicer, as it avoids unnecessary 'shouting'.