More changes from downstream Emacs.