Backport typo fixes from Emacs revno 111250 by Paul Eggert.