Making some attribute diagnostics more consistent. Removes a newly-unused diagnostic.

Reviewed by Fariborz Jahanian