Re: [V21.5] [CORE] Reinstate a couple of things we lost from mule-misc.el