Merge "Lint fixes and config tweaks."