Fixed up FileStore, but KeyValueStore still needs to use the new factory method.