More spacing fixes.
Merge pull request #8399 from Rivet-the-Zombie/spacing

More spacing fixes.