Cleanup how we determine when to add a space.