Fix typos fixed in Emacs trunk.