Clean up the File option/default option code

It's more obvious if we do a merge in the intializer with defalts
rather than have the whole setup* call