Bug 337977: [quick fix] Add quick fixes for null annotations
- Wording tweaks
- Code style
- Bug fixes
5 files changed