More and more lint fixes.