Updated to work with emacs24.