Arch-tag lines and declaration fixes from upstream Emacs.