Small cleanup.
Updates required for emacs 24 theme changes.