Fix trailing ws (merge from 3.5).