Emacs 23 compatibility fixes.