Adjust for the new Emacs.