Changes to get my .emacs to work in Emacs 23.