Fix remaining broken normalize cases.