Fix problem with switching between file loaders that have properties with same name but different default. Tidied up the logic in the same place. Removed an if clause that could never succeed. Re #2476.