Fix highlight broken by trunk Emacs.