Combat some more emacs 24.4 "useful" changes.