Update for rust-geom changes