That seems like a good idea, and definitely better in terms of "transaction safety" than what we have now.