Cleanup FileStorage

A set of cleanup changes, mainly to convince myself that it is thread safe and sufficiently robust...
I don't know what happened, this should be ```CHECK_EQ(status, util::Status::OK);```, even.