Backport typo fixes from Emacs revno 115988