Various lint fixes.

BTW, we need a task for this stuff...