Replace some existing type attribute diagnostics with a
single diagnostic that selects.  No functional changes intended.