Make ready for Emacs 24.4