Fix compatibility with emacs-24.4.