Lint fixes 2.
Lint fixes 3.
Lint fixes 4.
Doug's review fixes.