More lint fixes.