Follow-up fixes for the previous white-space changes