White-space related lint fixes.