Geometry refactor.