GeometryCollection refactoring.