Being more cautious with white-space.