Fixing a typo, updating the diagnostic wording and logic based on post-commit review feedback. Amends r206186.