Backport typo fixes from Emacs revno r115923