Tweaks for emacs 24.4.