From zenburn-emacs: Fix various Emacs 24.3 issues.