Lots of lint fixes.