It may be reasonable to change this more, but the benefits aren't clear.
(These changes will be used from the new-install-branch.)