Fix for emacs-23.