Did a round of lint fixes.