Ah yes - I agree. This is a bigger problem and probably wouldn't belong in the storage branch.

We should add an issue that addresses that.