Adjust to emacs-devel discussion.