GH-10: Further strip down the storage type switching

Storage type is now a global setting.  This removes a lot of complexity.

File settings are checked by default, if they don't exist, then the
registry is honoured.

Now that it's gone, I can't see any advantages to the old code, so I'm
guessing there's a glaring omission here somewhere. (Famous last words.)