Final large batch of lint fixes.