Local changes before trying the emacs-24 branch.