Minor misc tidies

Is this ever called with `false`? If not, can we simplify this code? Is there an advantage to setting the defaults in `resetGlobalFiles` rather than in the field initialisers?