Pomax's lint fixes.