Address comments from various code reviews.
3 files changed