Adjust to further changes in {utils}/filestorage.