Make safer for Emacs 23.