Cosmetic: use symbolic names for two diagnostics