to_ds_type - return actual datasource_geometry_t (remove optional) update across datasources experssions - revert to using