@michaelcahill: I went with your idea, I think it's a better solution.

This first diff is just support for column-store, I'm going to take a run at row-store next.