Refactor to rely on GEOSGeometry base class to determine geometry type.