Backport spelling fixes from Emacs r115885