Fix in preparation for Emacs 25.0