Move xemacs-21.5 code back into init.el proper.
Small cleanups.