clean up semantics parser, support for GeometryCollections, all test passing