#1640: Rearrange how spaces are handled.