Cleanup FileStorage

A set of cleanup changes, mainly to convince myself that it is thread safe and sufficiently robust...
D'oh, of course that's not the same.  But I like your suggestion; yes please.