[#3266] Lint fixes.