Optimise ValueGeometry
Merge branch 'optimize-geometry' into h2-fork