Use 'c++' not 'cxx' in these diagnostic group names for consistency.