More changes from abandoned reworking of  file loading.