Minor changes to normalize_space()