Diagnostic overshadowing reviewed and reconsidered.

Diagnostic overshadowing reviewed and reconsidered.