Changes from Airlift: Improve H2EmbeddedDataSource

I don't know enough about this area to evaluate the impact of these changes.