Further remove some unneeded spaces.