Some more white-space lint fixes