diff --git a/meta/src/meta/grammar.y b/meta/src/meta/grammar.y
index 7df7da9b..8d7c2c88 100644
--- a/meta/src/meta/grammar.y
+++ b/meta/src/meta/grammar.y
@@ -87,6 +87,14 @@
 %nonterm gnf_column logic.GNFColumn
 %nonterm gnf_column_path Sequence[String]
 %nonterm gnf_columns Sequence[logic.GNFColumn]
+%nonterm named_column logic.NamedColumn
+%nonterm relation_keys Sequence[logic.NamedColumn]
+%nonterm target_relation logic.TargetRelation
+%nonterm non_cdc_relations Sequence[logic.TargetRelation]
+%nonterm cdc_inserts Sequence[logic.TargetRelation]
+%nonterm cdc_deletes Sequence[logic.TargetRelation]
+%nonterm relation_body logic.TargetRelations
+%nonterm target_relations logic.TargetRelations
 %nonterm csv_config logic.CSVConfig
 %nonterm csv_data logic.CSVData
 %nonterm csv_locator_inline_data String
@@ -1107,13 +1115,58 @@ csv_asof
     : "(" "asof" STRING ")"
 
 csv_data
-    : "(" "csv_data" csvlocator csv_config gnf_columns csv_asof ")"
-      construct: $$ = logic.CSVData(locator=$3, config=$4, columns=$5, asof=$6)
+    : "(" "csv_data" csvlocator csv_config gnf_columns? target_relations? csv_asof ")"
+      construct: $$ = construct_csv_data($3, $4, $5, $6, $7)
       deconstruct:
         $3: logic.CSVLocator = $$.locator
         $4: logic.CSVConfig = $$.config
-        $5: Sequence[logic.GNFColumn] = $$.columns
-        $6: String = $$.asof
+        $5: Optional[Sequence[logic.GNFColumn]] = deconstruct_csv_data_columns_optional($$)
+        $6: Optional[logic.TargetRelations] = deconstruct_csv_data_relations_optional($$)
+        $7: String = $$.asof
+
+named_column
+    : "(" "column" STRING type ")"
+      construct: $$ = logic.NamedColumn(name=$3, type=$4)
+      deconstruct:
+        $3: String = $$.name
+        $4: logic.Type = $$.type
+
+relation_keys
+    : "(" "keys" named_column* ")"
+
+target_relation
+    : "(" "relation" relation_id named_column* ")"
+      construct: $$ = logic.TargetRelation(target_id=$3, values=$4)
+      deconstruct:
+        $3: logic.RelationId = $$.target_id
+        $4: Sequence[logic.NamedColumn] = $$.values
+
+non_cdc_relations
+    : target_relation*
+
+cdc_inserts
+    : "(" "inserts" target_relation* ")"
+
+cdc_deletes
+    : "(" "deletes" target_relation* ")"
+
+relation_body
+    : non_cdc_relations
+      construct: $$ = construct_non_cdc_relations($1)
+      deconstruct if builtin.has_proto_field($$, 'plain'):
+        $1: Sequence[logic.TargetRelation] = $$.plain.targets
+    | cdc_inserts cdc_deletes
+      construct: $$ = construct_cdc_relations($1, $2)
+      deconstruct if builtin.has_proto_field($$, 'cdc'):
+        $1: Sequence[logic.TargetRelation] = $$.cdc.inserts
+        $2: Sequence[logic.TargetRelation] = $$.cdc.deletes
+
+target_relations
+    : "(" "relations" relation_keys relation_body ")"
+      construct: $$ = construct_relations($3, $4)
+      deconstruct:
+        $3: Sequence[logic.NamedColumn] = $$.keys
+        $4: logic.TargetRelations = $$
 
 csv_locator_paths
     : "(" "paths" STRING* ")"
@@ -1473,6 +1526,62 @@ def _try_extract_value_string_list(value: Optional[logic.Value]) -> Optional[Seq
     return None
 
 
+def construct_non_cdc_relations(
+    targets: Sequence[logic.TargetRelation],
+) -> logic.TargetRelations:
+    return logic.TargetRelations(
+        keys=list[logic.NamedColumn](),
+        plain=logic.PlainTargets(targets=targets),
+    )
+
+
+def construct_cdc_relations(
+    inserts: Sequence[logic.TargetRelation],
+    deletes: Sequence[logic.TargetRelation],
+) -> logic.TargetRelations:
+    return logic.TargetRelations(
+        keys=list[logic.NamedColumn](),
+        cdc=logic.CdcTargets(inserts=inserts, deletes=deletes),
+    )
+
+
+def construct_relations(
+    keys: Sequence[logic.NamedColumn],
+    body: logic.TargetRelations,
+) -> logic.TargetRelations:
+    if builtin.has_proto_field(body, "plain"):
+        return logic.TargetRelations(keys=keys, plain=body.plain)
+    return logic.TargetRelations(keys=keys, cdc=body.cdc)
+
+
+def construct_csv_data(
+    locator: logic.CSVLocator,
+    config: logic.CSVConfig,
+    columns_opt: Optional[Sequence[logic.GNFColumn]],
+    relations_opt: Optional[logic.TargetRelations],
+    asof: String,
+) -> logic.CSVData:
+    return logic.CSVData(
+        locator=locator,
+        config=config,
+        columns=builtin.unwrap_option_or(columns_opt, list[logic.GNFColumn]()),
+        asof=asof,
+        relations=relations_opt,
+    )
+
+
+def deconstruct_csv_data_columns_optional(msg: logic.CSVData) -> Optional[Sequence[logic.GNFColumn]]:
+    if builtin.has_proto_field(msg, "relations"):
+        return builtin.none()
+    return builtin.some(msg.columns)
+
+
+def deconstruct_csv_data_relations_optional(msg: logic.CSVData) -> Optional[logic.TargetRelations]:
+    if builtin.has_proto_field(msg, "relations"):
+        return builtin.some(builtin.unwrap_option(msg.relations))
+    return builtin.none()
+
+
 def construct_csv_config(
     config_dict: Sequence[Tuple[String, logic.Value]],
     storage_integration_opt: Optional[Sequence[Tuple[String, logic.Value]]],
diff --git a/proto/relationalai/lqp/v1/logic.proto b/proto/relationalai/lqp/v1/logic.proto
index 0f9f1170..db968b10 100644
--- a/proto/relationalai/lqp/v1/logic.proto
+++ b/proto/relationalai/lqp/v1/logic.proto
@@ -288,11 +288,46 @@ message StorageIntegration {
   string s3_secret_access_key = 5;
 }
 
+// A single named column with its type. Used to describe both shared key columns and
+// per-relation value columns in the generalized `TargetRelations` loading construct.
+message NamedColumn {
+  string name = 1; // Column name (e.g. "src"); special name "METADATA$KEY" => derived hash
+  Type type = 2;   // Column type
+}
+
+// One target relation: the shared keys plus this relation's own (possibly empty) value columns.
+message TargetRelation {
+  RelationId target_id = 1;        // Output relation path
+  repeated NamedColumn values = 2; // Value columns for this relation (may be empty)
+}
+
+// Plain (non-CDC) load: each input row becomes a tuple in every target relation.
+message PlainTargets {
+  repeated TargetRelation targets = 1; // Target relations (each row feeds all of them)
+}
+
+// CDC load: input rows are routed by METADATA$ACTION into insert and delete deltas.
+message CdcTargets {
+  repeated TargetRelation inserts = 1; // INSERT-action rows feed these
+  repeated TargetRelation deletes = 2; // DELETE-action rows feed these
+}
+
+// Generalized loading: shared key columns plus the target relations, loaded either as a
+// plain snapshot or as CDC insert/delete deltas. The two modes are mutually exclusive.
+message TargetRelations {
+  repeated NamedColumn keys = 1; // Shared key columns (name "METADATA$KEY" => derived hash)
+  oneof body {
+    PlainTargets plain = 2;
+    CdcTargets cdc = 3;
+  }
+}
+
 message CSVData {
   CSVLocator locator = 1;
   CSVConfig config = 2;
   repeated GNFColumn columns = 3;
   string asof = 4; // Blob storage timestamp for freshness requirements
+  optional TargetRelations relations = 5; // If present, generalized loading; mutually exclusive with columns
 }
 
 message CSVLocator {
diff --git a/sdks/go/src/lqp/v1/logic.pb.go b/sdks/go/src/lqp/v1/logic.pb.go
index 6e978d5a..14f2ad8b 100644
--- a/sdks/go/src/lqp/v1/logic.pb.go
+++ b/sdks/go/src/lqp/v1/logic.pb.go
@@ -3014,19 +3014,317 @@ func (x *StorageIntegration) GetS3SecretAccessKey() string {
 	return ""
 }
 
+// A single named column with its type. Used to describe both shared key columns and
+// per-relation value columns in the generalized `TargetRelations` loading construct.
+type NamedColumn struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Column name (e.g. "src"); special name "METADATA$KEY" => derived hash
+	Type          *Type                  `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"` // Column type
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *NamedColumn) Reset() {
+	*x = NamedColumn{}
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[44]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *NamedColumn) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NamedColumn) ProtoMessage() {}
+
+func (x *NamedColumn) ProtoReflect() protoreflect.Message {
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[44]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use NamedColumn.ProtoReflect.Descriptor instead.
+func (*NamedColumn) Descriptor() ([]byte, []int) {
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{44}
+}
+
+func (x *NamedColumn) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *NamedColumn) GetType() *Type {
+	if x != nil {
+		return x.Type
+	}
+	return nil
+}
+
+// One target relation: the shared keys plus this relation's own (possibly empty) value columns.
+type TargetRelation struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	TargetId      *RelationId            `protobuf:"bytes,1,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"` // Output relation path
+	Values        []*NamedColumn         `protobuf:"bytes,2,rep,name=values,proto3" json:"values,omitempty"`                     // Value columns for this relation (may be empty)
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *TargetRelation) Reset() {
+	*x = TargetRelation{}
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[45]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *TargetRelation) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TargetRelation) ProtoMessage() {}
+
+func (x *TargetRelation) ProtoReflect() protoreflect.Message {
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[45]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TargetRelation.ProtoReflect.Descriptor instead.
+func (*TargetRelation) Descriptor() ([]byte, []int) {
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{45}
+}
+
+func (x *TargetRelation) GetTargetId() *RelationId {
+	if x != nil {
+		return x.TargetId
+	}
+	return nil
+}
+
+func (x *TargetRelation) GetValues() []*NamedColumn {
+	if x != nil {
+		return x.Values
+	}
+	return nil
+}
+
+// Plain (non-CDC) load: each input row becomes a tuple in every target relation.
+type PlainTargets struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Targets       []*TargetRelation      `protobuf:"bytes,1,rep,name=targets,proto3" json:"targets,omitempty"` // Target relations (each row feeds all of them)
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *PlainTargets) Reset() {
+	*x = PlainTargets{}
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[46]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *PlainTargets) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PlainTargets) ProtoMessage() {}
+
+func (x *PlainTargets) ProtoReflect() protoreflect.Message {
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[46]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PlainTargets.ProtoReflect.Descriptor instead.
+func (*PlainTargets) Descriptor() ([]byte, []int) {
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{46}
+}
+
+func (x *PlainTargets) GetTargets() []*TargetRelation {
+	if x != nil {
+		return x.Targets
+	}
+	return nil
+}
+
+// CDC load: input rows are routed by METADATA$ACTION into insert and delete deltas.
+type CdcTargets struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Inserts       []*TargetRelation      `protobuf:"bytes,1,rep,name=inserts,proto3" json:"inserts,omitempty"` // INSERT-action rows feed these
+	Deletes       []*TargetRelation      `protobuf:"bytes,2,rep,name=deletes,proto3" json:"deletes,omitempty"` // DELETE-action rows feed these
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *CdcTargets) Reset() {
+	*x = CdcTargets{}
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[47]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *CdcTargets) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CdcTargets) ProtoMessage() {}
+
+func (x *CdcTargets) ProtoReflect() protoreflect.Message {
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[47]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CdcTargets.ProtoReflect.Descriptor instead.
+func (*CdcTargets) Descriptor() ([]byte, []int) {
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{47}
+}
+
+func (x *CdcTargets) GetInserts() []*TargetRelation {
+	if x != nil {
+		return x.Inserts
+	}
+	return nil
+}
+
+func (x *CdcTargets) GetDeletes() []*TargetRelation {
+	if x != nil {
+		return x.Deletes
+	}
+	return nil
+}
+
+// Generalized loading: shared key columns plus the target relations, loaded either as a
+// plain snapshot or as CDC insert/delete deltas. The two modes are mutually exclusive.
+type TargetRelations struct {
+	state protoimpl.MessageState `protogen:"open.v1"`
+	Keys  []*NamedColumn         `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys,omitempty"` // Shared key columns (name "METADATA$KEY" => derived hash)
+	// Types that are valid to be assigned to Body:
+	//
+	//	*TargetRelations_Plain
+	//	*TargetRelations_Cdc
+	Body          isTargetRelations_Body `protobuf_oneof:"body"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *TargetRelations) Reset() {
+	*x = TargetRelations{}
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[48]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *TargetRelations) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TargetRelations) ProtoMessage() {}
+
+func (x *TargetRelations) ProtoReflect() protoreflect.Message {
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[48]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TargetRelations.ProtoReflect.Descriptor instead.
+func (*TargetRelations) Descriptor() ([]byte, []int) {
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{48}
+}
+
+func (x *TargetRelations) GetKeys() []*NamedColumn {
+	if x != nil {
+		return x.Keys
+	}
+	return nil
+}
+
+func (x *TargetRelations) GetBody() isTargetRelations_Body {
+	if x != nil {
+		return x.Body
+	}
+	return nil
+}
+
+func (x *TargetRelations) GetPlain() *PlainTargets {
+	if x != nil {
+		if x, ok := x.Body.(*TargetRelations_Plain); ok {
+			return x.Plain
+		}
+	}
+	return nil
+}
+
+func (x *TargetRelations) GetCdc() *CdcTargets {
+	if x != nil {
+		if x, ok := x.Body.(*TargetRelations_Cdc); ok {
+			return x.Cdc
+		}
+	}
+	return nil
+}
+
+type isTargetRelations_Body interface {
+	isTargetRelations_Body()
+}
+
+type TargetRelations_Plain struct {
+	Plain *PlainTargets `protobuf:"bytes,2,opt,name=plain,proto3,oneof"`
+}
+
+type TargetRelations_Cdc struct {
+	Cdc *CdcTargets `protobuf:"bytes,3,opt,name=cdc,proto3,oneof"`
+}
+
+func (*TargetRelations_Plain) isTargetRelations_Body() {}
+
+func (*TargetRelations_Cdc) isTargetRelations_Body() {}
+
 type CSVData struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Locator       *CSVLocator            `protobuf:"bytes,1,opt,name=locator,proto3" json:"locator,omitempty"`
 	Config        *CSVConfig             `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 	Columns       []*GNFColumn           `protobuf:"bytes,3,rep,name=columns,proto3" json:"columns,omitempty"`
-	Asof          string                 `protobuf:"bytes,4,opt,name=asof,proto3" json:"asof,omitempty"` // Blob storage timestamp for freshness requirements
+	Asof          string                 `protobuf:"bytes,4,opt,name=asof,proto3" json:"asof,omitempty"`                 // Blob storage timestamp for freshness requirements
+	Relations     *TargetRelations       `protobuf:"bytes,5,opt,name=relations,proto3,oneof" json:"relations,omitempty"` // If present, generalized loading; mutually exclusive with columns
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CSVData) Reset() {
 	*x = CSVData{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[44]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[49]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3038,7 +3336,7 @@ func (x *CSVData) String() string {
 func (*CSVData) ProtoMessage() {}
 
 func (x *CSVData) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[44]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[49]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3051,7 +3349,7 @@ func (x *CSVData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CSVData.ProtoReflect.Descriptor instead.
 func (*CSVData) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{44}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{49}
 }
 
 func (x *CSVData) GetLocator() *CSVLocator {
@@ -3082,6 +3380,13 @@ func (x *CSVData) GetAsof() string {
 	return ""
 }
 
+func (x *CSVData) GetRelations() *TargetRelations {
+	if x != nil {
+		return x.Relations
+	}
+	return nil
+}
+
 type CSVLocator struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Paths         []string               `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`                             // URL(s) or filesystem path(s) for partitioned loading
@@ -3092,7 +3397,7 @@ type CSVLocator struct {
 
 func (x *CSVLocator) Reset() {
 	*x = CSVLocator{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[45]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[50]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3104,7 +3409,7 @@ func (x *CSVLocator) String() string {
 func (*CSVLocator) ProtoMessage() {}
 
 func (x *CSVLocator) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[45]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[50]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3117,7 +3422,7 @@ func (x *CSVLocator) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CSVLocator.ProtoReflect.Descriptor instead.
 func (*CSVLocator) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{45}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{50}
 }
 
 func (x *CSVLocator) GetPaths() []string {
@@ -3163,7 +3468,7 @@ type CSVConfig struct {
 
 func (x *CSVConfig) Reset() {
 	*x = CSVConfig{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[46]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[51]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3175,7 +3480,7 @@ func (x *CSVConfig) String() string {
 func (*CSVConfig) ProtoMessage() {}
 
 func (x *CSVConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[46]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[51]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3188,7 +3493,7 @@ func (x *CSVConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CSVConfig.ProtoReflect.Descriptor instead.
 func (*CSVConfig) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{46}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{51}
 }
 
 func (x *CSVConfig) GetHeaderRow() int32 {
@@ -3296,7 +3601,7 @@ type IcebergData struct {
 
 func (x *IcebergData) Reset() {
 	*x = IcebergData{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[47]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[52]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3308,7 +3613,7 @@ func (x *IcebergData) String() string {
 func (*IcebergData) ProtoMessage() {}
 
 func (x *IcebergData) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[47]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[52]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3321,7 +3626,7 @@ func (x *IcebergData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IcebergData.ProtoReflect.Descriptor instead.
 func (*IcebergData) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{47}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{52}
 }
 
 func (x *IcebergData) GetLocator() *IcebergLocator {
@@ -3377,7 +3682,7 @@ type IcebergLocator struct {
 
 func (x *IcebergLocator) Reset() {
 	*x = IcebergLocator{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[48]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[53]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3389,7 +3694,7 @@ func (x *IcebergLocator) String() string {
 func (*IcebergLocator) ProtoMessage() {}
 
 func (x *IcebergLocator) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[48]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[53]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3402,7 +3707,7 @@ func (x *IcebergLocator) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IcebergLocator.ProtoReflect.Descriptor instead.
 func (*IcebergLocator) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{48}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{53}
 }
 
 func (x *IcebergLocator) GetTableName() string {
@@ -3438,7 +3743,7 @@ type IcebergCatalogConfig struct {
 
 func (x *IcebergCatalogConfig) Reset() {
 	*x = IcebergCatalogConfig{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[49]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[54]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3450,7 +3755,7 @@ func (x *IcebergCatalogConfig) String() string {
 func (*IcebergCatalogConfig) ProtoMessage() {}
 
 func (x *IcebergCatalogConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[49]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[54]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3463,7 +3768,7 @@ func (x *IcebergCatalogConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IcebergCatalogConfig.ProtoReflect.Descriptor instead.
 func (*IcebergCatalogConfig) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{49}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{54}
 }
 
 func (x *IcebergCatalogConfig) GetCatalogUri() string {
@@ -3505,7 +3810,7 @@ type GNFColumn struct {
 
 func (x *GNFColumn) Reset() {
 	*x = GNFColumn{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[50]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[55]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3517,7 +3822,7 @@ func (x *GNFColumn) String() string {
 func (*GNFColumn) ProtoMessage() {}
 
 func (x *GNFColumn) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[50]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[55]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3530,7 +3835,7 @@ func (x *GNFColumn) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GNFColumn.ProtoReflect.Descriptor instead.
 func (*GNFColumn) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{50}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{55}
 }
 
 func (x *GNFColumn) GetColumnPath() []string {
@@ -3565,7 +3870,7 @@ type RelationId struct {
 
 func (x *RelationId) Reset() {
 	*x = RelationId{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[51]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[56]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3577,7 +3882,7 @@ func (x *RelationId) String() string {
 func (*RelationId) ProtoMessage() {}
 
 func (x *RelationId) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[51]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[56]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3590,7 +3895,7 @@ func (x *RelationId) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RelationId.ProtoReflect.Descriptor instead.
 func (*RelationId) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{51}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{56}
 }
 
 func (x *RelationId) GetIdLow() uint64 {
@@ -3632,7 +3937,7 @@ type Type struct {
 
 func (x *Type) Reset() {
 	*x = Type{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[52]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[57]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3644,7 +3949,7 @@ func (x *Type) String() string {
 func (*Type) ProtoMessage() {}
 
 func (x *Type) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[52]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[57]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3657,7 +3962,7 @@ func (x *Type) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Type.ProtoReflect.Descriptor instead.
 func (*Type) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{52}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{57}
 }
 
 func (x *Type) GetType() isType_Type {
@@ -3889,7 +4194,7 @@ type UnspecifiedType struct {
 
 func (x *UnspecifiedType) Reset() {
 	*x = UnspecifiedType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[53]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[58]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3901,7 +4206,7 @@ func (x *UnspecifiedType) String() string {
 func (*UnspecifiedType) ProtoMessage() {}
 
 func (x *UnspecifiedType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[53]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[58]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3914,7 +4219,7 @@ func (x *UnspecifiedType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UnspecifiedType.ProtoReflect.Descriptor instead.
 func (*UnspecifiedType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{53}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{58}
 }
 
 type StringType struct {
@@ -3925,7 +4230,7 @@ type StringType struct {
 
 func (x *StringType) Reset() {
 	*x = StringType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[54]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[59]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3937,7 +4242,7 @@ func (x *StringType) String() string {
 func (*StringType) ProtoMessage() {}
 
 func (x *StringType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[54]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[59]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3950,7 +4255,7 @@ func (x *StringType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StringType.ProtoReflect.Descriptor instead.
 func (*StringType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{54}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{59}
 }
 
 type IntType struct {
@@ -3961,7 +4266,7 @@ type IntType struct {
 
 func (x *IntType) Reset() {
 	*x = IntType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[55]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[60]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3973,7 +4278,7 @@ func (x *IntType) String() string {
 func (*IntType) ProtoMessage() {}
 
 func (x *IntType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[55]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[60]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3986,7 +4291,7 @@ func (x *IntType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IntType.ProtoReflect.Descriptor instead.
 func (*IntType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{55}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{60}
 }
 
 type FloatType struct {
@@ -3997,7 +4302,7 @@ type FloatType struct {
 
 func (x *FloatType) Reset() {
 	*x = FloatType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[56]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[61]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4009,7 +4314,7 @@ func (x *FloatType) String() string {
 func (*FloatType) ProtoMessage() {}
 
 func (x *FloatType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[56]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[61]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4022,7 +4327,7 @@ func (x *FloatType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FloatType.ProtoReflect.Descriptor instead.
 func (*FloatType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{56}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{61}
 }
 
 type UInt128Type struct {
@@ -4033,7 +4338,7 @@ type UInt128Type struct {
 
 func (x *UInt128Type) Reset() {
 	*x = UInt128Type{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[57]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[62]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4045,7 +4350,7 @@ func (x *UInt128Type) String() string {
 func (*UInt128Type) ProtoMessage() {}
 
 func (x *UInt128Type) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[57]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[62]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4058,7 +4363,7 @@ func (x *UInt128Type) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UInt128Type.ProtoReflect.Descriptor instead.
 func (*UInt128Type) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{57}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{62}
 }
 
 type Int128Type struct {
@@ -4069,7 +4374,7 @@ type Int128Type struct {
 
 func (x *Int128Type) Reset() {
 	*x = Int128Type{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[58]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[63]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4081,7 +4386,7 @@ func (x *Int128Type) String() string {
 func (*Int128Type) ProtoMessage() {}
 
 func (x *Int128Type) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[58]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[63]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4094,7 +4399,7 @@ func (x *Int128Type) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Int128Type.ProtoReflect.Descriptor instead.
 func (*Int128Type) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{58}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{63}
 }
 
 type DateType struct {
@@ -4105,7 +4410,7 @@ type DateType struct {
 
 func (x *DateType) Reset() {
 	*x = DateType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[59]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[64]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4117,7 +4422,7 @@ func (x *DateType) String() string {
 func (*DateType) ProtoMessage() {}
 
 func (x *DateType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[59]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[64]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4130,7 +4435,7 @@ func (x *DateType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DateType.ProtoReflect.Descriptor instead.
 func (*DateType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{59}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{64}
 }
 
 type DateTimeType struct {
@@ -4141,7 +4446,7 @@ type DateTimeType struct {
 
 func (x *DateTimeType) Reset() {
 	*x = DateTimeType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[60]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[65]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4153,7 +4458,7 @@ func (x *DateTimeType) String() string {
 func (*DateTimeType) ProtoMessage() {}
 
 func (x *DateTimeType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[60]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[65]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4166,7 +4471,7 @@ func (x *DateTimeType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DateTimeType.ProtoReflect.Descriptor instead.
 func (*DateTimeType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{60}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{65}
 }
 
 type MissingType struct {
@@ -4177,7 +4482,7 @@ type MissingType struct {
 
 func (x *MissingType) Reset() {
 	*x = MissingType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[61]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[66]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4189,7 +4494,7 @@ func (x *MissingType) String() string {
 func (*MissingType) ProtoMessage() {}
 
 func (x *MissingType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[61]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[66]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4202,7 +4507,7 @@ func (x *MissingType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MissingType.ProtoReflect.Descriptor instead.
 func (*MissingType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{61}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{66}
 }
 
 type DecimalType struct {
@@ -4215,7 +4520,7 @@ type DecimalType struct {
 
 func (x *DecimalType) Reset() {
 	*x = DecimalType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[62]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[67]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4227,7 +4532,7 @@ func (x *DecimalType) String() string {
 func (*DecimalType) ProtoMessage() {}
 
 func (x *DecimalType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[62]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[67]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4240,7 +4545,7 @@ func (x *DecimalType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DecimalType.ProtoReflect.Descriptor instead.
 func (*DecimalType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{62}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{67}
 }
 
 func (x *DecimalType) GetPrecision() int32 {
@@ -4265,7 +4570,7 @@ type BooleanType struct {
 
 func (x *BooleanType) Reset() {
 	*x = BooleanType{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[63]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[68]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4277,7 +4582,7 @@ func (x *BooleanType) String() string {
 func (*BooleanType) ProtoMessage() {}
 
 func (x *BooleanType) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[63]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[68]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4290,7 +4595,7 @@ func (x *BooleanType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BooleanType.ProtoReflect.Descriptor instead.
 func (*BooleanType) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{63}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{68}
 }
 
 type Int32Type struct {
@@ -4301,7 +4606,7 @@ type Int32Type struct {
 
 func (x *Int32Type) Reset() {
 	*x = Int32Type{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[64]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[69]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4313,7 +4618,7 @@ func (x *Int32Type) String() string {
 func (*Int32Type) ProtoMessage() {}
 
 func (x *Int32Type) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[64]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[69]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4326,7 +4631,7 @@ func (x *Int32Type) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Int32Type.ProtoReflect.Descriptor instead.
 func (*Int32Type) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{64}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{69}
 }
 
 type Float32Type struct {
@@ -4337,7 +4642,7 @@ type Float32Type struct {
 
 func (x *Float32Type) Reset() {
 	*x = Float32Type{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[65]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[70]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4349,7 +4654,7 @@ func (x *Float32Type) String() string {
 func (*Float32Type) ProtoMessage() {}
 
 func (x *Float32Type) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[65]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[70]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4362,7 +4667,7 @@ func (x *Float32Type) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Float32Type.ProtoReflect.Descriptor instead.
 func (*Float32Type) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{65}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{70}
 }
 
 type UInt32Type struct {
@@ -4373,7 +4678,7 @@ type UInt32Type struct {
 
 func (x *UInt32Type) Reset() {
 	*x = UInt32Type{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[66]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[71]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4385,7 +4690,7 @@ func (x *UInt32Type) String() string {
 func (*UInt32Type) ProtoMessage() {}
 
 func (x *UInt32Type) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[66]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[71]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4398,7 +4703,7 @@ func (x *UInt32Type) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UInt32Type.ProtoReflect.Descriptor instead.
 func (*UInt32Type) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{66}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{71}
 }
 
 type Value struct {
@@ -4425,7 +4730,7 @@ type Value struct {
 
 func (x *Value) Reset() {
 	*x = Value{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[67]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[72]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4437,7 +4742,7 @@ func (x *Value) String() string {
 func (*Value) ProtoMessage() {}
 
 func (x *Value) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[67]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[72]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4450,7 +4755,7 @@ func (x *Value) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Value.ProtoReflect.Descriptor instead.
 func (*Value) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{67}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{72}
 }
 
 func (x *Value) GetValue() isValue_Value {
@@ -4669,7 +4974,7 @@ type UInt128Value struct {
 
 func (x *UInt128Value) Reset() {
 	*x = UInt128Value{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[68]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[73]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4681,7 +4986,7 @@ func (x *UInt128Value) String() string {
 func (*UInt128Value) ProtoMessage() {}
 
 func (x *UInt128Value) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[68]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[73]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4694,7 +4999,7 @@ func (x *UInt128Value) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UInt128Value.ProtoReflect.Descriptor instead.
 func (*UInt128Value) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{68}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{73}
 }
 
 func (x *UInt128Value) GetLow() uint64 {
@@ -4721,7 +5026,7 @@ type Int128Value struct {
 
 func (x *Int128Value) Reset() {
 	*x = Int128Value{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[69]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[74]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4733,7 +5038,7 @@ func (x *Int128Value) String() string {
 func (*Int128Value) ProtoMessage() {}
 
 func (x *Int128Value) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[69]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[74]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4746,7 +5051,7 @@ func (x *Int128Value) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Int128Value.ProtoReflect.Descriptor instead.
 func (*Int128Value) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{69}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{74}
 }
 
 func (x *Int128Value) GetLow() uint64 {
@@ -4771,7 +5076,7 @@ type MissingValue struct {
 
 func (x *MissingValue) Reset() {
 	*x = MissingValue{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[70]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[75]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4783,7 +5088,7 @@ func (x *MissingValue) String() string {
 func (*MissingValue) ProtoMessage() {}
 
 func (x *MissingValue) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[70]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[75]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4796,7 +5101,7 @@ func (x *MissingValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MissingValue.ProtoReflect.Descriptor instead.
 func (*MissingValue) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{70}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{75}
 }
 
 type DateValue struct {
@@ -4810,7 +5115,7 @@ type DateValue struct {
 
 func (x *DateValue) Reset() {
 	*x = DateValue{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[71]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[76]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4822,7 +5127,7 @@ func (x *DateValue) String() string {
 func (*DateValue) ProtoMessage() {}
 
 func (x *DateValue) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[71]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[76]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4835,7 +5140,7 @@ func (x *DateValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DateValue.ProtoReflect.Descriptor instead.
 func (*DateValue) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{71}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{76}
 }
 
 func (x *DateValue) GetYear() int32 {
@@ -4876,7 +5181,7 @@ type DateTimeValue struct {
 
 func (x *DateTimeValue) Reset() {
 	*x = DateTimeValue{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[72]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[77]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4888,7 +5193,7 @@ func (x *DateTimeValue) String() string {
 func (*DateTimeValue) ProtoMessage() {}
 
 func (x *DateTimeValue) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[72]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[77]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4901,7 +5206,7 @@ func (x *DateTimeValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DateTimeValue.ProtoReflect.Descriptor instead.
 func (*DateTimeValue) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{72}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{77}
 }
 
 func (x *DateTimeValue) GetYear() int32 {
@@ -4964,7 +5269,7 @@ type DecimalValue struct {
 
 func (x *DecimalValue) Reset() {
 	*x = DecimalValue{}
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[73]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[78]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -4976,7 +5281,7 @@ func (x *DecimalValue) String() string {
 func (*DecimalValue) ProtoMessage() {}
 
 func (x *DecimalValue) ProtoReflect() protoreflect.Message {
-	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[73]
+	mi := &file_relationalai_lqp_v1_logic_proto_msgTypes[78]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4989,7 +5294,7 @@ func (x *DecimalValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DecimalValue.ProtoReflect.Descriptor instead.
 func (*DecimalValue) Descriptor() ([]byte, []int) {
-	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{73}
+	return file_relationalai_lqp_v1_logic_proto_rawDescGZIP(), []int{78}
 }
 
 func (x *DecimalValue) GetPrecision() int32 {
@@ -5449,284 +5754,329 @@ var file_relationalai_lqp_v1_logic_proto_rawDesc = string([]byte{
 	0x49, 0x64, 0x12, 0x2f, 0x0a, 0x14, 0x73, 0x33, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f,
 	0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x11, 0x73, 0x33, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,
-	0x4b, 0x65, 0x79, 0x22, 0xca, 0x01, 0x0a, 0x07, 0x43, 0x53, 0x56, 0x44, 0x61, 0x74, 0x61, 0x12,
-	0x39, 0x0a, 0x07, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1f, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e,
-	0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x53, 0x56, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f,
-	0x72, 0x52, 0x07, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x36, 0x0a, 0x06, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x53, 0x56, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x4b, 0x65, 0x79, 0x22, 0x50, 0x0a, 0x0b, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
+	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x88, 0x01, 0x0a, 0x0e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74,
+	0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67,
+	0x65, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65,
+	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76,
+	0x31, 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x52, 0x08, 0x74, 0x61,
+	0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x61, 0x6d,
+	0x65, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
+	0x22, 0x4d, 0x0a, 0x0c, 0x50, 0x6c, 0x61, 0x69, 0x6e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73,
+	0x12, 0x3d, 0x0a, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x23, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69,
+	0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65,
+	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x22,
+	0x8a, 0x01, 0x0a, 0x0a, 0x43, 0x64, 0x63, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x12, 0x3d,
+	0x0a, 0x07, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x23, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c,
+	0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x73, 0x12, 0x3d, 0x0a,
+	0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23,
+	0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x07, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0xbf, 0x01, 0x0a,
+	0x0f, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x12, 0x34, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20,
+	0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x39, 0x0a, 0x05, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6c, 0x61, 0x69,
+	0x6e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x48, 0x00, 0x52, 0x05, 0x70, 0x6c, 0x61, 0x69,
+	0x6e, 0x12, 0x33, 0x0a, 0x03, 0x63, 0x64, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f,
+	0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x64, 0x63, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x48,
+	0x00, 0x52, 0x03, 0x63, 0x64, 0x63, 0x42, 0x06, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x22, 0xa1,
+	0x02, 0x0a, 0x07, 0x43, 0x53, 0x56, 0x44, 0x61, 0x74, 0x61, 0x12, 0x39, 0x0a, 0x07, 0x6c, 0x6f,
+	0x63, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65,
+	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76,
+	0x31, 0x2e, 0x43, 0x53, 0x56, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x07, 0x6c, 0x6f,
+	0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x36, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x53, 0x56, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x38, 0x0a,
+	0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e,
+	0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x4e, 0x46, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x07,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x73, 0x6f, 0x66, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x73, 0x6f, 0x66, 0x12, 0x47, 0x0a, 0x09, 0x72,
+	0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24,
+	0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x22, 0x43, 0x0a, 0x0a, 0x43, 0x53, 0x56, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72,
+	0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
+	0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x69, 0x6e, 0x6c,
+	0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x22, 0x86, 0x04, 0x0a, 0x09, 0x43, 0x53, 0x56, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f,
+	0x72, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x52, 0x6f, 0x77, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x5f,
+	0x6c, 0x69, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, 0x65, 0x77, 0x4c,
+	0x69, 0x6e, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65,
+	0x72, 0x12, 0x1c, 0x0a, 0x09, 0x71, 0x75, 0x6f, 0x74, 0x65, 0x63, 0x68, 0x61, 0x72, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x71, 0x75, 0x6f, 0x74, 0x65, 0x63, 0x68, 0x61, 0x72, 0x12,
+	0x1e, 0x0a, 0x0a, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x63, 0x68, 0x61, 0x72, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x63, 0x68, 0x61, 0x72, 0x12,
+	0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6d, 0x69, 0x73,
+	0x73, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x0e, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x5f, 0x73, 0x65,
+	0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64,
+	0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x12,
+	0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x63,
+	0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a,
+	0x11, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f,
+	0x6d, 0x62, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x53, 0x69, 0x7a, 0x65, 0x4d, 0x62, 0x12, 0x5d, 0x0a, 0x13, 0x73, 0x74, 0x6f,
+	0x72, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x74, 0x6f,
+	0x72, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48,
+	0x00, 0x52, 0x12, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x73, 0x74, 0x6f,
+	0x72, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x22, 0xe0, 0x02, 0x0a, 0x0b, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x44, 0x61, 0x74, 0x61,
+	0x12, 0x3d, 0x0a, 0x07, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x23, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69,
+	0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x4c,
+	0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x07, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12,
+	0x41, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x29, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c,
+	0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x43, 0x61, 0x74,
+	0x61, 0x6c, 0x6f, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66,
 	0x69, 0x67, 0x12, 0x38, 0x0a, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x03, 0x20,
 	0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
 	0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x4e, 0x46, 0x43, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04,
-	0x61, 0x73, 0x6f, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x73, 0x6f, 0x66,
-	0x22, 0x43, 0x0a, 0x0a, 0x43, 0x53, 0x56, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x14,
-	0x0a, 0x05, 0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x70,
-	0x61, 0x74, 0x68, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x69, 0x6e, 0x6c, 0x69, 0x6e,
-	0x65, 0x44, 0x61, 0x74, 0x61, 0x22, 0x86, 0x04, 0x0a, 0x09, 0x43, 0x53, 0x56, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x72, 0x6f,
-	0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52,
-	0x6f, 0x77, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x5f, 0x6c, 0x69,
-	0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, 0x65, 0x77, 0x4c, 0x69, 0x6e,
-	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x12,
-	0x1c, 0x0a, 0x09, 0x71, 0x75, 0x6f, 0x74, 0x65, 0x63, 0x68, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x71, 0x75, 0x6f, 0x74, 0x65, 0x63, 0x68, 0x61, 0x72, 0x12, 0x1e, 0x0a,
-	0x0a, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x63, 0x68, 0x61, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x63, 0x68, 0x61, 0x72, 0x12, 0x18, 0x0a,
-	0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x6d, 0x69, 0x73, 0x73, 0x69,
-	0x6e, 0x67, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x0e, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73,
-	0x12, 0x2b, 0x0a, 0x11, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x5f, 0x73, 0x65, 0x70, 0x61,
-	0x72, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x65, 0x63,
-	0x69, 0x6d, 0x61, 0x6c, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1a, 0x0a,
-	0x08, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x6d,
-	0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
-	0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x70,
-	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x6d, 0x62,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x53, 0x69, 0x7a, 0x65, 0x4d, 0x62, 0x12, 0x5d, 0x0a, 0x13, 0x73, 0x74, 0x6f, 0x72, 0x61,
-	0x67, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61,
-	0x67, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52,
-	0x12, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61,
-	0x67, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xe0,
-	0x02, 0x0a, 0x0b, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x3d,
-	0x0a, 0x07, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x23, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c,
-	0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x4c, 0x6f, 0x63,
-	0x61, 0x74, 0x6f, 0x72, 0x52, 0x07, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x41, 0x0a,
-	0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
-	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70,
-	0x2e, 0x76, 0x31, 0x2e, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x43, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x38, 0x0a, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69,
-	0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x4e, 0x46, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x28, 0x0a, 0x0d, 0x66, 0x72,
-	0x6f, 0x6d, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x48, 0x00, 0x52, 0x0c, 0x66, 0x72, 0x6f, 0x6d, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f,
-	0x74, 0x88, 0x01, 0x01, 0x12, 0x24, 0x0a, 0x0b, 0x74, 0x6f, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73,
-	0x68, 0x6f, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0a, 0x74, 0x6f, 0x53,
-	0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65,
-	0x74, 0x75, 0x72, 0x6e, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x42,
-	0x10, 0x0a, 0x0e, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f,
-	0x74, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x74, 0x6f, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f,
-	0x74, 0x22, 0x6b, 0x0a, 0x0e, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x4c, 0x6f, 0x63, 0x61,
-	0x74, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x12, 0x1c, 0x0a, 0x09, 0x77, 0x61, 0x72, 0x65, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x77, 0x61, 0x72, 0x65, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x22, 0xa1,
-	0x03, 0x0a, 0x14, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f,
-	0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x61,
-	0x74, 0x61, 0x6c, 0x6f, 0x67, 0x55, 0x72, 0x69, 0x12, 0x19, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65,
-	0x88, 0x01, 0x01, 0x12, 0x59, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
-	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x63,
-	0x65, 0x62, 0x65, 0x72, 0x67, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x12, 0x66,
-	0x0a, 0x0f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
-	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x63,
-	0x65, 0x62, 0x65, 0x72, 0x67, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x61, 0x75, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x70,
-	0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-	0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x68, 0x50, 0x72, 0x6f,
-	0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x73, 0x63, 0x6f,
-	0x70, 0x65, 0x22, 0xae, 0x01, 0x0a, 0x09, 0x47, 0x4e, 0x46, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x50, 0x61, 0x74,
-	0x68, 0x12, 0x41, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x48, 0x00, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49,
-	0x64, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x05, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05,
-	0x74, 0x79, 0x70, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
-	0x5f, 0x69, 0x64, 0x22, 0x3c, 0x0a, 0x0a, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
-	0x64, 0x12, 0x15, 0x0a, 0x06, 0x69, 0x64, 0x5f, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x06, 0x52, 0x05, 0x69, 0x64, 0x4c, 0x6f, 0x77, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x64, 0x5f, 0x68,
-	0x69, 0x67, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x06, 0x52, 0x06, 0x69, 0x64, 0x48, 0x69, 0x67,
-	0x68, 0x22, 0xd5, 0x07, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x51, 0x0a, 0x10, 0x75, 0x6e,
-	0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x73, 0x70, 0x65,
-	0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x75, 0x6e,
-	0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x42, 0x0a,
-	0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61,
-	0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x54,
-	0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x39, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x48, 0x00, 0x52, 0x07, 0x69, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3f, 0x0a, 0x0a,
-	0x66, 0x6c, 0x6f, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e,
-	0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65,
-	0x48, 0x00, 0x52, 0x09, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x45, 0x0a,
-	0x0c, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x31, 0x32,
-	0x38, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x42, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65, 0x6c, 0x61,
+	0x75, 0x6d, 0x6e, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x28, 0x0a, 0x0d,
+	0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x66, 0x72, 0x6f, 0x6d, 0x53, 0x6e, 0x61, 0x70, 0x73,
+	0x68, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x12, 0x24, 0x0a, 0x0b, 0x74, 0x6f, 0x5f, 0x73, 0x6e, 0x61,
+	0x70, 0x73, 0x68, 0x6f, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0a, 0x74,
+	0x6f, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0d,
+	0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x44, 0x65, 0x6c, 0x74,
+	0x61, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73,
+	0x68, 0x6f, 0x74, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x74, 0x6f, 0x5f, 0x73, 0x6e, 0x61, 0x70, 0x73,
+	0x68, 0x6f, 0x74, 0x22, 0x6b, 0x0a, 0x0e, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x4c, 0x6f,
+	0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x77, 0x61, 0x72, 0x65, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x77, 0x61, 0x72, 0x65, 0x68, 0x6f, 0x75, 0x73, 0x65,
+	0x22, 0xa1, 0x03, 0x0a, 0x14, 0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x43, 0x61, 0x74, 0x61,
+	0x6c, 0x6f, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x61, 0x74,
+	0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x55, 0x72, 0x69, 0x12, 0x19, 0x0a, 0x05, 0x73, 0x63,
+	0x6f, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x73, 0x63, 0x6f,
+	0x70, 0x65, 0x88, 0x01, 0x01, 0x12, 0x59, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x72, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e,
+	0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73,
+	0x12, 0x66, 0x0a, 0x0f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x72, 0x65, 0x6c, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e,
-	0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e,
-	0x74, 0x31, 0x32, 0x38, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x09, 0x64, 0x61, 0x74, 0x65,
-	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x72, 0x65,
+	0x49, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x61, 0x75, 0x74, 0x68, 0x50, 0x72,
+	0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x70,
+	0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x68, 0x50,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x73,
+	0x63, 0x6f, 0x70, 0x65, 0x22, 0xae, 0x01, 0x0a, 0x09, 0x47, 0x4e, 0x46, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x70, 0x61, 0x74,
+	0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x50,
+	0x61, 0x74, 0x68, 0x12, 0x41, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6c,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x48, 0x00, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
+	0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x05, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18,
+	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x79, 0x70, 0x65,
+	0x52, 0x05, 0x74, 0x79, 0x70, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x61, 0x72, 0x67,
+	0x65, 0x74, 0x5f, 0x69, 0x64, 0x22, 0x3c, 0x0a, 0x0a, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x69, 0x64, 0x5f, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x06, 0x52, 0x05, 0x69, 0x64, 0x4c, 0x6f, 0x77, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x64,
+	0x5f, 0x68, 0x69, 0x67, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x06, 0x52, 0x06, 0x69, 0x64, 0x48,
+	0x69, 0x67, 0x68, 0x22, 0xd5, 0x07, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x51, 0x0a, 0x10,
+	0x75, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6e, 0x73,
+	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0f,
+	0x75, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x42, 0x0a, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
+	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x39, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x07, 0x69, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3f,
+	0x0a, 0x0a, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61,
+	0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x54, 0x79,
+	0x70, 0x65, 0x48, 0x00, 0x52, 0x09, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x45, 0x0a, 0x0c, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x49, 0x6e, 0x74,
+	0x31, 0x32, 0x38, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x69, 0x6e, 0x74, 0x31,
+	0x32, 0x38, 0x54, 0x79, 0x70, 0x65, 0x12, 0x42, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65,
 	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x08, 0x64, 0x61,
-	0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69,
-	0x6d, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
-	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70,
-	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65,
-	0x48, 0x00, 0x52, 0x0c, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x45, 0x0a, 0x0c, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x69, 0x73,
-	0x73, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x45, 0x0a, 0x0c, 0x64, 0x65, 0x63, 0x69, 0x6d,
-	0x61, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
+	0x31, 0x2e, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0a,
+	0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x09, 0x64, 0x61,
+	0x74, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e,
 	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70,
-	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x48,
-	0x00, 0x52, 0x0b, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x45,
-	0x0a, 0x0c, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x65,
-	0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61,
-	0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x74,
-	0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x12, 0x45, 0x0a, 0x0c, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x33,
-	0x32, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72,
-	0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e,
-	0x76, 0x31, 0x2e, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00,
-	0x52, 0x0b, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x12, 0x42, 0x0a,
-	0x0b, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61,
-	0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x54,
-	0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70,
-	0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x6e, 0x73,
-	0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0c, 0x0a, 0x0a,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x09, 0x0a, 0x07, 0x49, 0x6e,
-	0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0b, 0x0a, 0x09, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x54, 0x79,
-	0x70, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x54, 0x79, 0x70,
-	0x65, 0x22, 0x0c, 0x0a, 0x0a, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x54, 0x79, 0x70, 0x65, 0x22,
-	0x0a, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0e, 0x0a, 0x0c, 0x44,
-	0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x4d,
-	0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x41, 0x0a, 0x0b, 0x44, 0x65,
-	0x63, 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x65,
-	0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x70, 0x72,
-	0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x61, 0x6c, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x0d, 0x0a,
-	0x0b, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0b, 0x0a, 0x09,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x46, 0x6c, 0x6f,
-	0x61, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0c, 0x0a, 0x0a, 0x55, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x22, 0xc0, 0x05, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x5f, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x6c, 0x6f,
-	0x61, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x75, 0x69, 0x6e, 0x74, 0x31,
-	0x32, 0x38, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21,
-	0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71,
-	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x48, 0x00, 0x52, 0x0c, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x45, 0x0a, 0x0c, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x5f, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e,
-	0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x69, 0x6e, 0x74,
-	0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x08,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x64, 0x61, 0x74, 0x65,
+	0x74, 0x69, 0x6d, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x21, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c,
-	0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x61, 0x74,
-	0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x09, 0x64, 0x61, 0x74, 0x65, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x12, 0x4b, 0x0a, 0x0e, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x72, 0x65,
+	0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x45, 0x0a, 0x0c, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x5f, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d,
+	0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x6d, 0x69,
+	0x73, 0x73, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x45, 0x0a, 0x0c, 0x64, 0x65, 0x63,
+	0x69, 0x6d, 0x61, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c,
+	0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x79, 0x70,
+	0x65, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x45, 0x0a, 0x0c, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65,
+	0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x6f, 0x6f,
+	0x6c, 0x65, 0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x6f, 0x6f, 0x6c,
+	0x65, 0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x69, 0x6e, 0x74, 0x33, 0x32,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65,
 	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48,
-	0x00, 0x52, 0x0d, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x12, 0x48, 0x0a, 0x0d, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65,
-	0x63, 0x69, 0x6d, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x64, 0x65,
-	0x63, 0x69, 0x6d, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0d, 0x62, 0x6f,
-	0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x08, 0x48, 0x00, 0x52, 0x0c, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x21, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0d, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x33, 0x32, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x02, 0x48, 0x00, 0x52, 0x0c, 0x66,
-	0x6c, 0x6f, 0x61, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x75,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28,
-	0x0d, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x34, 0x0a, 0x0c, 0x55, 0x49, 0x6e,
-	0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x77,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x06, 0x52, 0x03, 0x6c, 0x6f, 0x77, 0x12, 0x12, 0x0a, 0x04, 0x68,
-	0x69, 0x67, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x06, 0x52, 0x04, 0x68, 0x69, 0x67, 0x68, 0x22,
-	0x33, 0x0a, 0x0b, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x10,
-	0x0a, 0x03, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x06, 0x52, 0x03, 0x6c, 0x6f, 0x77,
-	0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x67, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x06, 0x52, 0x04,
-	0x68, 0x69, 0x67, 0x68, 0x22, 0x0e, 0x0a, 0x0c, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x22, 0x47, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75,
+	0x31, 0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x09, 0x69,
+	0x6e, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x12, 0x45, 0x0a, 0x0c, 0x66, 0x6c, 0x6f, 0x61,
+	0x74, 0x33, 0x32, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
+	0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65,
+	0x48, 0x00, 0x52, 0x0b, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x42, 0x0a, 0x0b, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0e,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
+	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33,
+	0x32, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x54,
+	0x79, 0x70, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x11, 0x0a, 0x0f, 0x55,
+	0x6e, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0c,
+	0x0a, 0x0a, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x09, 0x0a, 0x07,
+	0x49, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0b, 0x0a, 0x09, 0x46, 0x6c, 0x6f, 0x61, 0x74,
+	0x54, 0x79, 0x70, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x54,
+	0x79, 0x70, 0x65, 0x22, 0x0c, 0x0a, 0x0a, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x54, 0x79, 0x70,
+	0x65, 0x22, 0x0a, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0e, 0x0a,
+	0x0c, 0x44, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0d, 0x0a,
+	0x0b, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x41, 0x0a, 0x0b,
+	0x44, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70,
+	0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
+	0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x61,
+	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22,
+	0x0d, 0x0a, 0x0b, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0b,
+	0x0a, 0x09, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x46,
+	0x6c, 0x6f, 0x61, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0c, 0x0a, 0x0a, 0x55, 0x49,
+	0x6e, 0x74, 0x33, 0x32, 0x54, 0x79, 0x70, 0x65, 0x22, 0xc0, 0x05, 0x0a, 0x05, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69,
+	0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x5f, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e,
+	0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x5f,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x66,
+	0x6c, 0x6f, 0x61, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x75, 0x69, 0x6e,
+	0x74, 0x31, 0x32, 0x38, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x21, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e,
+	0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x75, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x45, 0x0a, 0x0c, 0x69, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x5f, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e,
+	0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x69,
+	0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x6d, 0x69,
+	0x73, 0x73, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x21, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69,
+	0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x44,
+	0x61, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x09, 0x64, 0x61, 0x74, 0x65,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x4b, 0x0a, 0x0e, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d,
+	0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e,
+	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70,
+	0x2e, 0x76, 0x31, 0x2e, 0x44, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x48, 0x00, 0x52, 0x0d, 0x64, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x12, 0x48, 0x0a, 0x0d, 0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x5f, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e,
+	0x44, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x0c,
+	0x64, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0d,
+	0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0c, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x33,
+	0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0d, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x33,
+	0x32, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x02, 0x48, 0x00, 0x52,
+	0x0c, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a,
+	0x0c, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0d, 0x20,
+	0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x34, 0x0a, 0x0c, 0x55,
+	0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6c,
+	0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x06, 0x52, 0x03, 0x6c, 0x6f, 0x77, 0x12, 0x12, 0x0a,
+	0x04, 0x68, 0x69, 0x67, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x06, 0x52, 0x04, 0x68, 0x69, 0x67,
+	0x68, 0x22, 0x33, 0x0a, 0x0b, 0x49, 0x6e, 0x74, 0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x06, 0x52, 0x03, 0x6c,
+	0x6f, 0x77, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x67, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x06,
+	0x52, 0x04, 0x68, 0x69, 0x67, 0x68, 0x22, 0x0e, 0x0a, 0x0c, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6e,
+	0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x47, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x65, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x79, 0x65, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x04, 0x79, 0x65, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x12, 0x10, 0x0a,
+	0x03, 0x64, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x22,
+	0xb1, 0x01, 0x0a, 0x0d, 0x44, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x56, 0x61, 0x6c, 0x75,
 	0x65, 0x12, 0x12, 0x0a, 0x04, 0x79, 0x65, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
 	0x04, 0x79, 0x65, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x64,
-	0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x22, 0xb1, 0x01,
-	0x0a, 0x0d, 0x44, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12,
-	0x12, 0x0a, 0x04, 0x79, 0x65, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x79,
-	0x65, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x68,
-	0x6f, 0x75, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x6f, 0x75, 0x72, 0x12,
-	0x16, 0x0a, 0x06, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x06, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e,
-	0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x12,
-	0x20, 0x0a, 0x0b, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x65, 0x63, 0x6f, 0x6e,
-	0x64, 0x22, 0x7a, 0x0a, 0x0c, 0x44, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12,
-	0x14, 0x0a, 0x05, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x73, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x74, 0x31, 0x32,
-	0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x43, 0x5a,
-	0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x52, 0x65, 0x6c, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x41, 0x49, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0x61, 0x6c,
-	0x2d, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f,
-	0x73, 0x64, 0x6b, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x73, 0x72, 0x63, 0x2f, 0x6c, 0x71, 0x70, 0x2f,
-	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x12, 0x0a,
+	0x04, 0x68, 0x6f, 0x75, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x6f, 0x75,
+	0x72, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63,
+	0x6f, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e,
+	0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x65, 0x63,
+	0x6f, 0x6e, 0x64, 0x22, 0x7a, 0x0a, 0x0c, 0x44, 0x65, 0x63, 0x69, 0x6d, 0x61, 0x6c, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f,
+	0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x36, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x74,
+	0x31, 0x32, 0x38, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42,
+	0x43, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x52, 0x65,
+	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x41, 0x49, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x63,
+	0x61, 0x6c, 0x2d, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
+	0x6c, 0x2f, 0x73, 0x64, 0x6b, 0x73, 0x2f, 0x67, 0x6f, 0x2f, 0x73, 0x72, 0x63, 0x2f, 0x6c, 0x71,
+	0x70, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 })
 
 var (
@@ -5741,7 +6091,7 @@ func file_relationalai_lqp_v1_logic_proto_rawDescGZIP() []byte {
 	return file_relationalai_lqp_v1_logic_proto_rawDescData
 }
 
-var file_relationalai_lqp_v1_logic_proto_msgTypes = make([]protoimpl.MessageInfo, 76)
+var file_relationalai_lqp_v1_logic_proto_msgTypes = make([]protoimpl.MessageInfo, 81)
 var file_relationalai_lqp_v1_logic_proto_goTypes = []any{
 	(*Declaration)(nil),          // 0: relationalai.lqp.v1.Declaration
 	(*Def)(nil),                  // 1: relationalai.lqp.v1.Def
@@ -5787,53 +6137,58 @@ var file_relationalai_lqp_v1_logic_proto_goTypes = []any{
 	(*BeTreeConfig)(nil),         // 41: relationalai.lqp.v1.BeTreeConfig
 	(*BeTreeLocator)(nil),        // 42: relationalai.lqp.v1.BeTreeLocator
 	(*StorageIntegration)(nil),   // 43: relationalai.lqp.v1.StorageIntegration
-	(*CSVData)(nil),              // 44: relationalai.lqp.v1.CSVData
-	(*CSVLocator)(nil),           // 45: relationalai.lqp.v1.CSVLocator
-	(*CSVConfig)(nil),            // 46: relationalai.lqp.v1.CSVConfig
-	(*IcebergData)(nil),          // 47: relationalai.lqp.v1.IcebergData
-	(*IcebergLocator)(nil),       // 48: relationalai.lqp.v1.IcebergLocator
-	(*IcebergCatalogConfig)(nil), // 49: relationalai.lqp.v1.IcebergCatalogConfig
-	(*GNFColumn)(nil),            // 50: relationalai.lqp.v1.GNFColumn
-	(*RelationId)(nil),           // 51: relationalai.lqp.v1.RelationId
-	(*Type)(nil),                 // 52: relationalai.lqp.v1.Type
-	(*UnspecifiedType)(nil),      // 53: relationalai.lqp.v1.UnspecifiedType
-	(*StringType)(nil),           // 54: relationalai.lqp.v1.StringType
-	(*IntType)(nil),              // 55: relationalai.lqp.v1.IntType
-	(*FloatType)(nil),            // 56: relationalai.lqp.v1.FloatType
-	(*UInt128Type)(nil),          // 57: relationalai.lqp.v1.UInt128Type
-	(*Int128Type)(nil),           // 58: relationalai.lqp.v1.Int128Type
-	(*DateType)(nil),             // 59: relationalai.lqp.v1.DateType
-	(*DateTimeType)(nil),         // 60: relationalai.lqp.v1.DateTimeType
-	(*MissingType)(nil),          // 61: relationalai.lqp.v1.MissingType
-	(*DecimalType)(nil),          // 62: relationalai.lqp.v1.DecimalType
-	(*BooleanType)(nil),          // 63: relationalai.lqp.v1.BooleanType
-	(*Int32Type)(nil),            // 64: relationalai.lqp.v1.Int32Type
-	(*Float32Type)(nil),          // 65: relationalai.lqp.v1.Float32Type
-	(*UInt32Type)(nil),           // 66: relationalai.lqp.v1.UInt32Type
-	(*Value)(nil),                // 67: relationalai.lqp.v1.Value
-	(*UInt128Value)(nil),         // 68: relationalai.lqp.v1.UInt128Value
-	(*Int128Value)(nil),          // 69: relationalai.lqp.v1.Int128Value
-	(*MissingValue)(nil),         // 70: relationalai.lqp.v1.MissingValue
-	(*DateValue)(nil),            // 71: relationalai.lqp.v1.DateValue
-	(*DateTimeValue)(nil),        // 72: relationalai.lqp.v1.DateTimeValue
-	(*DecimalValue)(nil),         // 73: relationalai.lqp.v1.DecimalValue
-	nil,                          // 74: relationalai.lqp.v1.IcebergCatalogConfig.PropertiesEntry
-	nil,                          // 75: relationalai.lqp.v1.IcebergCatalogConfig.AuthPropertiesEntry
+	(*NamedColumn)(nil),          // 44: relationalai.lqp.v1.NamedColumn
+	(*TargetRelation)(nil),       // 45: relationalai.lqp.v1.TargetRelation
+	(*PlainTargets)(nil),         // 46: relationalai.lqp.v1.PlainTargets
+	(*CdcTargets)(nil),           // 47: relationalai.lqp.v1.CdcTargets
+	(*TargetRelations)(nil),      // 48: relationalai.lqp.v1.TargetRelations
+	(*CSVData)(nil),              // 49: relationalai.lqp.v1.CSVData
+	(*CSVLocator)(nil),           // 50: relationalai.lqp.v1.CSVLocator
+	(*CSVConfig)(nil),            // 51: relationalai.lqp.v1.CSVConfig
+	(*IcebergData)(nil),          // 52: relationalai.lqp.v1.IcebergData
+	(*IcebergLocator)(nil),       // 53: relationalai.lqp.v1.IcebergLocator
+	(*IcebergCatalogConfig)(nil), // 54: relationalai.lqp.v1.IcebergCatalogConfig
+	(*GNFColumn)(nil),            // 55: relationalai.lqp.v1.GNFColumn
+	(*RelationId)(nil),           // 56: relationalai.lqp.v1.RelationId
+	(*Type)(nil),                 // 57: relationalai.lqp.v1.Type
+	(*UnspecifiedType)(nil),      // 58: relationalai.lqp.v1.UnspecifiedType
+	(*StringType)(nil),           // 59: relationalai.lqp.v1.StringType
+	(*IntType)(nil),              // 60: relationalai.lqp.v1.IntType
+	(*FloatType)(nil),            // 61: relationalai.lqp.v1.FloatType
+	(*UInt128Type)(nil),          // 62: relationalai.lqp.v1.UInt128Type
+	(*Int128Type)(nil),           // 63: relationalai.lqp.v1.Int128Type
+	(*DateType)(nil),             // 64: relationalai.lqp.v1.DateType
+	(*DateTimeType)(nil),         // 65: relationalai.lqp.v1.DateTimeType
+	(*MissingType)(nil),          // 66: relationalai.lqp.v1.MissingType
+	(*DecimalType)(nil),          // 67: relationalai.lqp.v1.DecimalType
+	(*BooleanType)(nil),          // 68: relationalai.lqp.v1.BooleanType
+	(*Int32Type)(nil),            // 69: relationalai.lqp.v1.Int32Type
+	(*Float32Type)(nil),          // 70: relationalai.lqp.v1.Float32Type
+	(*UInt32Type)(nil),           // 71: relationalai.lqp.v1.UInt32Type
+	(*Value)(nil),                // 72: relationalai.lqp.v1.Value
+	(*UInt128Value)(nil),         // 73: relationalai.lqp.v1.UInt128Value
+	(*Int128Value)(nil),          // 74: relationalai.lqp.v1.Int128Value
+	(*MissingValue)(nil),         // 75: relationalai.lqp.v1.MissingValue
+	(*DateValue)(nil),            // 76: relationalai.lqp.v1.DateValue
+	(*DateTimeValue)(nil),        // 77: relationalai.lqp.v1.DateTimeValue
+	(*DecimalValue)(nil),         // 78: relationalai.lqp.v1.DecimalValue
+	nil,                          // 79: relationalai.lqp.v1.IcebergCatalogConfig.PropertiesEntry
+	nil,                          // 80: relationalai.lqp.v1.IcebergCatalogConfig.AuthPropertiesEntry
 }
 var file_relationalai_lqp_v1_logic_proto_depIdxs = []int32{
 	1,   // 0: relationalai.lqp.v1.Declaration.def:type_name -> relationalai.lqp.v1.Def
 	4,   // 1: relationalai.lqp.v1.Declaration.algorithm:type_name -> relationalai.lqp.v1.Algorithm
 	2,   // 2: relationalai.lqp.v1.Declaration.constraint:type_name -> relationalai.lqp.v1.Constraint
 	37,  // 3: relationalai.lqp.v1.Declaration.data:type_name -> relationalai.lqp.v1.Data
-	51,  // 4: relationalai.lqp.v1.Def.name:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 4: relationalai.lqp.v1.Def.name:type_name -> relationalai.lqp.v1.RelationId
 	20,  // 5: relationalai.lqp.v1.Def.body:type_name -> relationalai.lqp.v1.Abstraction
 	36,  // 6: relationalai.lqp.v1.Def.attrs:type_name -> relationalai.lqp.v1.Attribute
-	51,  // 7: relationalai.lqp.v1.Constraint.name:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 7: relationalai.lqp.v1.Constraint.name:type_name -> relationalai.lqp.v1.RelationId
 	3,   // 8: relationalai.lqp.v1.Constraint.functional_dependency:type_name -> relationalai.lqp.v1.FunctionalDependency
 	20,  // 9: relationalai.lqp.v1.FunctionalDependency.guard:type_name -> relationalai.lqp.v1.Abstraction
 	35,  // 10: relationalai.lqp.v1.FunctionalDependency.keys:type_name -> relationalai.lqp.v1.Var
 	35,  // 11: relationalai.lqp.v1.FunctionalDependency.values:type_name -> relationalai.lqp.v1.Var
-	51,  // 12: relationalai.lqp.v1.Algorithm.global:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 12: relationalai.lqp.v1.Algorithm.global:type_name -> relationalai.lqp.v1.RelationId
 	5,   // 13: relationalai.lqp.v1.Algorithm.body:type_name -> relationalai.lqp.v1.Script
 	36,  // 14: relationalai.lqp.v1.Algorithm.attrs:type_name -> relationalai.lqp.v1.Attribute
 	6,   // 15: relationalai.lqp.v1.Script.constructs:type_name -> relationalai.lqp.v1.Construct
@@ -5847,32 +6202,32 @@ var file_relationalai_lqp_v1_logic_proto_depIdxs = []int32{
 	11,  // 23: relationalai.lqp.v1.Instruction.break:type_name -> relationalai.lqp.v1.Break
 	12,  // 24: relationalai.lqp.v1.Instruction.monoid_def:type_name -> relationalai.lqp.v1.MonoidDef
 	13,  // 25: relationalai.lqp.v1.Instruction.monus_def:type_name -> relationalai.lqp.v1.MonusDef
-	51,  // 26: relationalai.lqp.v1.Assign.name:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 26: relationalai.lqp.v1.Assign.name:type_name -> relationalai.lqp.v1.RelationId
 	20,  // 27: relationalai.lqp.v1.Assign.body:type_name -> relationalai.lqp.v1.Abstraction
 	36,  // 28: relationalai.lqp.v1.Assign.attrs:type_name -> relationalai.lqp.v1.Attribute
-	51,  // 29: relationalai.lqp.v1.Upsert.name:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 29: relationalai.lqp.v1.Upsert.name:type_name -> relationalai.lqp.v1.RelationId
 	20,  // 30: relationalai.lqp.v1.Upsert.body:type_name -> relationalai.lqp.v1.Abstraction
 	36,  // 31: relationalai.lqp.v1.Upsert.attrs:type_name -> relationalai.lqp.v1.Attribute
-	51,  // 32: relationalai.lqp.v1.Break.name:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 32: relationalai.lqp.v1.Break.name:type_name -> relationalai.lqp.v1.RelationId
 	20,  // 33: relationalai.lqp.v1.Break.body:type_name -> relationalai.lqp.v1.Abstraction
 	36,  // 34: relationalai.lqp.v1.Break.attrs:type_name -> relationalai.lqp.v1.Attribute
 	14,  // 35: relationalai.lqp.v1.MonoidDef.monoid:type_name -> relationalai.lqp.v1.Monoid
-	51,  // 36: relationalai.lqp.v1.MonoidDef.name:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 36: relationalai.lqp.v1.MonoidDef.name:type_name -> relationalai.lqp.v1.RelationId
 	20,  // 37: relationalai.lqp.v1.MonoidDef.body:type_name -> relationalai.lqp.v1.Abstraction
 	36,  // 38: relationalai.lqp.v1.MonoidDef.attrs:type_name -> relationalai.lqp.v1.Attribute
 	14,  // 39: relationalai.lqp.v1.MonusDef.monoid:type_name -> relationalai.lqp.v1.Monoid
-	51,  // 40: relationalai.lqp.v1.MonusDef.name:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 40: relationalai.lqp.v1.MonusDef.name:type_name -> relationalai.lqp.v1.RelationId
 	20,  // 41: relationalai.lqp.v1.MonusDef.body:type_name -> relationalai.lqp.v1.Abstraction
 	36,  // 42: relationalai.lqp.v1.MonusDef.attrs:type_name -> relationalai.lqp.v1.Attribute
 	15,  // 43: relationalai.lqp.v1.Monoid.or_monoid:type_name -> relationalai.lqp.v1.OrMonoid
 	16,  // 44: relationalai.lqp.v1.Monoid.min_monoid:type_name -> relationalai.lqp.v1.MinMonoid
 	17,  // 45: relationalai.lqp.v1.Monoid.max_monoid:type_name -> relationalai.lqp.v1.MaxMonoid
 	18,  // 46: relationalai.lqp.v1.Monoid.sum_monoid:type_name -> relationalai.lqp.v1.SumMonoid
-	52,  // 47: relationalai.lqp.v1.MinMonoid.type:type_name -> relationalai.lqp.v1.Type
-	52,  // 48: relationalai.lqp.v1.MaxMonoid.type:type_name -> relationalai.lqp.v1.Type
-	52,  // 49: relationalai.lqp.v1.SumMonoid.type:type_name -> relationalai.lqp.v1.Type
+	57,  // 47: relationalai.lqp.v1.MinMonoid.type:type_name -> relationalai.lqp.v1.Type
+	57,  // 48: relationalai.lqp.v1.MaxMonoid.type:type_name -> relationalai.lqp.v1.Type
+	57,  // 49: relationalai.lqp.v1.SumMonoid.type:type_name -> relationalai.lqp.v1.Type
 	35,  // 50: relationalai.lqp.v1.Binding.var:type_name -> relationalai.lqp.v1.Var
-	52,  // 51: relationalai.lqp.v1.Binding.type:type_name -> relationalai.lqp.v1.Type
+	57,  // 51: relationalai.lqp.v1.Binding.type:type_name -> relationalai.lqp.v1.Type
 	19,  // 52: relationalai.lqp.v1.Abstraction.vars:type_name -> relationalai.lqp.v1.Binding
 	21,  // 53: relationalai.lqp.v1.Abstraction.value:type_name -> relationalai.lqp.v1.Formula
 	22,  // 54: relationalai.lqp.v1.Formula.exists:type_name -> relationalai.lqp.v1.Exists
@@ -5895,68 +6250,78 @@ var file_relationalai_lqp_v1_logic_proto_depIdxs = []int32{
 	21,  // 71: relationalai.lqp.v1.Not.arg:type_name -> relationalai.lqp.v1.Formula
 	20,  // 72: relationalai.lqp.v1.FFI.args:type_name -> relationalai.lqp.v1.Abstraction
 	34,  // 73: relationalai.lqp.v1.FFI.terms:type_name -> relationalai.lqp.v1.Term
-	51,  // 74: relationalai.lqp.v1.Atom.name:type_name -> relationalai.lqp.v1.RelationId
+	56,  // 74: relationalai.lqp.v1.Atom.name:type_name -> relationalai.lqp.v1.RelationId
 	34,  // 75: relationalai.lqp.v1.Atom.terms:type_name -> relationalai.lqp.v1.Term
 	34,  // 76: relationalai.lqp.v1.Pragma.terms:type_name -> relationalai.lqp.v1.Term
 	33,  // 77: relationalai.lqp.v1.Primitive.terms:type_name -> relationalai.lqp.v1.RelTerm
 	33,  // 78: relationalai.lqp.v1.RelAtom.terms:type_name -> relationalai.lqp.v1.RelTerm
 	34,  // 79: relationalai.lqp.v1.Cast.input:type_name -> relationalai.lqp.v1.Term
 	34,  // 80: relationalai.lqp.v1.Cast.result:type_name -> relationalai.lqp.v1.Term
-	67,  // 81: relationalai.lqp.v1.RelTerm.specialized_value:type_name -> relationalai.lqp.v1.Value
+	72,  // 81: relationalai.lqp.v1.RelTerm.specialized_value:type_name -> relationalai.lqp.v1.Value
 	34,  // 82: relationalai.lqp.v1.RelTerm.term:type_name -> relationalai.lqp.v1.Term
 	35,  // 83: relationalai.lqp.v1.Term.var:type_name -> relationalai.lqp.v1.Var
-	67,  // 84: relationalai.lqp.v1.Term.constant:type_name -> relationalai.lqp.v1.Value
-	67,  // 85: relationalai.lqp.v1.Attribute.args:type_name -> relationalai.lqp.v1.Value
+	72,  // 84: relationalai.lqp.v1.Term.constant:type_name -> relationalai.lqp.v1.Value
+	72,  // 85: relationalai.lqp.v1.Attribute.args:type_name -> relationalai.lqp.v1.Value
 	38,  // 86: relationalai.lqp.v1.Data.edb:type_name -> relationalai.lqp.v1.EDB
 	39,  // 87: relationalai.lqp.v1.Data.betree_relation:type_name -> relationalai.lqp.v1.BeTreeRelation
-	44,  // 88: relationalai.lqp.v1.Data.csv_data:type_name -> relationalai.lqp.v1.CSVData
-	47,  // 89: relationalai.lqp.v1.Data.iceberg_data:type_name -> relationalai.lqp.v1.IcebergData
-	51,  // 90: relationalai.lqp.v1.EDB.target_id:type_name -> relationalai.lqp.v1.RelationId
-	52,  // 91: relationalai.lqp.v1.EDB.types:type_name -> relationalai.lqp.v1.Type
-	51,  // 92: relationalai.lqp.v1.BeTreeRelation.name:type_name -> relationalai.lqp.v1.RelationId
+	49,  // 88: relationalai.lqp.v1.Data.csv_data:type_name -> relationalai.lqp.v1.CSVData
+	52,  // 89: relationalai.lqp.v1.Data.iceberg_data:type_name -> relationalai.lqp.v1.IcebergData
+	56,  // 90: relationalai.lqp.v1.EDB.target_id:type_name -> relationalai.lqp.v1.RelationId
+	57,  // 91: relationalai.lqp.v1.EDB.types:type_name -> relationalai.lqp.v1.Type
+	56,  // 92: relationalai.lqp.v1.BeTreeRelation.name:type_name -> relationalai.lqp.v1.RelationId
 	40,  // 93: relationalai.lqp.v1.BeTreeRelation.relation_info:type_name -> relationalai.lqp.v1.BeTreeInfo
-	52,  // 94: relationalai.lqp.v1.BeTreeInfo.key_types:type_name -> relationalai.lqp.v1.Type
-	52,  // 95: relationalai.lqp.v1.BeTreeInfo.value_types:type_name -> relationalai.lqp.v1.Type
+	57,  // 94: relationalai.lqp.v1.BeTreeInfo.key_types:type_name -> relationalai.lqp.v1.Type
+	57,  // 95: relationalai.lqp.v1.BeTreeInfo.value_types:type_name -> relationalai.lqp.v1.Type
 	41,  // 96: relationalai.lqp.v1.BeTreeInfo.storage_config:type_name -> relationalai.lqp.v1.BeTreeConfig
 	42,  // 97: relationalai.lqp.v1.BeTreeInfo.relation_locator:type_name -> relationalai.lqp.v1.BeTreeLocator
-	68,  // 98: relationalai.lqp.v1.BeTreeLocator.root_pageid:type_name -> relationalai.lqp.v1.UInt128Value
-	45,  // 99: relationalai.lqp.v1.CSVData.locator:type_name -> relationalai.lqp.v1.CSVLocator
-	46,  // 100: relationalai.lqp.v1.CSVData.config:type_name -> relationalai.lqp.v1.CSVConfig
-	50,  // 101: relationalai.lqp.v1.CSVData.columns:type_name -> relationalai.lqp.v1.GNFColumn
-	43,  // 102: relationalai.lqp.v1.CSVConfig.storage_integration:type_name -> relationalai.lqp.v1.StorageIntegration
-	48,  // 103: relationalai.lqp.v1.IcebergData.locator:type_name -> relationalai.lqp.v1.IcebergLocator
-	49,  // 104: relationalai.lqp.v1.IcebergData.config:type_name -> relationalai.lqp.v1.IcebergCatalogConfig
-	50,  // 105: relationalai.lqp.v1.IcebergData.columns:type_name -> relationalai.lqp.v1.GNFColumn
-	74,  // 106: relationalai.lqp.v1.IcebergCatalogConfig.properties:type_name -> relationalai.lqp.v1.IcebergCatalogConfig.PropertiesEntry
-	75,  // 107: relationalai.lqp.v1.IcebergCatalogConfig.auth_properties:type_name -> relationalai.lqp.v1.IcebergCatalogConfig.AuthPropertiesEntry
-	51,  // 108: relationalai.lqp.v1.GNFColumn.target_id:type_name -> relationalai.lqp.v1.RelationId
-	52,  // 109: relationalai.lqp.v1.GNFColumn.types:type_name -> relationalai.lqp.v1.Type
-	53,  // 110: relationalai.lqp.v1.Type.unspecified_type:type_name -> relationalai.lqp.v1.UnspecifiedType
-	54,  // 111: relationalai.lqp.v1.Type.string_type:type_name -> relationalai.lqp.v1.StringType
-	55,  // 112: relationalai.lqp.v1.Type.int_type:type_name -> relationalai.lqp.v1.IntType
-	56,  // 113: relationalai.lqp.v1.Type.float_type:type_name -> relationalai.lqp.v1.FloatType
-	57,  // 114: relationalai.lqp.v1.Type.uint128_type:type_name -> relationalai.lqp.v1.UInt128Type
-	58,  // 115: relationalai.lqp.v1.Type.int128_type:type_name -> relationalai.lqp.v1.Int128Type
-	59,  // 116: relationalai.lqp.v1.Type.date_type:type_name -> relationalai.lqp.v1.DateType
-	60,  // 117: relationalai.lqp.v1.Type.datetime_type:type_name -> relationalai.lqp.v1.DateTimeType
-	61,  // 118: relationalai.lqp.v1.Type.missing_type:type_name -> relationalai.lqp.v1.MissingType
-	62,  // 119: relationalai.lqp.v1.Type.decimal_type:type_name -> relationalai.lqp.v1.DecimalType
-	63,  // 120: relationalai.lqp.v1.Type.boolean_type:type_name -> relationalai.lqp.v1.BooleanType
-	64,  // 121: relationalai.lqp.v1.Type.int32_type:type_name -> relationalai.lqp.v1.Int32Type
-	65,  // 122: relationalai.lqp.v1.Type.float32_type:type_name -> relationalai.lqp.v1.Float32Type
-	66,  // 123: relationalai.lqp.v1.Type.uint32_type:type_name -> relationalai.lqp.v1.UInt32Type
-	68,  // 124: relationalai.lqp.v1.Value.uint128_value:type_name -> relationalai.lqp.v1.UInt128Value
-	69,  // 125: relationalai.lqp.v1.Value.int128_value:type_name -> relationalai.lqp.v1.Int128Value
-	70,  // 126: relationalai.lqp.v1.Value.missing_value:type_name -> relationalai.lqp.v1.MissingValue
-	71,  // 127: relationalai.lqp.v1.Value.date_value:type_name -> relationalai.lqp.v1.DateValue
-	72,  // 128: relationalai.lqp.v1.Value.datetime_value:type_name -> relationalai.lqp.v1.DateTimeValue
-	73,  // 129: relationalai.lqp.v1.Value.decimal_value:type_name -> relationalai.lqp.v1.DecimalValue
-	69,  // 130: relationalai.lqp.v1.DecimalValue.value:type_name -> relationalai.lqp.v1.Int128Value
-	131, // [131:131] is the sub-list for method output_type
-	131, // [131:131] is the sub-list for method input_type
-	131, // [131:131] is the sub-list for extension type_name
-	131, // [131:131] is the sub-list for extension extendee
-	0,   // [0:131] is the sub-list for field type_name
+	73,  // 98: relationalai.lqp.v1.BeTreeLocator.root_pageid:type_name -> relationalai.lqp.v1.UInt128Value
+	57,  // 99: relationalai.lqp.v1.NamedColumn.type:type_name -> relationalai.lqp.v1.Type
+	56,  // 100: relationalai.lqp.v1.TargetRelation.target_id:type_name -> relationalai.lqp.v1.RelationId
+	44,  // 101: relationalai.lqp.v1.TargetRelation.values:type_name -> relationalai.lqp.v1.NamedColumn
+	45,  // 102: relationalai.lqp.v1.PlainTargets.targets:type_name -> relationalai.lqp.v1.TargetRelation
+	45,  // 103: relationalai.lqp.v1.CdcTargets.inserts:type_name -> relationalai.lqp.v1.TargetRelation
+	45,  // 104: relationalai.lqp.v1.CdcTargets.deletes:type_name -> relationalai.lqp.v1.TargetRelation
+	44,  // 105: relationalai.lqp.v1.TargetRelations.keys:type_name -> relationalai.lqp.v1.NamedColumn
+	46,  // 106: relationalai.lqp.v1.TargetRelations.plain:type_name -> relationalai.lqp.v1.PlainTargets
+	47,  // 107: relationalai.lqp.v1.TargetRelations.cdc:type_name -> relationalai.lqp.v1.CdcTargets
+	50,  // 108: relationalai.lqp.v1.CSVData.locator:type_name -> relationalai.lqp.v1.CSVLocator
+	51,  // 109: relationalai.lqp.v1.CSVData.config:type_name -> relationalai.lqp.v1.CSVConfig
+	55,  // 110: relationalai.lqp.v1.CSVData.columns:type_name -> relationalai.lqp.v1.GNFColumn
+	48,  // 111: relationalai.lqp.v1.CSVData.relations:type_name -> relationalai.lqp.v1.TargetRelations
+	43,  // 112: relationalai.lqp.v1.CSVConfig.storage_integration:type_name -> relationalai.lqp.v1.StorageIntegration
+	53,  // 113: relationalai.lqp.v1.IcebergData.locator:type_name -> relationalai.lqp.v1.IcebergLocator
+	54,  // 114: relationalai.lqp.v1.IcebergData.config:type_name -> relationalai.lqp.v1.IcebergCatalogConfig
+	55,  // 115: relationalai.lqp.v1.IcebergData.columns:type_name -> relationalai.lqp.v1.GNFColumn
+	79,  // 116: relationalai.lqp.v1.IcebergCatalogConfig.properties:type_name -> relationalai.lqp.v1.IcebergCatalogConfig.PropertiesEntry
+	80,  // 117: relationalai.lqp.v1.IcebergCatalogConfig.auth_properties:type_name -> relationalai.lqp.v1.IcebergCatalogConfig.AuthPropertiesEntry
+	56,  // 118: relationalai.lqp.v1.GNFColumn.target_id:type_name -> relationalai.lqp.v1.RelationId
+	57,  // 119: relationalai.lqp.v1.GNFColumn.types:type_name -> relationalai.lqp.v1.Type
+	58,  // 120: relationalai.lqp.v1.Type.unspecified_type:type_name -> relationalai.lqp.v1.UnspecifiedType
+	59,  // 121: relationalai.lqp.v1.Type.string_type:type_name -> relationalai.lqp.v1.StringType
+	60,  // 122: relationalai.lqp.v1.Type.int_type:type_name -> relationalai.lqp.v1.IntType
+	61,  // 123: relationalai.lqp.v1.Type.float_type:type_name -> relationalai.lqp.v1.FloatType
+	62,  // 124: relationalai.lqp.v1.Type.uint128_type:type_name -> relationalai.lqp.v1.UInt128Type
+	63,  // 125: relationalai.lqp.v1.Type.int128_type:type_name -> relationalai.lqp.v1.Int128Type
+	64,  // 126: relationalai.lqp.v1.Type.date_type:type_name -> relationalai.lqp.v1.DateType
+	65,  // 127: relationalai.lqp.v1.Type.datetime_type:type_name -> relationalai.lqp.v1.DateTimeType
+	66,  // 128: relationalai.lqp.v1.Type.missing_type:type_name -> relationalai.lqp.v1.MissingType
+	67,  // 129: relationalai.lqp.v1.Type.decimal_type:type_name -> relationalai.lqp.v1.DecimalType
+	68,  // 130: relationalai.lqp.v1.Type.boolean_type:type_name -> relationalai.lqp.v1.BooleanType
+	69,  // 131: relationalai.lqp.v1.Type.int32_type:type_name -> relationalai.lqp.v1.Int32Type
+	70,  // 132: relationalai.lqp.v1.Type.float32_type:type_name -> relationalai.lqp.v1.Float32Type
+	71,  // 133: relationalai.lqp.v1.Type.uint32_type:type_name -> relationalai.lqp.v1.UInt32Type
+	73,  // 134: relationalai.lqp.v1.Value.uint128_value:type_name -> relationalai.lqp.v1.UInt128Value
+	74,  // 135: relationalai.lqp.v1.Value.int128_value:type_name -> relationalai.lqp.v1.Int128Value
+	75,  // 136: relationalai.lqp.v1.Value.missing_value:type_name -> relationalai.lqp.v1.MissingValue
+	76,  // 137: relationalai.lqp.v1.Value.date_value:type_name -> relationalai.lqp.v1.DateValue
+	77,  // 138: relationalai.lqp.v1.Value.datetime_value:type_name -> relationalai.lqp.v1.DateTimeValue
+	78,  // 139: relationalai.lqp.v1.Value.decimal_value:type_name -> relationalai.lqp.v1.DecimalValue
+	74,  // 140: relationalai.lqp.v1.DecimalValue.value:type_name -> relationalai.lqp.v1.Int128Value
+	141, // [141:141] is the sub-list for method output_type
+	141, // [141:141] is the sub-list for method input_type
+	141, // [141:141] is the sub-list for extension type_name
+	141, // [141:141] is the sub-list for extension extendee
+	0,   // [0:141] is the sub-list for field type_name
 }
 
 func init() { file_relationalai_lqp_v1_logic_proto_init() }
@@ -6021,11 +6386,16 @@ func file_relationalai_lqp_v1_logic_proto_init() {
 		(*BeTreeLocator_RootPageid)(nil),
 		(*BeTreeLocator_InlineData)(nil),
 	}
-	file_relationalai_lqp_v1_logic_proto_msgTypes[46].OneofWrappers = []any{}
-	file_relationalai_lqp_v1_logic_proto_msgTypes[47].OneofWrappers = []any{}
+	file_relationalai_lqp_v1_logic_proto_msgTypes[48].OneofWrappers = []any{
+		(*TargetRelations_Plain)(nil),
+		(*TargetRelations_Cdc)(nil),
+	}
 	file_relationalai_lqp_v1_logic_proto_msgTypes[49].OneofWrappers = []any{}
-	file_relationalai_lqp_v1_logic_proto_msgTypes[50].OneofWrappers = []any{}
-	file_relationalai_lqp_v1_logic_proto_msgTypes[52].OneofWrappers = []any{
+	file_relationalai_lqp_v1_logic_proto_msgTypes[51].OneofWrappers = []any{}
+	file_relationalai_lqp_v1_logic_proto_msgTypes[52].OneofWrappers = []any{}
+	file_relationalai_lqp_v1_logic_proto_msgTypes[54].OneofWrappers = []any{}
+	file_relationalai_lqp_v1_logic_proto_msgTypes[55].OneofWrappers = []any{}
+	file_relationalai_lqp_v1_logic_proto_msgTypes[57].OneofWrappers = []any{
 		(*Type_UnspecifiedType)(nil),
 		(*Type_StringType)(nil),
 		(*Type_IntType)(nil),
@@ -6041,7 +6411,7 @@ func file_relationalai_lqp_v1_logic_proto_init() {
 		(*Type_Float32Type)(nil),
 		(*Type_Uint32Type)(nil),
 	}
-	file_relationalai_lqp_v1_logic_proto_msgTypes[67].OneofWrappers = []any{
+	file_relationalai_lqp_v1_logic_proto_msgTypes[72].OneofWrappers = []any{
 		(*Value_StringValue)(nil),
 		(*Value_IntValue)(nil),
 		(*Value_FloatValue)(nil),
@@ -6062,7 +6432,7 @@ func file_relationalai_lqp_v1_logic_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_relationalai_lqp_v1_logic_proto_rawDesc), len(file_relationalai_lqp_v1_logic_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   76,
+			NumMessages:   81,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/sdks/go/src/parser.go b/sdks/go/src/parser.go
index a5962189..e0edcf4f 100644
--- a/sdks/go/src/parser.go
+++ b/sdks/go/src/parser.go
@@ -655,170 +655,206 @@ func toPascalCase(s string) string {
 // --- Helper functions ---
 
 func (p *Parser) _extract_value_int32(value *pb.Value, default_ int64) int32 {
-	var _t2101 interface{}
+	var _t2200 interface{}
 	if (value != nil && hasProtoField(value, "int32_value")) {
 		return value.GetInt32Value()
 	}
-	_ = _t2101
+	_ = _t2200
 	return int32(default_)
 }
 
 func (p *Parser) _extract_value_int64(value *pb.Value, default_ int64) int64 {
-	var _t2102 interface{}
+	var _t2201 interface{}
 	if (value != nil && hasProtoField(value, "int_value")) {
 		return value.GetIntValue()
 	}
-	_ = _t2102
+	_ = _t2201
 	return default_
 }
 
 func (p *Parser) _extract_value_string(value *pb.Value, default_ string) string {
-	var _t2103 interface{}
+	var _t2202 interface{}
 	if (value != nil && hasProtoField(value, "string_value")) {
 		return value.GetStringValue()
 	}
-	_ = _t2103
+	_ = _t2202
 	return default_
 }
 
 func (p *Parser) _extract_value_boolean(value *pb.Value, default_ bool) bool {
-	var _t2104 interface{}
+	var _t2203 interface{}
 	if (value != nil && hasProtoField(value, "boolean_value")) {
 		return value.GetBooleanValue()
 	}
-	_ = _t2104
+	_ = _t2203
 	return default_
 }
 
 func (p *Parser) _extract_value_string_list(value *pb.Value, default_ []string) []string {
-	var _t2105 interface{}
+	var _t2204 interface{}
 	if (value != nil && hasProtoField(value, "string_value")) {
 		return []string{value.GetStringValue()}
 	}
-	_ = _t2105
+	_ = _t2204
 	return default_
 }
 
 func (p *Parser) _try_extract_value_int64(value *pb.Value) *int64 {
-	var _t2106 interface{}
+	var _t2205 interface{}
 	if (value != nil && hasProtoField(value, "int_value")) {
 		return ptr(value.GetIntValue())
 	}
-	_ = _t2106
+	_ = _t2205
 	return nil
 }
 
 func (p *Parser) _try_extract_value_float64(value *pb.Value) *float64 {
-	var _t2107 interface{}
+	var _t2206 interface{}
 	if (value != nil && hasProtoField(value, "float_value")) {
 		return ptr(value.GetFloatValue())
 	}
-	_ = _t2107
+	_ = _t2206
 	return nil
 }
 
 func (p *Parser) _try_extract_value_bytes(value *pb.Value) []byte {
-	var _t2108 interface{}
+	var _t2207 interface{}
 	if (value != nil && hasProtoField(value, "string_value")) {
 		return []byte(value.GetStringValue())
 	}
-	_ = _t2108
+	_ = _t2207
 	return nil
 }
 
 func (p *Parser) _try_extract_value_uint128(value *pb.Value) *pb.UInt128Value {
-	var _t2109 interface{}
+	var _t2208 interface{}
 	if (value != nil && hasProtoField(value, "uint128_value")) {
 		return value.GetUint128Value()
 	}
-	_ = _t2109
+	_ = _t2208
 	return nil
 }
 
+func (p *Parser) construct_non_cdc_relations(targets []*pb.TargetRelation) *pb.TargetRelations {
+	_t2209 := &pb.PlainTargets{Targets: targets}
+	_t2210 := &pb.TargetRelations{Keys: []*pb.NamedColumn{}}
+	_t2210.Body = &pb.TargetRelations_Plain{Plain: _t2209}
+	return _t2210
+}
+
+func (p *Parser) construct_cdc_relations(inserts []*pb.TargetRelation, deletes []*pb.TargetRelation) *pb.TargetRelations {
+	_t2211 := &pb.CdcTargets{Inserts: inserts, Deletes: deletes}
+	_t2212 := &pb.TargetRelations{Keys: []*pb.NamedColumn{}}
+	_t2212.Body = &pb.TargetRelations_Cdc{Cdc: _t2211}
+	return _t2212
+}
+
+func (p *Parser) construct_relations(keys []*pb.NamedColumn, body *pb.TargetRelations) *pb.TargetRelations {
+	var _t2213 interface{}
+	if hasProtoField(body, "plain") {
+		_t2214 := &pb.TargetRelations{Keys: keys}
+		_t2214.Body = &pb.TargetRelations_Plain{Plain: body.GetPlain()}
+		return _t2214
+	}
+	_ = _t2213
+	_t2215 := &pb.TargetRelations{Keys: keys}
+	_t2215.Body = &pb.TargetRelations_Cdc{Cdc: body.GetCdc()}
+	return _t2215
+}
+
+func (p *Parser) construct_csv_data(locator *pb.CSVLocator, config *pb.CSVConfig, columns_opt []*pb.GNFColumn, relations_opt *pb.TargetRelations, asof string) *pb.CSVData {
+	_t2216 := columns_opt
+	if columns_opt == nil {
+		_t2216 = []*pb.GNFColumn{}
+	}
+	_t2217 := &pb.CSVData{Locator: locator, Config: config, Columns: _t2216, Asof: asof, Relations: relations_opt}
+	return _t2217
+}
+
 func (p *Parser) construct_csv_config(config_dict [][]interface{}, storage_integration_opt [][]interface{}) *pb.CSVConfig {
 	config := dictFromList(config_dict)
-	_t2110 := p._extract_value_int32(dictGetValue(config, "csv_header_row"), 1)
-	header_row := _t2110
-	_t2111 := p._extract_value_int64(dictGetValue(config, "csv_skip"), 0)
-	skip := _t2111
-	_t2112 := p._extract_value_string(dictGetValue(config, "csv_new_line"), "")
-	new_line := _t2112
-	_t2113 := p._extract_value_string(dictGetValue(config, "csv_delimiter"), ",")
-	delimiter := _t2113
-	_t2114 := p._extract_value_string(dictGetValue(config, "csv_quotechar"), "\"")
-	quotechar := _t2114
-	_t2115 := p._extract_value_string(dictGetValue(config, "csv_escapechar"), "\"")
-	escapechar := _t2115
-	_t2116 := p._extract_value_string(dictGetValue(config, "csv_comment"), "")
-	comment := _t2116
-	_t2117 := p._extract_value_string_list(dictGetValue(config, "csv_missing_strings"), []string{})
-	missing_strings := _t2117
-	_t2118 := p._extract_value_string(dictGetValue(config, "csv_decimal_separator"), ".")
-	decimal_separator := _t2118
-	_t2119 := p._extract_value_string(dictGetValue(config, "csv_encoding"), "utf-8")
-	encoding := _t2119
-	_t2120 := p._extract_value_string(dictGetValue(config, "csv_compression"), "")
-	compression := _t2120
-	_t2121 := p._extract_value_int64(dictGetValue(config, "csv_partition_size_mb"), 0)
-	partition_size_mb := _t2121
-	_t2122 := p.construct_csv_storage_integration(storage_integration_opt)
-	storage_integration := _t2122
-	_t2123 := &pb.CSVConfig{HeaderRow: header_row, Skip: skip, NewLine: new_line, Delimiter: delimiter, Quotechar: quotechar, Escapechar: escapechar, Comment: comment, MissingStrings: missing_strings, DecimalSeparator: decimal_separator, Encoding: encoding, Compression: compression, PartitionSizeMb: partition_size_mb, StorageIntegration: storage_integration}
-	return _t2123
+	_t2218 := p._extract_value_int32(dictGetValue(config, "csv_header_row"), 1)
+	header_row := _t2218
+	_t2219 := p._extract_value_int64(dictGetValue(config, "csv_skip"), 0)
+	skip := _t2219
+	_t2220 := p._extract_value_string(dictGetValue(config, "csv_new_line"), "")
+	new_line := _t2220
+	_t2221 := p._extract_value_string(dictGetValue(config, "csv_delimiter"), ",")
+	delimiter := _t2221
+	_t2222 := p._extract_value_string(dictGetValue(config, "csv_quotechar"), "\"")
+	quotechar := _t2222
+	_t2223 := p._extract_value_string(dictGetValue(config, "csv_escapechar"), "\"")
+	escapechar := _t2223
+	_t2224 := p._extract_value_string(dictGetValue(config, "csv_comment"), "")
+	comment := _t2224
+	_t2225 := p._extract_value_string_list(dictGetValue(config, "csv_missing_strings"), []string{})
+	missing_strings := _t2225
+	_t2226 := p._extract_value_string(dictGetValue(config, "csv_decimal_separator"), ".")
+	decimal_separator := _t2226
+	_t2227 := p._extract_value_string(dictGetValue(config, "csv_encoding"), "utf-8")
+	encoding := _t2227
+	_t2228 := p._extract_value_string(dictGetValue(config, "csv_compression"), "")
+	compression := _t2228
+	_t2229 := p._extract_value_int64(dictGetValue(config, "csv_partition_size_mb"), 0)
+	partition_size_mb := _t2229
+	_t2230 := p.construct_csv_storage_integration(storage_integration_opt)
+	storage_integration := _t2230
+	_t2231 := &pb.CSVConfig{HeaderRow: header_row, Skip: skip, NewLine: new_line, Delimiter: delimiter, Quotechar: quotechar, Escapechar: escapechar, Comment: comment, MissingStrings: missing_strings, DecimalSeparator: decimal_separator, Encoding: encoding, Compression: compression, PartitionSizeMb: partition_size_mb, StorageIntegration: storage_integration}
+	return _t2231
 }
 
 func (p *Parser) construct_csv_storage_integration(storage_integration_opt [][]interface{}) *pb.StorageIntegration {
-	var _t2124 interface{}
+	var _t2232 interface{}
 	if storage_integration_opt == nil {
 		return nil
 	}
-	_ = _t2124
+	_ = _t2232
 	config := dictFromList(storage_integration_opt)
-	_t2125 := p._extract_value_string(dictGetValue(config, "provider"), "")
-	_t2126 := p._extract_value_string(dictGetValue(config, "azure_sas_token"), "")
-	_t2127 := p._extract_value_string(dictGetValue(config, "s3_region"), "")
-	_t2128 := p._extract_value_string(dictGetValue(config, "s3_access_key_id"), "")
-	_t2129 := p._extract_value_string(dictGetValue(config, "s3_secret_access_key"), "")
-	_t2130 := &pb.StorageIntegration{Provider: _t2125, AzureSasToken: _t2126, S3Region: _t2127, S3AccessKeyId: _t2128, S3SecretAccessKey: _t2129}
-	return _t2130
+	_t2233 := p._extract_value_string(dictGetValue(config, "provider"), "")
+	_t2234 := p._extract_value_string(dictGetValue(config, "azure_sas_token"), "")
+	_t2235 := p._extract_value_string(dictGetValue(config, "s3_region"), "")
+	_t2236 := p._extract_value_string(dictGetValue(config, "s3_access_key_id"), "")
+	_t2237 := p._extract_value_string(dictGetValue(config, "s3_secret_access_key"), "")
+	_t2238 := &pb.StorageIntegration{Provider: _t2233, AzureSasToken: _t2234, S3Region: _t2235, S3AccessKeyId: _t2236, S3SecretAccessKey: _t2237}
+	return _t2238
 }
 
 func (p *Parser) construct_betree_info(key_types []*pb.Type, value_types []*pb.Type, config_dict [][]interface{}) *pb.BeTreeInfo {
 	config := dictFromList(config_dict)
-	_t2131 := p._try_extract_value_float64(dictGetValue(config, "betree_config_epsilon"))
-	epsilon := _t2131
-	_t2132 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_pivots"))
-	max_pivots := _t2132
-	_t2133 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_deltas"))
-	max_deltas := _t2133
-	_t2134 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_leaf"))
-	max_leaf := _t2134
-	_t2135 := &pb.BeTreeConfig{Epsilon: deref(epsilon, 0.0), MaxPivots: deref(max_pivots, 0), MaxDeltas: deref(max_deltas, 0), MaxLeaf: deref(max_leaf, 0)}
-	storage_config := _t2135
-	_t2136 := p._try_extract_value_uint128(dictGetValue(config, "betree_locator_root_pageid"))
-	root_pageid := _t2136
-	_t2137 := p._try_extract_value_bytes(dictGetValue(config, "betree_locator_inline_data"))
-	inline_data := _t2137
-	_t2138 := p._try_extract_value_int64(dictGetValue(config, "betree_locator_element_count"))
-	element_count := _t2138
-	_t2139 := p._try_extract_value_int64(dictGetValue(config, "betree_locator_tree_height"))
-	tree_height := _t2139
-	_t2140 := &pb.BeTreeLocator{ElementCount: deref(element_count, 0), TreeHeight: deref(tree_height, 0)}
+	_t2239 := p._try_extract_value_float64(dictGetValue(config, "betree_config_epsilon"))
+	epsilon := _t2239
+	_t2240 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_pivots"))
+	max_pivots := _t2240
+	_t2241 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_deltas"))
+	max_deltas := _t2241
+	_t2242 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_leaf"))
+	max_leaf := _t2242
+	_t2243 := &pb.BeTreeConfig{Epsilon: deref(epsilon, 0.0), MaxPivots: deref(max_pivots, 0), MaxDeltas: deref(max_deltas, 0), MaxLeaf: deref(max_leaf, 0)}
+	storage_config := _t2243
+	_t2244 := p._try_extract_value_uint128(dictGetValue(config, "betree_locator_root_pageid"))
+	root_pageid := _t2244
+	_t2245 := p._try_extract_value_bytes(dictGetValue(config, "betree_locator_inline_data"))
+	inline_data := _t2245
+	_t2246 := p._try_extract_value_int64(dictGetValue(config, "betree_locator_element_count"))
+	element_count := _t2246
+	_t2247 := p._try_extract_value_int64(dictGetValue(config, "betree_locator_tree_height"))
+	tree_height := _t2247
+	_t2248 := &pb.BeTreeLocator{ElementCount: deref(element_count, 0), TreeHeight: deref(tree_height, 0)}
 	if root_pageid != nil {
-		_t2140.Location = &pb.BeTreeLocator_RootPageid{RootPageid: root_pageid}
+		_t2248.Location = &pb.BeTreeLocator_RootPageid{RootPageid: root_pageid}
 	} else {
-		_t2140.Location = &pb.BeTreeLocator_InlineData{InlineData: inline_data}
+		_t2248.Location = &pb.BeTreeLocator_InlineData{InlineData: inline_data}
 	}
-	relation_locator := _t2140
-	_t2141 := &pb.BeTreeInfo{KeyTypes: key_types, ValueTypes: value_types, StorageConfig: storage_config, RelationLocator: relation_locator}
-	return _t2141
+	relation_locator := _t2248
+	_t2249 := &pb.BeTreeInfo{KeyTypes: key_types, ValueTypes: value_types, StorageConfig: storage_config, RelationLocator: relation_locator}
+	return _t2249
 }
 
 func (p *Parser) default_configure() *pb.Configure {
-	_t2142 := &pb.IVMConfig{Level: pb.MaintenanceLevel_MAINTENANCE_LEVEL_OFF}
-	ivm_config := _t2142
-	_t2143 := &pb.Configure{SemanticsVersion: 0, IvmConfig: ivm_config}
-	return _t2143
+	_t2250 := &pb.IVMConfig{Level: pb.MaintenanceLevel_MAINTENANCE_LEVEL_OFF}
+	ivm_config := _t2250
+	_t2251 := &pb.Configure{SemanticsVersion: 0, IvmConfig: ivm_config}
+	return _t2251
 }
 
 func (p *Parser) construct_configure(config_dict [][]interface{}) *pb.Configure {
@@ -840,4274 +876,4441 @@ func (p *Parser) construct_configure(config_dict [][]interface{}) *pb.Configure
 			}
 		}
 	}
-	_t2144 := &pb.IVMConfig{Level: maintenance_level}
-	ivm_config := _t2144
-	_t2145 := p._extract_value_int64(dictGetValue(config, "semantics_version"), 0)
-	semantics_version := _t2145
-	_t2146 := &pb.Configure{SemanticsVersion: semantics_version, IvmConfig: ivm_config}
-	return _t2146
+	_t2252 := &pb.IVMConfig{Level: maintenance_level}
+	ivm_config := _t2252
+	_t2253 := p._extract_value_int64(dictGetValue(config, "semantics_version"), 0)
+	semantics_version := _t2253
+	_t2254 := &pb.Configure{SemanticsVersion: semantics_version, IvmConfig: ivm_config}
+	return _t2254
 }
 
 func (p *Parser) construct_export_csv_config(path string, columns []*pb.ExportCSVColumn, config_dict [][]interface{}) *pb.ExportCSVConfig {
 	config := dictFromList(config_dict)
-	_t2147 := p._extract_value_int64(dictGetValue(config, "partition_size"), 0)
-	partition_size := _t2147
-	_t2148 := p._extract_value_string(dictGetValue(config, "compression"), "")
-	compression := _t2148
-	_t2149 := p._extract_value_boolean(dictGetValue(config, "syntax_header_row"), true)
-	syntax_header_row := _t2149
-	_t2150 := p._extract_value_string(dictGetValue(config, "syntax_missing_string"), "")
-	syntax_missing_string := _t2150
-	_t2151 := p._extract_value_string(dictGetValue(config, "syntax_delim"), ",")
-	syntax_delim := _t2151
-	_t2152 := p._extract_value_string(dictGetValue(config, "syntax_quotechar"), "\"")
-	syntax_quotechar := _t2152
-	_t2153 := p._extract_value_string(dictGetValue(config, "syntax_escapechar"), "\\")
-	syntax_escapechar := _t2153
-	_t2154 := &pb.ExportCSVConfig{Path: path, DataColumns: columns, PartitionSize: ptr(partition_size), Compression: ptr(compression), SyntaxHeaderRow: ptr(syntax_header_row), SyntaxMissingString: ptr(syntax_missing_string), SyntaxDelim: ptr(syntax_delim), SyntaxQuotechar: ptr(syntax_quotechar), SyntaxEscapechar: ptr(syntax_escapechar)}
-	return _t2154
+	_t2255 := p._extract_value_int64(dictGetValue(config, "partition_size"), 0)
+	partition_size := _t2255
+	_t2256 := p._extract_value_string(dictGetValue(config, "compression"), "")
+	compression := _t2256
+	_t2257 := p._extract_value_boolean(dictGetValue(config, "syntax_header_row"), true)
+	syntax_header_row := _t2257
+	_t2258 := p._extract_value_string(dictGetValue(config, "syntax_missing_string"), "")
+	syntax_missing_string := _t2258
+	_t2259 := p._extract_value_string(dictGetValue(config, "syntax_delim"), ",")
+	syntax_delim := _t2259
+	_t2260 := p._extract_value_string(dictGetValue(config, "syntax_quotechar"), "\"")
+	syntax_quotechar := _t2260
+	_t2261 := p._extract_value_string(dictGetValue(config, "syntax_escapechar"), "\\")
+	syntax_escapechar := _t2261
+	_t2262 := &pb.ExportCSVConfig{Path: path, DataColumns: columns, PartitionSize: ptr(partition_size), Compression: ptr(compression), SyntaxHeaderRow: ptr(syntax_header_row), SyntaxMissingString: ptr(syntax_missing_string), SyntaxDelim: ptr(syntax_delim), SyntaxQuotechar: ptr(syntax_quotechar), SyntaxEscapechar: ptr(syntax_escapechar)}
+	return _t2262
 }
 
 func (p *Parser) construct_export_csv_config_with_source(path string, csv_source *pb.ExportCSVSource, csv_config *pb.CSVConfig) *pb.ExportCSVConfig {
-	_t2155 := &pb.ExportCSVConfig{Path: path, CsvSource: csv_source, CsvConfig: csv_config}
-	return _t2155
+	_t2263 := &pb.ExportCSVConfig{Path: path, CsvSource: csv_source, CsvConfig: csv_config}
+	return _t2263
 }
 
 func (p *Parser) construct_iceberg_catalog_config(catalog_uri string, scope_opt *string, property_pairs [][]interface{}, auth_property_pairs [][]interface{}) *pb.IcebergCatalogConfig {
 	props := stringMapFromPairs(property_pairs)
 	auth_props := stringMapFromPairs(auth_property_pairs)
-	_t2156 := &pb.IcebergCatalogConfig{CatalogUri: catalog_uri, Scope: ptr(deref(scope_opt, "")), Properties: props, AuthProperties: auth_props}
-	return _t2156
+	_t2264 := &pb.IcebergCatalogConfig{CatalogUri: catalog_uri, Scope: ptr(deref(scope_opt, "")), Properties: props, AuthProperties: auth_props}
+	return _t2264
 }
 
 func (p *Parser) construct_iceberg_data(locator *pb.IcebergLocator, config *pb.IcebergCatalogConfig, columns []*pb.GNFColumn, from_snapshot_opt *string, to_snapshot_opt *string, returns_delta bool) *pb.IcebergData {
-	_t2157 := &pb.IcebergData{Locator: locator, Config: config, Columns: columns, FromSnapshot: ptr(deref(from_snapshot_opt, "")), ToSnapshot: ptr(deref(to_snapshot_opt, "")), ReturnsDelta: returns_delta}
-	return _t2157
+	_t2265 := &pb.IcebergData{Locator: locator, Config: config, Columns: columns, FromSnapshot: ptr(deref(from_snapshot_opt, "")), ToSnapshot: ptr(deref(to_snapshot_opt, "")), ReturnsDelta: returns_delta}
+	return _t2265
 }
 
 func (p *Parser) construct_export_iceberg_config_full(locator *pb.IcebergLocator, config *pb.IcebergCatalogConfig, table_def *pb.RelationId, table_property_pairs [][]interface{}, config_dict [][]interface{}) *pb.ExportIcebergConfig {
-	_t2158 := config_dict
+	_t2266 := config_dict
 	if config_dict == nil {
-		_t2158 = [][]interface{}{}
-	}
-	cfg := dictFromList(_t2158)
-	_t2159 := p._extract_value_string(dictGetValue(cfg, "prefix"), "")
-	prefix := _t2159
-	_t2160 := p._extract_value_int64(dictGetValue(cfg, "target_file_size_bytes"), 0)
-	target_file_size_bytes := _t2160
-	_t2161 := p._extract_value_string(dictGetValue(cfg, "compression"), "")
-	compression := _t2161
+		_t2266 = [][]interface{}{}
+	}
+	cfg := dictFromList(_t2266)
+	_t2267 := p._extract_value_string(dictGetValue(cfg, "prefix"), "")
+	prefix := _t2267
+	_t2268 := p._extract_value_int64(dictGetValue(cfg, "target_file_size_bytes"), 0)
+	target_file_size_bytes := _t2268
+	_t2269 := p._extract_value_string(dictGetValue(cfg, "compression"), "")
+	compression := _t2269
 	table_props := stringMapFromPairs(table_property_pairs)
-	_t2162 := &pb.ExportIcebergConfig{Locator: locator, Config: config, TableDef: table_def, Prefix: ptr(prefix), TargetFileSizeBytes: ptr(target_file_size_bytes), Compression: compression, TableProperties: table_props}
-	return _t2162
+	_t2270 := &pb.ExportIcebergConfig{Locator: locator, Config: config, TableDef: table_def, Prefix: ptr(prefix), TargetFileSizeBytes: ptr(target_file_size_bytes), Compression: compression, TableProperties: table_props}
+	return _t2270
 }
 
 // --- Parse functions ---
 
 func (p *Parser) parse_transaction() *pb.Transaction {
-	span_start673 := int64(p.spanStart())
+	span_start710 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("transaction")
-	var _t1334 *pb.Configure
+	var _t1408 *pb.Configure
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("configure", 1)) {
-		_t1335 := p.parse_configure()
-		_t1334 = _t1335
+		_t1409 := p.parse_configure()
+		_t1408 = _t1409
 	}
-	configure667 := _t1334
-	var _t1336 *pb.Sync
+	configure704 := _t1408
+	var _t1410 *pb.Sync
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("sync", 1)) {
-		_t1337 := p.parse_sync()
-		_t1336 = _t1337
-	}
-	sync668 := _t1336
-	xs669 := []*pb.Epoch{}
-	cond670 := p.matchLookaheadLiteral("(", 0)
-	for cond670 {
-		_t1338 := p.parse_epoch()
-		item671 := _t1338
-		xs669 = append(xs669, item671)
-		cond670 = p.matchLookaheadLiteral("(", 0)
-	}
-	epochs672 := xs669
+		_t1411 := p.parse_sync()
+		_t1410 = _t1411
+	}
+	sync705 := _t1410
+	xs706 := []*pb.Epoch{}
+	cond707 := p.matchLookaheadLiteral("(", 0)
+	for cond707 {
+		_t1412 := p.parse_epoch()
+		item708 := _t1412
+		xs706 = append(xs706, item708)
+		cond707 = p.matchLookaheadLiteral("(", 0)
+	}
+	epochs709 := xs706
 	p.consumeLiteral(")")
-	_t1339 := p.default_configure()
-	_t1340 := configure667
-	if configure667 == nil {
-		_t1340 = _t1339
+	_t1413 := p.default_configure()
+	_t1414 := configure704
+	if configure704 == nil {
+		_t1414 = _t1413
 	}
-	_t1341 := &pb.Transaction{Epochs: epochs672, Configure: _t1340, Sync: sync668}
-	result674 := _t1341
-	p.recordSpan(int(span_start673), "Transaction")
-	return result674
+	_t1415 := &pb.Transaction{Epochs: epochs709, Configure: _t1414, Sync: sync705}
+	result711 := _t1415
+	p.recordSpan(int(span_start710), "Transaction")
+	return result711
 }
 
 func (p *Parser) parse_configure() *pb.Configure {
-	span_start676 := int64(p.spanStart())
+	span_start713 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("configure")
-	_t1342 := p.parse_config_dict()
-	config_dict675 := _t1342
+	_t1416 := p.parse_config_dict()
+	config_dict712 := _t1416
 	p.consumeLiteral(")")
-	_t1343 := p.construct_configure(config_dict675)
-	result677 := _t1343
-	p.recordSpan(int(span_start676), "Configure")
-	return result677
+	_t1417 := p.construct_configure(config_dict712)
+	result714 := _t1417
+	p.recordSpan(int(span_start713), "Configure")
+	return result714
 }
 
 func (p *Parser) parse_config_dict() [][]interface{} {
 	p.consumeLiteral("{")
-	xs678 := [][]interface{}{}
-	cond679 := p.matchLookaheadLiteral(":", 0)
-	for cond679 {
-		_t1344 := p.parse_config_key_value()
-		item680 := _t1344
-		xs678 = append(xs678, item680)
-		cond679 = p.matchLookaheadLiteral(":", 0)
-	}
-	config_key_values681 := xs678
+	xs715 := [][]interface{}{}
+	cond716 := p.matchLookaheadLiteral(":", 0)
+	for cond716 {
+		_t1418 := p.parse_config_key_value()
+		item717 := _t1418
+		xs715 = append(xs715, item717)
+		cond716 = p.matchLookaheadLiteral(":", 0)
+	}
+	config_key_values718 := xs715
 	p.consumeLiteral("}")
-	return config_key_values681
+	return config_key_values718
 }
 
 func (p *Parser) parse_config_key_value() []interface{} {
 	p.consumeLiteral(":")
-	symbol682 := p.consumeTerminal("SYMBOL").Value.str
-	_t1345 := p.parse_raw_value()
-	raw_value683 := _t1345
-	return []interface{}{symbol682, raw_value683}
+	symbol719 := p.consumeTerminal("SYMBOL").Value.str
+	_t1419 := p.parse_raw_value()
+	raw_value720 := _t1419
+	return []interface{}{symbol719, raw_value720}
 }
 
 func (p *Parser) parse_raw_value() *pb.Value {
-	span_start697 := int64(p.spanStart())
-	var _t1346 int64
+	span_start734 := int64(p.spanStart())
+	var _t1420 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1346 = 12
+		_t1420 = 12
 	} else {
-		var _t1347 int64
+		var _t1421 int64
 		if p.matchLookaheadLiteral("missing", 0) {
-			_t1347 = 11
+			_t1421 = 11
 		} else {
-			var _t1348 int64
+			var _t1422 int64
 			if p.matchLookaheadLiteral("false", 0) {
-				_t1348 = 12
+				_t1422 = 12
 			} else {
-				var _t1349 int64
+				var _t1423 int64
 				if p.matchLookaheadLiteral("(", 0) {
-					var _t1350 int64
+					var _t1424 int64
 					if p.matchLookaheadLiteral("datetime", 1) {
-						_t1350 = 1
+						_t1424 = 1
 					} else {
-						var _t1351 int64
+						var _t1425 int64
 						if p.matchLookaheadLiteral("date", 1) {
-							_t1351 = 0
+							_t1425 = 0
 						} else {
-							_t1351 = -1
+							_t1425 = -1
 						}
-						_t1350 = _t1351
+						_t1424 = _t1425
 					}
-					_t1349 = _t1350
+					_t1423 = _t1424
 				} else {
-					var _t1352 int64
+					var _t1426 int64
 					if p.matchLookaheadTerminal("UINT32", 0) {
-						_t1352 = 7
+						_t1426 = 7
 					} else {
-						var _t1353 int64
+						var _t1427 int64
 						if p.matchLookaheadTerminal("UINT128", 0) {
-							_t1353 = 8
+							_t1427 = 8
 						} else {
-							var _t1354 int64
+							var _t1428 int64
 							if p.matchLookaheadTerminal("STRING", 0) {
-								_t1354 = 2
+								_t1428 = 2
 							} else {
-								var _t1355 int64
+								var _t1429 int64
 								if p.matchLookaheadTerminal("INT32", 0) {
-									_t1355 = 3
+									_t1429 = 3
 								} else {
-									var _t1356 int64
+									var _t1430 int64
 									if p.matchLookaheadTerminal("INT128", 0) {
-										_t1356 = 9
+										_t1430 = 9
 									} else {
-										var _t1357 int64
+										var _t1431 int64
 										if p.matchLookaheadTerminal("INT", 0) {
-											_t1357 = 4
+											_t1431 = 4
 										} else {
-											var _t1358 int64
+											var _t1432 int64
 											if p.matchLookaheadTerminal("FLOAT32", 0) {
-												_t1358 = 5
+												_t1432 = 5
 											} else {
-												var _t1359 int64
+												var _t1433 int64
 												if p.matchLookaheadTerminal("FLOAT", 0) {
-													_t1359 = 6
+													_t1433 = 6
 												} else {
-													var _t1360 int64
+													var _t1434 int64
 													if p.matchLookaheadTerminal("DECIMAL", 0) {
-														_t1360 = 10
+														_t1434 = 10
 													} else {
-														_t1360 = -1
+														_t1434 = -1
 													}
-													_t1359 = _t1360
+													_t1433 = _t1434
 												}
-												_t1358 = _t1359
+												_t1432 = _t1433
 											}
-											_t1357 = _t1358
+											_t1431 = _t1432
 										}
-										_t1356 = _t1357
+										_t1430 = _t1431
 									}
-									_t1355 = _t1356
+									_t1429 = _t1430
 								}
-								_t1354 = _t1355
+								_t1428 = _t1429
 							}
-							_t1353 = _t1354
+							_t1427 = _t1428
 						}
-						_t1352 = _t1353
+						_t1426 = _t1427
 					}
-					_t1349 = _t1352
+					_t1423 = _t1426
 				}
-				_t1348 = _t1349
+				_t1422 = _t1423
 			}
-			_t1347 = _t1348
+			_t1421 = _t1422
 		}
-		_t1346 = _t1347
-	}
-	prediction684 := _t1346
-	var _t1361 *pb.Value
-	if prediction684 == 12 {
-		_t1362 := p.parse_boolean_value()
-		boolean_value696 := _t1362
-		_t1363 := &pb.Value{}
-		_t1363.Value = &pb.Value_BooleanValue{BooleanValue: boolean_value696}
-		_t1361 = _t1363
+		_t1420 = _t1421
+	}
+	prediction721 := _t1420
+	var _t1435 *pb.Value
+	if prediction721 == 12 {
+		_t1436 := p.parse_boolean_value()
+		boolean_value733 := _t1436
+		_t1437 := &pb.Value{}
+		_t1437.Value = &pb.Value_BooleanValue{BooleanValue: boolean_value733}
+		_t1435 = _t1437
 	} else {
-		var _t1364 *pb.Value
-		if prediction684 == 11 {
+		var _t1438 *pb.Value
+		if prediction721 == 11 {
 			p.consumeLiteral("missing")
-			_t1365 := &pb.MissingValue{}
-			_t1366 := &pb.Value{}
-			_t1366.Value = &pb.Value_MissingValue{MissingValue: _t1365}
-			_t1364 = _t1366
+			_t1439 := &pb.MissingValue{}
+			_t1440 := &pb.Value{}
+			_t1440.Value = &pb.Value_MissingValue{MissingValue: _t1439}
+			_t1438 = _t1440
 		} else {
-			var _t1367 *pb.Value
-			if prediction684 == 10 {
-				decimal695 := p.consumeTerminal("DECIMAL").Value.decimal
-				_t1368 := &pb.Value{}
-				_t1368.Value = &pb.Value_DecimalValue{DecimalValue: decimal695}
-				_t1367 = _t1368
+			var _t1441 *pb.Value
+			if prediction721 == 10 {
+				decimal732 := p.consumeTerminal("DECIMAL").Value.decimal
+				_t1442 := &pb.Value{}
+				_t1442.Value = &pb.Value_DecimalValue{DecimalValue: decimal732}
+				_t1441 = _t1442
 			} else {
-				var _t1369 *pb.Value
-				if prediction684 == 9 {
-					int128694 := p.consumeTerminal("INT128").Value.int128
-					_t1370 := &pb.Value{}
-					_t1370.Value = &pb.Value_Int128Value{Int128Value: int128694}
-					_t1369 = _t1370
+				var _t1443 *pb.Value
+				if prediction721 == 9 {
+					int128731 := p.consumeTerminal("INT128").Value.int128
+					_t1444 := &pb.Value{}
+					_t1444.Value = &pb.Value_Int128Value{Int128Value: int128731}
+					_t1443 = _t1444
 				} else {
-					var _t1371 *pb.Value
-					if prediction684 == 8 {
-						uint128693 := p.consumeTerminal("UINT128").Value.uint128
-						_t1372 := &pb.Value{}
-						_t1372.Value = &pb.Value_Uint128Value{Uint128Value: uint128693}
-						_t1371 = _t1372
+					var _t1445 *pb.Value
+					if prediction721 == 8 {
+						uint128730 := p.consumeTerminal("UINT128").Value.uint128
+						_t1446 := &pb.Value{}
+						_t1446.Value = &pb.Value_Uint128Value{Uint128Value: uint128730}
+						_t1445 = _t1446
 					} else {
-						var _t1373 *pb.Value
-						if prediction684 == 7 {
-							uint32692 := p.consumeTerminal("UINT32").Value.u32
-							_t1374 := &pb.Value{}
-							_t1374.Value = &pb.Value_Uint32Value{Uint32Value: uint32692}
-							_t1373 = _t1374
+						var _t1447 *pb.Value
+						if prediction721 == 7 {
+							uint32729 := p.consumeTerminal("UINT32").Value.u32
+							_t1448 := &pb.Value{}
+							_t1448.Value = &pb.Value_Uint32Value{Uint32Value: uint32729}
+							_t1447 = _t1448
 						} else {
-							var _t1375 *pb.Value
-							if prediction684 == 6 {
-								float691 := p.consumeTerminal("FLOAT").Value.f64
-								_t1376 := &pb.Value{}
-								_t1376.Value = &pb.Value_FloatValue{FloatValue: float691}
-								_t1375 = _t1376
+							var _t1449 *pb.Value
+							if prediction721 == 6 {
+								float728 := p.consumeTerminal("FLOAT").Value.f64
+								_t1450 := &pb.Value{}
+								_t1450.Value = &pb.Value_FloatValue{FloatValue: float728}
+								_t1449 = _t1450
 							} else {
-								var _t1377 *pb.Value
-								if prediction684 == 5 {
-									float32690 := p.consumeTerminal("FLOAT32").Value.f32
-									_t1378 := &pb.Value{}
-									_t1378.Value = &pb.Value_Float32Value{Float32Value: float32690}
-									_t1377 = _t1378
+								var _t1451 *pb.Value
+								if prediction721 == 5 {
+									float32727 := p.consumeTerminal("FLOAT32").Value.f32
+									_t1452 := &pb.Value{}
+									_t1452.Value = &pb.Value_Float32Value{Float32Value: float32727}
+									_t1451 = _t1452
 								} else {
-									var _t1379 *pb.Value
-									if prediction684 == 4 {
-										int689 := p.consumeTerminal("INT").Value.i64
-										_t1380 := &pb.Value{}
-										_t1380.Value = &pb.Value_IntValue{IntValue: int689}
-										_t1379 = _t1380
+									var _t1453 *pb.Value
+									if prediction721 == 4 {
+										int726 := p.consumeTerminal("INT").Value.i64
+										_t1454 := &pb.Value{}
+										_t1454.Value = &pb.Value_IntValue{IntValue: int726}
+										_t1453 = _t1454
 									} else {
-										var _t1381 *pb.Value
-										if prediction684 == 3 {
-											int32688 := p.consumeTerminal("INT32").Value.i32
-											_t1382 := &pb.Value{}
-											_t1382.Value = &pb.Value_Int32Value{Int32Value: int32688}
-											_t1381 = _t1382
+										var _t1455 *pb.Value
+										if prediction721 == 3 {
+											int32725 := p.consumeTerminal("INT32").Value.i32
+											_t1456 := &pb.Value{}
+											_t1456.Value = &pb.Value_Int32Value{Int32Value: int32725}
+											_t1455 = _t1456
 										} else {
-											var _t1383 *pb.Value
-											if prediction684 == 2 {
-												string687 := p.consumeTerminal("STRING").Value.str
-												_t1384 := &pb.Value{}
-												_t1384.Value = &pb.Value_StringValue{StringValue: string687}
-												_t1383 = _t1384
+											var _t1457 *pb.Value
+											if prediction721 == 2 {
+												string724 := p.consumeTerminal("STRING").Value.str
+												_t1458 := &pb.Value{}
+												_t1458.Value = &pb.Value_StringValue{StringValue: string724}
+												_t1457 = _t1458
 											} else {
-												var _t1385 *pb.Value
-												if prediction684 == 1 {
-													_t1386 := p.parse_raw_datetime()
-													raw_datetime686 := _t1386
-													_t1387 := &pb.Value{}
-													_t1387.Value = &pb.Value_DatetimeValue{DatetimeValue: raw_datetime686}
-													_t1385 = _t1387
+												var _t1459 *pb.Value
+												if prediction721 == 1 {
+													_t1460 := p.parse_raw_datetime()
+													raw_datetime723 := _t1460
+													_t1461 := &pb.Value{}
+													_t1461.Value = &pb.Value_DatetimeValue{DatetimeValue: raw_datetime723}
+													_t1459 = _t1461
 												} else {
-													var _t1388 *pb.Value
-													if prediction684 == 0 {
-														_t1389 := p.parse_raw_date()
-														raw_date685 := _t1389
-														_t1390 := &pb.Value{}
-														_t1390.Value = &pb.Value_DateValue{DateValue: raw_date685}
-														_t1388 = _t1390
+													var _t1462 *pb.Value
+													if prediction721 == 0 {
+														_t1463 := p.parse_raw_date()
+														raw_date722 := _t1463
+														_t1464 := &pb.Value{}
+														_t1464.Value = &pb.Value_DateValue{DateValue: raw_date722}
+														_t1462 = _t1464
 													} else {
 														panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in raw_value", p.lookahead(0).Type, p.lookahead(0).Value)})
 													}
-													_t1385 = _t1388
+													_t1459 = _t1462
 												}
-												_t1383 = _t1385
+												_t1457 = _t1459
 											}
-											_t1381 = _t1383
+											_t1455 = _t1457
 										}
-										_t1379 = _t1381
+										_t1453 = _t1455
 									}
-									_t1377 = _t1379
+									_t1451 = _t1453
 								}
-								_t1375 = _t1377
+								_t1449 = _t1451
 							}
-							_t1373 = _t1375
+							_t1447 = _t1449
 						}
-						_t1371 = _t1373
+						_t1445 = _t1447
 					}
-					_t1369 = _t1371
+					_t1443 = _t1445
 				}
-				_t1367 = _t1369
+				_t1441 = _t1443
 			}
-			_t1364 = _t1367
+			_t1438 = _t1441
 		}
-		_t1361 = _t1364
+		_t1435 = _t1438
 	}
-	result698 := _t1361
-	p.recordSpan(int(span_start697), "Value")
-	return result698
+	result735 := _t1435
+	p.recordSpan(int(span_start734), "Value")
+	return result735
 }
 
 func (p *Parser) parse_raw_date() *pb.DateValue {
-	span_start702 := int64(p.spanStart())
+	span_start739 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("date")
-	int699 := p.consumeTerminal("INT").Value.i64
-	int_3700 := p.consumeTerminal("INT").Value.i64
-	int_4701 := p.consumeTerminal("INT").Value.i64
+	int736 := p.consumeTerminal("INT").Value.i64
+	int_3737 := p.consumeTerminal("INT").Value.i64
+	int_4738 := p.consumeTerminal("INT").Value.i64
 	p.consumeLiteral(")")
-	_t1391 := &pb.DateValue{Year: int32(int699), Month: int32(int_3700), Day: int32(int_4701)}
-	result703 := _t1391
-	p.recordSpan(int(span_start702), "DateValue")
-	return result703
+	_t1465 := &pb.DateValue{Year: int32(int736), Month: int32(int_3737), Day: int32(int_4738)}
+	result740 := _t1465
+	p.recordSpan(int(span_start739), "DateValue")
+	return result740
 }
 
 func (p *Parser) parse_raw_datetime() *pb.DateTimeValue {
-	span_start711 := int64(p.spanStart())
+	span_start748 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("datetime")
-	int704 := p.consumeTerminal("INT").Value.i64
-	int_3705 := p.consumeTerminal("INT").Value.i64
-	int_4706 := p.consumeTerminal("INT").Value.i64
-	int_5707 := p.consumeTerminal("INT").Value.i64
-	int_6708 := p.consumeTerminal("INT").Value.i64
-	int_7709 := p.consumeTerminal("INT").Value.i64
-	var _t1392 *int64
+	int741 := p.consumeTerminal("INT").Value.i64
+	int_3742 := p.consumeTerminal("INT").Value.i64
+	int_4743 := p.consumeTerminal("INT").Value.i64
+	int_5744 := p.consumeTerminal("INT").Value.i64
+	int_6745 := p.consumeTerminal("INT").Value.i64
+	int_7746 := p.consumeTerminal("INT").Value.i64
+	var _t1466 *int64
 	if p.matchLookaheadTerminal("INT", 0) {
-		_t1392 = ptr(p.consumeTerminal("INT").Value.i64)
+		_t1466 = ptr(p.consumeTerminal("INT").Value.i64)
 	}
-	int_8710 := _t1392
+	int_8747 := _t1466
 	p.consumeLiteral(")")
-	_t1393 := &pb.DateTimeValue{Year: int32(int704), Month: int32(int_3705), Day: int32(int_4706), Hour: int32(int_5707), Minute: int32(int_6708), Second: int32(int_7709), Microsecond: int32(deref(int_8710, 0))}
-	result712 := _t1393
-	p.recordSpan(int(span_start711), "DateTimeValue")
-	return result712
+	_t1467 := &pb.DateTimeValue{Year: int32(int741), Month: int32(int_3742), Day: int32(int_4743), Hour: int32(int_5744), Minute: int32(int_6745), Second: int32(int_7746), Microsecond: int32(deref(int_8747, 0))}
+	result749 := _t1467
+	p.recordSpan(int(span_start748), "DateTimeValue")
+	return result749
 }
 
 func (p *Parser) parse_boolean_value() bool {
-	var _t1394 int64
+	var _t1468 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1394 = 0
+		_t1468 = 0
 	} else {
-		var _t1395 int64
+		var _t1469 int64
 		if p.matchLookaheadLiteral("false", 0) {
-			_t1395 = 1
+			_t1469 = 1
 		} else {
-			_t1395 = -1
+			_t1469 = -1
 		}
-		_t1394 = _t1395
+		_t1468 = _t1469
 	}
-	prediction713 := _t1394
-	var _t1396 bool
-	if prediction713 == 1 {
+	prediction750 := _t1468
+	var _t1470 bool
+	if prediction750 == 1 {
 		p.consumeLiteral("false")
-		_t1396 = false
+		_t1470 = false
 	} else {
-		var _t1397 bool
-		if prediction713 == 0 {
+		var _t1471 bool
+		if prediction750 == 0 {
 			p.consumeLiteral("true")
-			_t1397 = true
+			_t1471 = true
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in boolean_value", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1396 = _t1397
+		_t1470 = _t1471
 	}
-	return _t1396
+	return _t1470
 }
 
 func (p *Parser) parse_sync() *pb.Sync {
-	span_start718 := int64(p.spanStart())
+	span_start755 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("sync")
-	xs714 := []*pb.FragmentId{}
-	cond715 := p.matchLookaheadLiteral(":", 0)
-	for cond715 {
-		_t1398 := p.parse_fragment_id()
-		item716 := _t1398
-		xs714 = append(xs714, item716)
-		cond715 = p.matchLookaheadLiteral(":", 0)
-	}
-	fragment_ids717 := xs714
+	xs751 := []*pb.FragmentId{}
+	cond752 := p.matchLookaheadLiteral(":", 0)
+	for cond752 {
+		_t1472 := p.parse_fragment_id()
+		item753 := _t1472
+		xs751 = append(xs751, item753)
+		cond752 = p.matchLookaheadLiteral(":", 0)
+	}
+	fragment_ids754 := xs751
 	p.consumeLiteral(")")
-	_t1399 := &pb.Sync{Fragments: fragment_ids717}
-	result719 := _t1399
-	p.recordSpan(int(span_start718), "Sync")
-	return result719
+	_t1473 := &pb.Sync{Fragments: fragment_ids754}
+	result756 := _t1473
+	p.recordSpan(int(span_start755), "Sync")
+	return result756
 }
 
 func (p *Parser) parse_fragment_id() *pb.FragmentId {
-	span_start721 := int64(p.spanStart())
+	span_start758 := int64(p.spanStart())
 	p.consumeLiteral(":")
-	symbol720 := p.consumeTerminal("SYMBOL").Value.str
-	result722 := &pb.FragmentId{Id: []byte(symbol720)}
-	p.recordSpan(int(span_start721), "FragmentId")
-	return result722
+	symbol757 := p.consumeTerminal("SYMBOL").Value.str
+	result759 := &pb.FragmentId{Id: []byte(symbol757)}
+	p.recordSpan(int(span_start758), "FragmentId")
+	return result759
 }
 
 func (p *Parser) parse_epoch() *pb.Epoch {
-	span_start725 := int64(p.spanStart())
+	span_start762 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("epoch")
-	var _t1400 []*pb.Write
+	var _t1474 []*pb.Write
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("writes", 1)) {
-		_t1401 := p.parse_epoch_writes()
-		_t1400 = _t1401
+		_t1475 := p.parse_epoch_writes()
+		_t1474 = _t1475
 	}
-	epoch_writes723 := _t1400
-	var _t1402 []*pb.Read
+	epoch_writes760 := _t1474
+	var _t1476 []*pb.Read
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1403 := p.parse_epoch_reads()
-		_t1402 = _t1403
+		_t1477 := p.parse_epoch_reads()
+		_t1476 = _t1477
 	}
-	epoch_reads724 := _t1402
+	epoch_reads761 := _t1476
 	p.consumeLiteral(")")
-	_t1404 := epoch_writes723
-	if epoch_writes723 == nil {
-		_t1404 = []*pb.Write{}
+	_t1478 := epoch_writes760
+	if epoch_writes760 == nil {
+		_t1478 = []*pb.Write{}
 	}
-	_t1405 := epoch_reads724
-	if epoch_reads724 == nil {
-		_t1405 = []*pb.Read{}
+	_t1479 := epoch_reads761
+	if epoch_reads761 == nil {
+		_t1479 = []*pb.Read{}
 	}
-	_t1406 := &pb.Epoch{Writes: _t1404, Reads: _t1405}
-	result726 := _t1406
-	p.recordSpan(int(span_start725), "Epoch")
-	return result726
+	_t1480 := &pb.Epoch{Writes: _t1478, Reads: _t1479}
+	result763 := _t1480
+	p.recordSpan(int(span_start762), "Epoch")
+	return result763
 }
 
 func (p *Parser) parse_epoch_writes() []*pb.Write {
 	p.consumeLiteral("(")
 	p.consumeLiteral("writes")
-	xs727 := []*pb.Write{}
-	cond728 := p.matchLookaheadLiteral("(", 0)
-	for cond728 {
-		_t1407 := p.parse_write()
-		item729 := _t1407
-		xs727 = append(xs727, item729)
-		cond728 = p.matchLookaheadLiteral("(", 0)
-	}
-	writes730 := xs727
+	xs764 := []*pb.Write{}
+	cond765 := p.matchLookaheadLiteral("(", 0)
+	for cond765 {
+		_t1481 := p.parse_write()
+		item766 := _t1481
+		xs764 = append(xs764, item766)
+		cond765 = p.matchLookaheadLiteral("(", 0)
+	}
+	writes767 := xs764
 	p.consumeLiteral(")")
-	return writes730
+	return writes767
 }
 
 func (p *Parser) parse_write() *pb.Write {
-	span_start736 := int64(p.spanStart())
-	var _t1408 int64
+	span_start773 := int64(p.spanStart())
+	var _t1482 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1409 int64
+		var _t1483 int64
 		if p.matchLookaheadLiteral("undefine", 1) {
-			_t1409 = 1
+			_t1483 = 1
 		} else {
-			var _t1410 int64
+			var _t1484 int64
 			if p.matchLookaheadLiteral("snapshot", 1) {
-				_t1410 = 3
+				_t1484 = 3
 			} else {
-				var _t1411 int64
+				var _t1485 int64
 				if p.matchLookaheadLiteral("define", 1) {
-					_t1411 = 0
+					_t1485 = 0
 				} else {
-					var _t1412 int64
+					var _t1486 int64
 					if p.matchLookaheadLiteral("context", 1) {
-						_t1412 = 2
+						_t1486 = 2
 					} else {
-						_t1412 = -1
+						_t1486 = -1
 					}
-					_t1411 = _t1412
+					_t1485 = _t1486
 				}
-				_t1410 = _t1411
+				_t1484 = _t1485
 			}
-			_t1409 = _t1410
+			_t1483 = _t1484
 		}
-		_t1408 = _t1409
+		_t1482 = _t1483
 	} else {
-		_t1408 = -1
-	}
-	prediction731 := _t1408
-	var _t1413 *pb.Write
-	if prediction731 == 3 {
-		_t1414 := p.parse_snapshot()
-		snapshot735 := _t1414
-		_t1415 := &pb.Write{}
-		_t1415.WriteType = &pb.Write_Snapshot{Snapshot: snapshot735}
-		_t1413 = _t1415
+		_t1482 = -1
+	}
+	prediction768 := _t1482
+	var _t1487 *pb.Write
+	if prediction768 == 3 {
+		_t1488 := p.parse_snapshot()
+		snapshot772 := _t1488
+		_t1489 := &pb.Write{}
+		_t1489.WriteType = &pb.Write_Snapshot{Snapshot: snapshot772}
+		_t1487 = _t1489
 	} else {
-		var _t1416 *pb.Write
-		if prediction731 == 2 {
-			_t1417 := p.parse_context()
-			context734 := _t1417
-			_t1418 := &pb.Write{}
-			_t1418.WriteType = &pb.Write_Context{Context: context734}
-			_t1416 = _t1418
+		var _t1490 *pb.Write
+		if prediction768 == 2 {
+			_t1491 := p.parse_context()
+			context771 := _t1491
+			_t1492 := &pb.Write{}
+			_t1492.WriteType = &pb.Write_Context{Context: context771}
+			_t1490 = _t1492
 		} else {
-			var _t1419 *pb.Write
-			if prediction731 == 1 {
-				_t1420 := p.parse_undefine()
-				undefine733 := _t1420
-				_t1421 := &pb.Write{}
-				_t1421.WriteType = &pb.Write_Undefine{Undefine: undefine733}
-				_t1419 = _t1421
+			var _t1493 *pb.Write
+			if prediction768 == 1 {
+				_t1494 := p.parse_undefine()
+				undefine770 := _t1494
+				_t1495 := &pb.Write{}
+				_t1495.WriteType = &pb.Write_Undefine{Undefine: undefine770}
+				_t1493 = _t1495
 			} else {
-				var _t1422 *pb.Write
-				if prediction731 == 0 {
-					_t1423 := p.parse_define()
-					define732 := _t1423
-					_t1424 := &pb.Write{}
-					_t1424.WriteType = &pb.Write_Define{Define: define732}
-					_t1422 = _t1424
+				var _t1496 *pb.Write
+				if prediction768 == 0 {
+					_t1497 := p.parse_define()
+					define769 := _t1497
+					_t1498 := &pb.Write{}
+					_t1498.WriteType = &pb.Write_Define{Define: define769}
+					_t1496 = _t1498
 				} else {
 					panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in write", p.lookahead(0).Type, p.lookahead(0).Value)})
 				}
-				_t1419 = _t1422
+				_t1493 = _t1496
 			}
-			_t1416 = _t1419
+			_t1490 = _t1493
 		}
-		_t1413 = _t1416
+		_t1487 = _t1490
 	}
-	result737 := _t1413
-	p.recordSpan(int(span_start736), "Write")
-	return result737
+	result774 := _t1487
+	p.recordSpan(int(span_start773), "Write")
+	return result774
 }
 
 func (p *Parser) parse_define() *pb.Define {
-	span_start739 := int64(p.spanStart())
+	span_start776 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("define")
-	_t1425 := p.parse_fragment()
-	fragment738 := _t1425
+	_t1499 := p.parse_fragment()
+	fragment775 := _t1499
 	p.consumeLiteral(")")
-	_t1426 := &pb.Define{Fragment: fragment738}
-	result740 := _t1426
-	p.recordSpan(int(span_start739), "Define")
-	return result740
+	_t1500 := &pb.Define{Fragment: fragment775}
+	result777 := _t1500
+	p.recordSpan(int(span_start776), "Define")
+	return result777
 }
 
 func (p *Parser) parse_fragment() *pb.Fragment {
-	span_start746 := int64(p.spanStart())
+	span_start783 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("fragment")
-	_t1427 := p.parse_new_fragment_id()
-	new_fragment_id741 := _t1427
-	xs742 := []*pb.Declaration{}
-	cond743 := p.matchLookaheadLiteral("(", 0)
-	for cond743 {
-		_t1428 := p.parse_declaration()
-		item744 := _t1428
-		xs742 = append(xs742, item744)
-		cond743 = p.matchLookaheadLiteral("(", 0)
-	}
-	declarations745 := xs742
+	_t1501 := p.parse_new_fragment_id()
+	new_fragment_id778 := _t1501
+	xs779 := []*pb.Declaration{}
+	cond780 := p.matchLookaheadLiteral("(", 0)
+	for cond780 {
+		_t1502 := p.parse_declaration()
+		item781 := _t1502
+		xs779 = append(xs779, item781)
+		cond780 = p.matchLookaheadLiteral("(", 0)
+	}
+	declarations782 := xs779
 	p.consumeLiteral(")")
-	result747 := p.constructFragment(new_fragment_id741, declarations745)
-	p.recordSpan(int(span_start746), "Fragment")
-	return result747
+	result784 := p.constructFragment(new_fragment_id778, declarations782)
+	p.recordSpan(int(span_start783), "Fragment")
+	return result784
 }
 
 func (p *Parser) parse_new_fragment_id() *pb.FragmentId {
-	span_start749 := int64(p.spanStart())
-	_t1429 := p.parse_fragment_id()
-	fragment_id748 := _t1429
-	p.startFragment(fragment_id748)
-	result750 := fragment_id748
-	p.recordSpan(int(span_start749), "FragmentId")
-	return result750
+	span_start786 := int64(p.spanStart())
+	_t1503 := p.parse_fragment_id()
+	fragment_id785 := _t1503
+	p.startFragment(fragment_id785)
+	result787 := fragment_id785
+	p.recordSpan(int(span_start786), "FragmentId")
+	return result787
 }
 
 func (p *Parser) parse_declaration() *pb.Declaration {
-	span_start756 := int64(p.spanStart())
-	var _t1430 int64
+	span_start793 := int64(p.spanStart())
+	var _t1504 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1431 int64
+		var _t1505 int64
 		if p.matchLookaheadLiteral("iceberg_data", 1) {
-			_t1431 = 3
+			_t1505 = 3
 		} else {
-			var _t1432 int64
+			var _t1506 int64
 			if p.matchLookaheadLiteral("functional_dependency", 1) {
-				_t1432 = 2
+				_t1506 = 2
 			} else {
-				var _t1433 int64
+				var _t1507 int64
 				if p.matchLookaheadLiteral("edb", 1) {
-					_t1433 = 3
+					_t1507 = 3
 				} else {
-					var _t1434 int64
+					var _t1508 int64
 					if p.matchLookaheadLiteral("def", 1) {
-						_t1434 = 0
+						_t1508 = 0
 					} else {
-						var _t1435 int64
+						var _t1509 int64
 						if p.matchLookaheadLiteral("csv_data", 1) {
-							_t1435 = 3
+							_t1509 = 3
 						} else {
-							var _t1436 int64
+							var _t1510 int64
 							if p.matchLookaheadLiteral("betree_relation", 1) {
-								_t1436 = 3
+								_t1510 = 3
 							} else {
-								var _t1437 int64
+								var _t1511 int64
 								if p.matchLookaheadLiteral("algorithm", 1) {
-									_t1437 = 1
+									_t1511 = 1
 								} else {
-									_t1437 = -1
+									_t1511 = -1
 								}
-								_t1436 = _t1437
+								_t1510 = _t1511
 							}
-							_t1435 = _t1436
+							_t1509 = _t1510
 						}
-						_t1434 = _t1435
+						_t1508 = _t1509
 					}
-					_t1433 = _t1434
+					_t1507 = _t1508
 				}
-				_t1432 = _t1433
+				_t1506 = _t1507
 			}
-			_t1431 = _t1432
+			_t1505 = _t1506
 		}
-		_t1430 = _t1431
+		_t1504 = _t1505
 	} else {
-		_t1430 = -1
-	}
-	prediction751 := _t1430
-	var _t1438 *pb.Declaration
-	if prediction751 == 3 {
-		_t1439 := p.parse_data()
-		data755 := _t1439
-		_t1440 := &pb.Declaration{}
-		_t1440.DeclarationType = &pb.Declaration_Data{Data: data755}
-		_t1438 = _t1440
+		_t1504 = -1
+	}
+	prediction788 := _t1504
+	var _t1512 *pb.Declaration
+	if prediction788 == 3 {
+		_t1513 := p.parse_data()
+		data792 := _t1513
+		_t1514 := &pb.Declaration{}
+		_t1514.DeclarationType = &pb.Declaration_Data{Data: data792}
+		_t1512 = _t1514
 	} else {
-		var _t1441 *pb.Declaration
-		if prediction751 == 2 {
-			_t1442 := p.parse_constraint()
-			constraint754 := _t1442
-			_t1443 := &pb.Declaration{}
-			_t1443.DeclarationType = &pb.Declaration_Constraint{Constraint: constraint754}
-			_t1441 = _t1443
+		var _t1515 *pb.Declaration
+		if prediction788 == 2 {
+			_t1516 := p.parse_constraint()
+			constraint791 := _t1516
+			_t1517 := &pb.Declaration{}
+			_t1517.DeclarationType = &pb.Declaration_Constraint{Constraint: constraint791}
+			_t1515 = _t1517
 		} else {
-			var _t1444 *pb.Declaration
-			if prediction751 == 1 {
-				_t1445 := p.parse_algorithm()
-				algorithm753 := _t1445
-				_t1446 := &pb.Declaration{}
-				_t1446.DeclarationType = &pb.Declaration_Algorithm{Algorithm: algorithm753}
-				_t1444 = _t1446
+			var _t1518 *pb.Declaration
+			if prediction788 == 1 {
+				_t1519 := p.parse_algorithm()
+				algorithm790 := _t1519
+				_t1520 := &pb.Declaration{}
+				_t1520.DeclarationType = &pb.Declaration_Algorithm{Algorithm: algorithm790}
+				_t1518 = _t1520
 			} else {
-				var _t1447 *pb.Declaration
-				if prediction751 == 0 {
-					_t1448 := p.parse_def()
-					def752 := _t1448
-					_t1449 := &pb.Declaration{}
-					_t1449.DeclarationType = &pb.Declaration_Def{Def: def752}
-					_t1447 = _t1449
+				var _t1521 *pb.Declaration
+				if prediction788 == 0 {
+					_t1522 := p.parse_def()
+					def789 := _t1522
+					_t1523 := &pb.Declaration{}
+					_t1523.DeclarationType = &pb.Declaration_Def{Def: def789}
+					_t1521 = _t1523
 				} else {
 					panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in declaration", p.lookahead(0).Type, p.lookahead(0).Value)})
 				}
-				_t1444 = _t1447
+				_t1518 = _t1521
 			}
-			_t1441 = _t1444
+			_t1515 = _t1518
 		}
-		_t1438 = _t1441
+		_t1512 = _t1515
 	}
-	result757 := _t1438
-	p.recordSpan(int(span_start756), "Declaration")
-	return result757
+	result794 := _t1512
+	p.recordSpan(int(span_start793), "Declaration")
+	return result794
 }
 
 func (p *Parser) parse_def() *pb.Def {
-	span_start761 := int64(p.spanStart())
+	span_start798 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("def")
-	_t1450 := p.parse_relation_id()
-	relation_id758 := _t1450
-	_t1451 := p.parse_abstraction()
-	abstraction759 := _t1451
-	var _t1452 []*pb.Attribute
+	_t1524 := p.parse_relation_id()
+	relation_id795 := _t1524
+	_t1525 := p.parse_abstraction()
+	abstraction796 := _t1525
+	var _t1526 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1453 := p.parse_attrs()
-		_t1452 = _t1453
+		_t1527 := p.parse_attrs()
+		_t1526 = _t1527
 	}
-	attrs760 := _t1452
+	attrs797 := _t1526
 	p.consumeLiteral(")")
-	_t1454 := attrs760
-	if attrs760 == nil {
-		_t1454 = []*pb.Attribute{}
+	_t1528 := attrs797
+	if attrs797 == nil {
+		_t1528 = []*pb.Attribute{}
 	}
-	_t1455 := &pb.Def{Name: relation_id758, Body: abstraction759, Attrs: _t1454}
-	result762 := _t1455
-	p.recordSpan(int(span_start761), "Def")
-	return result762
+	_t1529 := &pb.Def{Name: relation_id795, Body: abstraction796, Attrs: _t1528}
+	result799 := _t1529
+	p.recordSpan(int(span_start798), "Def")
+	return result799
 }
 
 func (p *Parser) parse_relation_id() *pb.RelationId {
-	span_start766 := int64(p.spanStart())
-	var _t1456 int64
+	span_start803 := int64(p.spanStart())
+	var _t1530 int64
 	if p.matchLookaheadLiteral(":", 0) {
-		_t1456 = 0
+		_t1530 = 0
 	} else {
-		var _t1457 int64
+		var _t1531 int64
 		if p.matchLookaheadTerminal("UINT128", 0) {
-			_t1457 = 1
+			_t1531 = 1
 		} else {
-			_t1457 = -1
+			_t1531 = -1
 		}
-		_t1456 = _t1457
-	}
-	prediction763 := _t1456
-	var _t1458 *pb.RelationId
-	if prediction763 == 1 {
-		uint128765 := p.consumeTerminal("UINT128").Value.uint128
-		_ = uint128765
-		_t1458 = &pb.RelationId{IdLow: uint128765.Low, IdHigh: uint128765.High}
+		_t1530 = _t1531
+	}
+	prediction800 := _t1530
+	var _t1532 *pb.RelationId
+	if prediction800 == 1 {
+		uint128802 := p.consumeTerminal("UINT128").Value.uint128
+		_ = uint128802
+		_t1532 = &pb.RelationId{IdLow: uint128802.Low, IdHigh: uint128802.High}
 	} else {
-		var _t1459 *pb.RelationId
-		if prediction763 == 0 {
+		var _t1533 *pb.RelationId
+		if prediction800 == 0 {
 			p.consumeLiteral(":")
-			symbol764 := p.consumeTerminal("SYMBOL").Value.str
-			_t1459 = p.relationIdFromString(symbol764)
+			symbol801 := p.consumeTerminal("SYMBOL").Value.str
+			_t1533 = p.relationIdFromString(symbol801)
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in relation_id", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1458 = _t1459
+		_t1532 = _t1533
 	}
-	result767 := _t1458
-	p.recordSpan(int(span_start766), "RelationId")
-	return result767
+	result804 := _t1532
+	p.recordSpan(int(span_start803), "RelationId")
+	return result804
 }
 
 func (p *Parser) parse_abstraction() *pb.Abstraction {
-	span_start770 := int64(p.spanStart())
+	span_start807 := int64(p.spanStart())
 	p.consumeLiteral("(")
-	_t1460 := p.parse_bindings()
-	bindings768 := _t1460
-	_t1461 := p.parse_formula()
-	formula769 := _t1461
+	_t1534 := p.parse_bindings()
+	bindings805 := _t1534
+	_t1535 := p.parse_formula()
+	formula806 := _t1535
 	p.consumeLiteral(")")
-	_t1462 := &pb.Abstraction{Vars: listConcat(bindings768[0].([]*pb.Binding), bindings768[1].([]*pb.Binding)), Value: formula769}
-	result771 := _t1462
-	p.recordSpan(int(span_start770), "Abstraction")
-	return result771
+	_t1536 := &pb.Abstraction{Vars: listConcat(bindings805[0].([]*pb.Binding), bindings805[1].([]*pb.Binding)), Value: formula806}
+	result808 := _t1536
+	p.recordSpan(int(span_start807), "Abstraction")
+	return result808
 }
 
 func (p *Parser) parse_bindings() []interface{} {
 	p.consumeLiteral("[")
-	xs772 := []*pb.Binding{}
-	cond773 := p.matchLookaheadTerminal("SYMBOL", 0)
-	for cond773 {
-		_t1463 := p.parse_binding()
-		item774 := _t1463
-		xs772 = append(xs772, item774)
-		cond773 = p.matchLookaheadTerminal("SYMBOL", 0)
-	}
-	bindings775 := xs772
-	var _t1464 []*pb.Binding
+	xs809 := []*pb.Binding{}
+	cond810 := p.matchLookaheadTerminal("SYMBOL", 0)
+	for cond810 {
+		_t1537 := p.parse_binding()
+		item811 := _t1537
+		xs809 = append(xs809, item811)
+		cond810 = p.matchLookaheadTerminal("SYMBOL", 0)
+	}
+	bindings812 := xs809
+	var _t1538 []*pb.Binding
 	if p.matchLookaheadLiteral("|", 0) {
-		_t1465 := p.parse_value_bindings()
-		_t1464 = _t1465
+		_t1539 := p.parse_value_bindings()
+		_t1538 = _t1539
 	}
-	value_bindings776 := _t1464
+	value_bindings813 := _t1538
 	p.consumeLiteral("]")
-	_t1466 := value_bindings776
-	if value_bindings776 == nil {
-		_t1466 = []*pb.Binding{}
+	_t1540 := value_bindings813
+	if value_bindings813 == nil {
+		_t1540 = []*pb.Binding{}
 	}
-	return []interface{}{bindings775, _t1466}
+	return []interface{}{bindings812, _t1540}
 }
 
 func (p *Parser) parse_binding() *pb.Binding {
-	span_start779 := int64(p.spanStart())
-	symbol777 := p.consumeTerminal("SYMBOL").Value.str
+	span_start816 := int64(p.spanStart())
+	symbol814 := p.consumeTerminal("SYMBOL").Value.str
 	p.consumeLiteral("::")
-	_t1467 := p.parse_type()
-	type778 := _t1467
-	_t1468 := &pb.Var{Name: symbol777}
-	_t1469 := &pb.Binding{Var: _t1468, Type: type778}
-	result780 := _t1469
-	p.recordSpan(int(span_start779), "Binding")
-	return result780
+	_t1541 := p.parse_type()
+	type815 := _t1541
+	_t1542 := &pb.Var{Name: symbol814}
+	_t1543 := &pb.Binding{Var: _t1542, Type: type815}
+	result817 := _t1543
+	p.recordSpan(int(span_start816), "Binding")
+	return result817
 }
 
 func (p *Parser) parse_type() *pb.Type {
-	span_start796 := int64(p.spanStart())
-	var _t1470 int64
+	span_start833 := int64(p.spanStart())
+	var _t1544 int64
 	if p.matchLookaheadLiteral("UNKNOWN", 0) {
-		_t1470 = 0
+		_t1544 = 0
 	} else {
-		var _t1471 int64
+		var _t1545 int64
 		if p.matchLookaheadLiteral("UINT32", 0) {
-			_t1471 = 13
+			_t1545 = 13
 		} else {
-			var _t1472 int64
+			var _t1546 int64
 			if p.matchLookaheadLiteral("UINT128", 0) {
-				_t1472 = 4
+				_t1546 = 4
 			} else {
-				var _t1473 int64
+				var _t1547 int64
 				if p.matchLookaheadLiteral("STRING", 0) {
-					_t1473 = 1
+					_t1547 = 1
 				} else {
-					var _t1474 int64
+					var _t1548 int64
 					if p.matchLookaheadLiteral("MISSING", 0) {
-						_t1474 = 8
+						_t1548 = 8
 					} else {
-						var _t1475 int64
+						var _t1549 int64
 						if p.matchLookaheadLiteral("INT32", 0) {
-							_t1475 = 11
+							_t1549 = 11
 						} else {
-							var _t1476 int64
+							var _t1550 int64
 							if p.matchLookaheadLiteral("INT128", 0) {
-								_t1476 = 5
+								_t1550 = 5
 							} else {
-								var _t1477 int64
+								var _t1551 int64
 								if p.matchLookaheadLiteral("INT", 0) {
-									_t1477 = 2
+									_t1551 = 2
 								} else {
-									var _t1478 int64
+									var _t1552 int64
 									if p.matchLookaheadLiteral("FLOAT32", 0) {
-										_t1478 = 12
+										_t1552 = 12
 									} else {
-										var _t1479 int64
+										var _t1553 int64
 										if p.matchLookaheadLiteral("FLOAT", 0) {
-											_t1479 = 3
+											_t1553 = 3
 										} else {
-											var _t1480 int64
+											var _t1554 int64
 											if p.matchLookaheadLiteral("DATETIME", 0) {
-												_t1480 = 7
+												_t1554 = 7
 											} else {
-												var _t1481 int64
+												var _t1555 int64
 												if p.matchLookaheadLiteral("DATE", 0) {
-													_t1481 = 6
+													_t1555 = 6
 												} else {
-													var _t1482 int64
+													var _t1556 int64
 													if p.matchLookaheadLiteral("BOOLEAN", 0) {
-														_t1482 = 10
+														_t1556 = 10
 													} else {
-														var _t1483 int64
+														var _t1557 int64
 														if p.matchLookaheadLiteral("(", 0) {
-															_t1483 = 9
+															_t1557 = 9
 														} else {
-															_t1483 = -1
+															_t1557 = -1
 														}
-														_t1482 = _t1483
+														_t1556 = _t1557
 													}
-													_t1481 = _t1482
+													_t1555 = _t1556
 												}
-												_t1480 = _t1481
+												_t1554 = _t1555
 											}
-											_t1479 = _t1480
+											_t1553 = _t1554
 										}
-										_t1478 = _t1479
+										_t1552 = _t1553
 									}
-									_t1477 = _t1478
+									_t1551 = _t1552
 								}
-								_t1476 = _t1477
+								_t1550 = _t1551
 							}
-							_t1475 = _t1476
+							_t1549 = _t1550
 						}
-						_t1474 = _t1475
+						_t1548 = _t1549
 					}
-					_t1473 = _t1474
+					_t1547 = _t1548
 				}
-				_t1472 = _t1473
+				_t1546 = _t1547
 			}
-			_t1471 = _t1472
+			_t1545 = _t1546
 		}
-		_t1470 = _t1471
-	}
-	prediction781 := _t1470
-	var _t1484 *pb.Type
-	if prediction781 == 13 {
-		_t1485 := p.parse_uint32_type()
-		uint32_type795 := _t1485
-		_t1486 := &pb.Type{}
-		_t1486.Type = &pb.Type_Uint32Type{Uint32Type: uint32_type795}
-		_t1484 = _t1486
+		_t1544 = _t1545
+	}
+	prediction818 := _t1544
+	var _t1558 *pb.Type
+	if prediction818 == 13 {
+		_t1559 := p.parse_uint32_type()
+		uint32_type832 := _t1559
+		_t1560 := &pb.Type{}
+		_t1560.Type = &pb.Type_Uint32Type{Uint32Type: uint32_type832}
+		_t1558 = _t1560
 	} else {
-		var _t1487 *pb.Type
-		if prediction781 == 12 {
-			_t1488 := p.parse_float32_type()
-			float32_type794 := _t1488
-			_t1489 := &pb.Type{}
-			_t1489.Type = &pb.Type_Float32Type{Float32Type: float32_type794}
-			_t1487 = _t1489
+		var _t1561 *pb.Type
+		if prediction818 == 12 {
+			_t1562 := p.parse_float32_type()
+			float32_type831 := _t1562
+			_t1563 := &pb.Type{}
+			_t1563.Type = &pb.Type_Float32Type{Float32Type: float32_type831}
+			_t1561 = _t1563
 		} else {
-			var _t1490 *pb.Type
-			if prediction781 == 11 {
-				_t1491 := p.parse_int32_type()
-				int32_type793 := _t1491
-				_t1492 := &pb.Type{}
-				_t1492.Type = &pb.Type_Int32Type{Int32Type: int32_type793}
-				_t1490 = _t1492
+			var _t1564 *pb.Type
+			if prediction818 == 11 {
+				_t1565 := p.parse_int32_type()
+				int32_type830 := _t1565
+				_t1566 := &pb.Type{}
+				_t1566.Type = &pb.Type_Int32Type{Int32Type: int32_type830}
+				_t1564 = _t1566
 			} else {
-				var _t1493 *pb.Type
-				if prediction781 == 10 {
-					_t1494 := p.parse_boolean_type()
-					boolean_type792 := _t1494
-					_t1495 := &pb.Type{}
-					_t1495.Type = &pb.Type_BooleanType{BooleanType: boolean_type792}
-					_t1493 = _t1495
+				var _t1567 *pb.Type
+				if prediction818 == 10 {
+					_t1568 := p.parse_boolean_type()
+					boolean_type829 := _t1568
+					_t1569 := &pb.Type{}
+					_t1569.Type = &pb.Type_BooleanType{BooleanType: boolean_type829}
+					_t1567 = _t1569
 				} else {
-					var _t1496 *pb.Type
-					if prediction781 == 9 {
-						_t1497 := p.parse_decimal_type()
-						decimal_type791 := _t1497
-						_t1498 := &pb.Type{}
-						_t1498.Type = &pb.Type_DecimalType{DecimalType: decimal_type791}
-						_t1496 = _t1498
+					var _t1570 *pb.Type
+					if prediction818 == 9 {
+						_t1571 := p.parse_decimal_type()
+						decimal_type828 := _t1571
+						_t1572 := &pb.Type{}
+						_t1572.Type = &pb.Type_DecimalType{DecimalType: decimal_type828}
+						_t1570 = _t1572
 					} else {
-						var _t1499 *pb.Type
-						if prediction781 == 8 {
-							_t1500 := p.parse_missing_type()
-							missing_type790 := _t1500
-							_t1501 := &pb.Type{}
-							_t1501.Type = &pb.Type_MissingType{MissingType: missing_type790}
-							_t1499 = _t1501
+						var _t1573 *pb.Type
+						if prediction818 == 8 {
+							_t1574 := p.parse_missing_type()
+							missing_type827 := _t1574
+							_t1575 := &pb.Type{}
+							_t1575.Type = &pb.Type_MissingType{MissingType: missing_type827}
+							_t1573 = _t1575
 						} else {
-							var _t1502 *pb.Type
-							if prediction781 == 7 {
-								_t1503 := p.parse_datetime_type()
-								datetime_type789 := _t1503
-								_t1504 := &pb.Type{}
-								_t1504.Type = &pb.Type_DatetimeType{DatetimeType: datetime_type789}
-								_t1502 = _t1504
+							var _t1576 *pb.Type
+							if prediction818 == 7 {
+								_t1577 := p.parse_datetime_type()
+								datetime_type826 := _t1577
+								_t1578 := &pb.Type{}
+								_t1578.Type = &pb.Type_DatetimeType{DatetimeType: datetime_type826}
+								_t1576 = _t1578
 							} else {
-								var _t1505 *pb.Type
-								if prediction781 == 6 {
-									_t1506 := p.parse_date_type()
-									date_type788 := _t1506
-									_t1507 := &pb.Type{}
-									_t1507.Type = &pb.Type_DateType{DateType: date_type788}
-									_t1505 = _t1507
+								var _t1579 *pb.Type
+								if prediction818 == 6 {
+									_t1580 := p.parse_date_type()
+									date_type825 := _t1580
+									_t1581 := &pb.Type{}
+									_t1581.Type = &pb.Type_DateType{DateType: date_type825}
+									_t1579 = _t1581
 								} else {
-									var _t1508 *pb.Type
-									if prediction781 == 5 {
-										_t1509 := p.parse_int128_type()
-										int128_type787 := _t1509
-										_t1510 := &pb.Type{}
-										_t1510.Type = &pb.Type_Int128Type{Int128Type: int128_type787}
-										_t1508 = _t1510
+									var _t1582 *pb.Type
+									if prediction818 == 5 {
+										_t1583 := p.parse_int128_type()
+										int128_type824 := _t1583
+										_t1584 := &pb.Type{}
+										_t1584.Type = &pb.Type_Int128Type{Int128Type: int128_type824}
+										_t1582 = _t1584
 									} else {
-										var _t1511 *pb.Type
-										if prediction781 == 4 {
-											_t1512 := p.parse_uint128_type()
-											uint128_type786 := _t1512
-											_t1513 := &pb.Type{}
-											_t1513.Type = &pb.Type_Uint128Type{Uint128Type: uint128_type786}
-											_t1511 = _t1513
+										var _t1585 *pb.Type
+										if prediction818 == 4 {
+											_t1586 := p.parse_uint128_type()
+											uint128_type823 := _t1586
+											_t1587 := &pb.Type{}
+											_t1587.Type = &pb.Type_Uint128Type{Uint128Type: uint128_type823}
+											_t1585 = _t1587
 										} else {
-											var _t1514 *pb.Type
-											if prediction781 == 3 {
-												_t1515 := p.parse_float_type()
-												float_type785 := _t1515
-												_t1516 := &pb.Type{}
-												_t1516.Type = &pb.Type_FloatType{FloatType: float_type785}
-												_t1514 = _t1516
+											var _t1588 *pb.Type
+											if prediction818 == 3 {
+												_t1589 := p.parse_float_type()
+												float_type822 := _t1589
+												_t1590 := &pb.Type{}
+												_t1590.Type = &pb.Type_FloatType{FloatType: float_type822}
+												_t1588 = _t1590
 											} else {
-												var _t1517 *pb.Type
-												if prediction781 == 2 {
-													_t1518 := p.parse_int_type()
-													int_type784 := _t1518
-													_t1519 := &pb.Type{}
-													_t1519.Type = &pb.Type_IntType{IntType: int_type784}
-													_t1517 = _t1519
+												var _t1591 *pb.Type
+												if prediction818 == 2 {
+													_t1592 := p.parse_int_type()
+													int_type821 := _t1592
+													_t1593 := &pb.Type{}
+													_t1593.Type = &pb.Type_IntType{IntType: int_type821}
+													_t1591 = _t1593
 												} else {
-													var _t1520 *pb.Type
-													if prediction781 == 1 {
-														_t1521 := p.parse_string_type()
-														string_type783 := _t1521
-														_t1522 := &pb.Type{}
-														_t1522.Type = &pb.Type_StringType{StringType: string_type783}
-														_t1520 = _t1522
+													var _t1594 *pb.Type
+													if prediction818 == 1 {
+														_t1595 := p.parse_string_type()
+														string_type820 := _t1595
+														_t1596 := &pb.Type{}
+														_t1596.Type = &pb.Type_StringType{StringType: string_type820}
+														_t1594 = _t1596
 													} else {
-														var _t1523 *pb.Type
-														if prediction781 == 0 {
-															_t1524 := p.parse_unspecified_type()
-															unspecified_type782 := _t1524
-															_t1525 := &pb.Type{}
-															_t1525.Type = &pb.Type_UnspecifiedType{UnspecifiedType: unspecified_type782}
-															_t1523 = _t1525
+														var _t1597 *pb.Type
+														if prediction818 == 0 {
+															_t1598 := p.parse_unspecified_type()
+															unspecified_type819 := _t1598
+															_t1599 := &pb.Type{}
+															_t1599.Type = &pb.Type_UnspecifiedType{UnspecifiedType: unspecified_type819}
+															_t1597 = _t1599
 														} else {
 															panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in type", p.lookahead(0).Type, p.lookahead(0).Value)})
 														}
-														_t1520 = _t1523
+														_t1594 = _t1597
 													}
-													_t1517 = _t1520
+													_t1591 = _t1594
 												}
-												_t1514 = _t1517
+												_t1588 = _t1591
 											}
-											_t1511 = _t1514
+											_t1585 = _t1588
 										}
-										_t1508 = _t1511
+										_t1582 = _t1585
 									}
-									_t1505 = _t1508
+									_t1579 = _t1582
 								}
-								_t1502 = _t1505
+								_t1576 = _t1579
 							}
-							_t1499 = _t1502
+							_t1573 = _t1576
 						}
-						_t1496 = _t1499
+						_t1570 = _t1573
 					}
-					_t1493 = _t1496
+					_t1567 = _t1570
 				}
-				_t1490 = _t1493
+				_t1564 = _t1567
 			}
-			_t1487 = _t1490
+			_t1561 = _t1564
 		}
-		_t1484 = _t1487
+		_t1558 = _t1561
 	}
-	result797 := _t1484
-	p.recordSpan(int(span_start796), "Type")
-	return result797
+	result834 := _t1558
+	p.recordSpan(int(span_start833), "Type")
+	return result834
 }
 
 func (p *Parser) parse_unspecified_type() *pb.UnspecifiedType {
-	span_start798 := int64(p.spanStart())
+	span_start835 := int64(p.spanStart())
 	p.consumeLiteral("UNKNOWN")
-	_t1526 := &pb.UnspecifiedType{}
-	result799 := _t1526
-	p.recordSpan(int(span_start798), "UnspecifiedType")
-	return result799
+	_t1600 := &pb.UnspecifiedType{}
+	result836 := _t1600
+	p.recordSpan(int(span_start835), "UnspecifiedType")
+	return result836
 }
 
 func (p *Parser) parse_string_type() *pb.StringType {
-	span_start800 := int64(p.spanStart())
+	span_start837 := int64(p.spanStart())
 	p.consumeLiteral("STRING")
-	_t1527 := &pb.StringType{}
-	result801 := _t1527
-	p.recordSpan(int(span_start800), "StringType")
-	return result801
+	_t1601 := &pb.StringType{}
+	result838 := _t1601
+	p.recordSpan(int(span_start837), "StringType")
+	return result838
 }
 
 func (p *Parser) parse_int_type() *pb.IntType {
-	span_start802 := int64(p.spanStart())
+	span_start839 := int64(p.spanStart())
 	p.consumeLiteral("INT")
-	_t1528 := &pb.IntType{}
-	result803 := _t1528
-	p.recordSpan(int(span_start802), "IntType")
-	return result803
+	_t1602 := &pb.IntType{}
+	result840 := _t1602
+	p.recordSpan(int(span_start839), "IntType")
+	return result840
 }
 
 func (p *Parser) parse_float_type() *pb.FloatType {
-	span_start804 := int64(p.spanStart())
+	span_start841 := int64(p.spanStart())
 	p.consumeLiteral("FLOAT")
-	_t1529 := &pb.FloatType{}
-	result805 := _t1529
-	p.recordSpan(int(span_start804), "FloatType")
-	return result805
+	_t1603 := &pb.FloatType{}
+	result842 := _t1603
+	p.recordSpan(int(span_start841), "FloatType")
+	return result842
 }
 
 func (p *Parser) parse_uint128_type() *pb.UInt128Type {
-	span_start806 := int64(p.spanStart())
+	span_start843 := int64(p.spanStart())
 	p.consumeLiteral("UINT128")
-	_t1530 := &pb.UInt128Type{}
-	result807 := _t1530
-	p.recordSpan(int(span_start806), "UInt128Type")
-	return result807
+	_t1604 := &pb.UInt128Type{}
+	result844 := _t1604
+	p.recordSpan(int(span_start843), "UInt128Type")
+	return result844
 }
 
 func (p *Parser) parse_int128_type() *pb.Int128Type {
-	span_start808 := int64(p.spanStart())
+	span_start845 := int64(p.spanStart())
 	p.consumeLiteral("INT128")
-	_t1531 := &pb.Int128Type{}
-	result809 := _t1531
-	p.recordSpan(int(span_start808), "Int128Type")
-	return result809
+	_t1605 := &pb.Int128Type{}
+	result846 := _t1605
+	p.recordSpan(int(span_start845), "Int128Type")
+	return result846
 }
 
 func (p *Parser) parse_date_type() *pb.DateType {
-	span_start810 := int64(p.spanStart())
+	span_start847 := int64(p.spanStart())
 	p.consumeLiteral("DATE")
-	_t1532 := &pb.DateType{}
-	result811 := _t1532
-	p.recordSpan(int(span_start810), "DateType")
-	return result811
+	_t1606 := &pb.DateType{}
+	result848 := _t1606
+	p.recordSpan(int(span_start847), "DateType")
+	return result848
 }
 
 func (p *Parser) parse_datetime_type() *pb.DateTimeType {
-	span_start812 := int64(p.spanStart())
+	span_start849 := int64(p.spanStart())
 	p.consumeLiteral("DATETIME")
-	_t1533 := &pb.DateTimeType{}
-	result813 := _t1533
-	p.recordSpan(int(span_start812), "DateTimeType")
-	return result813
+	_t1607 := &pb.DateTimeType{}
+	result850 := _t1607
+	p.recordSpan(int(span_start849), "DateTimeType")
+	return result850
 }
 
 func (p *Parser) parse_missing_type() *pb.MissingType {
-	span_start814 := int64(p.spanStart())
+	span_start851 := int64(p.spanStart())
 	p.consumeLiteral("MISSING")
-	_t1534 := &pb.MissingType{}
-	result815 := _t1534
-	p.recordSpan(int(span_start814), "MissingType")
-	return result815
+	_t1608 := &pb.MissingType{}
+	result852 := _t1608
+	p.recordSpan(int(span_start851), "MissingType")
+	return result852
 }
 
 func (p *Parser) parse_decimal_type() *pb.DecimalType {
-	span_start818 := int64(p.spanStart())
+	span_start855 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("DECIMAL")
-	int816 := p.consumeTerminal("INT").Value.i64
-	int_3817 := p.consumeTerminal("INT").Value.i64
+	int853 := p.consumeTerminal("INT").Value.i64
+	int_3854 := p.consumeTerminal("INT").Value.i64
 	p.consumeLiteral(")")
-	_t1535 := &pb.DecimalType{Precision: int32(int816), Scale: int32(int_3817)}
-	result819 := _t1535
-	p.recordSpan(int(span_start818), "DecimalType")
-	return result819
+	_t1609 := &pb.DecimalType{Precision: int32(int853), Scale: int32(int_3854)}
+	result856 := _t1609
+	p.recordSpan(int(span_start855), "DecimalType")
+	return result856
 }
 
 func (p *Parser) parse_boolean_type() *pb.BooleanType {
-	span_start820 := int64(p.spanStart())
+	span_start857 := int64(p.spanStart())
 	p.consumeLiteral("BOOLEAN")
-	_t1536 := &pb.BooleanType{}
-	result821 := _t1536
-	p.recordSpan(int(span_start820), "BooleanType")
-	return result821
+	_t1610 := &pb.BooleanType{}
+	result858 := _t1610
+	p.recordSpan(int(span_start857), "BooleanType")
+	return result858
 }
 
 func (p *Parser) parse_int32_type() *pb.Int32Type {
-	span_start822 := int64(p.spanStart())
+	span_start859 := int64(p.spanStart())
 	p.consumeLiteral("INT32")
-	_t1537 := &pb.Int32Type{}
-	result823 := _t1537
-	p.recordSpan(int(span_start822), "Int32Type")
-	return result823
+	_t1611 := &pb.Int32Type{}
+	result860 := _t1611
+	p.recordSpan(int(span_start859), "Int32Type")
+	return result860
 }
 
 func (p *Parser) parse_float32_type() *pb.Float32Type {
-	span_start824 := int64(p.spanStart())
+	span_start861 := int64(p.spanStart())
 	p.consumeLiteral("FLOAT32")
-	_t1538 := &pb.Float32Type{}
-	result825 := _t1538
-	p.recordSpan(int(span_start824), "Float32Type")
-	return result825
+	_t1612 := &pb.Float32Type{}
+	result862 := _t1612
+	p.recordSpan(int(span_start861), "Float32Type")
+	return result862
 }
 
 func (p *Parser) parse_uint32_type() *pb.UInt32Type {
-	span_start826 := int64(p.spanStart())
+	span_start863 := int64(p.spanStart())
 	p.consumeLiteral("UINT32")
-	_t1539 := &pb.UInt32Type{}
-	result827 := _t1539
-	p.recordSpan(int(span_start826), "UInt32Type")
-	return result827
+	_t1613 := &pb.UInt32Type{}
+	result864 := _t1613
+	p.recordSpan(int(span_start863), "UInt32Type")
+	return result864
 }
 
 func (p *Parser) parse_value_bindings() []*pb.Binding {
 	p.consumeLiteral("|")
-	xs828 := []*pb.Binding{}
-	cond829 := p.matchLookaheadTerminal("SYMBOL", 0)
-	for cond829 {
-		_t1540 := p.parse_binding()
-		item830 := _t1540
-		xs828 = append(xs828, item830)
-		cond829 = p.matchLookaheadTerminal("SYMBOL", 0)
+	xs865 := []*pb.Binding{}
+	cond866 := p.matchLookaheadTerminal("SYMBOL", 0)
+	for cond866 {
+		_t1614 := p.parse_binding()
+		item867 := _t1614
+		xs865 = append(xs865, item867)
+		cond866 = p.matchLookaheadTerminal("SYMBOL", 0)
 	}
-	bindings831 := xs828
-	return bindings831
+	bindings868 := xs865
+	return bindings868
 }
 
 func (p *Parser) parse_formula() *pb.Formula {
-	span_start846 := int64(p.spanStart())
-	var _t1541 int64
+	span_start883 := int64(p.spanStart())
+	var _t1615 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1542 int64
+		var _t1616 int64
 		if p.matchLookaheadLiteral("true", 1) {
-			_t1542 = 0
+			_t1616 = 0
 		} else {
-			var _t1543 int64
+			var _t1617 int64
 			if p.matchLookaheadLiteral("relatom", 1) {
-				_t1543 = 11
+				_t1617 = 11
 			} else {
-				var _t1544 int64
+				var _t1618 int64
 				if p.matchLookaheadLiteral("reduce", 1) {
-					_t1544 = 3
+					_t1618 = 3
 				} else {
-					var _t1545 int64
+					var _t1619 int64
 					if p.matchLookaheadLiteral("primitive", 1) {
-						_t1545 = 10
+						_t1619 = 10
 					} else {
-						var _t1546 int64
+						var _t1620 int64
 						if p.matchLookaheadLiteral("pragma", 1) {
-							_t1546 = 9
+							_t1620 = 9
 						} else {
-							var _t1547 int64
+							var _t1621 int64
 							if p.matchLookaheadLiteral("or", 1) {
-								_t1547 = 5
+								_t1621 = 5
 							} else {
-								var _t1548 int64
+								var _t1622 int64
 								if p.matchLookaheadLiteral("not", 1) {
-									_t1548 = 6
+									_t1622 = 6
 								} else {
-									var _t1549 int64
+									var _t1623 int64
 									if p.matchLookaheadLiteral("ffi", 1) {
-										_t1549 = 7
+										_t1623 = 7
 									} else {
-										var _t1550 int64
+										var _t1624 int64
 										if p.matchLookaheadLiteral("false", 1) {
-											_t1550 = 1
+											_t1624 = 1
 										} else {
-											var _t1551 int64
+											var _t1625 int64
 											if p.matchLookaheadLiteral("exists", 1) {
-												_t1551 = 2
+												_t1625 = 2
 											} else {
-												var _t1552 int64
+												var _t1626 int64
 												if p.matchLookaheadLiteral("cast", 1) {
-													_t1552 = 12
+													_t1626 = 12
 												} else {
-													var _t1553 int64
+													var _t1627 int64
 													if p.matchLookaheadLiteral("atom", 1) {
-														_t1553 = 8
+														_t1627 = 8
 													} else {
-														var _t1554 int64
+														var _t1628 int64
 														if p.matchLookaheadLiteral("and", 1) {
-															_t1554 = 4
+															_t1628 = 4
 														} else {
-															var _t1555 int64
+															var _t1629 int64
 															if p.matchLookaheadLiteral(">=", 1) {
-																_t1555 = 10
+																_t1629 = 10
 															} else {
-																var _t1556 int64
+																var _t1630 int64
 																if p.matchLookaheadLiteral(">", 1) {
-																	_t1556 = 10
+																	_t1630 = 10
 																} else {
-																	var _t1557 int64
+																	var _t1631 int64
 																	if p.matchLookaheadLiteral("=", 1) {
-																		_t1557 = 10
+																		_t1631 = 10
 																	} else {
-																		var _t1558 int64
+																		var _t1632 int64
 																		if p.matchLookaheadLiteral("<=", 1) {
-																			_t1558 = 10
+																			_t1632 = 10
 																		} else {
-																			var _t1559 int64
+																			var _t1633 int64
 																			if p.matchLookaheadLiteral("<", 1) {
-																				_t1559 = 10
+																				_t1633 = 10
 																			} else {
-																				var _t1560 int64
+																				var _t1634 int64
 																				if p.matchLookaheadLiteral("/", 1) {
-																					_t1560 = 10
+																					_t1634 = 10
 																				} else {
-																					var _t1561 int64
+																					var _t1635 int64
 																					if p.matchLookaheadLiteral("-", 1) {
-																						_t1561 = 10
+																						_t1635 = 10
 																					} else {
-																						var _t1562 int64
+																						var _t1636 int64
 																						if p.matchLookaheadLiteral("+", 1) {
-																							_t1562 = 10
+																							_t1636 = 10
 																						} else {
-																							var _t1563 int64
+																							var _t1637 int64
 																							if p.matchLookaheadLiteral("*", 1) {
-																								_t1563 = 10
+																								_t1637 = 10
 																							} else {
-																								_t1563 = -1
+																								_t1637 = -1
 																							}
-																							_t1562 = _t1563
+																							_t1636 = _t1637
 																						}
-																						_t1561 = _t1562
+																						_t1635 = _t1636
 																					}
-																					_t1560 = _t1561
+																					_t1634 = _t1635
 																				}
-																				_t1559 = _t1560
+																				_t1633 = _t1634
 																			}
-																			_t1558 = _t1559
+																			_t1632 = _t1633
 																		}
-																		_t1557 = _t1558
+																		_t1631 = _t1632
 																	}
-																	_t1556 = _t1557
+																	_t1630 = _t1631
 																}
-																_t1555 = _t1556
+																_t1629 = _t1630
 															}
-															_t1554 = _t1555
+															_t1628 = _t1629
 														}
-														_t1553 = _t1554
+														_t1627 = _t1628
 													}
-													_t1552 = _t1553
+													_t1626 = _t1627
 												}
-												_t1551 = _t1552
+												_t1625 = _t1626
 											}
-											_t1550 = _t1551
+											_t1624 = _t1625
 										}
-										_t1549 = _t1550
+										_t1623 = _t1624
 									}
-									_t1548 = _t1549
+									_t1622 = _t1623
 								}
-								_t1547 = _t1548
+								_t1621 = _t1622
 							}
-							_t1546 = _t1547
+							_t1620 = _t1621
 						}
-						_t1545 = _t1546
+						_t1619 = _t1620
 					}
-					_t1544 = _t1545
+					_t1618 = _t1619
 				}
-				_t1543 = _t1544
+				_t1617 = _t1618
 			}
-			_t1542 = _t1543
+			_t1616 = _t1617
 		}
-		_t1541 = _t1542
+		_t1615 = _t1616
 	} else {
-		_t1541 = -1
-	}
-	prediction832 := _t1541
-	var _t1564 *pb.Formula
-	if prediction832 == 12 {
-		_t1565 := p.parse_cast()
-		cast845 := _t1565
-		_t1566 := &pb.Formula{}
-		_t1566.FormulaType = &pb.Formula_Cast{Cast: cast845}
-		_t1564 = _t1566
+		_t1615 = -1
+	}
+	prediction869 := _t1615
+	var _t1638 *pb.Formula
+	if prediction869 == 12 {
+		_t1639 := p.parse_cast()
+		cast882 := _t1639
+		_t1640 := &pb.Formula{}
+		_t1640.FormulaType = &pb.Formula_Cast{Cast: cast882}
+		_t1638 = _t1640
 	} else {
-		var _t1567 *pb.Formula
-		if prediction832 == 11 {
-			_t1568 := p.parse_rel_atom()
-			rel_atom844 := _t1568
-			_t1569 := &pb.Formula{}
-			_t1569.FormulaType = &pb.Formula_RelAtom{RelAtom: rel_atom844}
-			_t1567 = _t1569
+		var _t1641 *pb.Formula
+		if prediction869 == 11 {
+			_t1642 := p.parse_rel_atom()
+			rel_atom881 := _t1642
+			_t1643 := &pb.Formula{}
+			_t1643.FormulaType = &pb.Formula_RelAtom{RelAtom: rel_atom881}
+			_t1641 = _t1643
 		} else {
-			var _t1570 *pb.Formula
-			if prediction832 == 10 {
-				_t1571 := p.parse_primitive()
-				primitive843 := _t1571
-				_t1572 := &pb.Formula{}
-				_t1572.FormulaType = &pb.Formula_Primitive{Primitive: primitive843}
-				_t1570 = _t1572
+			var _t1644 *pb.Formula
+			if prediction869 == 10 {
+				_t1645 := p.parse_primitive()
+				primitive880 := _t1645
+				_t1646 := &pb.Formula{}
+				_t1646.FormulaType = &pb.Formula_Primitive{Primitive: primitive880}
+				_t1644 = _t1646
 			} else {
-				var _t1573 *pb.Formula
-				if prediction832 == 9 {
-					_t1574 := p.parse_pragma()
-					pragma842 := _t1574
-					_t1575 := &pb.Formula{}
-					_t1575.FormulaType = &pb.Formula_Pragma{Pragma: pragma842}
-					_t1573 = _t1575
+				var _t1647 *pb.Formula
+				if prediction869 == 9 {
+					_t1648 := p.parse_pragma()
+					pragma879 := _t1648
+					_t1649 := &pb.Formula{}
+					_t1649.FormulaType = &pb.Formula_Pragma{Pragma: pragma879}
+					_t1647 = _t1649
 				} else {
-					var _t1576 *pb.Formula
-					if prediction832 == 8 {
-						_t1577 := p.parse_atom()
-						atom841 := _t1577
-						_t1578 := &pb.Formula{}
-						_t1578.FormulaType = &pb.Formula_Atom{Atom: atom841}
-						_t1576 = _t1578
+					var _t1650 *pb.Formula
+					if prediction869 == 8 {
+						_t1651 := p.parse_atom()
+						atom878 := _t1651
+						_t1652 := &pb.Formula{}
+						_t1652.FormulaType = &pb.Formula_Atom{Atom: atom878}
+						_t1650 = _t1652
 					} else {
-						var _t1579 *pb.Formula
-						if prediction832 == 7 {
-							_t1580 := p.parse_ffi()
-							ffi840 := _t1580
-							_t1581 := &pb.Formula{}
-							_t1581.FormulaType = &pb.Formula_Ffi{Ffi: ffi840}
-							_t1579 = _t1581
+						var _t1653 *pb.Formula
+						if prediction869 == 7 {
+							_t1654 := p.parse_ffi()
+							ffi877 := _t1654
+							_t1655 := &pb.Formula{}
+							_t1655.FormulaType = &pb.Formula_Ffi{Ffi: ffi877}
+							_t1653 = _t1655
 						} else {
-							var _t1582 *pb.Formula
-							if prediction832 == 6 {
-								_t1583 := p.parse_not()
-								not839 := _t1583
-								_t1584 := &pb.Formula{}
-								_t1584.FormulaType = &pb.Formula_Not{Not: not839}
-								_t1582 = _t1584
+							var _t1656 *pb.Formula
+							if prediction869 == 6 {
+								_t1657 := p.parse_not()
+								not876 := _t1657
+								_t1658 := &pb.Formula{}
+								_t1658.FormulaType = &pb.Formula_Not{Not: not876}
+								_t1656 = _t1658
 							} else {
-								var _t1585 *pb.Formula
-								if prediction832 == 5 {
-									_t1586 := p.parse_disjunction()
-									disjunction838 := _t1586
-									_t1587 := &pb.Formula{}
-									_t1587.FormulaType = &pb.Formula_Disjunction{Disjunction: disjunction838}
-									_t1585 = _t1587
+								var _t1659 *pb.Formula
+								if prediction869 == 5 {
+									_t1660 := p.parse_disjunction()
+									disjunction875 := _t1660
+									_t1661 := &pb.Formula{}
+									_t1661.FormulaType = &pb.Formula_Disjunction{Disjunction: disjunction875}
+									_t1659 = _t1661
 								} else {
-									var _t1588 *pb.Formula
-									if prediction832 == 4 {
-										_t1589 := p.parse_conjunction()
-										conjunction837 := _t1589
-										_t1590 := &pb.Formula{}
-										_t1590.FormulaType = &pb.Formula_Conjunction{Conjunction: conjunction837}
-										_t1588 = _t1590
+									var _t1662 *pb.Formula
+									if prediction869 == 4 {
+										_t1663 := p.parse_conjunction()
+										conjunction874 := _t1663
+										_t1664 := &pb.Formula{}
+										_t1664.FormulaType = &pb.Formula_Conjunction{Conjunction: conjunction874}
+										_t1662 = _t1664
 									} else {
-										var _t1591 *pb.Formula
-										if prediction832 == 3 {
-											_t1592 := p.parse_reduce()
-											reduce836 := _t1592
-											_t1593 := &pb.Formula{}
-											_t1593.FormulaType = &pb.Formula_Reduce{Reduce: reduce836}
-											_t1591 = _t1593
+										var _t1665 *pb.Formula
+										if prediction869 == 3 {
+											_t1666 := p.parse_reduce()
+											reduce873 := _t1666
+											_t1667 := &pb.Formula{}
+											_t1667.FormulaType = &pb.Formula_Reduce{Reduce: reduce873}
+											_t1665 = _t1667
 										} else {
-											var _t1594 *pb.Formula
-											if prediction832 == 2 {
-												_t1595 := p.parse_exists()
-												exists835 := _t1595
-												_t1596 := &pb.Formula{}
-												_t1596.FormulaType = &pb.Formula_Exists{Exists: exists835}
-												_t1594 = _t1596
+											var _t1668 *pb.Formula
+											if prediction869 == 2 {
+												_t1669 := p.parse_exists()
+												exists872 := _t1669
+												_t1670 := &pb.Formula{}
+												_t1670.FormulaType = &pb.Formula_Exists{Exists: exists872}
+												_t1668 = _t1670
 											} else {
-												var _t1597 *pb.Formula
-												if prediction832 == 1 {
-													_t1598 := p.parse_false()
-													false834 := _t1598
-													_t1599 := &pb.Formula{}
-													_t1599.FormulaType = &pb.Formula_Disjunction{Disjunction: false834}
-													_t1597 = _t1599
+												var _t1671 *pb.Formula
+												if prediction869 == 1 {
+													_t1672 := p.parse_false()
+													false871 := _t1672
+													_t1673 := &pb.Formula{}
+													_t1673.FormulaType = &pb.Formula_Disjunction{Disjunction: false871}
+													_t1671 = _t1673
 												} else {
-													var _t1600 *pb.Formula
-													if prediction832 == 0 {
-														_t1601 := p.parse_true()
-														true833 := _t1601
-														_t1602 := &pb.Formula{}
-														_t1602.FormulaType = &pb.Formula_Conjunction{Conjunction: true833}
-														_t1600 = _t1602
+													var _t1674 *pb.Formula
+													if prediction869 == 0 {
+														_t1675 := p.parse_true()
+														true870 := _t1675
+														_t1676 := &pb.Formula{}
+														_t1676.FormulaType = &pb.Formula_Conjunction{Conjunction: true870}
+														_t1674 = _t1676
 													} else {
 														panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in formula", p.lookahead(0).Type, p.lookahead(0).Value)})
 													}
-													_t1597 = _t1600
+													_t1671 = _t1674
 												}
-												_t1594 = _t1597
+												_t1668 = _t1671
 											}
-											_t1591 = _t1594
+											_t1665 = _t1668
 										}
-										_t1588 = _t1591
+										_t1662 = _t1665
 									}
-									_t1585 = _t1588
+									_t1659 = _t1662
 								}
-								_t1582 = _t1585
+								_t1656 = _t1659
 							}
-							_t1579 = _t1582
+							_t1653 = _t1656
 						}
-						_t1576 = _t1579
+						_t1650 = _t1653
 					}
-					_t1573 = _t1576
+					_t1647 = _t1650
 				}
-				_t1570 = _t1573
+				_t1644 = _t1647
 			}
-			_t1567 = _t1570
+			_t1641 = _t1644
 		}
-		_t1564 = _t1567
+		_t1638 = _t1641
 	}
-	result847 := _t1564
-	p.recordSpan(int(span_start846), "Formula")
-	return result847
+	result884 := _t1638
+	p.recordSpan(int(span_start883), "Formula")
+	return result884
 }
 
 func (p *Parser) parse_true() *pb.Conjunction {
-	span_start848 := int64(p.spanStart())
+	span_start885 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("true")
 	p.consumeLiteral(")")
-	_t1603 := &pb.Conjunction{Args: []*pb.Formula{}}
-	result849 := _t1603
-	p.recordSpan(int(span_start848), "Conjunction")
-	return result849
+	_t1677 := &pb.Conjunction{Args: []*pb.Formula{}}
+	result886 := _t1677
+	p.recordSpan(int(span_start885), "Conjunction")
+	return result886
 }
 
 func (p *Parser) parse_false() *pb.Disjunction {
-	span_start850 := int64(p.spanStart())
+	span_start887 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("false")
 	p.consumeLiteral(")")
-	_t1604 := &pb.Disjunction{Args: []*pb.Formula{}}
-	result851 := _t1604
-	p.recordSpan(int(span_start850), "Disjunction")
-	return result851
+	_t1678 := &pb.Disjunction{Args: []*pb.Formula{}}
+	result888 := _t1678
+	p.recordSpan(int(span_start887), "Disjunction")
+	return result888
 }
 
 func (p *Parser) parse_exists() *pb.Exists {
-	span_start854 := int64(p.spanStart())
+	span_start891 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("exists")
-	_t1605 := p.parse_bindings()
-	bindings852 := _t1605
-	_t1606 := p.parse_formula()
-	formula853 := _t1606
+	_t1679 := p.parse_bindings()
+	bindings889 := _t1679
+	_t1680 := p.parse_formula()
+	formula890 := _t1680
 	p.consumeLiteral(")")
-	_t1607 := &pb.Abstraction{Vars: listConcat(bindings852[0].([]*pb.Binding), bindings852[1].([]*pb.Binding)), Value: formula853}
-	_t1608 := &pb.Exists{Body: _t1607}
-	result855 := _t1608
-	p.recordSpan(int(span_start854), "Exists")
-	return result855
+	_t1681 := &pb.Abstraction{Vars: listConcat(bindings889[0].([]*pb.Binding), bindings889[1].([]*pb.Binding)), Value: formula890}
+	_t1682 := &pb.Exists{Body: _t1681}
+	result892 := _t1682
+	p.recordSpan(int(span_start891), "Exists")
+	return result892
 }
 
 func (p *Parser) parse_reduce() *pb.Reduce {
-	span_start859 := int64(p.spanStart())
+	span_start896 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("reduce")
-	_t1609 := p.parse_abstraction()
-	abstraction856 := _t1609
-	_t1610 := p.parse_abstraction()
-	abstraction_3857 := _t1610
-	_t1611 := p.parse_terms()
-	terms858 := _t1611
+	_t1683 := p.parse_abstraction()
+	abstraction893 := _t1683
+	_t1684 := p.parse_abstraction()
+	abstraction_3894 := _t1684
+	_t1685 := p.parse_terms()
+	terms895 := _t1685
 	p.consumeLiteral(")")
-	_t1612 := &pb.Reduce{Op: abstraction856, Body: abstraction_3857, Terms: terms858}
-	result860 := _t1612
-	p.recordSpan(int(span_start859), "Reduce")
-	return result860
+	_t1686 := &pb.Reduce{Op: abstraction893, Body: abstraction_3894, Terms: terms895}
+	result897 := _t1686
+	p.recordSpan(int(span_start896), "Reduce")
+	return result897
 }
 
 func (p *Parser) parse_terms() []*pb.Term {
 	p.consumeLiteral("(")
 	p.consumeLiteral("terms")
-	xs861 := []*pb.Term{}
-	cond862 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-	for cond862 {
-		_t1613 := p.parse_term()
-		item863 := _t1613
-		xs861 = append(xs861, item863)
-		cond862 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-	}
-	terms864 := xs861
+	xs898 := []*pb.Term{}
+	cond899 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+	for cond899 {
+		_t1687 := p.parse_term()
+		item900 := _t1687
+		xs898 = append(xs898, item900)
+		cond899 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+	}
+	terms901 := xs898
 	p.consumeLiteral(")")
-	return terms864
+	return terms901
 }
 
 func (p *Parser) parse_term() *pb.Term {
-	span_start868 := int64(p.spanStart())
-	var _t1614 int64
+	span_start905 := int64(p.spanStart())
+	var _t1688 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1614 = 1
+		_t1688 = 1
 	} else {
-		var _t1615 int64
+		var _t1689 int64
 		if p.matchLookaheadLiteral("missing", 0) {
-			_t1615 = 1
+			_t1689 = 1
 		} else {
-			var _t1616 int64
+			var _t1690 int64
 			if p.matchLookaheadLiteral("false", 0) {
-				_t1616 = 1
+				_t1690 = 1
 			} else {
-				var _t1617 int64
+				var _t1691 int64
 				if p.matchLookaheadLiteral("(", 0) {
-					_t1617 = 1
+					_t1691 = 1
 				} else {
-					var _t1618 int64
+					var _t1692 int64
 					if p.matchLookaheadTerminal("SYMBOL", 0) {
-						_t1618 = 0
+						_t1692 = 0
 					} else {
-						var _t1619 int64
+						var _t1693 int64
 						if p.matchLookaheadTerminal("UINT32", 0) {
-							_t1619 = 1
+							_t1693 = 1
 						} else {
-							var _t1620 int64
+							var _t1694 int64
 							if p.matchLookaheadTerminal("UINT128", 0) {
-								_t1620 = 1
+								_t1694 = 1
 							} else {
-								var _t1621 int64
+								var _t1695 int64
 								if p.matchLookaheadTerminal("STRING", 0) {
-									_t1621 = 1
+									_t1695 = 1
 								} else {
-									var _t1622 int64
+									var _t1696 int64
 									if p.matchLookaheadTerminal("INT32", 0) {
-										_t1622 = 1
+										_t1696 = 1
 									} else {
-										var _t1623 int64
+										var _t1697 int64
 										if p.matchLookaheadTerminal("INT128", 0) {
-											_t1623 = 1
+											_t1697 = 1
 										} else {
-											var _t1624 int64
+											var _t1698 int64
 											if p.matchLookaheadTerminal("INT", 0) {
-												_t1624 = 1
+												_t1698 = 1
 											} else {
-												var _t1625 int64
+												var _t1699 int64
 												if p.matchLookaheadTerminal("FLOAT32", 0) {
-													_t1625 = 1
+													_t1699 = 1
 												} else {
-													var _t1626 int64
+													var _t1700 int64
 													if p.matchLookaheadTerminal("FLOAT", 0) {
-														_t1626 = 1
+														_t1700 = 1
 													} else {
-														var _t1627 int64
+														var _t1701 int64
 														if p.matchLookaheadTerminal("DECIMAL", 0) {
-															_t1627 = 1
+															_t1701 = 1
 														} else {
-															_t1627 = -1
+															_t1701 = -1
 														}
-														_t1626 = _t1627
+														_t1700 = _t1701
 													}
-													_t1625 = _t1626
+													_t1699 = _t1700
 												}
-												_t1624 = _t1625
+												_t1698 = _t1699
 											}
-											_t1623 = _t1624
+											_t1697 = _t1698
 										}
-										_t1622 = _t1623
+										_t1696 = _t1697
 									}
-									_t1621 = _t1622
+									_t1695 = _t1696
 								}
-								_t1620 = _t1621
+								_t1694 = _t1695
 							}
-							_t1619 = _t1620
+							_t1693 = _t1694
 						}
-						_t1618 = _t1619
+						_t1692 = _t1693
 					}
-					_t1617 = _t1618
+					_t1691 = _t1692
 				}
-				_t1616 = _t1617
+				_t1690 = _t1691
 			}
-			_t1615 = _t1616
+			_t1689 = _t1690
 		}
-		_t1614 = _t1615
-	}
-	prediction865 := _t1614
-	var _t1628 *pb.Term
-	if prediction865 == 1 {
-		_t1629 := p.parse_value()
-		value867 := _t1629
-		_t1630 := &pb.Term{}
-		_t1630.TermType = &pb.Term_Constant{Constant: value867}
-		_t1628 = _t1630
+		_t1688 = _t1689
+	}
+	prediction902 := _t1688
+	var _t1702 *pb.Term
+	if prediction902 == 1 {
+		_t1703 := p.parse_value()
+		value904 := _t1703
+		_t1704 := &pb.Term{}
+		_t1704.TermType = &pb.Term_Constant{Constant: value904}
+		_t1702 = _t1704
 	} else {
-		var _t1631 *pb.Term
-		if prediction865 == 0 {
-			_t1632 := p.parse_var()
-			var866 := _t1632
-			_t1633 := &pb.Term{}
-			_t1633.TermType = &pb.Term_Var{Var: var866}
-			_t1631 = _t1633
+		var _t1705 *pb.Term
+		if prediction902 == 0 {
+			_t1706 := p.parse_var()
+			var903 := _t1706
+			_t1707 := &pb.Term{}
+			_t1707.TermType = &pb.Term_Var{Var: var903}
+			_t1705 = _t1707
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in term", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1628 = _t1631
+		_t1702 = _t1705
 	}
-	result869 := _t1628
-	p.recordSpan(int(span_start868), "Term")
-	return result869
+	result906 := _t1702
+	p.recordSpan(int(span_start905), "Term")
+	return result906
 }
 
 func (p *Parser) parse_var() *pb.Var {
-	span_start871 := int64(p.spanStart())
-	symbol870 := p.consumeTerminal("SYMBOL").Value.str
-	_t1634 := &pb.Var{Name: symbol870}
-	result872 := _t1634
-	p.recordSpan(int(span_start871), "Var")
-	return result872
+	span_start908 := int64(p.spanStart())
+	symbol907 := p.consumeTerminal("SYMBOL").Value.str
+	_t1708 := &pb.Var{Name: symbol907}
+	result909 := _t1708
+	p.recordSpan(int(span_start908), "Var")
+	return result909
 }
 
 func (p *Parser) parse_value() *pb.Value {
-	span_start886 := int64(p.spanStart())
-	var _t1635 int64
+	span_start923 := int64(p.spanStart())
+	var _t1709 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1635 = 12
+		_t1709 = 12
 	} else {
-		var _t1636 int64
+		var _t1710 int64
 		if p.matchLookaheadLiteral("missing", 0) {
-			_t1636 = 11
+			_t1710 = 11
 		} else {
-			var _t1637 int64
+			var _t1711 int64
 			if p.matchLookaheadLiteral("false", 0) {
-				_t1637 = 12
+				_t1711 = 12
 			} else {
-				var _t1638 int64
+				var _t1712 int64
 				if p.matchLookaheadLiteral("(", 0) {
-					var _t1639 int64
+					var _t1713 int64
 					if p.matchLookaheadLiteral("datetime", 1) {
-						_t1639 = 1
+						_t1713 = 1
 					} else {
-						var _t1640 int64
+						var _t1714 int64
 						if p.matchLookaheadLiteral("date", 1) {
-							_t1640 = 0
+							_t1714 = 0
 						} else {
-							_t1640 = -1
+							_t1714 = -1
 						}
-						_t1639 = _t1640
+						_t1713 = _t1714
 					}
-					_t1638 = _t1639
+					_t1712 = _t1713
 				} else {
-					var _t1641 int64
+					var _t1715 int64
 					if p.matchLookaheadTerminal("UINT32", 0) {
-						_t1641 = 7
+						_t1715 = 7
 					} else {
-						var _t1642 int64
+						var _t1716 int64
 						if p.matchLookaheadTerminal("UINT128", 0) {
-							_t1642 = 8
+							_t1716 = 8
 						} else {
-							var _t1643 int64
+							var _t1717 int64
 							if p.matchLookaheadTerminal("STRING", 0) {
-								_t1643 = 2
+								_t1717 = 2
 							} else {
-								var _t1644 int64
+								var _t1718 int64
 								if p.matchLookaheadTerminal("INT32", 0) {
-									_t1644 = 3
+									_t1718 = 3
 								} else {
-									var _t1645 int64
+									var _t1719 int64
 									if p.matchLookaheadTerminal("INT128", 0) {
-										_t1645 = 9
+										_t1719 = 9
 									} else {
-										var _t1646 int64
+										var _t1720 int64
 										if p.matchLookaheadTerminal("INT", 0) {
-											_t1646 = 4
+											_t1720 = 4
 										} else {
-											var _t1647 int64
+											var _t1721 int64
 											if p.matchLookaheadTerminal("FLOAT32", 0) {
-												_t1647 = 5
+												_t1721 = 5
 											} else {
-												var _t1648 int64
+												var _t1722 int64
 												if p.matchLookaheadTerminal("FLOAT", 0) {
-													_t1648 = 6
+													_t1722 = 6
 												} else {
-													var _t1649 int64
+													var _t1723 int64
 													if p.matchLookaheadTerminal("DECIMAL", 0) {
-														_t1649 = 10
+														_t1723 = 10
 													} else {
-														_t1649 = -1
+														_t1723 = -1
 													}
-													_t1648 = _t1649
+													_t1722 = _t1723
 												}
-												_t1647 = _t1648
+												_t1721 = _t1722
 											}
-											_t1646 = _t1647
+											_t1720 = _t1721
 										}
-										_t1645 = _t1646
+										_t1719 = _t1720
 									}
-									_t1644 = _t1645
+									_t1718 = _t1719
 								}
-								_t1643 = _t1644
+								_t1717 = _t1718
 							}
-							_t1642 = _t1643
+							_t1716 = _t1717
 						}
-						_t1641 = _t1642
+						_t1715 = _t1716
 					}
-					_t1638 = _t1641
+					_t1712 = _t1715
 				}
-				_t1637 = _t1638
+				_t1711 = _t1712
 			}
-			_t1636 = _t1637
+			_t1710 = _t1711
 		}
-		_t1635 = _t1636
-	}
-	prediction873 := _t1635
-	var _t1650 *pb.Value
-	if prediction873 == 12 {
-		_t1651 := p.parse_boolean_value()
-		boolean_value885 := _t1651
-		_t1652 := &pb.Value{}
-		_t1652.Value = &pb.Value_BooleanValue{BooleanValue: boolean_value885}
-		_t1650 = _t1652
+		_t1709 = _t1710
+	}
+	prediction910 := _t1709
+	var _t1724 *pb.Value
+	if prediction910 == 12 {
+		_t1725 := p.parse_boolean_value()
+		boolean_value922 := _t1725
+		_t1726 := &pb.Value{}
+		_t1726.Value = &pb.Value_BooleanValue{BooleanValue: boolean_value922}
+		_t1724 = _t1726
 	} else {
-		var _t1653 *pb.Value
-		if prediction873 == 11 {
+		var _t1727 *pb.Value
+		if prediction910 == 11 {
 			p.consumeLiteral("missing")
-			_t1654 := &pb.MissingValue{}
-			_t1655 := &pb.Value{}
-			_t1655.Value = &pb.Value_MissingValue{MissingValue: _t1654}
-			_t1653 = _t1655
+			_t1728 := &pb.MissingValue{}
+			_t1729 := &pb.Value{}
+			_t1729.Value = &pb.Value_MissingValue{MissingValue: _t1728}
+			_t1727 = _t1729
 		} else {
-			var _t1656 *pb.Value
-			if prediction873 == 10 {
-				formatted_decimal884 := p.consumeTerminal("DECIMAL").Value.decimal
-				_t1657 := &pb.Value{}
-				_t1657.Value = &pb.Value_DecimalValue{DecimalValue: formatted_decimal884}
-				_t1656 = _t1657
+			var _t1730 *pb.Value
+			if prediction910 == 10 {
+				formatted_decimal921 := p.consumeTerminal("DECIMAL").Value.decimal
+				_t1731 := &pb.Value{}
+				_t1731.Value = &pb.Value_DecimalValue{DecimalValue: formatted_decimal921}
+				_t1730 = _t1731
 			} else {
-				var _t1658 *pb.Value
-				if prediction873 == 9 {
-					formatted_int128883 := p.consumeTerminal("INT128").Value.int128
-					_t1659 := &pb.Value{}
-					_t1659.Value = &pb.Value_Int128Value{Int128Value: formatted_int128883}
-					_t1658 = _t1659
+				var _t1732 *pb.Value
+				if prediction910 == 9 {
+					formatted_int128920 := p.consumeTerminal("INT128").Value.int128
+					_t1733 := &pb.Value{}
+					_t1733.Value = &pb.Value_Int128Value{Int128Value: formatted_int128920}
+					_t1732 = _t1733
 				} else {
-					var _t1660 *pb.Value
-					if prediction873 == 8 {
-						formatted_uint128882 := p.consumeTerminal("UINT128").Value.uint128
-						_t1661 := &pb.Value{}
-						_t1661.Value = &pb.Value_Uint128Value{Uint128Value: formatted_uint128882}
-						_t1660 = _t1661
+					var _t1734 *pb.Value
+					if prediction910 == 8 {
+						formatted_uint128919 := p.consumeTerminal("UINT128").Value.uint128
+						_t1735 := &pb.Value{}
+						_t1735.Value = &pb.Value_Uint128Value{Uint128Value: formatted_uint128919}
+						_t1734 = _t1735
 					} else {
-						var _t1662 *pb.Value
-						if prediction873 == 7 {
-							formatted_uint32881 := p.consumeTerminal("UINT32").Value.u32
-							_t1663 := &pb.Value{}
-							_t1663.Value = &pb.Value_Uint32Value{Uint32Value: formatted_uint32881}
-							_t1662 = _t1663
+						var _t1736 *pb.Value
+						if prediction910 == 7 {
+							formatted_uint32918 := p.consumeTerminal("UINT32").Value.u32
+							_t1737 := &pb.Value{}
+							_t1737.Value = &pb.Value_Uint32Value{Uint32Value: formatted_uint32918}
+							_t1736 = _t1737
 						} else {
-							var _t1664 *pb.Value
-							if prediction873 == 6 {
-								formatted_float880 := p.consumeTerminal("FLOAT").Value.f64
-								_t1665 := &pb.Value{}
-								_t1665.Value = &pb.Value_FloatValue{FloatValue: formatted_float880}
-								_t1664 = _t1665
+							var _t1738 *pb.Value
+							if prediction910 == 6 {
+								formatted_float917 := p.consumeTerminal("FLOAT").Value.f64
+								_t1739 := &pb.Value{}
+								_t1739.Value = &pb.Value_FloatValue{FloatValue: formatted_float917}
+								_t1738 = _t1739
 							} else {
-								var _t1666 *pb.Value
-								if prediction873 == 5 {
-									formatted_float32879 := p.consumeTerminal("FLOAT32").Value.f32
-									_t1667 := &pb.Value{}
-									_t1667.Value = &pb.Value_Float32Value{Float32Value: formatted_float32879}
-									_t1666 = _t1667
+								var _t1740 *pb.Value
+								if prediction910 == 5 {
+									formatted_float32916 := p.consumeTerminal("FLOAT32").Value.f32
+									_t1741 := &pb.Value{}
+									_t1741.Value = &pb.Value_Float32Value{Float32Value: formatted_float32916}
+									_t1740 = _t1741
 								} else {
-									var _t1668 *pb.Value
-									if prediction873 == 4 {
-										formatted_int878 := p.consumeTerminal("INT").Value.i64
-										_t1669 := &pb.Value{}
-										_t1669.Value = &pb.Value_IntValue{IntValue: formatted_int878}
-										_t1668 = _t1669
+									var _t1742 *pb.Value
+									if prediction910 == 4 {
+										formatted_int915 := p.consumeTerminal("INT").Value.i64
+										_t1743 := &pb.Value{}
+										_t1743.Value = &pb.Value_IntValue{IntValue: formatted_int915}
+										_t1742 = _t1743
 									} else {
-										var _t1670 *pb.Value
-										if prediction873 == 3 {
-											formatted_int32877 := p.consumeTerminal("INT32").Value.i32
-											_t1671 := &pb.Value{}
-											_t1671.Value = &pb.Value_Int32Value{Int32Value: formatted_int32877}
-											_t1670 = _t1671
+										var _t1744 *pb.Value
+										if prediction910 == 3 {
+											formatted_int32914 := p.consumeTerminal("INT32").Value.i32
+											_t1745 := &pb.Value{}
+											_t1745.Value = &pb.Value_Int32Value{Int32Value: formatted_int32914}
+											_t1744 = _t1745
 										} else {
-											var _t1672 *pb.Value
-											if prediction873 == 2 {
-												formatted_string876 := p.consumeTerminal("STRING").Value.str
-												_t1673 := &pb.Value{}
-												_t1673.Value = &pb.Value_StringValue{StringValue: formatted_string876}
-												_t1672 = _t1673
+											var _t1746 *pb.Value
+											if prediction910 == 2 {
+												formatted_string913 := p.consumeTerminal("STRING").Value.str
+												_t1747 := &pb.Value{}
+												_t1747.Value = &pb.Value_StringValue{StringValue: formatted_string913}
+												_t1746 = _t1747
 											} else {
-												var _t1674 *pb.Value
-												if prediction873 == 1 {
-													_t1675 := p.parse_datetime()
-													datetime875 := _t1675
-													_t1676 := &pb.Value{}
-													_t1676.Value = &pb.Value_DatetimeValue{DatetimeValue: datetime875}
-													_t1674 = _t1676
+												var _t1748 *pb.Value
+												if prediction910 == 1 {
+													_t1749 := p.parse_datetime()
+													datetime912 := _t1749
+													_t1750 := &pb.Value{}
+													_t1750.Value = &pb.Value_DatetimeValue{DatetimeValue: datetime912}
+													_t1748 = _t1750
 												} else {
-													var _t1677 *pb.Value
-													if prediction873 == 0 {
-														_t1678 := p.parse_date()
-														date874 := _t1678
-														_t1679 := &pb.Value{}
-														_t1679.Value = &pb.Value_DateValue{DateValue: date874}
-														_t1677 = _t1679
+													var _t1751 *pb.Value
+													if prediction910 == 0 {
+														_t1752 := p.parse_date()
+														date911 := _t1752
+														_t1753 := &pb.Value{}
+														_t1753.Value = &pb.Value_DateValue{DateValue: date911}
+														_t1751 = _t1753
 													} else {
 														panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in value", p.lookahead(0).Type, p.lookahead(0).Value)})
 													}
-													_t1674 = _t1677
+													_t1748 = _t1751
 												}
-												_t1672 = _t1674
+												_t1746 = _t1748
 											}
-											_t1670 = _t1672
+											_t1744 = _t1746
 										}
-										_t1668 = _t1670
+										_t1742 = _t1744
 									}
-									_t1666 = _t1668
+									_t1740 = _t1742
 								}
-								_t1664 = _t1666
+								_t1738 = _t1740
 							}
-							_t1662 = _t1664
+							_t1736 = _t1738
 						}
-						_t1660 = _t1662
+						_t1734 = _t1736
 					}
-					_t1658 = _t1660
+					_t1732 = _t1734
 				}
-				_t1656 = _t1658
+				_t1730 = _t1732
 			}
-			_t1653 = _t1656
+			_t1727 = _t1730
 		}
-		_t1650 = _t1653
+		_t1724 = _t1727
 	}
-	result887 := _t1650
-	p.recordSpan(int(span_start886), "Value")
-	return result887
+	result924 := _t1724
+	p.recordSpan(int(span_start923), "Value")
+	return result924
 }
 
 func (p *Parser) parse_date() *pb.DateValue {
-	span_start891 := int64(p.spanStart())
+	span_start928 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("date")
-	formatted_int888 := p.consumeTerminal("INT").Value.i64
-	formatted_int_3889 := p.consumeTerminal("INT").Value.i64
-	formatted_int_4890 := p.consumeTerminal("INT").Value.i64
+	formatted_int925 := p.consumeTerminal("INT").Value.i64
+	formatted_int_3926 := p.consumeTerminal("INT").Value.i64
+	formatted_int_4927 := p.consumeTerminal("INT").Value.i64
 	p.consumeLiteral(")")
-	_t1680 := &pb.DateValue{Year: int32(formatted_int888), Month: int32(formatted_int_3889), Day: int32(formatted_int_4890)}
-	result892 := _t1680
-	p.recordSpan(int(span_start891), "DateValue")
-	return result892
+	_t1754 := &pb.DateValue{Year: int32(formatted_int925), Month: int32(formatted_int_3926), Day: int32(formatted_int_4927)}
+	result929 := _t1754
+	p.recordSpan(int(span_start928), "DateValue")
+	return result929
 }
 
 func (p *Parser) parse_datetime() *pb.DateTimeValue {
-	span_start900 := int64(p.spanStart())
+	span_start937 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("datetime")
-	formatted_int893 := p.consumeTerminal("INT").Value.i64
-	formatted_int_3894 := p.consumeTerminal("INT").Value.i64
-	formatted_int_4895 := p.consumeTerminal("INT").Value.i64
-	formatted_int_5896 := p.consumeTerminal("INT").Value.i64
-	formatted_int_6897 := p.consumeTerminal("INT").Value.i64
-	formatted_int_7898 := p.consumeTerminal("INT").Value.i64
-	var _t1681 *int64
+	formatted_int930 := p.consumeTerminal("INT").Value.i64
+	formatted_int_3931 := p.consumeTerminal("INT").Value.i64
+	formatted_int_4932 := p.consumeTerminal("INT").Value.i64
+	formatted_int_5933 := p.consumeTerminal("INT").Value.i64
+	formatted_int_6934 := p.consumeTerminal("INT").Value.i64
+	formatted_int_7935 := p.consumeTerminal("INT").Value.i64
+	var _t1755 *int64
 	if p.matchLookaheadTerminal("INT", 0) {
-		_t1681 = ptr(p.consumeTerminal("INT").Value.i64)
+		_t1755 = ptr(p.consumeTerminal("INT").Value.i64)
 	}
-	formatted_int_8899 := _t1681
+	formatted_int_8936 := _t1755
 	p.consumeLiteral(")")
-	_t1682 := &pb.DateTimeValue{Year: int32(formatted_int893), Month: int32(formatted_int_3894), Day: int32(formatted_int_4895), Hour: int32(formatted_int_5896), Minute: int32(formatted_int_6897), Second: int32(formatted_int_7898), Microsecond: int32(deref(formatted_int_8899, 0))}
-	result901 := _t1682
-	p.recordSpan(int(span_start900), "DateTimeValue")
-	return result901
+	_t1756 := &pb.DateTimeValue{Year: int32(formatted_int930), Month: int32(formatted_int_3931), Day: int32(formatted_int_4932), Hour: int32(formatted_int_5933), Minute: int32(formatted_int_6934), Second: int32(formatted_int_7935), Microsecond: int32(deref(formatted_int_8936, 0))}
+	result938 := _t1756
+	p.recordSpan(int(span_start937), "DateTimeValue")
+	return result938
 }
 
 func (p *Parser) parse_conjunction() *pb.Conjunction {
-	span_start906 := int64(p.spanStart())
+	span_start943 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("and")
-	xs902 := []*pb.Formula{}
-	cond903 := p.matchLookaheadLiteral("(", 0)
-	for cond903 {
-		_t1683 := p.parse_formula()
-		item904 := _t1683
-		xs902 = append(xs902, item904)
-		cond903 = p.matchLookaheadLiteral("(", 0)
-	}
-	formulas905 := xs902
+	xs939 := []*pb.Formula{}
+	cond940 := p.matchLookaheadLiteral("(", 0)
+	for cond940 {
+		_t1757 := p.parse_formula()
+		item941 := _t1757
+		xs939 = append(xs939, item941)
+		cond940 = p.matchLookaheadLiteral("(", 0)
+	}
+	formulas942 := xs939
 	p.consumeLiteral(")")
-	_t1684 := &pb.Conjunction{Args: formulas905}
-	result907 := _t1684
-	p.recordSpan(int(span_start906), "Conjunction")
-	return result907
+	_t1758 := &pb.Conjunction{Args: formulas942}
+	result944 := _t1758
+	p.recordSpan(int(span_start943), "Conjunction")
+	return result944
 }
 
 func (p *Parser) parse_disjunction() *pb.Disjunction {
-	span_start912 := int64(p.spanStart())
+	span_start949 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("or")
-	xs908 := []*pb.Formula{}
-	cond909 := p.matchLookaheadLiteral("(", 0)
-	for cond909 {
-		_t1685 := p.parse_formula()
-		item910 := _t1685
-		xs908 = append(xs908, item910)
-		cond909 = p.matchLookaheadLiteral("(", 0)
-	}
-	formulas911 := xs908
+	xs945 := []*pb.Formula{}
+	cond946 := p.matchLookaheadLiteral("(", 0)
+	for cond946 {
+		_t1759 := p.parse_formula()
+		item947 := _t1759
+		xs945 = append(xs945, item947)
+		cond946 = p.matchLookaheadLiteral("(", 0)
+	}
+	formulas948 := xs945
 	p.consumeLiteral(")")
-	_t1686 := &pb.Disjunction{Args: formulas911}
-	result913 := _t1686
-	p.recordSpan(int(span_start912), "Disjunction")
-	return result913
+	_t1760 := &pb.Disjunction{Args: formulas948}
+	result950 := _t1760
+	p.recordSpan(int(span_start949), "Disjunction")
+	return result950
 }
 
 func (p *Parser) parse_not() *pb.Not {
-	span_start915 := int64(p.spanStart())
+	span_start952 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("not")
-	_t1687 := p.parse_formula()
-	formula914 := _t1687
+	_t1761 := p.parse_formula()
+	formula951 := _t1761
 	p.consumeLiteral(")")
-	_t1688 := &pb.Not{Arg: formula914}
-	result916 := _t1688
-	p.recordSpan(int(span_start915), "Not")
-	return result916
+	_t1762 := &pb.Not{Arg: formula951}
+	result953 := _t1762
+	p.recordSpan(int(span_start952), "Not")
+	return result953
 }
 
 func (p *Parser) parse_ffi() *pb.FFI {
-	span_start920 := int64(p.spanStart())
+	span_start957 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("ffi")
-	_t1689 := p.parse_name()
-	name917 := _t1689
-	_t1690 := p.parse_ffi_args()
-	ffi_args918 := _t1690
-	_t1691 := p.parse_terms()
-	terms919 := _t1691
+	_t1763 := p.parse_name()
+	name954 := _t1763
+	_t1764 := p.parse_ffi_args()
+	ffi_args955 := _t1764
+	_t1765 := p.parse_terms()
+	terms956 := _t1765
 	p.consumeLiteral(")")
-	_t1692 := &pb.FFI{Name: name917, Args: ffi_args918, Terms: terms919}
-	result921 := _t1692
-	p.recordSpan(int(span_start920), "FFI")
-	return result921
+	_t1766 := &pb.FFI{Name: name954, Args: ffi_args955, Terms: terms956}
+	result958 := _t1766
+	p.recordSpan(int(span_start957), "FFI")
+	return result958
 }
 
 func (p *Parser) parse_name() string {
 	p.consumeLiteral(":")
-	symbol922 := p.consumeTerminal("SYMBOL").Value.str
-	return symbol922
+	symbol959 := p.consumeTerminal("SYMBOL").Value.str
+	return symbol959
 }
 
 func (p *Parser) parse_ffi_args() []*pb.Abstraction {
 	p.consumeLiteral("(")
 	p.consumeLiteral("args")
-	xs923 := []*pb.Abstraction{}
-	cond924 := p.matchLookaheadLiteral("(", 0)
-	for cond924 {
-		_t1693 := p.parse_abstraction()
-		item925 := _t1693
-		xs923 = append(xs923, item925)
-		cond924 = p.matchLookaheadLiteral("(", 0)
-	}
-	abstractions926 := xs923
+	xs960 := []*pb.Abstraction{}
+	cond961 := p.matchLookaheadLiteral("(", 0)
+	for cond961 {
+		_t1767 := p.parse_abstraction()
+		item962 := _t1767
+		xs960 = append(xs960, item962)
+		cond961 = p.matchLookaheadLiteral("(", 0)
+	}
+	abstractions963 := xs960
 	p.consumeLiteral(")")
-	return abstractions926
+	return abstractions963
 }
 
 func (p *Parser) parse_atom() *pb.Atom {
-	span_start932 := int64(p.spanStart())
+	span_start969 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("atom")
-	_t1694 := p.parse_relation_id()
-	relation_id927 := _t1694
-	xs928 := []*pb.Term{}
-	cond929 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-	for cond929 {
-		_t1695 := p.parse_term()
-		item930 := _t1695
-		xs928 = append(xs928, item930)
-		cond929 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-	}
-	terms931 := xs928
+	_t1768 := p.parse_relation_id()
+	relation_id964 := _t1768
+	xs965 := []*pb.Term{}
+	cond966 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+	for cond966 {
+		_t1769 := p.parse_term()
+		item967 := _t1769
+		xs965 = append(xs965, item967)
+		cond966 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+	}
+	terms968 := xs965
 	p.consumeLiteral(")")
-	_t1696 := &pb.Atom{Name: relation_id927, Terms: terms931}
-	result933 := _t1696
-	p.recordSpan(int(span_start932), "Atom")
-	return result933
+	_t1770 := &pb.Atom{Name: relation_id964, Terms: terms968}
+	result970 := _t1770
+	p.recordSpan(int(span_start969), "Atom")
+	return result970
 }
 
 func (p *Parser) parse_pragma() *pb.Pragma {
-	span_start939 := int64(p.spanStart())
+	span_start976 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("pragma")
-	_t1697 := p.parse_name()
-	name934 := _t1697
-	xs935 := []*pb.Term{}
-	cond936 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-	for cond936 {
-		_t1698 := p.parse_term()
-		item937 := _t1698
-		xs935 = append(xs935, item937)
-		cond936 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-	}
-	terms938 := xs935
+	_t1771 := p.parse_name()
+	name971 := _t1771
+	xs972 := []*pb.Term{}
+	cond973 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+	for cond973 {
+		_t1772 := p.parse_term()
+		item974 := _t1772
+		xs972 = append(xs972, item974)
+		cond973 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+	}
+	terms975 := xs972
 	p.consumeLiteral(")")
-	_t1699 := &pb.Pragma{Name: name934, Terms: terms938}
-	result940 := _t1699
-	p.recordSpan(int(span_start939), "Pragma")
-	return result940
+	_t1773 := &pb.Pragma{Name: name971, Terms: terms975}
+	result977 := _t1773
+	p.recordSpan(int(span_start976), "Pragma")
+	return result977
 }
 
 func (p *Parser) parse_primitive() *pb.Primitive {
-	span_start956 := int64(p.spanStart())
-	var _t1700 int64
+	span_start993 := int64(p.spanStart())
+	var _t1774 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1701 int64
+		var _t1775 int64
 		if p.matchLookaheadLiteral("primitive", 1) {
-			_t1701 = 9
+			_t1775 = 9
 		} else {
-			var _t1702 int64
+			var _t1776 int64
 			if p.matchLookaheadLiteral(">=", 1) {
-				_t1702 = 4
+				_t1776 = 4
 			} else {
-				var _t1703 int64
+				var _t1777 int64
 				if p.matchLookaheadLiteral(">", 1) {
-					_t1703 = 3
+					_t1777 = 3
 				} else {
-					var _t1704 int64
+					var _t1778 int64
 					if p.matchLookaheadLiteral("=", 1) {
-						_t1704 = 0
+						_t1778 = 0
 					} else {
-						var _t1705 int64
+						var _t1779 int64
 						if p.matchLookaheadLiteral("<=", 1) {
-							_t1705 = 2
+							_t1779 = 2
 						} else {
-							var _t1706 int64
+							var _t1780 int64
 							if p.matchLookaheadLiteral("<", 1) {
-								_t1706 = 1
+								_t1780 = 1
 							} else {
-								var _t1707 int64
+								var _t1781 int64
 								if p.matchLookaheadLiteral("/", 1) {
-									_t1707 = 8
+									_t1781 = 8
 								} else {
-									var _t1708 int64
+									var _t1782 int64
 									if p.matchLookaheadLiteral("-", 1) {
-										_t1708 = 6
+										_t1782 = 6
 									} else {
-										var _t1709 int64
+										var _t1783 int64
 										if p.matchLookaheadLiteral("+", 1) {
-											_t1709 = 5
+											_t1783 = 5
 										} else {
-											var _t1710 int64
+											var _t1784 int64
 											if p.matchLookaheadLiteral("*", 1) {
-												_t1710 = 7
+												_t1784 = 7
 											} else {
-												_t1710 = -1
+												_t1784 = -1
 											}
-											_t1709 = _t1710
+											_t1783 = _t1784
 										}
-										_t1708 = _t1709
+										_t1782 = _t1783
 									}
-									_t1707 = _t1708
+									_t1781 = _t1782
 								}
-								_t1706 = _t1707
+								_t1780 = _t1781
 							}
-							_t1705 = _t1706
+							_t1779 = _t1780
 						}
-						_t1704 = _t1705
+						_t1778 = _t1779
 					}
-					_t1703 = _t1704
+					_t1777 = _t1778
 				}
-				_t1702 = _t1703
+				_t1776 = _t1777
 			}
-			_t1701 = _t1702
+			_t1775 = _t1776
 		}
-		_t1700 = _t1701
+		_t1774 = _t1775
 	} else {
-		_t1700 = -1
+		_t1774 = -1
 	}
-	prediction941 := _t1700
-	var _t1711 *pb.Primitive
-	if prediction941 == 9 {
+	prediction978 := _t1774
+	var _t1785 *pb.Primitive
+	if prediction978 == 9 {
 		p.consumeLiteral("(")
 		p.consumeLiteral("primitive")
-		_t1712 := p.parse_name()
-		name951 := _t1712
-		xs952 := []*pb.RelTerm{}
-		cond953 := ((((((((((((((p.matchLookaheadLiteral("#", 0) || p.matchLookaheadLiteral("(", 0)) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-		for cond953 {
-			_t1713 := p.parse_rel_term()
-			item954 := _t1713
-			xs952 = append(xs952, item954)
-			cond953 = ((((((((((((((p.matchLookaheadLiteral("#", 0) || p.matchLookaheadLiteral("(", 0)) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+		_t1786 := p.parse_name()
+		name988 := _t1786
+		xs989 := []*pb.RelTerm{}
+		cond990 := ((((((((((((((p.matchLookaheadLiteral("#", 0) || p.matchLookaheadLiteral("(", 0)) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+		for cond990 {
+			_t1787 := p.parse_rel_term()
+			item991 := _t1787
+			xs989 = append(xs989, item991)
+			cond990 = ((((((((((((((p.matchLookaheadLiteral("#", 0) || p.matchLookaheadLiteral("(", 0)) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
 		}
-		rel_terms955 := xs952
+		rel_terms992 := xs989
 		p.consumeLiteral(")")
-		_t1714 := &pb.Primitive{Name: name951, Terms: rel_terms955}
-		_t1711 = _t1714
+		_t1788 := &pb.Primitive{Name: name988, Terms: rel_terms992}
+		_t1785 = _t1788
 	} else {
-		var _t1715 *pb.Primitive
-		if prediction941 == 8 {
-			_t1716 := p.parse_divide()
-			divide950 := _t1716
-			_t1715 = divide950
+		var _t1789 *pb.Primitive
+		if prediction978 == 8 {
+			_t1790 := p.parse_divide()
+			divide987 := _t1790
+			_t1789 = divide987
 		} else {
-			var _t1717 *pb.Primitive
-			if prediction941 == 7 {
-				_t1718 := p.parse_multiply()
-				multiply949 := _t1718
-				_t1717 = multiply949
+			var _t1791 *pb.Primitive
+			if prediction978 == 7 {
+				_t1792 := p.parse_multiply()
+				multiply986 := _t1792
+				_t1791 = multiply986
 			} else {
-				var _t1719 *pb.Primitive
-				if prediction941 == 6 {
-					_t1720 := p.parse_minus()
-					minus948 := _t1720
-					_t1719 = minus948
+				var _t1793 *pb.Primitive
+				if prediction978 == 6 {
+					_t1794 := p.parse_minus()
+					minus985 := _t1794
+					_t1793 = minus985
 				} else {
-					var _t1721 *pb.Primitive
-					if prediction941 == 5 {
-						_t1722 := p.parse_add()
-						add947 := _t1722
-						_t1721 = add947
+					var _t1795 *pb.Primitive
+					if prediction978 == 5 {
+						_t1796 := p.parse_add()
+						add984 := _t1796
+						_t1795 = add984
 					} else {
-						var _t1723 *pb.Primitive
-						if prediction941 == 4 {
-							_t1724 := p.parse_gt_eq()
-							gt_eq946 := _t1724
-							_t1723 = gt_eq946
+						var _t1797 *pb.Primitive
+						if prediction978 == 4 {
+							_t1798 := p.parse_gt_eq()
+							gt_eq983 := _t1798
+							_t1797 = gt_eq983
 						} else {
-							var _t1725 *pb.Primitive
-							if prediction941 == 3 {
-								_t1726 := p.parse_gt()
-								gt945 := _t1726
-								_t1725 = gt945
+							var _t1799 *pb.Primitive
+							if prediction978 == 3 {
+								_t1800 := p.parse_gt()
+								gt982 := _t1800
+								_t1799 = gt982
 							} else {
-								var _t1727 *pb.Primitive
-								if prediction941 == 2 {
-									_t1728 := p.parse_lt_eq()
-									lt_eq944 := _t1728
-									_t1727 = lt_eq944
+								var _t1801 *pb.Primitive
+								if prediction978 == 2 {
+									_t1802 := p.parse_lt_eq()
+									lt_eq981 := _t1802
+									_t1801 = lt_eq981
 								} else {
-									var _t1729 *pb.Primitive
-									if prediction941 == 1 {
-										_t1730 := p.parse_lt()
-										lt943 := _t1730
-										_t1729 = lt943
+									var _t1803 *pb.Primitive
+									if prediction978 == 1 {
+										_t1804 := p.parse_lt()
+										lt980 := _t1804
+										_t1803 = lt980
 									} else {
-										var _t1731 *pb.Primitive
-										if prediction941 == 0 {
-											_t1732 := p.parse_eq()
-											eq942 := _t1732
-											_t1731 = eq942
+										var _t1805 *pb.Primitive
+										if prediction978 == 0 {
+											_t1806 := p.parse_eq()
+											eq979 := _t1806
+											_t1805 = eq979
 										} else {
 											panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in primitive", p.lookahead(0).Type, p.lookahead(0).Value)})
 										}
-										_t1729 = _t1731
+										_t1803 = _t1805
 									}
-									_t1727 = _t1729
+									_t1801 = _t1803
 								}
-								_t1725 = _t1727
+								_t1799 = _t1801
 							}
-							_t1723 = _t1725
+							_t1797 = _t1799
 						}
-						_t1721 = _t1723
+						_t1795 = _t1797
 					}
-					_t1719 = _t1721
+					_t1793 = _t1795
 				}
-				_t1717 = _t1719
+				_t1791 = _t1793
 			}
-			_t1715 = _t1717
+			_t1789 = _t1791
 		}
-		_t1711 = _t1715
+		_t1785 = _t1789
 	}
-	result957 := _t1711
-	p.recordSpan(int(span_start956), "Primitive")
-	return result957
+	result994 := _t1785
+	p.recordSpan(int(span_start993), "Primitive")
+	return result994
 }
 
 func (p *Parser) parse_eq() *pb.Primitive {
-	span_start960 := int64(p.spanStart())
+	span_start997 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("=")
-	_t1733 := p.parse_term()
-	term958 := _t1733
-	_t1734 := p.parse_term()
-	term_3959 := _t1734
+	_t1807 := p.parse_term()
+	term995 := _t1807
+	_t1808 := p.parse_term()
+	term_3996 := _t1808
 	p.consumeLiteral(")")
-	_t1735 := &pb.RelTerm{}
-	_t1735.RelTermType = &pb.RelTerm_Term{Term: term958}
-	_t1736 := &pb.RelTerm{}
-	_t1736.RelTermType = &pb.RelTerm_Term{Term: term_3959}
-	_t1737 := &pb.Primitive{Name: "rel_primitive_eq", Terms: []*pb.RelTerm{_t1735, _t1736}}
-	result961 := _t1737
-	p.recordSpan(int(span_start960), "Primitive")
-	return result961
+	_t1809 := &pb.RelTerm{}
+	_t1809.RelTermType = &pb.RelTerm_Term{Term: term995}
+	_t1810 := &pb.RelTerm{}
+	_t1810.RelTermType = &pb.RelTerm_Term{Term: term_3996}
+	_t1811 := &pb.Primitive{Name: "rel_primitive_eq", Terms: []*pb.RelTerm{_t1809, _t1810}}
+	result998 := _t1811
+	p.recordSpan(int(span_start997), "Primitive")
+	return result998
 }
 
 func (p *Parser) parse_lt() *pb.Primitive {
-	span_start964 := int64(p.spanStart())
+	span_start1001 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("<")
-	_t1738 := p.parse_term()
-	term962 := _t1738
-	_t1739 := p.parse_term()
-	term_3963 := _t1739
+	_t1812 := p.parse_term()
+	term999 := _t1812
+	_t1813 := p.parse_term()
+	term_31000 := _t1813
 	p.consumeLiteral(")")
-	_t1740 := &pb.RelTerm{}
-	_t1740.RelTermType = &pb.RelTerm_Term{Term: term962}
-	_t1741 := &pb.RelTerm{}
-	_t1741.RelTermType = &pb.RelTerm_Term{Term: term_3963}
-	_t1742 := &pb.Primitive{Name: "rel_primitive_lt_monotype", Terms: []*pb.RelTerm{_t1740, _t1741}}
-	result965 := _t1742
-	p.recordSpan(int(span_start964), "Primitive")
-	return result965
+	_t1814 := &pb.RelTerm{}
+	_t1814.RelTermType = &pb.RelTerm_Term{Term: term999}
+	_t1815 := &pb.RelTerm{}
+	_t1815.RelTermType = &pb.RelTerm_Term{Term: term_31000}
+	_t1816 := &pb.Primitive{Name: "rel_primitive_lt_monotype", Terms: []*pb.RelTerm{_t1814, _t1815}}
+	result1002 := _t1816
+	p.recordSpan(int(span_start1001), "Primitive")
+	return result1002
 }
 
 func (p *Parser) parse_lt_eq() *pb.Primitive {
-	span_start968 := int64(p.spanStart())
+	span_start1005 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("<=")
-	_t1743 := p.parse_term()
-	term966 := _t1743
-	_t1744 := p.parse_term()
-	term_3967 := _t1744
+	_t1817 := p.parse_term()
+	term1003 := _t1817
+	_t1818 := p.parse_term()
+	term_31004 := _t1818
 	p.consumeLiteral(")")
-	_t1745 := &pb.RelTerm{}
-	_t1745.RelTermType = &pb.RelTerm_Term{Term: term966}
-	_t1746 := &pb.RelTerm{}
-	_t1746.RelTermType = &pb.RelTerm_Term{Term: term_3967}
-	_t1747 := &pb.Primitive{Name: "rel_primitive_lt_eq_monotype", Terms: []*pb.RelTerm{_t1745, _t1746}}
-	result969 := _t1747
-	p.recordSpan(int(span_start968), "Primitive")
-	return result969
+	_t1819 := &pb.RelTerm{}
+	_t1819.RelTermType = &pb.RelTerm_Term{Term: term1003}
+	_t1820 := &pb.RelTerm{}
+	_t1820.RelTermType = &pb.RelTerm_Term{Term: term_31004}
+	_t1821 := &pb.Primitive{Name: "rel_primitive_lt_eq_monotype", Terms: []*pb.RelTerm{_t1819, _t1820}}
+	result1006 := _t1821
+	p.recordSpan(int(span_start1005), "Primitive")
+	return result1006
 }
 
 func (p *Parser) parse_gt() *pb.Primitive {
-	span_start972 := int64(p.spanStart())
+	span_start1009 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral(">")
-	_t1748 := p.parse_term()
-	term970 := _t1748
-	_t1749 := p.parse_term()
-	term_3971 := _t1749
+	_t1822 := p.parse_term()
+	term1007 := _t1822
+	_t1823 := p.parse_term()
+	term_31008 := _t1823
 	p.consumeLiteral(")")
-	_t1750 := &pb.RelTerm{}
-	_t1750.RelTermType = &pb.RelTerm_Term{Term: term970}
-	_t1751 := &pb.RelTerm{}
-	_t1751.RelTermType = &pb.RelTerm_Term{Term: term_3971}
-	_t1752 := &pb.Primitive{Name: "rel_primitive_gt_monotype", Terms: []*pb.RelTerm{_t1750, _t1751}}
-	result973 := _t1752
-	p.recordSpan(int(span_start972), "Primitive")
-	return result973
+	_t1824 := &pb.RelTerm{}
+	_t1824.RelTermType = &pb.RelTerm_Term{Term: term1007}
+	_t1825 := &pb.RelTerm{}
+	_t1825.RelTermType = &pb.RelTerm_Term{Term: term_31008}
+	_t1826 := &pb.Primitive{Name: "rel_primitive_gt_monotype", Terms: []*pb.RelTerm{_t1824, _t1825}}
+	result1010 := _t1826
+	p.recordSpan(int(span_start1009), "Primitive")
+	return result1010
 }
 
 func (p *Parser) parse_gt_eq() *pb.Primitive {
-	span_start976 := int64(p.spanStart())
+	span_start1013 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral(">=")
-	_t1753 := p.parse_term()
-	term974 := _t1753
-	_t1754 := p.parse_term()
-	term_3975 := _t1754
+	_t1827 := p.parse_term()
+	term1011 := _t1827
+	_t1828 := p.parse_term()
+	term_31012 := _t1828
 	p.consumeLiteral(")")
-	_t1755 := &pb.RelTerm{}
-	_t1755.RelTermType = &pb.RelTerm_Term{Term: term974}
-	_t1756 := &pb.RelTerm{}
-	_t1756.RelTermType = &pb.RelTerm_Term{Term: term_3975}
-	_t1757 := &pb.Primitive{Name: "rel_primitive_gt_eq_monotype", Terms: []*pb.RelTerm{_t1755, _t1756}}
-	result977 := _t1757
-	p.recordSpan(int(span_start976), "Primitive")
-	return result977
+	_t1829 := &pb.RelTerm{}
+	_t1829.RelTermType = &pb.RelTerm_Term{Term: term1011}
+	_t1830 := &pb.RelTerm{}
+	_t1830.RelTermType = &pb.RelTerm_Term{Term: term_31012}
+	_t1831 := &pb.Primitive{Name: "rel_primitive_gt_eq_monotype", Terms: []*pb.RelTerm{_t1829, _t1830}}
+	result1014 := _t1831
+	p.recordSpan(int(span_start1013), "Primitive")
+	return result1014
 }
 
 func (p *Parser) parse_add() *pb.Primitive {
-	span_start981 := int64(p.spanStart())
+	span_start1018 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("+")
-	_t1758 := p.parse_term()
-	term978 := _t1758
-	_t1759 := p.parse_term()
-	term_3979 := _t1759
-	_t1760 := p.parse_term()
-	term_4980 := _t1760
+	_t1832 := p.parse_term()
+	term1015 := _t1832
+	_t1833 := p.parse_term()
+	term_31016 := _t1833
+	_t1834 := p.parse_term()
+	term_41017 := _t1834
 	p.consumeLiteral(")")
-	_t1761 := &pb.RelTerm{}
-	_t1761.RelTermType = &pb.RelTerm_Term{Term: term978}
-	_t1762 := &pb.RelTerm{}
-	_t1762.RelTermType = &pb.RelTerm_Term{Term: term_3979}
-	_t1763 := &pb.RelTerm{}
-	_t1763.RelTermType = &pb.RelTerm_Term{Term: term_4980}
-	_t1764 := &pb.Primitive{Name: "rel_primitive_add_monotype", Terms: []*pb.RelTerm{_t1761, _t1762, _t1763}}
-	result982 := _t1764
-	p.recordSpan(int(span_start981), "Primitive")
-	return result982
+	_t1835 := &pb.RelTerm{}
+	_t1835.RelTermType = &pb.RelTerm_Term{Term: term1015}
+	_t1836 := &pb.RelTerm{}
+	_t1836.RelTermType = &pb.RelTerm_Term{Term: term_31016}
+	_t1837 := &pb.RelTerm{}
+	_t1837.RelTermType = &pb.RelTerm_Term{Term: term_41017}
+	_t1838 := &pb.Primitive{Name: "rel_primitive_add_monotype", Terms: []*pb.RelTerm{_t1835, _t1836, _t1837}}
+	result1019 := _t1838
+	p.recordSpan(int(span_start1018), "Primitive")
+	return result1019
 }
 
 func (p *Parser) parse_minus() *pb.Primitive {
-	span_start986 := int64(p.spanStart())
+	span_start1023 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("-")
-	_t1765 := p.parse_term()
-	term983 := _t1765
-	_t1766 := p.parse_term()
-	term_3984 := _t1766
-	_t1767 := p.parse_term()
-	term_4985 := _t1767
+	_t1839 := p.parse_term()
+	term1020 := _t1839
+	_t1840 := p.parse_term()
+	term_31021 := _t1840
+	_t1841 := p.parse_term()
+	term_41022 := _t1841
 	p.consumeLiteral(")")
-	_t1768 := &pb.RelTerm{}
-	_t1768.RelTermType = &pb.RelTerm_Term{Term: term983}
-	_t1769 := &pb.RelTerm{}
-	_t1769.RelTermType = &pb.RelTerm_Term{Term: term_3984}
-	_t1770 := &pb.RelTerm{}
-	_t1770.RelTermType = &pb.RelTerm_Term{Term: term_4985}
-	_t1771 := &pb.Primitive{Name: "rel_primitive_subtract_monotype", Terms: []*pb.RelTerm{_t1768, _t1769, _t1770}}
-	result987 := _t1771
-	p.recordSpan(int(span_start986), "Primitive")
-	return result987
+	_t1842 := &pb.RelTerm{}
+	_t1842.RelTermType = &pb.RelTerm_Term{Term: term1020}
+	_t1843 := &pb.RelTerm{}
+	_t1843.RelTermType = &pb.RelTerm_Term{Term: term_31021}
+	_t1844 := &pb.RelTerm{}
+	_t1844.RelTermType = &pb.RelTerm_Term{Term: term_41022}
+	_t1845 := &pb.Primitive{Name: "rel_primitive_subtract_monotype", Terms: []*pb.RelTerm{_t1842, _t1843, _t1844}}
+	result1024 := _t1845
+	p.recordSpan(int(span_start1023), "Primitive")
+	return result1024
 }
 
 func (p *Parser) parse_multiply() *pb.Primitive {
-	span_start991 := int64(p.spanStart())
+	span_start1028 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("*")
-	_t1772 := p.parse_term()
-	term988 := _t1772
-	_t1773 := p.parse_term()
-	term_3989 := _t1773
-	_t1774 := p.parse_term()
-	term_4990 := _t1774
+	_t1846 := p.parse_term()
+	term1025 := _t1846
+	_t1847 := p.parse_term()
+	term_31026 := _t1847
+	_t1848 := p.parse_term()
+	term_41027 := _t1848
 	p.consumeLiteral(")")
-	_t1775 := &pb.RelTerm{}
-	_t1775.RelTermType = &pb.RelTerm_Term{Term: term988}
-	_t1776 := &pb.RelTerm{}
-	_t1776.RelTermType = &pb.RelTerm_Term{Term: term_3989}
-	_t1777 := &pb.RelTerm{}
-	_t1777.RelTermType = &pb.RelTerm_Term{Term: term_4990}
-	_t1778 := &pb.Primitive{Name: "rel_primitive_multiply_monotype", Terms: []*pb.RelTerm{_t1775, _t1776, _t1777}}
-	result992 := _t1778
-	p.recordSpan(int(span_start991), "Primitive")
-	return result992
+	_t1849 := &pb.RelTerm{}
+	_t1849.RelTermType = &pb.RelTerm_Term{Term: term1025}
+	_t1850 := &pb.RelTerm{}
+	_t1850.RelTermType = &pb.RelTerm_Term{Term: term_31026}
+	_t1851 := &pb.RelTerm{}
+	_t1851.RelTermType = &pb.RelTerm_Term{Term: term_41027}
+	_t1852 := &pb.Primitive{Name: "rel_primitive_multiply_monotype", Terms: []*pb.RelTerm{_t1849, _t1850, _t1851}}
+	result1029 := _t1852
+	p.recordSpan(int(span_start1028), "Primitive")
+	return result1029
 }
 
 func (p *Parser) parse_divide() *pb.Primitive {
-	span_start996 := int64(p.spanStart())
+	span_start1033 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("/")
-	_t1779 := p.parse_term()
-	term993 := _t1779
-	_t1780 := p.parse_term()
-	term_3994 := _t1780
-	_t1781 := p.parse_term()
-	term_4995 := _t1781
+	_t1853 := p.parse_term()
+	term1030 := _t1853
+	_t1854 := p.parse_term()
+	term_31031 := _t1854
+	_t1855 := p.parse_term()
+	term_41032 := _t1855
 	p.consumeLiteral(")")
-	_t1782 := &pb.RelTerm{}
-	_t1782.RelTermType = &pb.RelTerm_Term{Term: term993}
-	_t1783 := &pb.RelTerm{}
-	_t1783.RelTermType = &pb.RelTerm_Term{Term: term_3994}
-	_t1784 := &pb.RelTerm{}
-	_t1784.RelTermType = &pb.RelTerm_Term{Term: term_4995}
-	_t1785 := &pb.Primitive{Name: "rel_primitive_divide_monotype", Terms: []*pb.RelTerm{_t1782, _t1783, _t1784}}
-	result997 := _t1785
-	p.recordSpan(int(span_start996), "Primitive")
-	return result997
+	_t1856 := &pb.RelTerm{}
+	_t1856.RelTermType = &pb.RelTerm_Term{Term: term1030}
+	_t1857 := &pb.RelTerm{}
+	_t1857.RelTermType = &pb.RelTerm_Term{Term: term_31031}
+	_t1858 := &pb.RelTerm{}
+	_t1858.RelTermType = &pb.RelTerm_Term{Term: term_41032}
+	_t1859 := &pb.Primitive{Name: "rel_primitive_divide_monotype", Terms: []*pb.RelTerm{_t1856, _t1857, _t1858}}
+	result1034 := _t1859
+	p.recordSpan(int(span_start1033), "Primitive")
+	return result1034
 }
 
 func (p *Parser) parse_rel_term() *pb.RelTerm {
-	span_start1001 := int64(p.spanStart())
-	var _t1786 int64
+	span_start1038 := int64(p.spanStart())
+	var _t1860 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1786 = 1
+		_t1860 = 1
 	} else {
-		var _t1787 int64
+		var _t1861 int64
 		if p.matchLookaheadLiteral("missing", 0) {
-			_t1787 = 1
+			_t1861 = 1
 		} else {
-			var _t1788 int64
+			var _t1862 int64
 			if p.matchLookaheadLiteral("false", 0) {
-				_t1788 = 1
+				_t1862 = 1
 			} else {
-				var _t1789 int64
+				var _t1863 int64
 				if p.matchLookaheadLiteral("(", 0) {
-					_t1789 = 1
+					_t1863 = 1
 				} else {
-					var _t1790 int64
+					var _t1864 int64
 					if p.matchLookaheadLiteral("#", 0) {
-						_t1790 = 0
+						_t1864 = 0
 					} else {
-						var _t1791 int64
+						var _t1865 int64
 						if p.matchLookaheadTerminal("SYMBOL", 0) {
-							_t1791 = 1
+							_t1865 = 1
 						} else {
-							var _t1792 int64
+							var _t1866 int64
 							if p.matchLookaheadTerminal("UINT32", 0) {
-								_t1792 = 1
+								_t1866 = 1
 							} else {
-								var _t1793 int64
+								var _t1867 int64
 								if p.matchLookaheadTerminal("UINT128", 0) {
-									_t1793 = 1
+									_t1867 = 1
 								} else {
-									var _t1794 int64
+									var _t1868 int64
 									if p.matchLookaheadTerminal("STRING", 0) {
-										_t1794 = 1
+										_t1868 = 1
 									} else {
-										var _t1795 int64
+										var _t1869 int64
 										if p.matchLookaheadTerminal("INT32", 0) {
-											_t1795 = 1
+											_t1869 = 1
 										} else {
-											var _t1796 int64
+											var _t1870 int64
 											if p.matchLookaheadTerminal("INT128", 0) {
-												_t1796 = 1
+												_t1870 = 1
 											} else {
-												var _t1797 int64
+												var _t1871 int64
 												if p.matchLookaheadTerminal("INT", 0) {
-													_t1797 = 1
+													_t1871 = 1
 												} else {
-													var _t1798 int64
+													var _t1872 int64
 													if p.matchLookaheadTerminal("FLOAT32", 0) {
-														_t1798 = 1
+														_t1872 = 1
 													} else {
-														var _t1799 int64
+														var _t1873 int64
 														if p.matchLookaheadTerminal("FLOAT", 0) {
-															_t1799 = 1
+															_t1873 = 1
 														} else {
-															var _t1800 int64
+															var _t1874 int64
 															if p.matchLookaheadTerminal("DECIMAL", 0) {
-																_t1800 = 1
+																_t1874 = 1
 															} else {
-																_t1800 = -1
+																_t1874 = -1
 															}
-															_t1799 = _t1800
+															_t1873 = _t1874
 														}
-														_t1798 = _t1799
+														_t1872 = _t1873
 													}
-													_t1797 = _t1798
+													_t1871 = _t1872
 												}
-												_t1796 = _t1797
+												_t1870 = _t1871
 											}
-											_t1795 = _t1796
+											_t1869 = _t1870
 										}
-										_t1794 = _t1795
+										_t1868 = _t1869
 									}
-									_t1793 = _t1794
+									_t1867 = _t1868
 								}
-								_t1792 = _t1793
+								_t1866 = _t1867
 							}
-							_t1791 = _t1792
+							_t1865 = _t1866
 						}
-						_t1790 = _t1791
+						_t1864 = _t1865
 					}
-					_t1789 = _t1790
+					_t1863 = _t1864
 				}
-				_t1788 = _t1789
+				_t1862 = _t1863
 			}
-			_t1787 = _t1788
+			_t1861 = _t1862
 		}
-		_t1786 = _t1787
-	}
-	prediction998 := _t1786
-	var _t1801 *pb.RelTerm
-	if prediction998 == 1 {
-		_t1802 := p.parse_term()
-		term1000 := _t1802
-		_t1803 := &pb.RelTerm{}
-		_t1803.RelTermType = &pb.RelTerm_Term{Term: term1000}
-		_t1801 = _t1803
+		_t1860 = _t1861
+	}
+	prediction1035 := _t1860
+	var _t1875 *pb.RelTerm
+	if prediction1035 == 1 {
+		_t1876 := p.parse_term()
+		term1037 := _t1876
+		_t1877 := &pb.RelTerm{}
+		_t1877.RelTermType = &pb.RelTerm_Term{Term: term1037}
+		_t1875 = _t1877
 	} else {
-		var _t1804 *pb.RelTerm
-		if prediction998 == 0 {
-			_t1805 := p.parse_specialized_value()
-			specialized_value999 := _t1805
-			_t1806 := &pb.RelTerm{}
-			_t1806.RelTermType = &pb.RelTerm_SpecializedValue{SpecializedValue: specialized_value999}
-			_t1804 = _t1806
+		var _t1878 *pb.RelTerm
+		if prediction1035 == 0 {
+			_t1879 := p.parse_specialized_value()
+			specialized_value1036 := _t1879
+			_t1880 := &pb.RelTerm{}
+			_t1880.RelTermType = &pb.RelTerm_SpecializedValue{SpecializedValue: specialized_value1036}
+			_t1878 = _t1880
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in rel_term", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1801 = _t1804
+		_t1875 = _t1878
 	}
-	result1002 := _t1801
-	p.recordSpan(int(span_start1001), "RelTerm")
-	return result1002
+	result1039 := _t1875
+	p.recordSpan(int(span_start1038), "RelTerm")
+	return result1039
 }
 
 func (p *Parser) parse_specialized_value() *pb.Value {
-	span_start1004 := int64(p.spanStart())
+	span_start1041 := int64(p.spanStart())
 	p.consumeLiteral("#")
-	_t1807 := p.parse_raw_value()
-	raw_value1003 := _t1807
-	result1005 := raw_value1003
-	p.recordSpan(int(span_start1004), "Value")
-	return result1005
+	_t1881 := p.parse_raw_value()
+	raw_value1040 := _t1881
+	result1042 := raw_value1040
+	p.recordSpan(int(span_start1041), "Value")
+	return result1042
 }
 
 func (p *Parser) parse_rel_atom() *pb.RelAtom {
-	span_start1011 := int64(p.spanStart())
+	span_start1048 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("relatom")
-	_t1808 := p.parse_name()
-	name1006 := _t1808
-	xs1007 := []*pb.RelTerm{}
-	cond1008 := ((((((((((((((p.matchLookaheadLiteral("#", 0) || p.matchLookaheadLiteral("(", 0)) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-	for cond1008 {
-		_t1809 := p.parse_rel_term()
-		item1009 := _t1809
-		xs1007 = append(xs1007, item1009)
-		cond1008 = ((((((((((((((p.matchLookaheadLiteral("#", 0) || p.matchLookaheadLiteral("(", 0)) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
-	}
-	rel_terms1010 := xs1007
+	_t1882 := p.parse_name()
+	name1043 := _t1882
+	xs1044 := []*pb.RelTerm{}
+	cond1045 := ((((((((((((((p.matchLookaheadLiteral("#", 0) || p.matchLookaheadLiteral("(", 0)) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+	for cond1045 {
+		_t1883 := p.parse_rel_term()
+		item1046 := _t1883
+		xs1044 = append(xs1044, item1046)
+		cond1045 = ((((((((((((((p.matchLookaheadLiteral("#", 0) || p.matchLookaheadLiteral("(", 0)) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0)) || p.matchLookaheadTerminal("SYMBOL", 0))
+	}
+	rel_terms1047 := xs1044
 	p.consumeLiteral(")")
-	_t1810 := &pb.RelAtom{Name: name1006, Terms: rel_terms1010}
-	result1012 := _t1810
-	p.recordSpan(int(span_start1011), "RelAtom")
-	return result1012
+	_t1884 := &pb.RelAtom{Name: name1043, Terms: rel_terms1047}
+	result1049 := _t1884
+	p.recordSpan(int(span_start1048), "RelAtom")
+	return result1049
 }
 
 func (p *Parser) parse_cast() *pb.Cast {
-	span_start1015 := int64(p.spanStart())
+	span_start1052 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("cast")
-	_t1811 := p.parse_term()
-	term1013 := _t1811
-	_t1812 := p.parse_term()
-	term_31014 := _t1812
+	_t1885 := p.parse_term()
+	term1050 := _t1885
+	_t1886 := p.parse_term()
+	term_31051 := _t1886
 	p.consumeLiteral(")")
-	_t1813 := &pb.Cast{Input: term1013, Result: term_31014}
-	result1016 := _t1813
-	p.recordSpan(int(span_start1015), "Cast")
-	return result1016
+	_t1887 := &pb.Cast{Input: term1050, Result: term_31051}
+	result1053 := _t1887
+	p.recordSpan(int(span_start1052), "Cast")
+	return result1053
 }
 
 func (p *Parser) parse_attrs() []*pb.Attribute {
 	p.consumeLiteral("(")
 	p.consumeLiteral("attrs")
-	xs1017 := []*pb.Attribute{}
-	cond1018 := p.matchLookaheadLiteral("(", 0)
-	for cond1018 {
-		_t1814 := p.parse_attribute()
-		item1019 := _t1814
-		xs1017 = append(xs1017, item1019)
-		cond1018 = p.matchLookaheadLiteral("(", 0)
-	}
-	attributes1020 := xs1017
+	xs1054 := []*pb.Attribute{}
+	cond1055 := p.matchLookaheadLiteral("(", 0)
+	for cond1055 {
+		_t1888 := p.parse_attribute()
+		item1056 := _t1888
+		xs1054 = append(xs1054, item1056)
+		cond1055 = p.matchLookaheadLiteral("(", 0)
+	}
+	attributes1057 := xs1054
 	p.consumeLiteral(")")
-	return attributes1020
+	return attributes1057
 }
 
 func (p *Parser) parse_attribute() *pb.Attribute {
-	span_start1026 := int64(p.spanStart())
+	span_start1063 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("attribute")
-	_t1815 := p.parse_name()
-	name1021 := _t1815
-	xs1022 := []*pb.Value{}
-	cond1023 := ((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0))
-	for cond1023 {
-		_t1816 := p.parse_raw_value()
-		item1024 := _t1816
-		xs1022 = append(xs1022, item1024)
-		cond1023 = ((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0))
-	}
-	raw_values1025 := xs1022
+	_t1889 := p.parse_name()
+	name1058 := _t1889
+	xs1059 := []*pb.Value{}
+	cond1060 := ((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0))
+	for cond1060 {
+		_t1890 := p.parse_raw_value()
+		item1061 := _t1890
+		xs1059 = append(xs1059, item1061)
+		cond1060 = ((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("false", 0)) || p.matchLookaheadLiteral("missing", 0)) || p.matchLookaheadLiteral("true", 0)) || p.matchLookaheadTerminal("DECIMAL", 0)) || p.matchLookaheadTerminal("FLOAT", 0)) || p.matchLookaheadTerminal("FLOAT32", 0)) || p.matchLookaheadTerminal("INT", 0)) || p.matchLookaheadTerminal("INT128", 0)) || p.matchLookaheadTerminal("INT32", 0)) || p.matchLookaheadTerminal("STRING", 0)) || p.matchLookaheadTerminal("UINT128", 0)) || p.matchLookaheadTerminal("UINT32", 0))
+	}
+	raw_values1062 := xs1059
 	p.consumeLiteral(")")
-	_t1817 := &pb.Attribute{Name: name1021, Args: raw_values1025}
-	result1027 := _t1817
-	p.recordSpan(int(span_start1026), "Attribute")
-	return result1027
+	_t1891 := &pb.Attribute{Name: name1058, Args: raw_values1062}
+	result1064 := _t1891
+	p.recordSpan(int(span_start1063), "Attribute")
+	return result1064
 }
 
 func (p *Parser) parse_algorithm() *pb.Algorithm {
-	span_start1034 := int64(p.spanStart())
+	span_start1071 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("algorithm")
-	xs1028 := []*pb.RelationId{}
-	cond1029 := (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
-	for cond1029 {
-		_t1818 := p.parse_relation_id()
-		item1030 := _t1818
-		xs1028 = append(xs1028, item1030)
-		cond1029 = (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
-	}
-	relation_ids1031 := xs1028
-	_t1819 := p.parse_script()
-	script1032 := _t1819
-	var _t1820 []*pb.Attribute
+	xs1065 := []*pb.RelationId{}
+	cond1066 := (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
+	for cond1066 {
+		_t1892 := p.parse_relation_id()
+		item1067 := _t1892
+		xs1065 = append(xs1065, item1067)
+		cond1066 = (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
+	}
+	relation_ids1068 := xs1065
+	_t1893 := p.parse_script()
+	script1069 := _t1893
+	var _t1894 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1821 := p.parse_attrs()
-		_t1820 = _t1821
+		_t1895 := p.parse_attrs()
+		_t1894 = _t1895
 	}
-	attrs1033 := _t1820
+	attrs1070 := _t1894
 	p.consumeLiteral(")")
-	_t1822 := attrs1033
-	if attrs1033 == nil {
-		_t1822 = []*pb.Attribute{}
+	_t1896 := attrs1070
+	if attrs1070 == nil {
+		_t1896 = []*pb.Attribute{}
 	}
-	_t1823 := &pb.Algorithm{Global: relation_ids1031, Body: script1032, Attrs: _t1822}
-	result1035 := _t1823
-	p.recordSpan(int(span_start1034), "Algorithm")
-	return result1035
+	_t1897 := &pb.Algorithm{Global: relation_ids1068, Body: script1069, Attrs: _t1896}
+	result1072 := _t1897
+	p.recordSpan(int(span_start1071), "Algorithm")
+	return result1072
 }
 
 func (p *Parser) parse_script() *pb.Script {
-	span_start1040 := int64(p.spanStart())
+	span_start1077 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("script")
-	xs1036 := []*pb.Construct{}
-	cond1037 := p.matchLookaheadLiteral("(", 0)
-	for cond1037 {
-		_t1824 := p.parse_construct()
-		item1038 := _t1824
-		xs1036 = append(xs1036, item1038)
-		cond1037 = p.matchLookaheadLiteral("(", 0)
-	}
-	constructs1039 := xs1036
+	xs1073 := []*pb.Construct{}
+	cond1074 := p.matchLookaheadLiteral("(", 0)
+	for cond1074 {
+		_t1898 := p.parse_construct()
+		item1075 := _t1898
+		xs1073 = append(xs1073, item1075)
+		cond1074 = p.matchLookaheadLiteral("(", 0)
+	}
+	constructs1076 := xs1073
 	p.consumeLiteral(")")
-	_t1825 := &pb.Script{Constructs: constructs1039}
-	result1041 := _t1825
-	p.recordSpan(int(span_start1040), "Script")
-	return result1041
+	_t1899 := &pb.Script{Constructs: constructs1076}
+	result1078 := _t1899
+	p.recordSpan(int(span_start1077), "Script")
+	return result1078
 }
 
 func (p *Parser) parse_construct() *pb.Construct {
-	span_start1045 := int64(p.spanStart())
-	var _t1826 int64
+	span_start1082 := int64(p.spanStart())
+	var _t1900 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1827 int64
+		var _t1901 int64
 		if p.matchLookaheadLiteral("upsert", 1) {
-			_t1827 = 1
+			_t1901 = 1
 		} else {
-			var _t1828 int64
+			var _t1902 int64
 			if p.matchLookaheadLiteral("monus", 1) {
-				_t1828 = 1
+				_t1902 = 1
 			} else {
-				var _t1829 int64
+				var _t1903 int64
 				if p.matchLookaheadLiteral("monoid", 1) {
-					_t1829 = 1
+					_t1903 = 1
 				} else {
-					var _t1830 int64
+					var _t1904 int64
 					if p.matchLookaheadLiteral("loop", 1) {
-						_t1830 = 0
+						_t1904 = 0
 					} else {
-						var _t1831 int64
+						var _t1905 int64
 						if p.matchLookaheadLiteral("break", 1) {
-							_t1831 = 1
+							_t1905 = 1
 						} else {
-							var _t1832 int64
+							var _t1906 int64
 							if p.matchLookaheadLiteral("assign", 1) {
-								_t1832 = 1
+								_t1906 = 1
 							} else {
-								_t1832 = -1
+								_t1906 = -1
 							}
-							_t1831 = _t1832
+							_t1905 = _t1906
 						}
-						_t1830 = _t1831
+						_t1904 = _t1905
 					}
-					_t1829 = _t1830
+					_t1903 = _t1904
 				}
-				_t1828 = _t1829
+				_t1902 = _t1903
 			}
-			_t1827 = _t1828
+			_t1901 = _t1902
 		}
-		_t1826 = _t1827
+		_t1900 = _t1901
 	} else {
-		_t1826 = -1
-	}
-	prediction1042 := _t1826
-	var _t1833 *pb.Construct
-	if prediction1042 == 1 {
-		_t1834 := p.parse_instruction()
-		instruction1044 := _t1834
-		_t1835 := &pb.Construct{}
-		_t1835.ConstructType = &pb.Construct_Instruction{Instruction: instruction1044}
-		_t1833 = _t1835
+		_t1900 = -1
+	}
+	prediction1079 := _t1900
+	var _t1907 *pb.Construct
+	if prediction1079 == 1 {
+		_t1908 := p.parse_instruction()
+		instruction1081 := _t1908
+		_t1909 := &pb.Construct{}
+		_t1909.ConstructType = &pb.Construct_Instruction{Instruction: instruction1081}
+		_t1907 = _t1909
 	} else {
-		var _t1836 *pb.Construct
-		if prediction1042 == 0 {
-			_t1837 := p.parse_loop()
-			loop1043 := _t1837
-			_t1838 := &pb.Construct{}
-			_t1838.ConstructType = &pb.Construct_Loop{Loop: loop1043}
-			_t1836 = _t1838
+		var _t1910 *pb.Construct
+		if prediction1079 == 0 {
+			_t1911 := p.parse_loop()
+			loop1080 := _t1911
+			_t1912 := &pb.Construct{}
+			_t1912.ConstructType = &pb.Construct_Loop{Loop: loop1080}
+			_t1910 = _t1912
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in construct", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1833 = _t1836
+		_t1907 = _t1910
 	}
-	result1046 := _t1833
-	p.recordSpan(int(span_start1045), "Construct")
-	return result1046
+	result1083 := _t1907
+	p.recordSpan(int(span_start1082), "Construct")
+	return result1083
 }
 
 func (p *Parser) parse_loop() *pb.Loop {
-	span_start1050 := int64(p.spanStart())
+	span_start1087 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("loop")
-	_t1839 := p.parse_init()
-	init1047 := _t1839
-	_t1840 := p.parse_script()
-	script1048 := _t1840
-	var _t1841 []*pb.Attribute
+	_t1913 := p.parse_init()
+	init1084 := _t1913
+	_t1914 := p.parse_script()
+	script1085 := _t1914
+	var _t1915 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1842 := p.parse_attrs()
-		_t1841 = _t1842
+		_t1916 := p.parse_attrs()
+		_t1915 = _t1916
 	}
-	attrs1049 := _t1841
+	attrs1086 := _t1915
 	p.consumeLiteral(")")
-	_t1843 := attrs1049
-	if attrs1049 == nil {
-		_t1843 = []*pb.Attribute{}
+	_t1917 := attrs1086
+	if attrs1086 == nil {
+		_t1917 = []*pb.Attribute{}
 	}
-	_t1844 := &pb.Loop{Init: init1047, Body: script1048, Attrs: _t1843}
-	result1051 := _t1844
-	p.recordSpan(int(span_start1050), "Loop")
-	return result1051
+	_t1918 := &pb.Loop{Init: init1084, Body: script1085, Attrs: _t1917}
+	result1088 := _t1918
+	p.recordSpan(int(span_start1087), "Loop")
+	return result1088
 }
 
 func (p *Parser) parse_init() []*pb.Instruction {
 	p.consumeLiteral("(")
 	p.consumeLiteral("init")
-	xs1052 := []*pb.Instruction{}
-	cond1053 := p.matchLookaheadLiteral("(", 0)
-	for cond1053 {
-		_t1845 := p.parse_instruction()
-		item1054 := _t1845
-		xs1052 = append(xs1052, item1054)
-		cond1053 = p.matchLookaheadLiteral("(", 0)
-	}
-	instructions1055 := xs1052
+	xs1089 := []*pb.Instruction{}
+	cond1090 := p.matchLookaheadLiteral("(", 0)
+	for cond1090 {
+		_t1919 := p.parse_instruction()
+		item1091 := _t1919
+		xs1089 = append(xs1089, item1091)
+		cond1090 = p.matchLookaheadLiteral("(", 0)
+	}
+	instructions1092 := xs1089
 	p.consumeLiteral(")")
-	return instructions1055
+	return instructions1092
 }
 
 func (p *Parser) parse_instruction() *pb.Instruction {
-	span_start1062 := int64(p.spanStart())
-	var _t1846 int64
+	span_start1099 := int64(p.spanStart())
+	var _t1920 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1847 int64
+		var _t1921 int64
 		if p.matchLookaheadLiteral("upsert", 1) {
-			_t1847 = 1
+			_t1921 = 1
 		} else {
-			var _t1848 int64
+			var _t1922 int64
 			if p.matchLookaheadLiteral("monus", 1) {
-				_t1848 = 4
+				_t1922 = 4
 			} else {
-				var _t1849 int64
+				var _t1923 int64
 				if p.matchLookaheadLiteral("monoid", 1) {
-					_t1849 = 3
+					_t1923 = 3
 				} else {
-					var _t1850 int64
+					var _t1924 int64
 					if p.matchLookaheadLiteral("break", 1) {
-						_t1850 = 2
+						_t1924 = 2
 					} else {
-						var _t1851 int64
+						var _t1925 int64
 						if p.matchLookaheadLiteral("assign", 1) {
-							_t1851 = 0
+							_t1925 = 0
 						} else {
-							_t1851 = -1
+							_t1925 = -1
 						}
-						_t1850 = _t1851
+						_t1924 = _t1925
 					}
-					_t1849 = _t1850
+					_t1923 = _t1924
 				}
-				_t1848 = _t1849
+				_t1922 = _t1923
 			}
-			_t1847 = _t1848
+			_t1921 = _t1922
 		}
-		_t1846 = _t1847
+		_t1920 = _t1921
 	} else {
-		_t1846 = -1
-	}
-	prediction1056 := _t1846
-	var _t1852 *pb.Instruction
-	if prediction1056 == 4 {
-		_t1853 := p.parse_monus_def()
-		monus_def1061 := _t1853
-		_t1854 := &pb.Instruction{}
-		_t1854.InstrType = &pb.Instruction_MonusDef{MonusDef: monus_def1061}
-		_t1852 = _t1854
+		_t1920 = -1
+	}
+	prediction1093 := _t1920
+	var _t1926 *pb.Instruction
+	if prediction1093 == 4 {
+		_t1927 := p.parse_monus_def()
+		monus_def1098 := _t1927
+		_t1928 := &pb.Instruction{}
+		_t1928.InstrType = &pb.Instruction_MonusDef{MonusDef: monus_def1098}
+		_t1926 = _t1928
 	} else {
-		var _t1855 *pb.Instruction
-		if prediction1056 == 3 {
-			_t1856 := p.parse_monoid_def()
-			monoid_def1060 := _t1856
-			_t1857 := &pb.Instruction{}
-			_t1857.InstrType = &pb.Instruction_MonoidDef{MonoidDef: monoid_def1060}
-			_t1855 = _t1857
+		var _t1929 *pb.Instruction
+		if prediction1093 == 3 {
+			_t1930 := p.parse_monoid_def()
+			monoid_def1097 := _t1930
+			_t1931 := &pb.Instruction{}
+			_t1931.InstrType = &pb.Instruction_MonoidDef{MonoidDef: monoid_def1097}
+			_t1929 = _t1931
 		} else {
-			var _t1858 *pb.Instruction
-			if prediction1056 == 2 {
-				_t1859 := p.parse_break()
-				break1059 := _t1859
-				_t1860 := &pb.Instruction{}
-				_t1860.InstrType = &pb.Instruction_Break{Break: break1059}
-				_t1858 = _t1860
+			var _t1932 *pb.Instruction
+			if prediction1093 == 2 {
+				_t1933 := p.parse_break()
+				break1096 := _t1933
+				_t1934 := &pb.Instruction{}
+				_t1934.InstrType = &pb.Instruction_Break{Break: break1096}
+				_t1932 = _t1934
 			} else {
-				var _t1861 *pb.Instruction
-				if prediction1056 == 1 {
-					_t1862 := p.parse_upsert()
-					upsert1058 := _t1862
-					_t1863 := &pb.Instruction{}
-					_t1863.InstrType = &pb.Instruction_Upsert{Upsert: upsert1058}
-					_t1861 = _t1863
+				var _t1935 *pb.Instruction
+				if prediction1093 == 1 {
+					_t1936 := p.parse_upsert()
+					upsert1095 := _t1936
+					_t1937 := &pb.Instruction{}
+					_t1937.InstrType = &pb.Instruction_Upsert{Upsert: upsert1095}
+					_t1935 = _t1937
 				} else {
-					var _t1864 *pb.Instruction
-					if prediction1056 == 0 {
-						_t1865 := p.parse_assign()
-						assign1057 := _t1865
-						_t1866 := &pb.Instruction{}
-						_t1866.InstrType = &pb.Instruction_Assign{Assign: assign1057}
-						_t1864 = _t1866
+					var _t1938 *pb.Instruction
+					if prediction1093 == 0 {
+						_t1939 := p.parse_assign()
+						assign1094 := _t1939
+						_t1940 := &pb.Instruction{}
+						_t1940.InstrType = &pb.Instruction_Assign{Assign: assign1094}
+						_t1938 = _t1940
 					} else {
 						panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in instruction", p.lookahead(0).Type, p.lookahead(0).Value)})
 					}
-					_t1861 = _t1864
+					_t1935 = _t1938
 				}
-				_t1858 = _t1861
+				_t1932 = _t1935
 			}
-			_t1855 = _t1858
+			_t1929 = _t1932
 		}
-		_t1852 = _t1855
+		_t1926 = _t1929
 	}
-	result1063 := _t1852
-	p.recordSpan(int(span_start1062), "Instruction")
-	return result1063
+	result1100 := _t1926
+	p.recordSpan(int(span_start1099), "Instruction")
+	return result1100
 }
 
 func (p *Parser) parse_assign() *pb.Assign {
-	span_start1067 := int64(p.spanStart())
+	span_start1104 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("assign")
-	_t1867 := p.parse_relation_id()
-	relation_id1064 := _t1867
-	_t1868 := p.parse_abstraction()
-	abstraction1065 := _t1868
-	var _t1869 []*pb.Attribute
+	_t1941 := p.parse_relation_id()
+	relation_id1101 := _t1941
+	_t1942 := p.parse_abstraction()
+	abstraction1102 := _t1942
+	var _t1943 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1870 := p.parse_attrs()
-		_t1869 = _t1870
+		_t1944 := p.parse_attrs()
+		_t1943 = _t1944
 	}
-	attrs1066 := _t1869
+	attrs1103 := _t1943
 	p.consumeLiteral(")")
-	_t1871 := attrs1066
-	if attrs1066 == nil {
-		_t1871 = []*pb.Attribute{}
+	_t1945 := attrs1103
+	if attrs1103 == nil {
+		_t1945 = []*pb.Attribute{}
 	}
-	_t1872 := &pb.Assign{Name: relation_id1064, Body: abstraction1065, Attrs: _t1871}
-	result1068 := _t1872
-	p.recordSpan(int(span_start1067), "Assign")
-	return result1068
+	_t1946 := &pb.Assign{Name: relation_id1101, Body: abstraction1102, Attrs: _t1945}
+	result1105 := _t1946
+	p.recordSpan(int(span_start1104), "Assign")
+	return result1105
 }
 
 func (p *Parser) parse_upsert() *pb.Upsert {
-	span_start1072 := int64(p.spanStart())
+	span_start1109 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("upsert")
-	_t1873 := p.parse_relation_id()
-	relation_id1069 := _t1873
-	_t1874 := p.parse_abstraction_with_arity()
-	abstraction_with_arity1070 := _t1874
-	var _t1875 []*pb.Attribute
+	_t1947 := p.parse_relation_id()
+	relation_id1106 := _t1947
+	_t1948 := p.parse_abstraction_with_arity()
+	abstraction_with_arity1107 := _t1948
+	var _t1949 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1876 := p.parse_attrs()
-		_t1875 = _t1876
+		_t1950 := p.parse_attrs()
+		_t1949 = _t1950
 	}
-	attrs1071 := _t1875
+	attrs1108 := _t1949
 	p.consumeLiteral(")")
-	_t1877 := attrs1071
-	if attrs1071 == nil {
-		_t1877 = []*pb.Attribute{}
+	_t1951 := attrs1108
+	if attrs1108 == nil {
+		_t1951 = []*pb.Attribute{}
 	}
-	_t1878 := &pb.Upsert{Name: relation_id1069, Body: abstraction_with_arity1070[0].(*pb.Abstraction), Attrs: _t1877, ValueArity: abstraction_with_arity1070[1].(int64)}
-	result1073 := _t1878
-	p.recordSpan(int(span_start1072), "Upsert")
-	return result1073
+	_t1952 := &pb.Upsert{Name: relation_id1106, Body: abstraction_with_arity1107[0].(*pb.Abstraction), Attrs: _t1951, ValueArity: abstraction_with_arity1107[1].(int64)}
+	result1110 := _t1952
+	p.recordSpan(int(span_start1109), "Upsert")
+	return result1110
 }
 
 func (p *Parser) parse_abstraction_with_arity() []interface{} {
 	p.consumeLiteral("(")
-	_t1879 := p.parse_bindings()
-	bindings1074 := _t1879
-	_t1880 := p.parse_formula()
-	formula1075 := _t1880
+	_t1953 := p.parse_bindings()
+	bindings1111 := _t1953
+	_t1954 := p.parse_formula()
+	formula1112 := _t1954
 	p.consumeLiteral(")")
-	_t1881 := &pb.Abstraction{Vars: listConcat(bindings1074[0].([]*pb.Binding), bindings1074[1].([]*pb.Binding)), Value: formula1075}
-	return []interface{}{_t1881, int64(len(bindings1074[1].([]*pb.Binding)))}
+	_t1955 := &pb.Abstraction{Vars: listConcat(bindings1111[0].([]*pb.Binding), bindings1111[1].([]*pb.Binding)), Value: formula1112}
+	return []interface{}{_t1955, int64(len(bindings1111[1].([]*pb.Binding)))}
 }
 
 func (p *Parser) parse_break() *pb.Break {
-	span_start1079 := int64(p.spanStart())
+	span_start1116 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("break")
-	_t1882 := p.parse_relation_id()
-	relation_id1076 := _t1882
-	_t1883 := p.parse_abstraction()
-	abstraction1077 := _t1883
-	var _t1884 []*pb.Attribute
+	_t1956 := p.parse_relation_id()
+	relation_id1113 := _t1956
+	_t1957 := p.parse_abstraction()
+	abstraction1114 := _t1957
+	var _t1958 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1885 := p.parse_attrs()
-		_t1884 = _t1885
+		_t1959 := p.parse_attrs()
+		_t1958 = _t1959
 	}
-	attrs1078 := _t1884
+	attrs1115 := _t1958
 	p.consumeLiteral(")")
-	_t1886 := attrs1078
-	if attrs1078 == nil {
-		_t1886 = []*pb.Attribute{}
+	_t1960 := attrs1115
+	if attrs1115 == nil {
+		_t1960 = []*pb.Attribute{}
 	}
-	_t1887 := &pb.Break{Name: relation_id1076, Body: abstraction1077, Attrs: _t1886}
-	result1080 := _t1887
-	p.recordSpan(int(span_start1079), "Break")
-	return result1080
+	_t1961 := &pb.Break{Name: relation_id1113, Body: abstraction1114, Attrs: _t1960}
+	result1117 := _t1961
+	p.recordSpan(int(span_start1116), "Break")
+	return result1117
 }
 
 func (p *Parser) parse_monoid_def() *pb.MonoidDef {
-	span_start1085 := int64(p.spanStart())
+	span_start1122 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("monoid")
-	_t1888 := p.parse_monoid()
-	monoid1081 := _t1888
-	_t1889 := p.parse_relation_id()
-	relation_id1082 := _t1889
-	_t1890 := p.parse_abstraction_with_arity()
-	abstraction_with_arity1083 := _t1890
-	var _t1891 []*pb.Attribute
+	_t1962 := p.parse_monoid()
+	monoid1118 := _t1962
+	_t1963 := p.parse_relation_id()
+	relation_id1119 := _t1963
+	_t1964 := p.parse_abstraction_with_arity()
+	abstraction_with_arity1120 := _t1964
+	var _t1965 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1892 := p.parse_attrs()
-		_t1891 = _t1892
+		_t1966 := p.parse_attrs()
+		_t1965 = _t1966
 	}
-	attrs1084 := _t1891
+	attrs1121 := _t1965
 	p.consumeLiteral(")")
-	_t1893 := attrs1084
-	if attrs1084 == nil {
-		_t1893 = []*pb.Attribute{}
+	_t1967 := attrs1121
+	if attrs1121 == nil {
+		_t1967 = []*pb.Attribute{}
 	}
-	_t1894 := &pb.MonoidDef{Monoid: monoid1081, Name: relation_id1082, Body: abstraction_with_arity1083[0].(*pb.Abstraction), Attrs: _t1893, ValueArity: abstraction_with_arity1083[1].(int64)}
-	result1086 := _t1894
-	p.recordSpan(int(span_start1085), "MonoidDef")
-	return result1086
+	_t1968 := &pb.MonoidDef{Monoid: monoid1118, Name: relation_id1119, Body: abstraction_with_arity1120[0].(*pb.Abstraction), Attrs: _t1967, ValueArity: abstraction_with_arity1120[1].(int64)}
+	result1123 := _t1968
+	p.recordSpan(int(span_start1122), "MonoidDef")
+	return result1123
 }
 
 func (p *Parser) parse_monoid() *pb.Monoid {
-	span_start1092 := int64(p.spanStart())
-	var _t1895 int64
+	span_start1129 := int64(p.spanStart())
+	var _t1969 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1896 int64
+		var _t1970 int64
 		if p.matchLookaheadLiteral("sum", 1) {
-			_t1896 = 3
+			_t1970 = 3
 		} else {
-			var _t1897 int64
+			var _t1971 int64
 			if p.matchLookaheadLiteral("or", 1) {
-				_t1897 = 0
+				_t1971 = 0
 			} else {
-				var _t1898 int64
+				var _t1972 int64
 				if p.matchLookaheadLiteral("min", 1) {
-					_t1898 = 1
+					_t1972 = 1
 				} else {
-					var _t1899 int64
+					var _t1973 int64
 					if p.matchLookaheadLiteral("max", 1) {
-						_t1899 = 2
+						_t1973 = 2
 					} else {
-						_t1899 = -1
+						_t1973 = -1
 					}
-					_t1898 = _t1899
+					_t1972 = _t1973
 				}
-				_t1897 = _t1898
+				_t1971 = _t1972
 			}
-			_t1896 = _t1897
+			_t1970 = _t1971
 		}
-		_t1895 = _t1896
+		_t1969 = _t1970
 	} else {
-		_t1895 = -1
-	}
-	prediction1087 := _t1895
-	var _t1900 *pb.Monoid
-	if prediction1087 == 3 {
-		_t1901 := p.parse_sum_monoid()
-		sum_monoid1091 := _t1901
-		_t1902 := &pb.Monoid{}
-		_t1902.Value = &pb.Monoid_SumMonoid{SumMonoid: sum_monoid1091}
-		_t1900 = _t1902
+		_t1969 = -1
+	}
+	prediction1124 := _t1969
+	var _t1974 *pb.Monoid
+	if prediction1124 == 3 {
+		_t1975 := p.parse_sum_monoid()
+		sum_monoid1128 := _t1975
+		_t1976 := &pb.Monoid{}
+		_t1976.Value = &pb.Monoid_SumMonoid{SumMonoid: sum_monoid1128}
+		_t1974 = _t1976
 	} else {
-		var _t1903 *pb.Monoid
-		if prediction1087 == 2 {
-			_t1904 := p.parse_max_monoid()
-			max_monoid1090 := _t1904
-			_t1905 := &pb.Monoid{}
-			_t1905.Value = &pb.Monoid_MaxMonoid{MaxMonoid: max_monoid1090}
-			_t1903 = _t1905
+		var _t1977 *pb.Monoid
+		if prediction1124 == 2 {
+			_t1978 := p.parse_max_monoid()
+			max_monoid1127 := _t1978
+			_t1979 := &pb.Monoid{}
+			_t1979.Value = &pb.Monoid_MaxMonoid{MaxMonoid: max_monoid1127}
+			_t1977 = _t1979
 		} else {
-			var _t1906 *pb.Monoid
-			if prediction1087 == 1 {
-				_t1907 := p.parse_min_monoid()
-				min_monoid1089 := _t1907
-				_t1908 := &pb.Monoid{}
-				_t1908.Value = &pb.Monoid_MinMonoid{MinMonoid: min_monoid1089}
-				_t1906 = _t1908
+			var _t1980 *pb.Monoid
+			if prediction1124 == 1 {
+				_t1981 := p.parse_min_monoid()
+				min_monoid1126 := _t1981
+				_t1982 := &pb.Monoid{}
+				_t1982.Value = &pb.Monoid_MinMonoid{MinMonoid: min_monoid1126}
+				_t1980 = _t1982
 			} else {
-				var _t1909 *pb.Monoid
-				if prediction1087 == 0 {
-					_t1910 := p.parse_or_monoid()
-					or_monoid1088 := _t1910
-					_t1911 := &pb.Monoid{}
-					_t1911.Value = &pb.Monoid_OrMonoid{OrMonoid: or_monoid1088}
-					_t1909 = _t1911
+				var _t1983 *pb.Monoid
+				if prediction1124 == 0 {
+					_t1984 := p.parse_or_monoid()
+					or_monoid1125 := _t1984
+					_t1985 := &pb.Monoid{}
+					_t1985.Value = &pb.Monoid_OrMonoid{OrMonoid: or_monoid1125}
+					_t1983 = _t1985
 				} else {
 					panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in monoid", p.lookahead(0).Type, p.lookahead(0).Value)})
 				}
-				_t1906 = _t1909
+				_t1980 = _t1983
 			}
-			_t1903 = _t1906
+			_t1977 = _t1980
 		}
-		_t1900 = _t1903
+		_t1974 = _t1977
 	}
-	result1093 := _t1900
-	p.recordSpan(int(span_start1092), "Monoid")
-	return result1093
+	result1130 := _t1974
+	p.recordSpan(int(span_start1129), "Monoid")
+	return result1130
 }
 
 func (p *Parser) parse_or_monoid() *pb.OrMonoid {
-	span_start1094 := int64(p.spanStart())
+	span_start1131 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("or")
 	p.consumeLiteral(")")
-	_t1912 := &pb.OrMonoid{}
-	result1095 := _t1912
-	p.recordSpan(int(span_start1094), "OrMonoid")
-	return result1095
+	_t1986 := &pb.OrMonoid{}
+	result1132 := _t1986
+	p.recordSpan(int(span_start1131), "OrMonoid")
+	return result1132
 }
 
 func (p *Parser) parse_min_monoid() *pb.MinMonoid {
-	span_start1097 := int64(p.spanStart())
+	span_start1134 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("min")
-	_t1913 := p.parse_type()
-	type1096 := _t1913
+	_t1987 := p.parse_type()
+	type1133 := _t1987
 	p.consumeLiteral(")")
-	_t1914 := &pb.MinMonoid{Type: type1096}
-	result1098 := _t1914
-	p.recordSpan(int(span_start1097), "MinMonoid")
-	return result1098
+	_t1988 := &pb.MinMonoid{Type: type1133}
+	result1135 := _t1988
+	p.recordSpan(int(span_start1134), "MinMonoid")
+	return result1135
 }
 
 func (p *Parser) parse_max_monoid() *pb.MaxMonoid {
-	span_start1100 := int64(p.spanStart())
+	span_start1137 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("max")
-	_t1915 := p.parse_type()
-	type1099 := _t1915
+	_t1989 := p.parse_type()
+	type1136 := _t1989
 	p.consumeLiteral(")")
-	_t1916 := &pb.MaxMonoid{Type: type1099}
-	result1101 := _t1916
-	p.recordSpan(int(span_start1100), "MaxMonoid")
-	return result1101
+	_t1990 := &pb.MaxMonoid{Type: type1136}
+	result1138 := _t1990
+	p.recordSpan(int(span_start1137), "MaxMonoid")
+	return result1138
 }
 
 func (p *Parser) parse_sum_monoid() *pb.SumMonoid {
-	span_start1103 := int64(p.spanStart())
+	span_start1140 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("sum")
-	_t1917 := p.parse_type()
-	type1102 := _t1917
+	_t1991 := p.parse_type()
+	type1139 := _t1991
 	p.consumeLiteral(")")
-	_t1918 := &pb.SumMonoid{Type: type1102}
-	result1104 := _t1918
-	p.recordSpan(int(span_start1103), "SumMonoid")
-	return result1104
+	_t1992 := &pb.SumMonoid{Type: type1139}
+	result1141 := _t1992
+	p.recordSpan(int(span_start1140), "SumMonoid")
+	return result1141
 }
 
 func (p *Parser) parse_monus_def() *pb.MonusDef {
-	span_start1109 := int64(p.spanStart())
+	span_start1146 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("monus")
-	_t1919 := p.parse_monoid()
-	monoid1105 := _t1919
-	_t1920 := p.parse_relation_id()
-	relation_id1106 := _t1920
-	_t1921 := p.parse_abstraction_with_arity()
-	abstraction_with_arity1107 := _t1921
-	var _t1922 []*pb.Attribute
+	_t1993 := p.parse_monoid()
+	monoid1142 := _t1993
+	_t1994 := p.parse_relation_id()
+	relation_id1143 := _t1994
+	_t1995 := p.parse_abstraction_with_arity()
+	abstraction_with_arity1144 := _t1995
+	var _t1996 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1923 := p.parse_attrs()
-		_t1922 = _t1923
+		_t1997 := p.parse_attrs()
+		_t1996 = _t1997
 	}
-	attrs1108 := _t1922
+	attrs1145 := _t1996
 	p.consumeLiteral(")")
-	_t1924 := attrs1108
-	if attrs1108 == nil {
-		_t1924 = []*pb.Attribute{}
+	_t1998 := attrs1145
+	if attrs1145 == nil {
+		_t1998 = []*pb.Attribute{}
 	}
-	_t1925 := &pb.MonusDef{Monoid: monoid1105, Name: relation_id1106, Body: abstraction_with_arity1107[0].(*pb.Abstraction), Attrs: _t1924, ValueArity: abstraction_with_arity1107[1].(int64)}
-	result1110 := _t1925
-	p.recordSpan(int(span_start1109), "MonusDef")
-	return result1110
+	_t1999 := &pb.MonusDef{Monoid: monoid1142, Name: relation_id1143, Body: abstraction_with_arity1144[0].(*pb.Abstraction), Attrs: _t1998, ValueArity: abstraction_with_arity1144[1].(int64)}
+	result1147 := _t1999
+	p.recordSpan(int(span_start1146), "MonusDef")
+	return result1147
 }
 
 func (p *Parser) parse_constraint() *pb.Constraint {
-	span_start1115 := int64(p.spanStart())
+	span_start1152 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("functional_dependency")
-	_t1926 := p.parse_relation_id()
-	relation_id1111 := _t1926
-	_t1927 := p.parse_abstraction()
-	abstraction1112 := _t1927
-	_t1928 := p.parse_functional_dependency_keys()
-	functional_dependency_keys1113 := _t1928
-	_t1929 := p.parse_functional_dependency_values()
-	functional_dependency_values1114 := _t1929
+	_t2000 := p.parse_relation_id()
+	relation_id1148 := _t2000
+	_t2001 := p.parse_abstraction()
+	abstraction1149 := _t2001
+	_t2002 := p.parse_functional_dependency_keys()
+	functional_dependency_keys1150 := _t2002
+	_t2003 := p.parse_functional_dependency_values()
+	functional_dependency_values1151 := _t2003
 	p.consumeLiteral(")")
-	_t1930 := &pb.FunctionalDependency{Guard: abstraction1112, Keys: functional_dependency_keys1113, Values: functional_dependency_values1114}
-	_t1931 := &pb.Constraint{Name: relation_id1111}
-	_t1931.ConstraintType = &pb.Constraint_FunctionalDependency{FunctionalDependency: _t1930}
-	result1116 := _t1931
-	p.recordSpan(int(span_start1115), "Constraint")
-	return result1116
+	_t2004 := &pb.FunctionalDependency{Guard: abstraction1149, Keys: functional_dependency_keys1150, Values: functional_dependency_values1151}
+	_t2005 := &pb.Constraint{Name: relation_id1148}
+	_t2005.ConstraintType = &pb.Constraint_FunctionalDependency{FunctionalDependency: _t2004}
+	result1153 := _t2005
+	p.recordSpan(int(span_start1152), "Constraint")
+	return result1153
 }
 
 func (p *Parser) parse_functional_dependency_keys() []*pb.Var {
 	p.consumeLiteral("(")
 	p.consumeLiteral("keys")
-	xs1117 := []*pb.Var{}
-	cond1118 := p.matchLookaheadTerminal("SYMBOL", 0)
-	for cond1118 {
-		_t1932 := p.parse_var()
-		item1119 := _t1932
-		xs1117 = append(xs1117, item1119)
-		cond1118 = p.matchLookaheadTerminal("SYMBOL", 0)
-	}
-	vars1120 := xs1117
+	xs1154 := []*pb.Var{}
+	cond1155 := p.matchLookaheadTerminal("SYMBOL", 0)
+	for cond1155 {
+		_t2006 := p.parse_var()
+		item1156 := _t2006
+		xs1154 = append(xs1154, item1156)
+		cond1155 = p.matchLookaheadTerminal("SYMBOL", 0)
+	}
+	vars1157 := xs1154
 	p.consumeLiteral(")")
-	return vars1120
+	return vars1157
 }
 
 func (p *Parser) parse_functional_dependency_values() []*pb.Var {
 	p.consumeLiteral("(")
 	p.consumeLiteral("values")
-	xs1121 := []*pb.Var{}
-	cond1122 := p.matchLookaheadTerminal("SYMBOL", 0)
-	for cond1122 {
-		_t1933 := p.parse_var()
-		item1123 := _t1933
-		xs1121 = append(xs1121, item1123)
-		cond1122 = p.matchLookaheadTerminal("SYMBOL", 0)
-	}
-	vars1124 := xs1121
+	xs1158 := []*pb.Var{}
+	cond1159 := p.matchLookaheadTerminal("SYMBOL", 0)
+	for cond1159 {
+		_t2007 := p.parse_var()
+		item1160 := _t2007
+		xs1158 = append(xs1158, item1160)
+		cond1159 = p.matchLookaheadTerminal("SYMBOL", 0)
+	}
+	vars1161 := xs1158
 	p.consumeLiteral(")")
-	return vars1124
+	return vars1161
 }
 
 func (p *Parser) parse_data() *pb.Data {
-	span_start1130 := int64(p.spanStart())
-	var _t1934 int64
+	span_start1167 := int64(p.spanStart())
+	var _t2008 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1935 int64
+		var _t2009 int64
 		if p.matchLookaheadLiteral("iceberg_data", 1) {
-			_t1935 = 3
+			_t2009 = 3
 		} else {
-			var _t1936 int64
+			var _t2010 int64
 			if p.matchLookaheadLiteral("edb", 1) {
-				_t1936 = 0
+				_t2010 = 0
 			} else {
-				var _t1937 int64
+				var _t2011 int64
 				if p.matchLookaheadLiteral("csv_data", 1) {
-					_t1937 = 2
+					_t2011 = 2
 				} else {
-					var _t1938 int64
+					var _t2012 int64
 					if p.matchLookaheadLiteral("betree_relation", 1) {
-						_t1938 = 1
+						_t2012 = 1
 					} else {
-						_t1938 = -1
+						_t2012 = -1
 					}
-					_t1937 = _t1938
+					_t2011 = _t2012
 				}
-				_t1936 = _t1937
+				_t2010 = _t2011
 			}
-			_t1935 = _t1936
+			_t2009 = _t2010
 		}
-		_t1934 = _t1935
+		_t2008 = _t2009
 	} else {
-		_t1934 = -1
-	}
-	prediction1125 := _t1934
-	var _t1939 *pb.Data
-	if prediction1125 == 3 {
-		_t1940 := p.parse_iceberg_data()
-		iceberg_data1129 := _t1940
-		_t1941 := &pb.Data{}
-		_t1941.DataType = &pb.Data_IcebergData{IcebergData: iceberg_data1129}
-		_t1939 = _t1941
+		_t2008 = -1
+	}
+	prediction1162 := _t2008
+	var _t2013 *pb.Data
+	if prediction1162 == 3 {
+		_t2014 := p.parse_iceberg_data()
+		iceberg_data1166 := _t2014
+		_t2015 := &pb.Data{}
+		_t2015.DataType = &pb.Data_IcebergData{IcebergData: iceberg_data1166}
+		_t2013 = _t2015
 	} else {
-		var _t1942 *pb.Data
-		if prediction1125 == 2 {
-			_t1943 := p.parse_csv_data()
-			csv_data1128 := _t1943
-			_t1944 := &pb.Data{}
-			_t1944.DataType = &pb.Data_CsvData{CsvData: csv_data1128}
-			_t1942 = _t1944
+		var _t2016 *pb.Data
+		if prediction1162 == 2 {
+			_t2017 := p.parse_csv_data()
+			csv_data1165 := _t2017
+			_t2018 := &pb.Data{}
+			_t2018.DataType = &pb.Data_CsvData{CsvData: csv_data1165}
+			_t2016 = _t2018
 		} else {
-			var _t1945 *pb.Data
-			if prediction1125 == 1 {
-				_t1946 := p.parse_betree_relation()
-				betree_relation1127 := _t1946
-				_t1947 := &pb.Data{}
-				_t1947.DataType = &pb.Data_BetreeRelation{BetreeRelation: betree_relation1127}
-				_t1945 = _t1947
+			var _t2019 *pb.Data
+			if prediction1162 == 1 {
+				_t2020 := p.parse_betree_relation()
+				betree_relation1164 := _t2020
+				_t2021 := &pb.Data{}
+				_t2021.DataType = &pb.Data_BetreeRelation{BetreeRelation: betree_relation1164}
+				_t2019 = _t2021
 			} else {
-				var _t1948 *pb.Data
-				if prediction1125 == 0 {
-					_t1949 := p.parse_edb()
-					edb1126 := _t1949
-					_t1950 := &pb.Data{}
-					_t1950.DataType = &pb.Data_Edb{Edb: edb1126}
-					_t1948 = _t1950
+				var _t2022 *pb.Data
+				if prediction1162 == 0 {
+					_t2023 := p.parse_edb()
+					edb1163 := _t2023
+					_t2024 := &pb.Data{}
+					_t2024.DataType = &pb.Data_Edb{Edb: edb1163}
+					_t2022 = _t2024
 				} else {
 					panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in data", p.lookahead(0).Type, p.lookahead(0).Value)})
 				}
-				_t1945 = _t1948
+				_t2019 = _t2022
 			}
-			_t1942 = _t1945
+			_t2016 = _t2019
 		}
-		_t1939 = _t1942
+		_t2013 = _t2016
 	}
-	result1131 := _t1939
-	p.recordSpan(int(span_start1130), "Data")
-	return result1131
+	result1168 := _t2013
+	p.recordSpan(int(span_start1167), "Data")
+	return result1168
 }
 
 func (p *Parser) parse_edb() *pb.EDB {
-	span_start1135 := int64(p.spanStart())
+	span_start1172 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("edb")
-	_t1951 := p.parse_relation_id()
-	relation_id1132 := _t1951
-	_t1952 := p.parse_edb_path()
-	edb_path1133 := _t1952
-	_t1953 := p.parse_edb_types()
-	edb_types1134 := _t1953
+	_t2025 := p.parse_relation_id()
+	relation_id1169 := _t2025
+	_t2026 := p.parse_edb_path()
+	edb_path1170 := _t2026
+	_t2027 := p.parse_edb_types()
+	edb_types1171 := _t2027
 	p.consumeLiteral(")")
-	_t1954 := &pb.EDB{TargetId: relation_id1132, Path: edb_path1133, Types: edb_types1134}
-	result1136 := _t1954
-	p.recordSpan(int(span_start1135), "EDB")
-	return result1136
+	_t2028 := &pb.EDB{TargetId: relation_id1169, Path: edb_path1170, Types: edb_types1171}
+	result1173 := _t2028
+	p.recordSpan(int(span_start1172), "EDB")
+	return result1173
 }
 
 func (p *Parser) parse_edb_path() []string {
 	p.consumeLiteral("[")
-	xs1137 := []string{}
-	cond1138 := p.matchLookaheadTerminal("STRING", 0)
-	for cond1138 {
-		item1139 := p.consumeTerminal("STRING").Value.str
-		xs1137 = append(xs1137, item1139)
-		cond1138 = p.matchLookaheadTerminal("STRING", 0)
-	}
-	strings1140 := xs1137
+	xs1174 := []string{}
+	cond1175 := p.matchLookaheadTerminal("STRING", 0)
+	for cond1175 {
+		item1176 := p.consumeTerminal("STRING").Value.str
+		xs1174 = append(xs1174, item1176)
+		cond1175 = p.matchLookaheadTerminal("STRING", 0)
+	}
+	strings1177 := xs1174
 	p.consumeLiteral("]")
-	return strings1140
+	return strings1177
 }
 
 func (p *Parser) parse_edb_types() []*pb.Type {
 	p.consumeLiteral("[")
-	xs1141 := []*pb.Type{}
-	cond1142 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
-	for cond1142 {
-		_t1955 := p.parse_type()
-		item1143 := _t1955
-		xs1141 = append(xs1141, item1143)
-		cond1142 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
-	}
-	types1144 := xs1141
+	xs1178 := []*pb.Type{}
+	cond1179 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
+	for cond1179 {
+		_t2029 := p.parse_type()
+		item1180 := _t2029
+		xs1178 = append(xs1178, item1180)
+		cond1179 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
+	}
+	types1181 := xs1178
 	p.consumeLiteral("]")
-	return types1144
+	return types1181
 }
 
 func (p *Parser) parse_betree_relation() *pb.BeTreeRelation {
-	span_start1147 := int64(p.spanStart())
+	span_start1184 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("betree_relation")
-	_t1956 := p.parse_relation_id()
-	relation_id1145 := _t1956
-	_t1957 := p.parse_betree_info()
-	betree_info1146 := _t1957
+	_t2030 := p.parse_relation_id()
+	relation_id1182 := _t2030
+	_t2031 := p.parse_betree_info()
+	betree_info1183 := _t2031
 	p.consumeLiteral(")")
-	_t1958 := &pb.BeTreeRelation{Name: relation_id1145, RelationInfo: betree_info1146}
-	result1148 := _t1958
-	p.recordSpan(int(span_start1147), "BeTreeRelation")
-	return result1148
+	_t2032 := &pb.BeTreeRelation{Name: relation_id1182, RelationInfo: betree_info1183}
+	result1185 := _t2032
+	p.recordSpan(int(span_start1184), "BeTreeRelation")
+	return result1185
 }
 
 func (p *Parser) parse_betree_info() *pb.BeTreeInfo {
-	span_start1152 := int64(p.spanStart())
+	span_start1189 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("betree_info")
-	_t1959 := p.parse_betree_info_key_types()
-	betree_info_key_types1149 := _t1959
-	_t1960 := p.parse_betree_info_value_types()
-	betree_info_value_types1150 := _t1960
-	_t1961 := p.parse_config_dict()
-	config_dict1151 := _t1961
+	_t2033 := p.parse_betree_info_key_types()
+	betree_info_key_types1186 := _t2033
+	_t2034 := p.parse_betree_info_value_types()
+	betree_info_value_types1187 := _t2034
+	_t2035 := p.parse_config_dict()
+	config_dict1188 := _t2035
 	p.consumeLiteral(")")
-	_t1962 := p.construct_betree_info(betree_info_key_types1149, betree_info_value_types1150, config_dict1151)
-	result1153 := _t1962
-	p.recordSpan(int(span_start1152), "BeTreeInfo")
-	return result1153
+	_t2036 := p.construct_betree_info(betree_info_key_types1186, betree_info_value_types1187, config_dict1188)
+	result1190 := _t2036
+	p.recordSpan(int(span_start1189), "BeTreeInfo")
+	return result1190
 }
 
 func (p *Parser) parse_betree_info_key_types() []*pb.Type {
 	p.consumeLiteral("(")
 	p.consumeLiteral("key_types")
-	xs1154 := []*pb.Type{}
-	cond1155 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
-	for cond1155 {
-		_t1963 := p.parse_type()
-		item1156 := _t1963
-		xs1154 = append(xs1154, item1156)
-		cond1155 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
-	}
-	types1157 := xs1154
+	xs1191 := []*pb.Type{}
+	cond1192 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
+	for cond1192 {
+		_t2037 := p.parse_type()
+		item1193 := _t2037
+		xs1191 = append(xs1191, item1193)
+		cond1192 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
+	}
+	types1194 := xs1191
 	p.consumeLiteral(")")
-	return types1157
+	return types1194
 }
 
 func (p *Parser) parse_betree_info_value_types() []*pb.Type {
 	p.consumeLiteral("(")
 	p.consumeLiteral("value_types")
-	xs1158 := []*pb.Type{}
-	cond1159 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
-	for cond1159 {
-		_t1964 := p.parse_type()
-		item1160 := _t1964
-		xs1158 = append(xs1158, item1160)
-		cond1159 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
-	}
-	types1161 := xs1158
+	xs1195 := []*pb.Type{}
+	cond1196 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
+	for cond1196 {
+		_t2038 := p.parse_type()
+		item1197 := _t2038
+		xs1195 = append(xs1195, item1197)
+		cond1196 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
+	}
+	types1198 := xs1195
 	p.consumeLiteral(")")
-	return types1161
+	return types1198
 }
 
 func (p *Parser) parse_csv_data() *pb.CSVData {
-	span_start1166 := int64(p.spanStart())
+	span_start1204 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("csv_data")
-	_t1965 := p.parse_csvlocator()
-	csvlocator1162 := _t1965
-	_t1966 := p.parse_csv_config()
-	csv_config1163 := _t1966
-	_t1967 := p.parse_gnf_columns()
-	gnf_columns1164 := _t1967
-	_t1968 := p.parse_csv_asof()
-	csv_asof1165 := _t1968
+	_t2039 := p.parse_csvlocator()
+	csvlocator1199 := _t2039
+	_t2040 := p.parse_csv_config()
+	csv_config1200 := _t2040
+	var _t2041 []*pb.GNFColumn
+	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("columns", 1)) {
+		_t2042 := p.parse_gnf_columns()
+		_t2041 = _t2042
+	}
+	gnf_columns1201 := _t2041
+	var _t2043 *pb.TargetRelations
+	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("relations", 1)) {
+		_t2044 := p.parse_target_relations()
+		_t2043 = _t2044
+	}
+	target_relations1202 := _t2043
+	_t2045 := p.parse_csv_asof()
+	csv_asof1203 := _t2045
 	p.consumeLiteral(")")
-	_t1969 := &pb.CSVData{Locator: csvlocator1162, Config: csv_config1163, Columns: gnf_columns1164, Asof: csv_asof1165}
-	result1167 := _t1969
-	p.recordSpan(int(span_start1166), "CSVData")
-	return result1167
+	_t2046 := p.construct_csv_data(csvlocator1199, csv_config1200, gnf_columns1201, target_relations1202, csv_asof1203)
+	result1205 := _t2046
+	p.recordSpan(int(span_start1204), "CSVData")
+	return result1205
 }
 
 func (p *Parser) parse_csvlocator() *pb.CSVLocator {
-	span_start1170 := int64(p.spanStart())
+	span_start1208 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("csv_locator")
-	var _t1970 []string
+	var _t2047 []string
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("paths", 1)) {
-		_t1971 := p.parse_csv_locator_paths()
-		_t1970 = _t1971
+		_t2048 := p.parse_csv_locator_paths()
+		_t2047 = _t2048
 	}
-	csv_locator_paths1168 := _t1970
-	var _t1972 *string
+	csv_locator_paths1206 := _t2047
+	var _t2049 *string
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1973 := p.parse_csv_locator_inline_data()
-		_t1972 = ptr(_t1973)
+		_t2050 := p.parse_csv_locator_inline_data()
+		_t2049 = ptr(_t2050)
 	}
-	csv_locator_inline_data1169 := _t1972
+	csv_locator_inline_data1207 := _t2049
 	p.consumeLiteral(")")
-	_t1974 := csv_locator_paths1168
-	if csv_locator_paths1168 == nil {
-		_t1974 = []string{}
+	_t2051 := csv_locator_paths1206
+	if csv_locator_paths1206 == nil {
+		_t2051 = []string{}
 	}
-	_t1975 := &pb.CSVLocator{Paths: _t1974, InlineData: []byte(deref(csv_locator_inline_data1169, ""))}
-	result1171 := _t1975
-	p.recordSpan(int(span_start1170), "CSVLocator")
-	return result1171
+	_t2052 := &pb.CSVLocator{Paths: _t2051, InlineData: []byte(deref(csv_locator_inline_data1207, ""))}
+	result1209 := _t2052
+	p.recordSpan(int(span_start1208), "CSVLocator")
+	return result1209
 }
 
 func (p *Parser) parse_csv_locator_paths() []string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("paths")
-	xs1172 := []string{}
-	cond1173 := p.matchLookaheadTerminal("STRING", 0)
-	for cond1173 {
-		item1174 := p.consumeTerminal("STRING").Value.str
-		xs1172 = append(xs1172, item1174)
-		cond1173 = p.matchLookaheadTerminal("STRING", 0)
-	}
-	strings1175 := xs1172
+	xs1210 := []string{}
+	cond1211 := p.matchLookaheadTerminal("STRING", 0)
+	for cond1211 {
+		item1212 := p.consumeTerminal("STRING").Value.str
+		xs1210 = append(xs1210, item1212)
+		cond1211 = p.matchLookaheadTerminal("STRING", 0)
+	}
+	strings1213 := xs1210
 	p.consumeLiteral(")")
-	return strings1175
+	return strings1213
 }
 
 func (p *Parser) parse_csv_locator_inline_data() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("inline_data")
-	formatted_string1176 := p.consumeTerminal("STRING").Value.str
+	formatted_string1214 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return formatted_string1176
+	return formatted_string1214
 }
 
 func (p *Parser) parse_csv_config() *pb.CSVConfig {
-	span_start1179 := int64(p.spanStart())
+	span_start1217 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("csv_config")
-	_t1976 := p.parse_config_dict()
-	config_dict1177 := _t1976
-	var _t1977 [][]interface{}
+	_t2053 := p.parse_config_dict()
+	config_dict1215 := _t2053
+	var _t2054 [][]interface{}
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1978 := p.parse__storage_integration()
-		_t1977 = _t1978
+		_t2055 := p.parse__storage_integration()
+		_t2054 = _t2055
 	}
-	_storage_integration1178 := _t1977
+	_storage_integration1216 := _t2054
 	p.consumeLiteral(")")
-	_t1979 := p.construct_csv_config(config_dict1177, _storage_integration1178)
-	result1180 := _t1979
-	p.recordSpan(int(span_start1179), "CSVConfig")
-	return result1180
+	_t2056 := p.construct_csv_config(config_dict1215, _storage_integration1216)
+	result1218 := _t2056
+	p.recordSpan(int(span_start1217), "CSVConfig")
+	return result1218
 }
 
 func (p *Parser) parse__storage_integration() [][]interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("storage_integration")
-	_t1980 := p.parse_config_dict()
-	config_dict1181 := _t1980
+	_t2057 := p.parse_config_dict()
+	config_dict1219 := _t2057
 	p.consumeLiteral(")")
-	return config_dict1181
+	return config_dict1219
 }
 
 func (p *Parser) parse_gnf_columns() []*pb.GNFColumn {
 	p.consumeLiteral("(")
 	p.consumeLiteral("columns")
-	xs1182 := []*pb.GNFColumn{}
-	cond1183 := p.matchLookaheadLiteral("(", 0)
-	for cond1183 {
-		_t1981 := p.parse_gnf_column()
-		item1184 := _t1981
-		xs1182 = append(xs1182, item1184)
-		cond1183 = p.matchLookaheadLiteral("(", 0)
-	}
-	gnf_columns1185 := xs1182
+	xs1220 := []*pb.GNFColumn{}
+	cond1221 := p.matchLookaheadLiteral("(", 0)
+	for cond1221 {
+		_t2058 := p.parse_gnf_column()
+		item1222 := _t2058
+		xs1220 = append(xs1220, item1222)
+		cond1221 = p.matchLookaheadLiteral("(", 0)
+	}
+	gnf_columns1223 := xs1220
 	p.consumeLiteral(")")
-	return gnf_columns1185
+	return gnf_columns1223
 }
 
 func (p *Parser) parse_gnf_column() *pb.GNFColumn {
-	span_start1192 := int64(p.spanStart())
+	span_start1230 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("column")
-	_t1982 := p.parse_gnf_column_path()
-	gnf_column_path1186 := _t1982
-	var _t1983 *pb.RelationId
+	_t2059 := p.parse_gnf_column_path()
+	gnf_column_path1224 := _t2059
+	var _t2060 *pb.RelationId
 	if (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0)) {
-		_t1984 := p.parse_relation_id()
-		_t1983 = _t1984
+		_t2061 := p.parse_relation_id()
+		_t2060 = _t2061
 	}
-	relation_id1187 := _t1983
+	relation_id1225 := _t2060
 	p.consumeLiteral("[")
-	xs1188 := []*pb.Type{}
-	cond1189 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
-	for cond1189 {
-		_t1985 := p.parse_type()
-		item1190 := _t1985
-		xs1188 = append(xs1188, item1190)
-		cond1189 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
-	}
-	types1191 := xs1188
+	xs1226 := []*pb.Type{}
+	cond1227 := (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
+	for cond1227 {
+		_t2062 := p.parse_type()
+		item1228 := _t2062
+		xs1226 = append(xs1226, item1228)
+		cond1227 = (((((((((((((p.matchLookaheadLiteral("(", 0) || p.matchLookaheadLiteral("BOOLEAN", 0)) || p.matchLookaheadLiteral("DATE", 0)) || p.matchLookaheadLiteral("DATETIME", 0)) || p.matchLookaheadLiteral("FLOAT", 0)) || p.matchLookaheadLiteral("FLOAT32", 0)) || p.matchLookaheadLiteral("INT", 0)) || p.matchLookaheadLiteral("INT128", 0)) || p.matchLookaheadLiteral("INT32", 0)) || p.matchLookaheadLiteral("MISSING", 0)) || p.matchLookaheadLiteral("STRING", 0)) || p.matchLookaheadLiteral("UINT128", 0)) || p.matchLookaheadLiteral("UINT32", 0)) || p.matchLookaheadLiteral("UNKNOWN", 0))
+	}
+	types1229 := xs1226
 	p.consumeLiteral("]")
 	p.consumeLiteral(")")
-	_t1986 := &pb.GNFColumn{ColumnPath: gnf_column_path1186, TargetId: relation_id1187, Types: types1191}
-	result1193 := _t1986
-	p.recordSpan(int(span_start1192), "GNFColumn")
-	return result1193
+	_t2063 := &pb.GNFColumn{ColumnPath: gnf_column_path1224, TargetId: relation_id1225, Types: types1229}
+	result1231 := _t2063
+	p.recordSpan(int(span_start1230), "GNFColumn")
+	return result1231
 }
 
 func (p *Parser) parse_gnf_column_path() []string {
-	var _t1987 int64
+	var _t2064 int64
 	if p.matchLookaheadLiteral("[", 0) {
-		_t1987 = 1
+		_t2064 = 1
 	} else {
-		var _t1988 int64
+		var _t2065 int64
 		if p.matchLookaheadTerminal("STRING", 0) {
-			_t1988 = 0
+			_t2065 = 0
 		} else {
-			_t1988 = -1
+			_t2065 = -1
 		}
-		_t1987 = _t1988
+		_t2064 = _t2065
 	}
-	prediction1194 := _t1987
-	var _t1989 []string
-	if prediction1194 == 1 {
+	prediction1232 := _t2064
+	var _t2066 []string
+	if prediction1232 == 1 {
 		p.consumeLiteral("[")
-		xs1196 := []string{}
-		cond1197 := p.matchLookaheadTerminal("STRING", 0)
-		for cond1197 {
-			item1198 := p.consumeTerminal("STRING").Value.str
-			xs1196 = append(xs1196, item1198)
-			cond1197 = p.matchLookaheadTerminal("STRING", 0)
+		xs1234 := []string{}
+		cond1235 := p.matchLookaheadTerminal("STRING", 0)
+		for cond1235 {
+			item1236 := p.consumeTerminal("STRING").Value.str
+			xs1234 = append(xs1234, item1236)
+			cond1235 = p.matchLookaheadTerminal("STRING", 0)
 		}
-		strings1199 := xs1196
+		strings1237 := xs1234
 		p.consumeLiteral("]")
-		_t1989 = strings1199
+		_t2066 = strings1237
 	} else {
-		var _t1990 []string
-		if prediction1194 == 0 {
-			string1195 := p.consumeTerminal("STRING").Value.str
-			_ = string1195
-			_t1990 = []string{string1195}
+		var _t2067 []string
+		if prediction1232 == 0 {
+			string1233 := p.consumeTerminal("STRING").Value.str
+			_ = string1233
+			_t2067 = []string{string1233}
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in gnf_column_path", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1989 = _t1990
+		_t2066 = _t2067
 	}
-	return _t1989
+	return _t2066
+}
+
+func (p *Parser) parse_target_relations() *pb.TargetRelations {
+	span_start1240 := int64(p.spanStart())
+	p.consumeLiteral("(")
+	p.consumeLiteral("relations")
+	_t2068 := p.parse_relation_keys()
+	relation_keys1238 := _t2068
+	_t2069 := p.parse_relation_body()
+	relation_body1239 := _t2069
+	p.consumeLiteral(")")
+	_t2070 := p.construct_relations(relation_keys1238, relation_body1239)
+	result1241 := _t2070
+	p.recordSpan(int(span_start1240), "TargetRelations")
+	return result1241
+}
+
+func (p *Parser) parse_relation_keys() []*pb.NamedColumn {
+	p.consumeLiteral("(")
+	p.consumeLiteral("keys")
+	xs1242 := []*pb.NamedColumn{}
+	cond1243 := p.matchLookaheadLiteral("(", 0)
+	for cond1243 {
+		_t2071 := p.parse_named_column()
+		item1244 := _t2071
+		xs1242 = append(xs1242, item1244)
+		cond1243 = p.matchLookaheadLiteral("(", 0)
+	}
+	named_columns1245 := xs1242
+	p.consumeLiteral(")")
+	return named_columns1245
+}
+
+func (p *Parser) parse_named_column() *pb.NamedColumn {
+	span_start1248 := int64(p.spanStart())
+	p.consumeLiteral("(")
+	p.consumeLiteral("column")
+	string1246 := p.consumeTerminal("STRING").Value.str
+	_t2072 := p.parse_type()
+	type1247 := _t2072
+	p.consumeLiteral(")")
+	_t2073 := &pb.NamedColumn{Name: string1246, Type: type1247}
+	result1249 := _t2073
+	p.recordSpan(int(span_start1248), "NamedColumn")
+	return result1249
+}
+
+func (p *Parser) parse_relation_body() *pb.TargetRelations {
+	span_start1254 := int64(p.spanStart())
+	var _t2074 int64
+	if p.matchLookaheadLiteral("(", 0) {
+		var _t2075 int64
+		if p.matchLookaheadLiteral("relation", 1) {
+			_t2075 = 0
+		} else {
+			var _t2076 int64
+			if p.matchLookaheadLiteral("inserts", 1) {
+				_t2076 = 1
+			} else {
+				_t2076 = 0
+			}
+			_t2075 = _t2076
+		}
+		_t2074 = _t2075
+	} else {
+		_t2074 = 0
+	}
+	prediction1250 := _t2074
+	var _t2077 *pb.TargetRelations
+	if prediction1250 == 1 {
+		_t2078 := p.parse_cdc_inserts()
+		cdc_inserts1252 := _t2078
+		_t2079 := p.parse_cdc_deletes()
+		cdc_deletes1253 := _t2079
+		_t2080 := p.construct_cdc_relations(cdc_inserts1252, cdc_deletes1253)
+		_t2077 = _t2080
+	} else {
+		var _t2081 *pb.TargetRelations
+		if prediction1250 == 0 {
+			_t2082 := p.parse_non_cdc_relations()
+			non_cdc_relations1251 := _t2082
+			_t2083 := p.construct_non_cdc_relations(non_cdc_relations1251)
+			_t2081 = _t2083
+		} else {
+			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in relation_body", p.lookahead(0).Type, p.lookahead(0).Value)})
+		}
+		_t2077 = _t2081
+	}
+	result1255 := _t2077
+	p.recordSpan(int(span_start1254), "TargetRelations")
+	return result1255
+}
+
+func (p *Parser) parse_non_cdc_relations() []*pb.TargetRelation {
+	xs1256 := []*pb.TargetRelation{}
+	cond1257 := p.matchLookaheadLiteral("(", 0)
+	for cond1257 {
+		_t2084 := p.parse_target_relation()
+		item1258 := _t2084
+		xs1256 = append(xs1256, item1258)
+		cond1257 = p.matchLookaheadLiteral("(", 0)
+	}
+	return xs1256
+}
+
+func (p *Parser) parse_target_relation() *pb.TargetRelation {
+	span_start1264 := int64(p.spanStart())
+	p.consumeLiteral("(")
+	p.consumeLiteral("relation")
+	_t2085 := p.parse_relation_id()
+	relation_id1259 := _t2085
+	xs1260 := []*pb.NamedColumn{}
+	cond1261 := p.matchLookaheadLiteral("(", 0)
+	for cond1261 {
+		_t2086 := p.parse_named_column()
+		item1262 := _t2086
+		xs1260 = append(xs1260, item1262)
+		cond1261 = p.matchLookaheadLiteral("(", 0)
+	}
+	named_columns1263 := xs1260
+	p.consumeLiteral(")")
+	_t2087 := &pb.TargetRelation{TargetId: relation_id1259, Values: named_columns1263}
+	result1265 := _t2087
+	p.recordSpan(int(span_start1264), "TargetRelation")
+	return result1265
+}
+
+func (p *Parser) parse_cdc_inserts() []*pb.TargetRelation {
+	p.consumeLiteral("(")
+	p.consumeLiteral("inserts")
+	xs1266 := []*pb.TargetRelation{}
+	cond1267 := p.matchLookaheadLiteral("(", 0)
+	for cond1267 {
+		_t2088 := p.parse_target_relation()
+		item1268 := _t2088
+		xs1266 = append(xs1266, item1268)
+		cond1267 = p.matchLookaheadLiteral("(", 0)
+	}
+	target_relations1269 := xs1266
+	p.consumeLiteral(")")
+	return target_relations1269
+}
+
+func (p *Parser) parse_cdc_deletes() []*pb.TargetRelation {
+	p.consumeLiteral("(")
+	p.consumeLiteral("deletes")
+	xs1270 := []*pb.TargetRelation{}
+	cond1271 := p.matchLookaheadLiteral("(", 0)
+	for cond1271 {
+		_t2089 := p.parse_target_relation()
+		item1272 := _t2089
+		xs1270 = append(xs1270, item1272)
+		cond1271 = p.matchLookaheadLiteral("(", 0)
+	}
+	target_relations1273 := xs1270
+	p.consumeLiteral(")")
+	return target_relations1273
 }
 
 func (p *Parser) parse_csv_asof() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("asof")
-	string1200 := p.consumeTerminal("STRING").Value.str
+	string1274 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1200
+	return string1274
 }
 
 func (p *Parser) parse_iceberg_data() *pb.IcebergData {
-	span_start1207 := int64(p.spanStart())
+	span_start1281 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("iceberg_data")
-	_t1991 := p.parse_iceberg_locator()
-	iceberg_locator1201 := _t1991
-	_t1992 := p.parse_iceberg_catalog_config()
-	iceberg_catalog_config1202 := _t1992
-	_t1993 := p.parse_gnf_columns()
-	gnf_columns1203 := _t1993
-	var _t1994 *string
+	_t2090 := p.parse_iceberg_locator()
+	iceberg_locator1275 := _t2090
+	_t2091 := p.parse_iceberg_catalog_config()
+	iceberg_catalog_config1276 := _t2091
+	_t2092 := p.parse_gnf_columns()
+	gnf_columns1277 := _t2092
+	var _t2093 *string
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("from_snapshot", 1)) {
-		_t1995 := p.parse_iceberg_from_snapshot()
-		_t1994 = ptr(_t1995)
+		_t2094 := p.parse_iceberg_from_snapshot()
+		_t2093 = ptr(_t2094)
 	}
-	iceberg_from_snapshot1204 := _t1994
-	var _t1996 *string
+	iceberg_from_snapshot1278 := _t2093
+	var _t2095 *string
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1997 := p.parse_iceberg_to_snapshot()
-		_t1996 = ptr(_t1997)
+		_t2096 := p.parse_iceberg_to_snapshot()
+		_t2095 = ptr(_t2096)
 	}
-	iceberg_to_snapshot1205 := _t1996
-	_t1998 := p.parse_boolean_value()
-	boolean_value1206 := _t1998
+	iceberg_to_snapshot1279 := _t2095
+	_t2097 := p.parse_boolean_value()
+	boolean_value1280 := _t2097
 	p.consumeLiteral(")")
-	_t1999 := p.construct_iceberg_data(iceberg_locator1201, iceberg_catalog_config1202, gnf_columns1203, iceberg_from_snapshot1204, iceberg_to_snapshot1205, boolean_value1206)
-	result1208 := _t1999
-	p.recordSpan(int(span_start1207), "IcebergData")
-	return result1208
+	_t2098 := p.construct_iceberg_data(iceberg_locator1275, iceberg_catalog_config1276, gnf_columns1277, iceberg_from_snapshot1278, iceberg_to_snapshot1279, boolean_value1280)
+	result1282 := _t2098
+	p.recordSpan(int(span_start1281), "IcebergData")
+	return result1282
 }
 
 func (p *Parser) parse_iceberg_locator() *pb.IcebergLocator {
-	span_start1212 := int64(p.spanStart())
+	span_start1286 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("iceberg_locator")
-	_t2000 := p.parse_iceberg_locator_table_name()
-	iceberg_locator_table_name1209 := _t2000
-	_t2001 := p.parse_iceberg_locator_namespace()
-	iceberg_locator_namespace1210 := _t2001
-	_t2002 := p.parse_iceberg_locator_warehouse()
-	iceberg_locator_warehouse1211 := _t2002
+	_t2099 := p.parse_iceberg_locator_table_name()
+	iceberg_locator_table_name1283 := _t2099
+	_t2100 := p.parse_iceberg_locator_namespace()
+	iceberg_locator_namespace1284 := _t2100
+	_t2101 := p.parse_iceberg_locator_warehouse()
+	iceberg_locator_warehouse1285 := _t2101
 	p.consumeLiteral(")")
-	_t2003 := &pb.IcebergLocator{TableName: iceberg_locator_table_name1209, Namespace: iceberg_locator_namespace1210, Warehouse: iceberg_locator_warehouse1211}
-	result1213 := _t2003
-	p.recordSpan(int(span_start1212), "IcebergLocator")
-	return result1213
+	_t2102 := &pb.IcebergLocator{TableName: iceberg_locator_table_name1283, Namespace: iceberg_locator_namespace1284, Warehouse: iceberg_locator_warehouse1285}
+	result1287 := _t2102
+	p.recordSpan(int(span_start1286), "IcebergLocator")
+	return result1287
 }
 
 func (p *Parser) parse_iceberg_locator_table_name() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("table_name")
-	string1214 := p.consumeTerminal("STRING").Value.str
+	string1288 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1214
+	return string1288
 }
 
 func (p *Parser) parse_iceberg_locator_namespace() []string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("namespace")
-	xs1215 := []string{}
-	cond1216 := p.matchLookaheadTerminal("STRING", 0)
-	for cond1216 {
-		item1217 := p.consumeTerminal("STRING").Value.str
-		xs1215 = append(xs1215, item1217)
-		cond1216 = p.matchLookaheadTerminal("STRING", 0)
-	}
-	strings1218 := xs1215
+	xs1289 := []string{}
+	cond1290 := p.matchLookaheadTerminal("STRING", 0)
+	for cond1290 {
+		item1291 := p.consumeTerminal("STRING").Value.str
+		xs1289 = append(xs1289, item1291)
+		cond1290 = p.matchLookaheadTerminal("STRING", 0)
+	}
+	strings1292 := xs1289
 	p.consumeLiteral(")")
-	return strings1218
+	return strings1292
 }
 
 func (p *Parser) parse_iceberg_locator_warehouse() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("warehouse")
-	string1219 := p.consumeTerminal("STRING").Value.str
+	string1293 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1219
+	return string1293
 }
 
 func (p *Parser) parse_iceberg_catalog_config() *pb.IcebergCatalogConfig {
-	span_start1224 := int64(p.spanStart())
+	span_start1298 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("iceberg_catalog_config")
-	_t2004 := p.parse_iceberg_catalog_uri()
-	iceberg_catalog_uri1220 := _t2004
-	var _t2005 *string
+	_t2103 := p.parse_iceberg_catalog_uri()
+	iceberg_catalog_uri1294 := _t2103
+	var _t2104 *string
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("scope", 1)) {
-		_t2006 := p.parse_iceberg_catalog_config_scope()
-		_t2005 = ptr(_t2006)
-	}
-	iceberg_catalog_config_scope1221 := _t2005
-	_t2007 := p.parse_iceberg_properties()
-	iceberg_properties1222 := _t2007
-	_t2008 := p.parse_iceberg_auth_properties()
-	iceberg_auth_properties1223 := _t2008
+		_t2105 := p.parse_iceberg_catalog_config_scope()
+		_t2104 = ptr(_t2105)
+	}
+	iceberg_catalog_config_scope1295 := _t2104
+	_t2106 := p.parse_iceberg_properties()
+	iceberg_properties1296 := _t2106
+	_t2107 := p.parse_iceberg_auth_properties()
+	iceberg_auth_properties1297 := _t2107
 	p.consumeLiteral(")")
-	_t2009 := p.construct_iceberg_catalog_config(iceberg_catalog_uri1220, iceberg_catalog_config_scope1221, iceberg_properties1222, iceberg_auth_properties1223)
-	result1225 := _t2009
-	p.recordSpan(int(span_start1224), "IcebergCatalogConfig")
-	return result1225
+	_t2108 := p.construct_iceberg_catalog_config(iceberg_catalog_uri1294, iceberg_catalog_config_scope1295, iceberg_properties1296, iceberg_auth_properties1297)
+	result1299 := _t2108
+	p.recordSpan(int(span_start1298), "IcebergCatalogConfig")
+	return result1299
 }
 
 func (p *Parser) parse_iceberg_catalog_uri() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("catalog_uri")
-	string1226 := p.consumeTerminal("STRING").Value.str
+	string1300 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1226
+	return string1300
 }
 
 func (p *Parser) parse_iceberg_catalog_config_scope() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("scope")
-	string1227 := p.consumeTerminal("STRING").Value.str
+	string1301 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1227
+	return string1301
 }
 
 func (p *Parser) parse_iceberg_properties() [][]interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("properties")
-	xs1228 := [][]interface{}{}
-	cond1229 := p.matchLookaheadLiteral("(", 0)
-	for cond1229 {
-		_t2010 := p.parse_iceberg_property_entry()
-		item1230 := _t2010
-		xs1228 = append(xs1228, item1230)
-		cond1229 = p.matchLookaheadLiteral("(", 0)
-	}
-	iceberg_property_entrys1231 := xs1228
+	xs1302 := [][]interface{}{}
+	cond1303 := p.matchLookaheadLiteral("(", 0)
+	for cond1303 {
+		_t2109 := p.parse_iceberg_property_entry()
+		item1304 := _t2109
+		xs1302 = append(xs1302, item1304)
+		cond1303 = p.matchLookaheadLiteral("(", 0)
+	}
+	iceberg_property_entrys1305 := xs1302
 	p.consumeLiteral(")")
-	return iceberg_property_entrys1231
+	return iceberg_property_entrys1305
 }
 
 func (p *Parser) parse_iceberg_property_entry() []interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("prop")
-	string1232 := p.consumeTerminal("STRING").Value.str
-	string_31233 := p.consumeTerminal("STRING").Value.str
+	string1306 := p.consumeTerminal("STRING").Value.str
+	string_31307 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return []interface{}{string1232, string_31233}
+	return []interface{}{string1306, string_31307}
 }
 
 func (p *Parser) parse_iceberg_auth_properties() [][]interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("auth_properties")
-	xs1234 := [][]interface{}{}
-	cond1235 := p.matchLookaheadLiteral("(", 0)
-	for cond1235 {
-		_t2011 := p.parse_iceberg_masked_property_entry()
-		item1236 := _t2011
-		xs1234 = append(xs1234, item1236)
-		cond1235 = p.matchLookaheadLiteral("(", 0)
-	}
-	iceberg_masked_property_entrys1237 := xs1234
+	xs1308 := [][]interface{}{}
+	cond1309 := p.matchLookaheadLiteral("(", 0)
+	for cond1309 {
+		_t2110 := p.parse_iceberg_masked_property_entry()
+		item1310 := _t2110
+		xs1308 = append(xs1308, item1310)
+		cond1309 = p.matchLookaheadLiteral("(", 0)
+	}
+	iceberg_masked_property_entrys1311 := xs1308
 	p.consumeLiteral(")")
-	return iceberg_masked_property_entrys1237
+	return iceberg_masked_property_entrys1311
 }
 
 func (p *Parser) parse_iceberg_masked_property_entry() []interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("prop")
-	string1238 := p.consumeTerminal("STRING").Value.str
-	string_31239 := p.consumeTerminal("STRING").Value.str
+	string1312 := p.consumeTerminal("STRING").Value.str
+	string_31313 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return []interface{}{string1238, string_31239}
+	return []interface{}{string1312, string_31313}
 }
 
 func (p *Parser) parse_iceberg_from_snapshot() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("from_snapshot")
-	string1240 := p.consumeTerminal("STRING").Value.str
+	string1314 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1240
+	return string1314
 }
 
 func (p *Parser) parse_iceberg_to_snapshot() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("to_snapshot")
-	string1241 := p.consumeTerminal("STRING").Value.str
+	string1315 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1241
+	return string1315
 }
 
 func (p *Parser) parse_undefine() *pb.Undefine {
-	span_start1243 := int64(p.spanStart())
+	span_start1317 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("undefine")
-	_t2012 := p.parse_fragment_id()
-	fragment_id1242 := _t2012
+	_t2111 := p.parse_fragment_id()
+	fragment_id1316 := _t2111
 	p.consumeLiteral(")")
-	_t2013 := &pb.Undefine{FragmentId: fragment_id1242}
-	result1244 := _t2013
-	p.recordSpan(int(span_start1243), "Undefine")
-	return result1244
+	_t2112 := &pb.Undefine{FragmentId: fragment_id1316}
+	result1318 := _t2112
+	p.recordSpan(int(span_start1317), "Undefine")
+	return result1318
 }
 
 func (p *Parser) parse_context() *pb.Context {
-	span_start1249 := int64(p.spanStart())
+	span_start1323 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("context")
-	xs1245 := []*pb.RelationId{}
-	cond1246 := (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
-	for cond1246 {
-		_t2014 := p.parse_relation_id()
-		item1247 := _t2014
-		xs1245 = append(xs1245, item1247)
-		cond1246 = (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
-	}
-	relation_ids1248 := xs1245
+	xs1319 := []*pb.RelationId{}
+	cond1320 := (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
+	for cond1320 {
+		_t2113 := p.parse_relation_id()
+		item1321 := _t2113
+		xs1319 = append(xs1319, item1321)
+		cond1320 = (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
+	}
+	relation_ids1322 := xs1319
 	p.consumeLiteral(")")
-	_t2015 := &pb.Context{Relations: relation_ids1248}
-	result1250 := _t2015
-	p.recordSpan(int(span_start1249), "Context")
-	return result1250
+	_t2114 := &pb.Context{Relations: relation_ids1322}
+	result1324 := _t2114
+	p.recordSpan(int(span_start1323), "Context")
+	return result1324
 }
 
 func (p *Parser) parse_snapshot() *pb.Snapshot {
-	span_start1256 := int64(p.spanStart())
+	span_start1330 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("snapshot")
-	_t2016 := p.parse_edb_path()
-	edb_path1251 := _t2016
-	xs1252 := []*pb.SnapshotMapping{}
-	cond1253 := p.matchLookaheadLiteral("[", 0)
-	for cond1253 {
-		_t2017 := p.parse_snapshot_mapping()
-		item1254 := _t2017
-		xs1252 = append(xs1252, item1254)
-		cond1253 = p.matchLookaheadLiteral("[", 0)
-	}
-	snapshot_mappings1255 := xs1252
+	_t2115 := p.parse_edb_path()
+	edb_path1325 := _t2115
+	xs1326 := []*pb.SnapshotMapping{}
+	cond1327 := p.matchLookaheadLiteral("[", 0)
+	for cond1327 {
+		_t2116 := p.parse_snapshot_mapping()
+		item1328 := _t2116
+		xs1326 = append(xs1326, item1328)
+		cond1327 = p.matchLookaheadLiteral("[", 0)
+	}
+	snapshot_mappings1329 := xs1326
 	p.consumeLiteral(")")
-	_t2018 := &pb.Snapshot{Prefix: edb_path1251, Mappings: snapshot_mappings1255}
-	result1257 := _t2018
-	p.recordSpan(int(span_start1256), "Snapshot")
-	return result1257
+	_t2117 := &pb.Snapshot{Prefix: edb_path1325, Mappings: snapshot_mappings1329}
+	result1331 := _t2117
+	p.recordSpan(int(span_start1330), "Snapshot")
+	return result1331
 }
 
 func (p *Parser) parse_snapshot_mapping() *pb.SnapshotMapping {
-	span_start1260 := int64(p.spanStart())
-	_t2019 := p.parse_edb_path()
-	edb_path1258 := _t2019
-	_t2020 := p.parse_relation_id()
-	relation_id1259 := _t2020
-	_t2021 := &pb.SnapshotMapping{DestinationPath: edb_path1258, SourceRelation: relation_id1259}
-	result1261 := _t2021
-	p.recordSpan(int(span_start1260), "SnapshotMapping")
-	return result1261
+	span_start1334 := int64(p.spanStart())
+	_t2118 := p.parse_edb_path()
+	edb_path1332 := _t2118
+	_t2119 := p.parse_relation_id()
+	relation_id1333 := _t2119
+	_t2120 := &pb.SnapshotMapping{DestinationPath: edb_path1332, SourceRelation: relation_id1333}
+	result1335 := _t2120
+	p.recordSpan(int(span_start1334), "SnapshotMapping")
+	return result1335
 }
 
 func (p *Parser) parse_epoch_reads() []*pb.Read {
 	p.consumeLiteral("(")
 	p.consumeLiteral("reads")
-	xs1262 := []*pb.Read{}
-	cond1263 := p.matchLookaheadLiteral("(", 0)
-	for cond1263 {
-		_t2022 := p.parse_read()
-		item1264 := _t2022
-		xs1262 = append(xs1262, item1264)
-		cond1263 = p.matchLookaheadLiteral("(", 0)
-	}
-	reads1265 := xs1262
+	xs1336 := []*pb.Read{}
+	cond1337 := p.matchLookaheadLiteral("(", 0)
+	for cond1337 {
+		_t2121 := p.parse_read()
+		item1338 := _t2121
+		xs1336 = append(xs1336, item1338)
+		cond1337 = p.matchLookaheadLiteral("(", 0)
+	}
+	reads1339 := xs1336
 	p.consumeLiteral(")")
-	return reads1265
+	return reads1339
 }
 
 func (p *Parser) parse_read() *pb.Read {
-	span_start1272 := int64(p.spanStart())
-	var _t2023 int64
+	span_start1346 := int64(p.spanStart())
+	var _t2122 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t2024 int64
+		var _t2123 int64
 		if p.matchLookaheadLiteral("what_if", 1) {
-			_t2024 = 2
+			_t2123 = 2
 		} else {
-			var _t2025 int64
+			var _t2124 int64
 			if p.matchLookaheadLiteral("output", 1) {
-				_t2025 = 1
+				_t2124 = 1
 			} else {
-				var _t2026 int64
+				var _t2125 int64
 				if p.matchLookaheadLiteral("export_iceberg", 1) {
-					_t2026 = 4
+					_t2125 = 4
 				} else {
-					var _t2027 int64
+					var _t2126 int64
 					if p.matchLookaheadLiteral("export", 1) {
-						_t2027 = 4
+						_t2126 = 4
 					} else {
-						var _t2028 int64
+						var _t2127 int64
 						if p.matchLookaheadLiteral("demand", 1) {
-							_t2028 = 0
+							_t2127 = 0
 						} else {
-							var _t2029 int64
+							var _t2128 int64
 							if p.matchLookaheadLiteral("abort", 1) {
-								_t2029 = 3
+								_t2128 = 3
 							} else {
-								_t2029 = -1
+								_t2128 = -1
 							}
-							_t2028 = _t2029
+							_t2127 = _t2128
 						}
-						_t2027 = _t2028
+						_t2126 = _t2127
 					}
-					_t2026 = _t2027
+					_t2125 = _t2126
 				}
-				_t2025 = _t2026
+				_t2124 = _t2125
 			}
-			_t2024 = _t2025
+			_t2123 = _t2124
 		}
-		_t2023 = _t2024
+		_t2122 = _t2123
 	} else {
-		_t2023 = -1
-	}
-	prediction1266 := _t2023
-	var _t2030 *pb.Read
-	if prediction1266 == 4 {
-		_t2031 := p.parse_export()
-		export1271 := _t2031
-		_t2032 := &pb.Read{}
-		_t2032.ReadType = &pb.Read_Export{Export: export1271}
-		_t2030 = _t2032
+		_t2122 = -1
+	}
+	prediction1340 := _t2122
+	var _t2129 *pb.Read
+	if prediction1340 == 4 {
+		_t2130 := p.parse_export()
+		export1345 := _t2130
+		_t2131 := &pb.Read{}
+		_t2131.ReadType = &pb.Read_Export{Export: export1345}
+		_t2129 = _t2131
 	} else {
-		var _t2033 *pb.Read
-		if prediction1266 == 3 {
-			_t2034 := p.parse_abort()
-			abort1270 := _t2034
-			_t2035 := &pb.Read{}
-			_t2035.ReadType = &pb.Read_Abort{Abort: abort1270}
-			_t2033 = _t2035
+		var _t2132 *pb.Read
+		if prediction1340 == 3 {
+			_t2133 := p.parse_abort()
+			abort1344 := _t2133
+			_t2134 := &pb.Read{}
+			_t2134.ReadType = &pb.Read_Abort{Abort: abort1344}
+			_t2132 = _t2134
 		} else {
-			var _t2036 *pb.Read
-			if prediction1266 == 2 {
-				_t2037 := p.parse_what_if()
-				what_if1269 := _t2037
-				_t2038 := &pb.Read{}
-				_t2038.ReadType = &pb.Read_WhatIf{WhatIf: what_if1269}
-				_t2036 = _t2038
+			var _t2135 *pb.Read
+			if prediction1340 == 2 {
+				_t2136 := p.parse_what_if()
+				what_if1343 := _t2136
+				_t2137 := &pb.Read{}
+				_t2137.ReadType = &pb.Read_WhatIf{WhatIf: what_if1343}
+				_t2135 = _t2137
 			} else {
-				var _t2039 *pb.Read
-				if prediction1266 == 1 {
-					_t2040 := p.parse_output()
-					output1268 := _t2040
-					_t2041 := &pb.Read{}
-					_t2041.ReadType = &pb.Read_Output{Output: output1268}
-					_t2039 = _t2041
+				var _t2138 *pb.Read
+				if prediction1340 == 1 {
+					_t2139 := p.parse_output()
+					output1342 := _t2139
+					_t2140 := &pb.Read{}
+					_t2140.ReadType = &pb.Read_Output{Output: output1342}
+					_t2138 = _t2140
 				} else {
-					var _t2042 *pb.Read
-					if prediction1266 == 0 {
-						_t2043 := p.parse_demand()
-						demand1267 := _t2043
-						_t2044 := &pb.Read{}
-						_t2044.ReadType = &pb.Read_Demand{Demand: demand1267}
-						_t2042 = _t2044
+					var _t2141 *pb.Read
+					if prediction1340 == 0 {
+						_t2142 := p.parse_demand()
+						demand1341 := _t2142
+						_t2143 := &pb.Read{}
+						_t2143.ReadType = &pb.Read_Demand{Demand: demand1341}
+						_t2141 = _t2143
 					} else {
 						panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in read", p.lookahead(0).Type, p.lookahead(0).Value)})
 					}
-					_t2039 = _t2042
+					_t2138 = _t2141
 				}
-				_t2036 = _t2039
+				_t2135 = _t2138
 			}
-			_t2033 = _t2036
+			_t2132 = _t2135
 		}
-		_t2030 = _t2033
+		_t2129 = _t2132
 	}
-	result1273 := _t2030
-	p.recordSpan(int(span_start1272), "Read")
-	return result1273
+	result1347 := _t2129
+	p.recordSpan(int(span_start1346), "Read")
+	return result1347
 }
 
 func (p *Parser) parse_demand() *pb.Demand {
-	span_start1275 := int64(p.spanStart())
+	span_start1349 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("demand")
-	_t2045 := p.parse_relation_id()
-	relation_id1274 := _t2045
+	_t2144 := p.parse_relation_id()
+	relation_id1348 := _t2144
 	p.consumeLiteral(")")
-	_t2046 := &pb.Demand{RelationId: relation_id1274}
-	result1276 := _t2046
-	p.recordSpan(int(span_start1275), "Demand")
-	return result1276
+	_t2145 := &pb.Demand{RelationId: relation_id1348}
+	result1350 := _t2145
+	p.recordSpan(int(span_start1349), "Demand")
+	return result1350
 }
 
 func (p *Parser) parse_output() *pb.Output {
-	span_start1279 := int64(p.spanStart())
+	span_start1353 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("output")
-	_t2047 := p.parse_name()
-	name1277 := _t2047
-	_t2048 := p.parse_relation_id()
-	relation_id1278 := _t2048
+	_t2146 := p.parse_name()
+	name1351 := _t2146
+	_t2147 := p.parse_relation_id()
+	relation_id1352 := _t2147
 	p.consumeLiteral(")")
-	_t2049 := &pb.Output{Name: name1277, RelationId: relation_id1278}
-	result1280 := _t2049
-	p.recordSpan(int(span_start1279), "Output")
-	return result1280
+	_t2148 := &pb.Output{Name: name1351, RelationId: relation_id1352}
+	result1354 := _t2148
+	p.recordSpan(int(span_start1353), "Output")
+	return result1354
 }
 
 func (p *Parser) parse_what_if() *pb.WhatIf {
-	span_start1283 := int64(p.spanStart())
+	span_start1357 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("what_if")
-	_t2050 := p.parse_name()
-	name1281 := _t2050
-	_t2051 := p.parse_epoch()
-	epoch1282 := _t2051
+	_t2149 := p.parse_name()
+	name1355 := _t2149
+	_t2150 := p.parse_epoch()
+	epoch1356 := _t2150
 	p.consumeLiteral(")")
-	_t2052 := &pb.WhatIf{Branch: name1281, Epoch: epoch1282}
-	result1284 := _t2052
-	p.recordSpan(int(span_start1283), "WhatIf")
-	return result1284
+	_t2151 := &pb.WhatIf{Branch: name1355, Epoch: epoch1356}
+	result1358 := _t2151
+	p.recordSpan(int(span_start1357), "WhatIf")
+	return result1358
 }
 
 func (p *Parser) parse_abort() *pb.Abort {
-	span_start1287 := int64(p.spanStart())
+	span_start1361 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("abort")
-	var _t2053 *string
+	var _t2152 *string
 	if (p.matchLookaheadLiteral(":", 0) && p.matchLookaheadTerminal("SYMBOL", 1)) {
-		_t2054 := p.parse_name()
-		_t2053 = ptr(_t2054)
+		_t2153 := p.parse_name()
+		_t2152 = ptr(_t2153)
 	}
-	name1285 := _t2053
-	_t2055 := p.parse_relation_id()
-	relation_id1286 := _t2055
+	name1359 := _t2152
+	_t2154 := p.parse_relation_id()
+	relation_id1360 := _t2154
 	p.consumeLiteral(")")
-	_t2056 := &pb.Abort{Name: deref(name1285, "abort"), RelationId: relation_id1286}
-	result1288 := _t2056
-	p.recordSpan(int(span_start1287), "Abort")
-	return result1288
+	_t2155 := &pb.Abort{Name: deref(name1359, "abort"), RelationId: relation_id1360}
+	result1362 := _t2155
+	p.recordSpan(int(span_start1361), "Abort")
+	return result1362
 }
 
 func (p *Parser) parse_export() *pb.Export {
-	span_start1292 := int64(p.spanStart())
-	var _t2057 int64
+	span_start1366 := int64(p.spanStart())
+	var _t2156 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t2058 int64
+		var _t2157 int64
 		if p.matchLookaheadLiteral("export_iceberg", 1) {
-			_t2058 = 1
+			_t2157 = 1
 		} else {
-			var _t2059 int64
+			var _t2158 int64
 			if p.matchLookaheadLiteral("export", 1) {
-				_t2059 = 0
+				_t2158 = 0
 			} else {
-				_t2059 = -1
+				_t2158 = -1
 			}
-			_t2058 = _t2059
+			_t2157 = _t2158
 		}
-		_t2057 = _t2058
+		_t2156 = _t2157
 	} else {
-		_t2057 = -1
+		_t2156 = -1
 	}
-	prediction1289 := _t2057
-	var _t2060 *pb.Export
-	if prediction1289 == 1 {
+	prediction1363 := _t2156
+	var _t2159 *pb.Export
+	if prediction1363 == 1 {
 		p.consumeLiteral("(")
 		p.consumeLiteral("export_iceberg")
-		_t2061 := p.parse_export_iceberg_config()
-		export_iceberg_config1291 := _t2061
+		_t2160 := p.parse_export_iceberg_config()
+		export_iceberg_config1365 := _t2160
 		p.consumeLiteral(")")
-		_t2062 := &pb.Export{}
-		_t2062.ExportConfig = &pb.Export_IcebergConfig{IcebergConfig: export_iceberg_config1291}
-		_t2060 = _t2062
+		_t2161 := &pb.Export{}
+		_t2161.ExportConfig = &pb.Export_IcebergConfig{IcebergConfig: export_iceberg_config1365}
+		_t2159 = _t2161
 	} else {
-		var _t2063 *pb.Export
-		if prediction1289 == 0 {
+		var _t2162 *pb.Export
+		if prediction1363 == 0 {
 			p.consumeLiteral("(")
 			p.consumeLiteral("export")
-			_t2064 := p.parse_export_csv_config()
-			export_csv_config1290 := _t2064
+			_t2163 := p.parse_export_csv_config()
+			export_csv_config1364 := _t2163
 			p.consumeLiteral(")")
-			_t2065 := &pb.Export{}
-			_t2065.ExportConfig = &pb.Export_CsvConfig{CsvConfig: export_csv_config1290}
-			_t2063 = _t2065
+			_t2164 := &pb.Export{}
+			_t2164.ExportConfig = &pb.Export_CsvConfig{CsvConfig: export_csv_config1364}
+			_t2162 = _t2164
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in export", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t2060 = _t2063
+		_t2159 = _t2162
 	}
-	result1293 := _t2060
-	p.recordSpan(int(span_start1292), "Export")
-	return result1293
+	result1367 := _t2159
+	p.recordSpan(int(span_start1366), "Export")
+	return result1367
 }
 
 func (p *Parser) parse_export_csv_config() *pb.ExportCSVConfig {
-	span_start1301 := int64(p.spanStart())
-	var _t2066 int64
+	span_start1375 := int64(p.spanStart())
+	var _t2165 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t2067 int64
+		var _t2166 int64
 		if p.matchLookaheadLiteral("export_csv_config_v2", 1) {
-			_t2067 = 0
+			_t2166 = 0
 		} else {
-			var _t2068 int64
+			var _t2167 int64
 			if p.matchLookaheadLiteral("export_csv_config", 1) {
-				_t2068 = 1
+				_t2167 = 1
 			} else {
-				_t2068 = -1
+				_t2167 = -1
 			}
-			_t2067 = _t2068
+			_t2166 = _t2167
 		}
-		_t2066 = _t2067
+		_t2165 = _t2166
 	} else {
-		_t2066 = -1
+		_t2165 = -1
 	}
-	prediction1294 := _t2066
-	var _t2069 *pb.ExportCSVConfig
-	if prediction1294 == 1 {
+	prediction1368 := _t2165
+	var _t2168 *pb.ExportCSVConfig
+	if prediction1368 == 1 {
 		p.consumeLiteral("(")
 		p.consumeLiteral("export_csv_config")
-		_t2070 := p.parse_export_csv_path()
-		export_csv_path1298 := _t2070
-		_t2071 := p.parse_export_csv_columns_list()
-		export_csv_columns_list1299 := _t2071
-		_t2072 := p.parse_config_dict()
-		config_dict1300 := _t2072
+		_t2169 := p.parse_export_csv_path()
+		export_csv_path1372 := _t2169
+		_t2170 := p.parse_export_csv_columns_list()
+		export_csv_columns_list1373 := _t2170
+		_t2171 := p.parse_config_dict()
+		config_dict1374 := _t2171
 		p.consumeLiteral(")")
-		_t2073 := p.construct_export_csv_config(export_csv_path1298, export_csv_columns_list1299, config_dict1300)
-		_t2069 = _t2073
+		_t2172 := p.construct_export_csv_config(export_csv_path1372, export_csv_columns_list1373, config_dict1374)
+		_t2168 = _t2172
 	} else {
-		var _t2074 *pb.ExportCSVConfig
-		if prediction1294 == 0 {
+		var _t2173 *pb.ExportCSVConfig
+		if prediction1368 == 0 {
 			p.consumeLiteral("(")
 			p.consumeLiteral("export_csv_config_v2")
-			_t2075 := p.parse_export_csv_path()
-			export_csv_path1295 := _t2075
-			_t2076 := p.parse_export_csv_source()
-			export_csv_source1296 := _t2076
-			_t2077 := p.parse_csv_config()
-			csv_config1297 := _t2077
+			_t2174 := p.parse_export_csv_path()
+			export_csv_path1369 := _t2174
+			_t2175 := p.parse_export_csv_source()
+			export_csv_source1370 := _t2175
+			_t2176 := p.parse_csv_config()
+			csv_config1371 := _t2176
 			p.consumeLiteral(")")
-			_t2078 := p.construct_export_csv_config_with_source(export_csv_path1295, export_csv_source1296, csv_config1297)
-			_t2074 = _t2078
+			_t2177 := p.construct_export_csv_config_with_source(export_csv_path1369, export_csv_source1370, csv_config1371)
+			_t2173 = _t2177
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in export_csv_config", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t2069 = _t2074
+		_t2168 = _t2173
 	}
-	result1302 := _t2069
-	p.recordSpan(int(span_start1301), "ExportCSVConfig")
-	return result1302
+	result1376 := _t2168
+	p.recordSpan(int(span_start1375), "ExportCSVConfig")
+	return result1376
 }
 
 func (p *Parser) parse_export_csv_path() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("path")
-	string1303 := p.consumeTerminal("STRING").Value.str
+	string1377 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1303
+	return string1377
 }
 
 func (p *Parser) parse_export_csv_source() *pb.ExportCSVSource {
-	span_start1310 := int64(p.spanStart())
-	var _t2079 int64
+	span_start1384 := int64(p.spanStart())
+	var _t2178 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t2080 int64
+		var _t2179 int64
 		if p.matchLookaheadLiteral("table_def", 1) {
-			_t2080 = 1
+			_t2179 = 1
 		} else {
-			var _t2081 int64
+			var _t2180 int64
 			if p.matchLookaheadLiteral("gnf_columns", 1) {
-				_t2081 = 0
+				_t2180 = 0
 			} else {
-				_t2081 = -1
+				_t2180 = -1
 			}
-			_t2080 = _t2081
+			_t2179 = _t2180
 		}
-		_t2079 = _t2080
+		_t2178 = _t2179
 	} else {
-		_t2079 = -1
+		_t2178 = -1
 	}
-	prediction1304 := _t2079
-	var _t2082 *pb.ExportCSVSource
-	if prediction1304 == 1 {
+	prediction1378 := _t2178
+	var _t2181 *pb.ExportCSVSource
+	if prediction1378 == 1 {
 		p.consumeLiteral("(")
 		p.consumeLiteral("table_def")
-		_t2083 := p.parse_relation_id()
-		relation_id1309 := _t2083
+		_t2182 := p.parse_relation_id()
+		relation_id1383 := _t2182
 		p.consumeLiteral(")")
-		_t2084 := &pb.ExportCSVSource{}
-		_t2084.CsvSource = &pb.ExportCSVSource_TableDef{TableDef: relation_id1309}
-		_t2082 = _t2084
+		_t2183 := &pb.ExportCSVSource{}
+		_t2183.CsvSource = &pb.ExportCSVSource_TableDef{TableDef: relation_id1383}
+		_t2181 = _t2183
 	} else {
-		var _t2085 *pb.ExportCSVSource
-		if prediction1304 == 0 {
+		var _t2184 *pb.ExportCSVSource
+		if prediction1378 == 0 {
 			p.consumeLiteral("(")
 			p.consumeLiteral("gnf_columns")
-			xs1305 := []*pb.ExportCSVColumn{}
-			cond1306 := p.matchLookaheadLiteral("(", 0)
-			for cond1306 {
-				_t2086 := p.parse_export_csv_column()
-				item1307 := _t2086
-				xs1305 = append(xs1305, item1307)
-				cond1306 = p.matchLookaheadLiteral("(", 0)
+			xs1379 := []*pb.ExportCSVColumn{}
+			cond1380 := p.matchLookaheadLiteral("(", 0)
+			for cond1380 {
+				_t2185 := p.parse_export_csv_column()
+				item1381 := _t2185
+				xs1379 = append(xs1379, item1381)
+				cond1380 = p.matchLookaheadLiteral("(", 0)
 			}
-			export_csv_columns1308 := xs1305
+			export_csv_columns1382 := xs1379
 			p.consumeLiteral(")")
-			_t2087 := &pb.ExportCSVColumns{Columns: export_csv_columns1308}
-			_t2088 := &pb.ExportCSVSource{}
-			_t2088.CsvSource = &pb.ExportCSVSource_GnfColumns{GnfColumns: _t2087}
-			_t2085 = _t2088
+			_t2186 := &pb.ExportCSVColumns{Columns: export_csv_columns1382}
+			_t2187 := &pb.ExportCSVSource{}
+			_t2187.CsvSource = &pb.ExportCSVSource_GnfColumns{GnfColumns: _t2186}
+			_t2184 = _t2187
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in export_csv_source", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t2082 = _t2085
+		_t2181 = _t2184
 	}
-	result1311 := _t2082
-	p.recordSpan(int(span_start1310), "ExportCSVSource")
-	return result1311
+	result1385 := _t2181
+	p.recordSpan(int(span_start1384), "ExportCSVSource")
+	return result1385
 }
 
 func (p *Parser) parse_export_csv_column() *pb.ExportCSVColumn {
-	span_start1314 := int64(p.spanStart())
+	span_start1388 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("column")
-	string1312 := p.consumeTerminal("STRING").Value.str
-	_t2089 := p.parse_relation_id()
-	relation_id1313 := _t2089
+	string1386 := p.consumeTerminal("STRING").Value.str
+	_t2188 := p.parse_relation_id()
+	relation_id1387 := _t2188
 	p.consumeLiteral(")")
-	_t2090 := &pb.ExportCSVColumn{ColumnName: string1312, ColumnData: relation_id1313}
-	result1315 := _t2090
-	p.recordSpan(int(span_start1314), "ExportCSVColumn")
-	return result1315
+	_t2189 := &pb.ExportCSVColumn{ColumnName: string1386, ColumnData: relation_id1387}
+	result1389 := _t2189
+	p.recordSpan(int(span_start1388), "ExportCSVColumn")
+	return result1389
 }
 
 func (p *Parser) parse_export_csv_columns_list() []*pb.ExportCSVColumn {
 	p.consumeLiteral("(")
 	p.consumeLiteral("columns")
-	xs1316 := []*pb.ExportCSVColumn{}
-	cond1317 := p.matchLookaheadLiteral("(", 0)
-	for cond1317 {
-		_t2091 := p.parse_export_csv_column()
-		item1318 := _t2091
-		xs1316 = append(xs1316, item1318)
-		cond1317 = p.matchLookaheadLiteral("(", 0)
-	}
-	export_csv_columns1319 := xs1316
+	xs1390 := []*pb.ExportCSVColumn{}
+	cond1391 := p.matchLookaheadLiteral("(", 0)
+	for cond1391 {
+		_t2190 := p.parse_export_csv_column()
+		item1392 := _t2190
+		xs1390 = append(xs1390, item1392)
+		cond1391 = p.matchLookaheadLiteral("(", 0)
+	}
+	export_csv_columns1393 := xs1390
 	p.consumeLiteral(")")
-	return export_csv_columns1319
+	return export_csv_columns1393
 }
 
 func (p *Parser) parse_export_iceberg_config() *pb.ExportIcebergConfig {
-	span_start1325 := int64(p.spanStart())
+	span_start1399 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("export_iceberg_config")
-	_t2092 := p.parse_iceberg_locator()
-	iceberg_locator1320 := _t2092
-	_t2093 := p.parse_iceberg_catalog_config()
-	iceberg_catalog_config1321 := _t2093
-	_t2094 := p.parse_export_iceberg_table_def()
-	export_iceberg_table_def1322 := _t2094
-	_t2095 := p.parse_iceberg_table_properties()
-	iceberg_table_properties1323 := _t2095
-	var _t2096 [][]interface{}
+	_t2191 := p.parse_iceberg_locator()
+	iceberg_locator1394 := _t2191
+	_t2192 := p.parse_iceberg_catalog_config()
+	iceberg_catalog_config1395 := _t2192
+	_t2193 := p.parse_export_iceberg_table_def()
+	export_iceberg_table_def1396 := _t2193
+	_t2194 := p.parse_iceberg_table_properties()
+	iceberg_table_properties1397 := _t2194
+	var _t2195 [][]interface{}
 	if p.matchLookaheadLiteral("{", 0) {
-		_t2097 := p.parse_config_dict()
-		_t2096 = _t2097
+		_t2196 := p.parse_config_dict()
+		_t2195 = _t2196
 	}
-	config_dict1324 := _t2096
+	config_dict1398 := _t2195
 	p.consumeLiteral(")")
-	_t2098 := p.construct_export_iceberg_config_full(iceberg_locator1320, iceberg_catalog_config1321, export_iceberg_table_def1322, iceberg_table_properties1323, config_dict1324)
-	result1326 := _t2098
-	p.recordSpan(int(span_start1325), "ExportIcebergConfig")
-	return result1326
+	_t2197 := p.construct_export_iceberg_config_full(iceberg_locator1394, iceberg_catalog_config1395, export_iceberg_table_def1396, iceberg_table_properties1397, config_dict1398)
+	result1400 := _t2197
+	p.recordSpan(int(span_start1399), "ExportIcebergConfig")
+	return result1400
 }
 
 func (p *Parser) parse_export_iceberg_table_def() *pb.RelationId {
-	span_start1328 := int64(p.spanStart())
+	span_start1402 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("table_def")
-	_t2099 := p.parse_relation_id()
-	relation_id1327 := _t2099
+	_t2198 := p.parse_relation_id()
+	relation_id1401 := _t2198
 	p.consumeLiteral(")")
-	result1329 := relation_id1327
-	p.recordSpan(int(span_start1328), "RelationId")
-	return result1329
+	result1403 := relation_id1401
+	p.recordSpan(int(span_start1402), "RelationId")
+	return result1403
 }
 
 func (p *Parser) parse_iceberg_table_properties() [][]interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("table_properties")
-	xs1330 := [][]interface{}{}
-	cond1331 := p.matchLookaheadLiteral("(", 0)
-	for cond1331 {
-		_t2100 := p.parse_iceberg_property_entry()
-		item1332 := _t2100
-		xs1330 = append(xs1330, item1332)
-		cond1331 = p.matchLookaheadLiteral("(", 0)
-	}
-	iceberg_property_entrys1333 := xs1330
+	xs1404 := [][]interface{}{}
+	cond1405 := p.matchLookaheadLiteral("(", 0)
+	for cond1405 {
+		_t2199 := p.parse_iceberg_property_entry()
+		item1406 := _t2199
+		xs1404 = append(xs1404, item1406)
+		cond1405 = p.matchLookaheadLiteral("(", 0)
+	}
+	iceberg_property_entrys1407 := xs1404
 	p.consumeLiteral(")")
-	return iceberg_property_entrys1333
+	return iceberg_property_entrys1407
 }
 
 
diff --git a/sdks/go/src/pretty.go b/sdks/go/src/pretty.go
index 9d97d637..e2e3ca7b 100644
--- a/sdks/go/src/pretty.go
+++ b/sdks/go/src/pretty.go
@@ -342,189 +342,207 @@ func formatBool(b bool) string {
 
 // --- Helper functions ---
 
+func (p *PrettyPrinter) deconstruct_csv_data_columns_optional(msg *pb.CSVData) []*pb.GNFColumn {
+	var _t1832 interface{}
+	if hasProtoField(msg, "relations") {
+		return nil
+	}
+	_ = _t1832
+	return msg.GetColumns()
+}
+
+func (p *PrettyPrinter) deconstruct_csv_data_relations_optional(msg *pb.CSVData) *pb.TargetRelations {
+	var _t1833 interface{}
+	if hasProtoField(msg, "relations") {
+		return msg.GetRelations()
+	}
+	_ = _t1833
+	return nil
+}
+
 func (p *PrettyPrinter) _make_value_int32(v int32) *pb.Value {
-	_t1742 := &pb.Value{}
-	_t1742.Value = &pb.Value_Int32Value{Int32Value: v}
-	return _t1742
+	_t1834 := &pb.Value{}
+	_t1834.Value = &pb.Value_Int32Value{Int32Value: v}
+	return _t1834
 }
 
 func (p *PrettyPrinter) _make_value_int64(v int64) *pb.Value {
-	_t1743 := &pb.Value{}
-	_t1743.Value = &pb.Value_IntValue{IntValue: v}
-	return _t1743
+	_t1835 := &pb.Value{}
+	_t1835.Value = &pb.Value_IntValue{IntValue: v}
+	return _t1835
 }
 
 func (p *PrettyPrinter) _make_value_float64(v float64) *pb.Value {
-	_t1744 := &pb.Value{}
-	_t1744.Value = &pb.Value_FloatValue{FloatValue: v}
-	return _t1744
+	_t1836 := &pb.Value{}
+	_t1836.Value = &pb.Value_FloatValue{FloatValue: v}
+	return _t1836
 }
 
 func (p *PrettyPrinter) _make_value_string(v string) *pb.Value {
-	_t1745 := &pb.Value{}
-	_t1745.Value = &pb.Value_StringValue{StringValue: v}
-	return _t1745
+	_t1837 := &pb.Value{}
+	_t1837.Value = &pb.Value_StringValue{StringValue: v}
+	return _t1837
 }
 
 func (p *PrettyPrinter) _make_value_boolean(v bool) *pb.Value {
-	_t1746 := &pb.Value{}
-	_t1746.Value = &pb.Value_BooleanValue{BooleanValue: v}
-	return _t1746
+	_t1838 := &pb.Value{}
+	_t1838.Value = &pb.Value_BooleanValue{BooleanValue: v}
+	return _t1838
 }
 
 func (p *PrettyPrinter) _make_value_uint128(v *pb.UInt128Value) *pb.Value {
-	_t1747 := &pb.Value{}
-	_t1747.Value = &pb.Value_Uint128Value{Uint128Value: v}
-	return _t1747
+	_t1839 := &pb.Value{}
+	_t1839.Value = &pb.Value_Uint128Value{Uint128Value: v}
+	return _t1839
 }
 
 func (p *PrettyPrinter) deconstruct_configure(msg *pb.Configure) [][]interface{} {
 	result := [][]interface{}{}
 	if msg.GetIvmConfig().GetLevel() == pb.MaintenanceLevel_MAINTENANCE_LEVEL_AUTO {
-		_t1748 := p._make_value_string("auto")
-		result = append(result, []interface{}{"ivm.maintenance_level", _t1748})
+		_t1840 := p._make_value_string("auto")
+		result = append(result, []interface{}{"ivm.maintenance_level", _t1840})
 	} else {
 		if msg.GetIvmConfig().GetLevel() == pb.MaintenanceLevel_MAINTENANCE_LEVEL_ALL {
-			_t1749 := p._make_value_string("all")
-			result = append(result, []interface{}{"ivm.maintenance_level", _t1749})
+			_t1841 := p._make_value_string("all")
+			result = append(result, []interface{}{"ivm.maintenance_level", _t1841})
 		} else {
 			if msg.GetIvmConfig().GetLevel() == pb.MaintenanceLevel_MAINTENANCE_LEVEL_OFF {
-				_t1750 := p._make_value_string("off")
-				result = append(result, []interface{}{"ivm.maintenance_level", _t1750})
+				_t1842 := p._make_value_string("off")
+				result = append(result, []interface{}{"ivm.maintenance_level", _t1842})
 			}
 		}
 	}
-	_t1751 := p._make_value_int64(msg.GetSemanticsVersion())
-	result = append(result, []interface{}{"semantics_version", _t1751})
+	_t1843 := p._make_value_int64(msg.GetSemanticsVersion())
+	result = append(result, []interface{}{"semantics_version", _t1843})
 	return listSort(result)
 }
 
 func (p *PrettyPrinter) deconstruct_csv_config(msg *pb.CSVConfig) [][]interface{} {
 	result := [][]interface{}{}
-	_t1752 := p._make_value_int32(msg.GetHeaderRow())
-	result = append(result, []interface{}{"csv_header_row", _t1752})
-	_t1753 := p._make_value_int64(msg.GetSkip())
-	result = append(result, []interface{}{"csv_skip", _t1753})
+	_t1844 := p._make_value_int32(msg.GetHeaderRow())
+	result = append(result, []interface{}{"csv_header_row", _t1844})
+	_t1845 := p._make_value_int64(msg.GetSkip())
+	result = append(result, []interface{}{"csv_skip", _t1845})
 	if msg.GetNewLine() != "" {
-		_t1754 := p._make_value_string(msg.GetNewLine())
-		result = append(result, []interface{}{"csv_new_line", _t1754})
-	}
-	_t1755 := p._make_value_string(msg.GetDelimiter())
-	result = append(result, []interface{}{"csv_delimiter", _t1755})
-	_t1756 := p._make_value_string(msg.GetQuotechar())
-	result = append(result, []interface{}{"csv_quotechar", _t1756})
-	_t1757 := p._make_value_string(msg.GetEscapechar())
-	result = append(result, []interface{}{"csv_escapechar", _t1757})
+		_t1846 := p._make_value_string(msg.GetNewLine())
+		result = append(result, []interface{}{"csv_new_line", _t1846})
+	}
+	_t1847 := p._make_value_string(msg.GetDelimiter())
+	result = append(result, []interface{}{"csv_delimiter", _t1847})
+	_t1848 := p._make_value_string(msg.GetQuotechar())
+	result = append(result, []interface{}{"csv_quotechar", _t1848})
+	_t1849 := p._make_value_string(msg.GetEscapechar())
+	result = append(result, []interface{}{"csv_escapechar", _t1849})
 	if msg.GetComment() != "" {
-		_t1758 := p._make_value_string(msg.GetComment())
-		result = append(result, []interface{}{"csv_comment", _t1758})
+		_t1850 := p._make_value_string(msg.GetComment())
+		result = append(result, []interface{}{"csv_comment", _t1850})
 	}
 	for _, missing_string := range msg.GetMissingStrings() {
-		_t1759 := p._make_value_string(missing_string)
-		result = append(result, []interface{}{"csv_missing_strings", _t1759})
-	}
-	_t1760 := p._make_value_string(msg.GetDecimalSeparator())
-	result = append(result, []interface{}{"csv_decimal_separator", _t1760})
-	_t1761 := p._make_value_string(msg.GetEncoding())
-	result = append(result, []interface{}{"csv_encoding", _t1761})
-	_t1762 := p._make_value_string(msg.GetCompression())
-	result = append(result, []interface{}{"csv_compression", _t1762})
+		_t1851 := p._make_value_string(missing_string)
+		result = append(result, []interface{}{"csv_missing_strings", _t1851})
+	}
+	_t1852 := p._make_value_string(msg.GetDecimalSeparator())
+	result = append(result, []interface{}{"csv_decimal_separator", _t1852})
+	_t1853 := p._make_value_string(msg.GetEncoding())
+	result = append(result, []interface{}{"csv_encoding", _t1853})
+	_t1854 := p._make_value_string(msg.GetCompression())
+	result = append(result, []interface{}{"csv_compression", _t1854})
 	if msg.GetPartitionSizeMb() != 0 {
-		_t1763 := p._make_value_int64(msg.GetPartitionSizeMb())
-		result = append(result, []interface{}{"csv_partition_size_mb", _t1763})
+		_t1855 := p._make_value_int64(msg.GetPartitionSizeMb())
+		result = append(result, []interface{}{"csv_partition_size_mb", _t1855})
 	}
 	return listSort(result)
 }
 
 func (p *PrettyPrinter) deconstruct_csv_storage_integration_optional(msg *pb.CSVConfig) [][]interface{} {
-	var _t1764 interface{}
+	var _t1856 interface{}
 	if !(hasProtoField(msg, "storage_integration")) {
 		return nil
 	}
-	_ = _t1764
+	_ = _t1856
 	si := msg.GetStorageIntegration()
 	result := [][]interface{}{}
 	if si.GetProvider() != "" {
-		_t1765 := p._make_value_string(si.GetProvider())
-		result = append(result, []interface{}{"provider", _t1765})
+		_t1857 := p._make_value_string(si.GetProvider())
+		result = append(result, []interface{}{"provider", _t1857})
 	}
 	if si.GetAzureSasToken() != "" {
-		_t1766 := p._make_value_string("***")
-		result = append(result, []interface{}{"azure_sas_token", _t1766})
+		_t1858 := p._make_value_string("***")
+		result = append(result, []interface{}{"azure_sas_token", _t1858})
 	}
 	if si.GetS3Region() != "" {
-		_t1767 := p._make_value_string(si.GetS3Region())
-		result = append(result, []interface{}{"s3_region", _t1767})
+		_t1859 := p._make_value_string(si.GetS3Region())
+		result = append(result, []interface{}{"s3_region", _t1859})
 	}
 	if si.GetS3AccessKeyId() != "" {
-		_t1768 := p._make_value_string("***")
-		result = append(result, []interface{}{"s3_access_key_id", _t1768})
+		_t1860 := p._make_value_string("***")
+		result = append(result, []interface{}{"s3_access_key_id", _t1860})
 	}
 	if si.GetS3SecretAccessKey() != "" {
-		_t1769 := p._make_value_string("***")
-		result = append(result, []interface{}{"s3_secret_access_key", _t1769})
+		_t1861 := p._make_value_string("***")
+		result = append(result, []interface{}{"s3_secret_access_key", _t1861})
 	}
 	return listSort(result)
 }
 
 func (p *PrettyPrinter) deconstruct_betree_info_config(msg *pb.BeTreeInfo) [][]interface{} {
 	result := [][]interface{}{}
-	_t1770 := p._make_value_float64(msg.GetStorageConfig().GetEpsilon())
-	result = append(result, []interface{}{"betree_config_epsilon", _t1770})
-	_t1771 := p._make_value_int64(msg.GetStorageConfig().GetMaxPivots())
-	result = append(result, []interface{}{"betree_config_max_pivots", _t1771})
-	_t1772 := p._make_value_int64(msg.GetStorageConfig().GetMaxDeltas())
-	result = append(result, []interface{}{"betree_config_max_deltas", _t1772})
-	_t1773 := p._make_value_int64(msg.GetStorageConfig().GetMaxLeaf())
-	result = append(result, []interface{}{"betree_config_max_leaf", _t1773})
+	_t1862 := p._make_value_float64(msg.GetStorageConfig().GetEpsilon())
+	result = append(result, []interface{}{"betree_config_epsilon", _t1862})
+	_t1863 := p._make_value_int64(msg.GetStorageConfig().GetMaxPivots())
+	result = append(result, []interface{}{"betree_config_max_pivots", _t1863})
+	_t1864 := p._make_value_int64(msg.GetStorageConfig().GetMaxDeltas())
+	result = append(result, []interface{}{"betree_config_max_deltas", _t1864})
+	_t1865 := p._make_value_int64(msg.GetStorageConfig().GetMaxLeaf())
+	result = append(result, []interface{}{"betree_config_max_leaf", _t1865})
 	if hasProtoField(msg.GetRelationLocator(), "root_pageid") {
 		if msg.GetRelationLocator().GetRootPageid() != nil {
-			_t1774 := p._make_value_uint128(msg.GetRelationLocator().GetRootPageid())
-			result = append(result, []interface{}{"betree_locator_root_pageid", _t1774})
+			_t1866 := p._make_value_uint128(msg.GetRelationLocator().GetRootPageid())
+			result = append(result, []interface{}{"betree_locator_root_pageid", _t1866})
 		}
 	}
 	if hasProtoField(msg.GetRelationLocator(), "inline_data") {
 		if msg.GetRelationLocator().GetInlineData() != nil {
-			_t1775 := p._make_value_string(string(msg.GetRelationLocator().GetInlineData()))
-			result = append(result, []interface{}{"betree_locator_inline_data", _t1775})
+			_t1867 := p._make_value_string(string(msg.GetRelationLocator().GetInlineData()))
+			result = append(result, []interface{}{"betree_locator_inline_data", _t1867})
 		}
 	}
-	_t1776 := p._make_value_int64(msg.GetRelationLocator().GetElementCount())
-	result = append(result, []interface{}{"betree_locator_element_count", _t1776})
-	_t1777 := p._make_value_int64(msg.GetRelationLocator().GetTreeHeight())
-	result = append(result, []interface{}{"betree_locator_tree_height", _t1777})
+	_t1868 := p._make_value_int64(msg.GetRelationLocator().GetElementCount())
+	result = append(result, []interface{}{"betree_locator_element_count", _t1868})
+	_t1869 := p._make_value_int64(msg.GetRelationLocator().GetTreeHeight())
+	result = append(result, []interface{}{"betree_locator_tree_height", _t1869})
 	return listSort(result)
 }
 
 func (p *PrettyPrinter) deconstruct_export_csv_config(msg *pb.ExportCSVConfig) [][]interface{} {
 	result := [][]interface{}{}
 	if msg.PartitionSize != nil {
-		_t1778 := p._make_value_int64(*msg.PartitionSize)
-		result = append(result, []interface{}{"partition_size", _t1778})
+		_t1870 := p._make_value_int64(*msg.PartitionSize)
+		result = append(result, []interface{}{"partition_size", _t1870})
 	}
 	if msg.Compression != nil {
-		_t1779 := p._make_value_string(*msg.Compression)
-		result = append(result, []interface{}{"compression", _t1779})
+		_t1871 := p._make_value_string(*msg.Compression)
+		result = append(result, []interface{}{"compression", _t1871})
 	}
 	if msg.SyntaxHeaderRow != nil {
-		_t1780 := p._make_value_boolean(*msg.SyntaxHeaderRow)
-		result = append(result, []interface{}{"syntax_header_row", _t1780})
+		_t1872 := p._make_value_boolean(*msg.SyntaxHeaderRow)
+		result = append(result, []interface{}{"syntax_header_row", _t1872})
 	}
 	if msg.SyntaxMissingString != nil {
-		_t1781 := p._make_value_string(*msg.SyntaxMissingString)
-		result = append(result, []interface{}{"syntax_missing_string", _t1781})
+		_t1873 := p._make_value_string(*msg.SyntaxMissingString)
+		result = append(result, []interface{}{"syntax_missing_string", _t1873})
 	}
 	if msg.SyntaxDelim != nil {
-		_t1782 := p._make_value_string(*msg.SyntaxDelim)
-		result = append(result, []interface{}{"syntax_delim", _t1782})
+		_t1874 := p._make_value_string(*msg.SyntaxDelim)
+		result = append(result, []interface{}{"syntax_delim", _t1874})
 	}
 	if msg.SyntaxQuotechar != nil {
-		_t1783 := p._make_value_string(*msg.SyntaxQuotechar)
-		result = append(result, []interface{}{"syntax_quotechar", _t1783})
+		_t1875 := p._make_value_string(*msg.SyntaxQuotechar)
+		result = append(result, []interface{}{"syntax_quotechar", _t1875})
 	}
 	if msg.SyntaxEscapechar != nil {
-		_t1784 := p._make_value_string(*msg.SyntaxEscapechar)
-		result = append(result, []interface{}{"syntax_escapechar", _t1784})
+		_t1876 := p._make_value_string(*msg.SyntaxEscapechar)
+		result = append(result, []interface{}{"syntax_escapechar", _t1876})
 	}
 	return listSort(result)
 }
@@ -534,51 +552,51 @@ func (p *PrettyPrinter) mask_secret_value(pair []interface{}) string {
 }
 
 func (p *PrettyPrinter) deconstruct_iceberg_catalog_config_scope_optional(msg *pb.IcebergCatalogConfig) *string {
-	var _t1785 interface{}
+	var _t1877 interface{}
 	if *msg.Scope != "" {
 		return ptr(*msg.Scope)
 	}
-	_ = _t1785
+	_ = _t1877
 	return nil
 }
 
 func (p *PrettyPrinter) deconstruct_iceberg_data_from_snapshot_optional(msg *pb.IcebergData) *string {
-	var _t1786 interface{}
+	var _t1878 interface{}
 	if *msg.FromSnapshot != "" {
 		return ptr(*msg.FromSnapshot)
 	}
-	_ = _t1786
+	_ = _t1878
 	return nil
 }
 
 func (p *PrettyPrinter) deconstruct_iceberg_data_to_snapshot_optional(msg *pb.IcebergData) *string {
-	var _t1787 interface{}
+	var _t1879 interface{}
 	if *msg.ToSnapshot != "" {
 		return ptr(*msg.ToSnapshot)
 	}
-	_ = _t1787
+	_ = _t1879
 	return nil
 }
 
 func (p *PrettyPrinter) deconstruct_export_iceberg_config_optional(msg *pb.ExportIcebergConfig) [][]interface{} {
 	result := [][]interface{}{}
 	if *msg.Prefix != "" {
-		_t1788 := p._make_value_string(*msg.Prefix)
-		result = append(result, []interface{}{"prefix", _t1788})
+		_t1880 := p._make_value_string(*msg.Prefix)
+		result = append(result, []interface{}{"prefix", _t1880})
 	}
 	if *msg.TargetFileSizeBytes != 0 {
-		_t1789 := p._make_value_int64(*msg.TargetFileSizeBytes)
-		result = append(result, []interface{}{"target_file_size_bytes", _t1789})
+		_t1881 := p._make_value_int64(*msg.TargetFileSizeBytes)
+		result = append(result, []interface{}{"target_file_size_bytes", _t1881})
 	}
 	if msg.GetCompression() != "" {
-		_t1790 := p._make_value_string(msg.GetCompression())
-		result = append(result, []interface{}{"compression", _t1790})
+		_t1882 := p._make_value_string(msg.GetCompression())
+		result = append(result, []interface{}{"compression", _t1882})
 	}
-	var _t1791 interface{}
+	var _t1883 interface{}
 	if int64(len(result)) == 0 {
 		return nil
 	}
-	_ = _t1791
+	_ = _t1883
 	return listSort(result)
 }
 
@@ -589,11 +607,11 @@ func (p *PrettyPrinter) deconstruct_relation_id_string(msg *pb.RelationId) strin
 
 func (p *PrettyPrinter) deconstruct_relation_id_uint128(msg *pb.RelationId) *pb.UInt128Value {
 	name := p.relationIdToString(msg)
-	var _t1792 interface{}
+	var _t1884 interface{}
 	if name == nil {
 		return p.relationIdToUint128(msg)
 	}
-	_ = _t1792
+	_ = _t1884
 	return nil
 }
 
@@ -611,45 +629,45 @@ func (p *PrettyPrinter) deconstruct_bindings_with_arity(abs *pb.Abstraction, val
 // --- Pretty-print methods ---
 
 func (p *PrettyPrinter) pretty_transaction(msg *pb.Transaction) interface{} {
-	flat808 := p.tryFlat(msg, func() { p.pretty_transaction(msg) })
-	if flat808 != nil {
-		p.write(*flat808)
+	flat851 := p.tryFlat(msg, func() { p.pretty_transaction(msg) })
+	if flat851 != nil {
+		p.write(*flat851)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1598 *pb.Configure
+		var _t1684 *pb.Configure
 		if hasProtoField(_dollar_dollar, "configure") {
-			_t1598 = _dollar_dollar.GetConfigure()
+			_t1684 = _dollar_dollar.GetConfigure()
 		}
-		var _t1599 *pb.Sync
+		var _t1685 *pb.Sync
 		if hasProtoField(_dollar_dollar, "sync") {
-			_t1599 = _dollar_dollar.GetSync()
+			_t1685 = _dollar_dollar.GetSync()
 		}
-		fields799 := []interface{}{_t1598, _t1599, _dollar_dollar.GetEpochs()}
-		unwrapped_fields800 := fields799
+		fields842 := []interface{}{_t1684, _t1685, _dollar_dollar.GetEpochs()}
+		unwrapped_fields843 := fields842
 		p.write("(")
 		p.write("transaction")
 		p.indentSexp()
-		field801 := unwrapped_fields800[0].(*pb.Configure)
-		if field801 != nil {
+		field844 := unwrapped_fields843[0].(*pb.Configure)
+		if field844 != nil {
 			p.newline()
-			opt_val802 := field801
-			p.pretty_configure(opt_val802)
+			opt_val845 := field844
+			p.pretty_configure(opt_val845)
 		}
-		field803 := unwrapped_fields800[1].(*pb.Sync)
-		if field803 != nil {
+		field846 := unwrapped_fields843[1].(*pb.Sync)
+		if field846 != nil {
 			p.newline()
-			opt_val804 := field803
-			p.pretty_sync(opt_val804)
+			opt_val847 := field846
+			p.pretty_sync(opt_val847)
 		}
-		field805 := unwrapped_fields800[2].([]*pb.Epoch)
-		if !(len(field805) == 0) {
+		field848 := unwrapped_fields843[2].([]*pb.Epoch)
+		if !(len(field848) == 0) {
 			p.newline()
-			for i807, elem806 := range field805 {
-				if (i807 > 0) {
+			for i850, elem849 := range field848 {
+				if (i850 > 0) {
 					p.newline()
 				}
-				p.pretty_epoch(elem806)
+				p.pretty_epoch(elem849)
 			}
 		}
 		p.dedent()
@@ -659,20 +677,20 @@ func (p *PrettyPrinter) pretty_transaction(msg *pb.Transaction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_configure(msg *pb.Configure) interface{} {
-	flat811 := p.tryFlat(msg, func() { p.pretty_configure(msg) })
-	if flat811 != nil {
-		p.write(*flat811)
+	flat854 := p.tryFlat(msg, func() { p.pretty_configure(msg) })
+	if flat854 != nil {
+		p.write(*flat854)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1600 := p.deconstruct_configure(_dollar_dollar)
-		fields809 := _t1600
-		unwrapped_fields810 := fields809
+		_t1686 := p.deconstruct_configure(_dollar_dollar)
+		fields852 := _t1686
+		unwrapped_fields853 := fields852
 		p.write("(")
 		p.write("configure")
 		p.indentSexp()
 		p.newline()
-		p.pretty_config_dict(unwrapped_fields810)
+		p.pretty_config_dict(unwrapped_fields853)
 		p.dedent()
 		p.write(")")
 	}
@@ -680,21 +698,21 @@ func (p *PrettyPrinter) pretty_configure(msg *pb.Configure) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_config_dict(msg [][]interface{}) interface{} {
-	flat815 := p.tryFlat(msg, func() { p.pretty_config_dict(msg) })
-	if flat815 != nil {
-		p.write(*flat815)
+	flat858 := p.tryFlat(msg, func() { p.pretty_config_dict(msg) })
+	if flat858 != nil {
+		p.write(*flat858)
 		return nil
 	} else {
-		fields812 := msg
+		fields855 := msg
 		p.write("{")
 		p.indent()
-		if !(len(fields812) == 0) {
+		if !(len(fields855) == 0) {
 			p.newline()
-			for i814, elem813 := range fields812 {
-				if (i814 > 0) {
+			for i857, elem856 := range fields855 {
+				if (i857 > 0) {
 					p.newline()
 				}
-				p.pretty_config_key_value(elem813)
+				p.pretty_config_key_value(elem856)
 			}
 		}
 		p.dedent()
@@ -704,152 +722,152 @@ func (p *PrettyPrinter) pretty_config_dict(msg [][]interface{}) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_config_key_value(msg []interface{}) interface{} {
-	flat820 := p.tryFlat(msg, func() { p.pretty_config_key_value(msg) })
-	if flat820 != nil {
-		p.write(*flat820)
+	flat863 := p.tryFlat(msg, func() { p.pretty_config_key_value(msg) })
+	if flat863 != nil {
+		p.write(*flat863)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields816 := []interface{}{_dollar_dollar[0].(string), _dollar_dollar[1].(*pb.Value)}
-		unwrapped_fields817 := fields816
+		fields859 := []interface{}{_dollar_dollar[0].(string), _dollar_dollar[1].(*pb.Value)}
+		unwrapped_fields860 := fields859
 		p.write(":")
-		field818 := unwrapped_fields817[0].(string)
-		p.write(field818)
+		field861 := unwrapped_fields860[0].(string)
+		p.write(field861)
 		p.write(" ")
-		field819 := unwrapped_fields817[1].(*pb.Value)
-		p.pretty_raw_value(field819)
+		field862 := unwrapped_fields860[1].(*pb.Value)
+		p.pretty_raw_value(field862)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_raw_value(msg *pb.Value) interface{} {
-	flat846 := p.tryFlat(msg, func() { p.pretty_raw_value(msg) })
-	if flat846 != nil {
-		p.write(*flat846)
+	flat889 := p.tryFlat(msg, func() { p.pretty_raw_value(msg) })
+	if flat889 != nil {
+		p.write(*flat889)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1601 *pb.DateValue
+		var _t1687 *pb.DateValue
 		if hasProtoField(_dollar_dollar, "date_value") {
-			_t1601 = _dollar_dollar.GetDateValue()
+			_t1687 = _dollar_dollar.GetDateValue()
 		}
-		deconstruct_result844 := _t1601
-		if deconstruct_result844 != nil {
-			unwrapped845 := deconstruct_result844
-			p.pretty_raw_date(unwrapped845)
+		deconstruct_result887 := _t1687
+		if deconstruct_result887 != nil {
+			unwrapped888 := deconstruct_result887
+			p.pretty_raw_date(unwrapped888)
 		} else {
 			_dollar_dollar := msg
-			var _t1602 *pb.DateTimeValue
+			var _t1688 *pb.DateTimeValue
 			if hasProtoField(_dollar_dollar, "datetime_value") {
-				_t1602 = _dollar_dollar.GetDatetimeValue()
+				_t1688 = _dollar_dollar.GetDatetimeValue()
 			}
-			deconstruct_result842 := _t1602
-			if deconstruct_result842 != nil {
-				unwrapped843 := deconstruct_result842
-				p.pretty_raw_datetime(unwrapped843)
+			deconstruct_result885 := _t1688
+			if deconstruct_result885 != nil {
+				unwrapped886 := deconstruct_result885
+				p.pretty_raw_datetime(unwrapped886)
 			} else {
 				_dollar_dollar := msg
-				var _t1603 *string
+				var _t1689 *string
 				if hasProtoField(_dollar_dollar, "string_value") {
-					_t1603 = ptr(_dollar_dollar.GetStringValue())
+					_t1689 = ptr(_dollar_dollar.GetStringValue())
 				}
-				deconstruct_result840 := _t1603
-				if deconstruct_result840 != nil {
-					unwrapped841 := *deconstruct_result840
-					p.write(p.formatStringValue(unwrapped841))
+				deconstruct_result883 := _t1689
+				if deconstruct_result883 != nil {
+					unwrapped884 := *deconstruct_result883
+					p.write(p.formatStringValue(unwrapped884))
 				} else {
 					_dollar_dollar := msg
-					var _t1604 *int32
+					var _t1690 *int32
 					if hasProtoField(_dollar_dollar, "int32_value") {
-						_t1604 = ptr(_dollar_dollar.GetInt32Value())
+						_t1690 = ptr(_dollar_dollar.GetInt32Value())
 					}
-					deconstruct_result838 := _t1604
-					if deconstruct_result838 != nil {
-						unwrapped839 := *deconstruct_result838
-						p.write(fmt.Sprintf("%di32", unwrapped839))
+					deconstruct_result881 := _t1690
+					if deconstruct_result881 != nil {
+						unwrapped882 := *deconstruct_result881
+						p.write(fmt.Sprintf("%di32", unwrapped882))
 					} else {
 						_dollar_dollar := msg
-						var _t1605 *int64
+						var _t1691 *int64
 						if hasProtoField(_dollar_dollar, "int_value") {
-							_t1605 = ptr(_dollar_dollar.GetIntValue())
+							_t1691 = ptr(_dollar_dollar.GetIntValue())
 						}
-						deconstruct_result836 := _t1605
-						if deconstruct_result836 != nil {
-							unwrapped837 := *deconstruct_result836
-							p.write(fmt.Sprintf("%d", unwrapped837))
+						deconstruct_result879 := _t1691
+						if deconstruct_result879 != nil {
+							unwrapped880 := *deconstruct_result879
+							p.write(fmt.Sprintf("%d", unwrapped880))
 						} else {
 							_dollar_dollar := msg
-							var _t1606 *float32
+							var _t1692 *float32
 							if hasProtoField(_dollar_dollar, "float32_value") {
-								_t1606 = ptr(_dollar_dollar.GetFloat32Value())
+								_t1692 = ptr(_dollar_dollar.GetFloat32Value())
 							}
-							deconstruct_result834 := _t1606
-							if deconstruct_result834 != nil {
-								unwrapped835 := *deconstruct_result834
-								p.write(formatFloat32(unwrapped835))
+							deconstruct_result877 := _t1692
+							if deconstruct_result877 != nil {
+								unwrapped878 := *deconstruct_result877
+								p.write(formatFloat32(unwrapped878))
 							} else {
 								_dollar_dollar := msg
-								var _t1607 *float64
+								var _t1693 *float64
 								if hasProtoField(_dollar_dollar, "float_value") {
-									_t1607 = ptr(_dollar_dollar.GetFloatValue())
+									_t1693 = ptr(_dollar_dollar.GetFloatValue())
 								}
-								deconstruct_result832 := _t1607
-								if deconstruct_result832 != nil {
-									unwrapped833 := *deconstruct_result832
-									p.write(formatFloat64(unwrapped833))
+								deconstruct_result875 := _t1693
+								if deconstruct_result875 != nil {
+									unwrapped876 := *deconstruct_result875
+									p.write(formatFloat64(unwrapped876))
 								} else {
 									_dollar_dollar := msg
-									var _t1608 *uint32
+									var _t1694 *uint32
 									if hasProtoField(_dollar_dollar, "uint32_value") {
-										_t1608 = ptr(_dollar_dollar.GetUint32Value())
+										_t1694 = ptr(_dollar_dollar.GetUint32Value())
 									}
-									deconstruct_result830 := _t1608
-									if deconstruct_result830 != nil {
-										unwrapped831 := *deconstruct_result830
-										p.write(fmt.Sprintf("%du32", unwrapped831))
+									deconstruct_result873 := _t1694
+									if deconstruct_result873 != nil {
+										unwrapped874 := *deconstruct_result873
+										p.write(fmt.Sprintf("%du32", unwrapped874))
 									} else {
 										_dollar_dollar := msg
-										var _t1609 *pb.UInt128Value
+										var _t1695 *pb.UInt128Value
 										if hasProtoField(_dollar_dollar, "uint128_value") {
-											_t1609 = _dollar_dollar.GetUint128Value()
+											_t1695 = _dollar_dollar.GetUint128Value()
 										}
-										deconstruct_result828 := _t1609
-										if deconstruct_result828 != nil {
-											unwrapped829 := deconstruct_result828
-											p.write(p.formatUint128(unwrapped829))
+										deconstruct_result871 := _t1695
+										if deconstruct_result871 != nil {
+											unwrapped872 := deconstruct_result871
+											p.write(p.formatUint128(unwrapped872))
 										} else {
 											_dollar_dollar := msg
-											var _t1610 *pb.Int128Value
+											var _t1696 *pb.Int128Value
 											if hasProtoField(_dollar_dollar, "int128_value") {
-												_t1610 = _dollar_dollar.GetInt128Value()
+												_t1696 = _dollar_dollar.GetInt128Value()
 											}
-											deconstruct_result826 := _t1610
-											if deconstruct_result826 != nil {
-												unwrapped827 := deconstruct_result826
-												p.write(p.formatInt128(unwrapped827))
+											deconstruct_result869 := _t1696
+											if deconstruct_result869 != nil {
+												unwrapped870 := deconstruct_result869
+												p.write(p.formatInt128(unwrapped870))
 											} else {
 												_dollar_dollar := msg
-												var _t1611 *pb.DecimalValue
+												var _t1697 *pb.DecimalValue
 												if hasProtoField(_dollar_dollar, "decimal_value") {
-													_t1611 = _dollar_dollar.GetDecimalValue()
+													_t1697 = _dollar_dollar.GetDecimalValue()
 												}
-												deconstruct_result824 := _t1611
-												if deconstruct_result824 != nil {
-													unwrapped825 := deconstruct_result824
-													p.write(p.formatDecimal(unwrapped825))
+												deconstruct_result867 := _t1697
+												if deconstruct_result867 != nil {
+													unwrapped868 := deconstruct_result867
+													p.write(p.formatDecimal(unwrapped868))
 												} else {
 													_dollar_dollar := msg
-													var _t1612 *bool
+													var _t1698 *bool
 													if hasProtoField(_dollar_dollar, "boolean_value") {
-														_t1612 = ptr(_dollar_dollar.GetBooleanValue())
+														_t1698 = ptr(_dollar_dollar.GetBooleanValue())
 													}
-													deconstruct_result822 := _t1612
-													if deconstruct_result822 != nil {
-														unwrapped823 := *deconstruct_result822
-														p.pretty_boolean_value(unwrapped823)
+													deconstruct_result865 := _t1698
+													if deconstruct_result865 != nil {
+														unwrapped866 := *deconstruct_result865
+														p.pretty_boolean_value(unwrapped866)
 													} else {
-														fields821 := msg
-														_ = fields821
+														fields864 := msg
+														_ = fields864
 														p.write("missing")
 													}
 												}
@@ -868,26 +886,26 @@ func (p *PrettyPrinter) pretty_raw_value(msg *pb.Value) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_raw_date(msg *pb.DateValue) interface{} {
-	flat852 := p.tryFlat(msg, func() { p.pretty_raw_date(msg) })
-	if flat852 != nil {
-		p.write(*flat852)
+	flat895 := p.tryFlat(msg, func() { p.pretty_raw_date(msg) })
+	if flat895 != nil {
+		p.write(*flat895)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields847 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay())}
-		unwrapped_fields848 := fields847
+		fields890 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay())}
+		unwrapped_fields891 := fields890
 		p.write("(")
 		p.write("date")
 		p.indentSexp()
 		p.newline()
-		field849 := unwrapped_fields848[0].(int64)
-		p.write(fmt.Sprintf("%d", field849))
+		field892 := unwrapped_fields891[0].(int64)
+		p.write(fmt.Sprintf("%d", field892))
 		p.newline()
-		field850 := unwrapped_fields848[1].(int64)
-		p.write(fmt.Sprintf("%d", field850))
+		field893 := unwrapped_fields891[1].(int64)
+		p.write(fmt.Sprintf("%d", field893))
 		p.newline()
-		field851 := unwrapped_fields848[2].(int64)
-		p.write(fmt.Sprintf("%d", field851))
+		field894 := unwrapped_fields891[2].(int64)
+		p.write(fmt.Sprintf("%d", field894))
 		p.dedent()
 		p.write(")")
 	}
@@ -895,40 +913,40 @@ func (p *PrettyPrinter) pretty_raw_date(msg *pb.DateValue) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_raw_datetime(msg *pb.DateTimeValue) interface{} {
-	flat863 := p.tryFlat(msg, func() { p.pretty_raw_datetime(msg) })
-	if flat863 != nil {
-		p.write(*flat863)
+	flat906 := p.tryFlat(msg, func() { p.pretty_raw_datetime(msg) })
+	if flat906 != nil {
+		p.write(*flat906)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields853 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay()), int64(_dollar_dollar.GetHour()), int64(_dollar_dollar.GetMinute()), int64(_dollar_dollar.GetSecond()), ptr(int64(_dollar_dollar.GetMicrosecond()))}
-		unwrapped_fields854 := fields853
+		fields896 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay()), int64(_dollar_dollar.GetHour()), int64(_dollar_dollar.GetMinute()), int64(_dollar_dollar.GetSecond()), ptr(int64(_dollar_dollar.GetMicrosecond()))}
+		unwrapped_fields897 := fields896
 		p.write("(")
 		p.write("datetime")
 		p.indentSexp()
 		p.newline()
-		field855 := unwrapped_fields854[0].(int64)
-		p.write(fmt.Sprintf("%d", field855))
+		field898 := unwrapped_fields897[0].(int64)
+		p.write(fmt.Sprintf("%d", field898))
 		p.newline()
-		field856 := unwrapped_fields854[1].(int64)
-		p.write(fmt.Sprintf("%d", field856))
+		field899 := unwrapped_fields897[1].(int64)
+		p.write(fmt.Sprintf("%d", field899))
 		p.newline()
-		field857 := unwrapped_fields854[2].(int64)
-		p.write(fmt.Sprintf("%d", field857))
+		field900 := unwrapped_fields897[2].(int64)
+		p.write(fmt.Sprintf("%d", field900))
 		p.newline()
-		field858 := unwrapped_fields854[3].(int64)
-		p.write(fmt.Sprintf("%d", field858))
+		field901 := unwrapped_fields897[3].(int64)
+		p.write(fmt.Sprintf("%d", field901))
 		p.newline()
-		field859 := unwrapped_fields854[4].(int64)
-		p.write(fmt.Sprintf("%d", field859))
+		field902 := unwrapped_fields897[4].(int64)
+		p.write(fmt.Sprintf("%d", field902))
 		p.newline()
-		field860 := unwrapped_fields854[5].(int64)
-		p.write(fmt.Sprintf("%d", field860))
-		field861 := unwrapped_fields854[6].(*int64)
-		if field861 != nil {
+		field903 := unwrapped_fields897[5].(int64)
+		p.write(fmt.Sprintf("%d", field903))
+		field904 := unwrapped_fields897[6].(*int64)
+		if field904 != nil {
 			p.newline()
-			opt_val862 := *field861
-			p.write(fmt.Sprintf("%d", opt_val862))
+			opt_val905 := *field904
+			p.write(fmt.Sprintf("%d", opt_val905))
 		}
 		p.dedent()
 		p.write(")")
@@ -938,25 +956,25 @@ func (p *PrettyPrinter) pretty_raw_datetime(msg *pb.DateTimeValue) interface{} {
 
 func (p *PrettyPrinter) pretty_boolean_value(msg bool) interface{} {
 	_dollar_dollar := msg
-	var _t1613 []interface{}
+	var _t1699 []interface{}
 	if _dollar_dollar {
-		_t1613 = []interface{}{}
+		_t1699 = []interface{}{}
 	}
-	deconstruct_result866 := _t1613
-	if deconstruct_result866 != nil {
-		unwrapped867 := deconstruct_result866
-		_ = unwrapped867
+	deconstruct_result909 := _t1699
+	if deconstruct_result909 != nil {
+		unwrapped910 := deconstruct_result909
+		_ = unwrapped910
 		p.write("true")
 	} else {
 		_dollar_dollar := msg
-		var _t1614 []interface{}
+		var _t1700 []interface{}
 		if !(_dollar_dollar) {
-			_t1614 = []interface{}{}
+			_t1700 = []interface{}{}
 		}
-		deconstruct_result864 := _t1614
-		if deconstruct_result864 != nil {
-			unwrapped865 := deconstruct_result864
-			_ = unwrapped865
+		deconstruct_result907 := _t1700
+		if deconstruct_result907 != nil {
+			unwrapped908 := deconstruct_result907
+			_ = unwrapped908
 			p.write("false")
 		} else {
 			panic(ParseError{msg: "No matching rule for boolean_value"})
@@ -966,24 +984,24 @@ func (p *PrettyPrinter) pretty_boolean_value(msg bool) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_sync(msg *pb.Sync) interface{} {
-	flat872 := p.tryFlat(msg, func() { p.pretty_sync(msg) })
-	if flat872 != nil {
-		p.write(*flat872)
+	flat915 := p.tryFlat(msg, func() { p.pretty_sync(msg) })
+	if flat915 != nil {
+		p.write(*flat915)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields868 := _dollar_dollar.GetFragments()
-		unwrapped_fields869 := fields868
+		fields911 := _dollar_dollar.GetFragments()
+		unwrapped_fields912 := fields911
 		p.write("(")
 		p.write("sync")
 		p.indentSexp()
-		if !(len(unwrapped_fields869) == 0) {
+		if !(len(unwrapped_fields912) == 0) {
 			p.newline()
-			for i871, elem870 := range unwrapped_fields869 {
-				if (i871 > 0) {
+			for i914, elem913 := range unwrapped_fields912 {
+				if (i914 > 0) {
 					p.newline()
 				}
-				p.pretty_fragment_id(elem870)
+				p.pretty_fragment_id(elem913)
 			}
 		}
 		p.dedent()
@@ -993,51 +1011,51 @@ func (p *PrettyPrinter) pretty_sync(msg *pb.Sync) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_fragment_id(msg *pb.FragmentId) interface{} {
-	flat875 := p.tryFlat(msg, func() { p.pretty_fragment_id(msg) })
-	if flat875 != nil {
-		p.write(*flat875)
+	flat918 := p.tryFlat(msg, func() { p.pretty_fragment_id(msg) })
+	if flat918 != nil {
+		p.write(*flat918)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields873 := p.fragmentIdToString(_dollar_dollar)
-		unwrapped_fields874 := fields873
+		fields916 := p.fragmentIdToString(_dollar_dollar)
+		unwrapped_fields917 := fields916
 		p.write(":")
-		p.write(unwrapped_fields874)
+		p.write(unwrapped_fields917)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_epoch(msg *pb.Epoch) interface{} {
-	flat882 := p.tryFlat(msg, func() { p.pretty_epoch(msg) })
-	if flat882 != nil {
-		p.write(*flat882)
+	flat925 := p.tryFlat(msg, func() { p.pretty_epoch(msg) })
+	if flat925 != nil {
+		p.write(*flat925)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1615 []*pb.Write
+		var _t1701 []*pb.Write
 		if !(len(_dollar_dollar.GetWrites()) == 0) {
-			_t1615 = _dollar_dollar.GetWrites()
+			_t1701 = _dollar_dollar.GetWrites()
 		}
-		var _t1616 []*pb.Read
+		var _t1702 []*pb.Read
 		if !(len(_dollar_dollar.GetReads()) == 0) {
-			_t1616 = _dollar_dollar.GetReads()
+			_t1702 = _dollar_dollar.GetReads()
 		}
-		fields876 := []interface{}{_t1615, _t1616}
-		unwrapped_fields877 := fields876
+		fields919 := []interface{}{_t1701, _t1702}
+		unwrapped_fields920 := fields919
 		p.write("(")
 		p.write("epoch")
 		p.indentSexp()
-		field878 := unwrapped_fields877[0].([]*pb.Write)
-		if field878 != nil {
+		field921 := unwrapped_fields920[0].([]*pb.Write)
+		if field921 != nil {
 			p.newline()
-			opt_val879 := field878
-			p.pretty_epoch_writes(opt_val879)
+			opt_val922 := field921
+			p.pretty_epoch_writes(opt_val922)
 		}
-		field880 := unwrapped_fields877[1].([]*pb.Read)
-		if field880 != nil {
+		field923 := unwrapped_fields920[1].([]*pb.Read)
+		if field923 != nil {
 			p.newline()
-			opt_val881 := field880
-			p.pretty_epoch_reads(opt_val881)
+			opt_val924 := field923
+			p.pretty_epoch_reads(opt_val924)
 		}
 		p.dedent()
 		p.write(")")
@@ -1046,22 +1064,22 @@ func (p *PrettyPrinter) pretty_epoch(msg *pb.Epoch) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_epoch_writes(msg []*pb.Write) interface{} {
-	flat886 := p.tryFlat(msg, func() { p.pretty_epoch_writes(msg) })
-	if flat886 != nil {
-		p.write(*flat886)
+	flat929 := p.tryFlat(msg, func() { p.pretty_epoch_writes(msg) })
+	if flat929 != nil {
+		p.write(*flat929)
 		return nil
 	} else {
-		fields883 := msg
+		fields926 := msg
 		p.write("(")
 		p.write("writes")
 		p.indentSexp()
-		if !(len(fields883) == 0) {
+		if !(len(fields926) == 0) {
 			p.newline()
-			for i885, elem884 := range fields883 {
-				if (i885 > 0) {
+			for i928, elem927 := range fields926 {
+				if (i928 > 0) {
 					p.newline()
 				}
-				p.pretty_write(elem884)
+				p.pretty_write(elem927)
 			}
 		}
 		p.dedent()
@@ -1071,50 +1089,50 @@ func (p *PrettyPrinter) pretty_epoch_writes(msg []*pb.Write) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_write(msg *pb.Write) interface{} {
-	flat895 := p.tryFlat(msg, func() { p.pretty_write(msg) })
-	if flat895 != nil {
-		p.write(*flat895)
+	flat938 := p.tryFlat(msg, func() { p.pretty_write(msg) })
+	if flat938 != nil {
+		p.write(*flat938)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1617 *pb.Define
+		var _t1703 *pb.Define
 		if hasProtoField(_dollar_dollar, "define") {
-			_t1617 = _dollar_dollar.GetDefine()
+			_t1703 = _dollar_dollar.GetDefine()
 		}
-		deconstruct_result893 := _t1617
-		if deconstruct_result893 != nil {
-			unwrapped894 := deconstruct_result893
-			p.pretty_define(unwrapped894)
+		deconstruct_result936 := _t1703
+		if deconstruct_result936 != nil {
+			unwrapped937 := deconstruct_result936
+			p.pretty_define(unwrapped937)
 		} else {
 			_dollar_dollar := msg
-			var _t1618 *pb.Undefine
+			var _t1704 *pb.Undefine
 			if hasProtoField(_dollar_dollar, "undefine") {
-				_t1618 = _dollar_dollar.GetUndefine()
+				_t1704 = _dollar_dollar.GetUndefine()
 			}
-			deconstruct_result891 := _t1618
-			if deconstruct_result891 != nil {
-				unwrapped892 := deconstruct_result891
-				p.pretty_undefine(unwrapped892)
+			deconstruct_result934 := _t1704
+			if deconstruct_result934 != nil {
+				unwrapped935 := deconstruct_result934
+				p.pretty_undefine(unwrapped935)
 			} else {
 				_dollar_dollar := msg
-				var _t1619 *pb.Context
+				var _t1705 *pb.Context
 				if hasProtoField(_dollar_dollar, "context") {
-					_t1619 = _dollar_dollar.GetContext()
+					_t1705 = _dollar_dollar.GetContext()
 				}
-				deconstruct_result889 := _t1619
-				if deconstruct_result889 != nil {
-					unwrapped890 := deconstruct_result889
-					p.pretty_context(unwrapped890)
+				deconstruct_result932 := _t1705
+				if deconstruct_result932 != nil {
+					unwrapped933 := deconstruct_result932
+					p.pretty_context(unwrapped933)
 				} else {
 					_dollar_dollar := msg
-					var _t1620 *pb.Snapshot
+					var _t1706 *pb.Snapshot
 					if hasProtoField(_dollar_dollar, "snapshot") {
-						_t1620 = _dollar_dollar.GetSnapshot()
+						_t1706 = _dollar_dollar.GetSnapshot()
 					}
-					deconstruct_result887 := _t1620
-					if deconstruct_result887 != nil {
-						unwrapped888 := deconstruct_result887
-						p.pretty_snapshot(unwrapped888)
+					deconstruct_result930 := _t1706
+					if deconstruct_result930 != nil {
+						unwrapped931 := deconstruct_result930
+						p.pretty_snapshot(unwrapped931)
 					} else {
 						panic(ParseError{msg: "No matching rule for write"})
 					}
@@ -1126,19 +1144,19 @@ func (p *PrettyPrinter) pretty_write(msg *pb.Write) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_define(msg *pb.Define) interface{} {
-	flat898 := p.tryFlat(msg, func() { p.pretty_define(msg) })
-	if flat898 != nil {
-		p.write(*flat898)
+	flat941 := p.tryFlat(msg, func() { p.pretty_define(msg) })
+	if flat941 != nil {
+		p.write(*flat941)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields896 := _dollar_dollar.GetFragment()
-		unwrapped_fields897 := fields896
+		fields939 := _dollar_dollar.GetFragment()
+		unwrapped_fields940 := fields939
 		p.write("(")
 		p.write("define")
 		p.indentSexp()
 		p.newline()
-		p.pretty_fragment(unwrapped_fields897)
+		p.pretty_fragment(unwrapped_fields940)
 		p.dedent()
 		p.write(")")
 	}
@@ -1146,29 +1164,29 @@ func (p *PrettyPrinter) pretty_define(msg *pb.Define) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_fragment(msg *pb.Fragment) interface{} {
-	flat905 := p.tryFlat(msg, func() { p.pretty_fragment(msg) })
-	if flat905 != nil {
-		p.write(*flat905)
+	flat948 := p.tryFlat(msg, func() { p.pretty_fragment(msg) })
+	if flat948 != nil {
+		p.write(*flat948)
 		return nil
 	} else {
 		_dollar_dollar := msg
 		p.startPrettyFragment(_dollar_dollar)
-		fields899 := []interface{}{_dollar_dollar.GetId(), _dollar_dollar.GetDeclarations()}
-		unwrapped_fields900 := fields899
+		fields942 := []interface{}{_dollar_dollar.GetId(), _dollar_dollar.GetDeclarations()}
+		unwrapped_fields943 := fields942
 		p.write("(")
 		p.write("fragment")
 		p.indentSexp()
 		p.newline()
-		field901 := unwrapped_fields900[0].(*pb.FragmentId)
-		p.pretty_new_fragment_id(field901)
-		field902 := unwrapped_fields900[1].([]*pb.Declaration)
-		if !(len(field902) == 0) {
+		field944 := unwrapped_fields943[0].(*pb.FragmentId)
+		p.pretty_new_fragment_id(field944)
+		field945 := unwrapped_fields943[1].([]*pb.Declaration)
+		if !(len(field945) == 0) {
 			p.newline()
-			for i904, elem903 := range field902 {
-				if (i904 > 0) {
+			for i947, elem946 := range field945 {
+				if (i947 > 0) {
 					p.newline()
 				}
-				p.pretty_declaration(elem903)
+				p.pretty_declaration(elem946)
 			}
 		}
 		p.dedent()
@@ -1178,62 +1196,62 @@ func (p *PrettyPrinter) pretty_fragment(msg *pb.Fragment) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_new_fragment_id(msg *pb.FragmentId) interface{} {
-	flat907 := p.tryFlat(msg, func() { p.pretty_new_fragment_id(msg) })
-	if flat907 != nil {
-		p.write(*flat907)
+	flat950 := p.tryFlat(msg, func() { p.pretty_new_fragment_id(msg) })
+	if flat950 != nil {
+		p.write(*flat950)
 		return nil
 	} else {
-		fields906 := msg
-		p.pretty_fragment_id(fields906)
+		fields949 := msg
+		p.pretty_fragment_id(fields949)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_declaration(msg *pb.Declaration) interface{} {
-	flat916 := p.tryFlat(msg, func() { p.pretty_declaration(msg) })
-	if flat916 != nil {
-		p.write(*flat916)
+	flat959 := p.tryFlat(msg, func() { p.pretty_declaration(msg) })
+	if flat959 != nil {
+		p.write(*flat959)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1621 *pb.Def
+		var _t1707 *pb.Def
 		if hasProtoField(_dollar_dollar, "def") {
-			_t1621 = _dollar_dollar.GetDef()
+			_t1707 = _dollar_dollar.GetDef()
 		}
-		deconstruct_result914 := _t1621
-		if deconstruct_result914 != nil {
-			unwrapped915 := deconstruct_result914
-			p.pretty_def(unwrapped915)
+		deconstruct_result957 := _t1707
+		if deconstruct_result957 != nil {
+			unwrapped958 := deconstruct_result957
+			p.pretty_def(unwrapped958)
 		} else {
 			_dollar_dollar := msg
-			var _t1622 *pb.Algorithm
+			var _t1708 *pb.Algorithm
 			if hasProtoField(_dollar_dollar, "algorithm") {
-				_t1622 = _dollar_dollar.GetAlgorithm()
+				_t1708 = _dollar_dollar.GetAlgorithm()
 			}
-			deconstruct_result912 := _t1622
-			if deconstruct_result912 != nil {
-				unwrapped913 := deconstruct_result912
-				p.pretty_algorithm(unwrapped913)
+			deconstruct_result955 := _t1708
+			if deconstruct_result955 != nil {
+				unwrapped956 := deconstruct_result955
+				p.pretty_algorithm(unwrapped956)
 			} else {
 				_dollar_dollar := msg
-				var _t1623 *pb.Constraint
+				var _t1709 *pb.Constraint
 				if hasProtoField(_dollar_dollar, "constraint") {
-					_t1623 = _dollar_dollar.GetConstraint()
+					_t1709 = _dollar_dollar.GetConstraint()
 				}
-				deconstruct_result910 := _t1623
-				if deconstruct_result910 != nil {
-					unwrapped911 := deconstruct_result910
-					p.pretty_constraint(unwrapped911)
+				deconstruct_result953 := _t1709
+				if deconstruct_result953 != nil {
+					unwrapped954 := deconstruct_result953
+					p.pretty_constraint(unwrapped954)
 				} else {
 					_dollar_dollar := msg
-					var _t1624 *pb.Data
+					var _t1710 *pb.Data
 					if hasProtoField(_dollar_dollar, "data") {
-						_t1624 = _dollar_dollar.GetData()
+						_t1710 = _dollar_dollar.GetData()
 					}
-					deconstruct_result908 := _t1624
-					if deconstruct_result908 != nil {
-						unwrapped909 := deconstruct_result908
-						p.pretty_data(unwrapped909)
+					deconstruct_result951 := _t1710
+					if deconstruct_result951 != nil {
+						unwrapped952 := deconstruct_result951
+						p.pretty_data(unwrapped952)
 					} else {
 						panic(ParseError{msg: "No matching rule for declaration"})
 					}
@@ -1245,32 +1263,32 @@ func (p *PrettyPrinter) pretty_declaration(msg *pb.Declaration) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_def(msg *pb.Def) interface{} {
-	flat923 := p.tryFlat(msg, func() { p.pretty_def(msg) })
-	if flat923 != nil {
-		p.write(*flat923)
+	flat966 := p.tryFlat(msg, func() { p.pretty_def(msg) })
+	if flat966 != nil {
+		p.write(*flat966)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1625 []*pb.Attribute
+		var _t1711 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1625 = _dollar_dollar.GetAttrs()
+			_t1711 = _dollar_dollar.GetAttrs()
 		}
-		fields917 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1625}
-		unwrapped_fields918 := fields917
+		fields960 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1711}
+		unwrapped_fields961 := fields960
 		p.write("(")
 		p.write("def")
 		p.indentSexp()
 		p.newline()
-		field919 := unwrapped_fields918[0].(*pb.RelationId)
-		p.pretty_relation_id(field919)
+		field962 := unwrapped_fields961[0].(*pb.RelationId)
+		p.pretty_relation_id(field962)
 		p.newline()
-		field920 := unwrapped_fields918[1].(*pb.Abstraction)
-		p.pretty_abstraction(field920)
-		field921 := unwrapped_fields918[2].([]*pb.Attribute)
-		if field921 != nil {
+		field963 := unwrapped_fields961[1].(*pb.Abstraction)
+		p.pretty_abstraction(field963)
+		field964 := unwrapped_fields961[2].([]*pb.Attribute)
+		if field964 != nil {
 			p.newline()
-			opt_val922 := field921
-			p.pretty_attrs(opt_val922)
+			opt_val965 := field964
+			p.pretty_attrs(opt_val965)
 		}
 		p.dedent()
 		p.write(")")
@@ -1279,29 +1297,29 @@ func (p *PrettyPrinter) pretty_def(msg *pb.Def) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_relation_id(msg *pb.RelationId) interface{} {
-	flat928 := p.tryFlat(msg, func() { p.pretty_relation_id(msg) })
-	if flat928 != nil {
-		p.write(*flat928)
+	flat971 := p.tryFlat(msg, func() { p.pretty_relation_id(msg) })
+	if flat971 != nil {
+		p.write(*flat971)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1626 *string
+		var _t1712 *string
 		if p.relationIdToString(_dollar_dollar) != nil {
-			_t1627 := p.deconstruct_relation_id_string(_dollar_dollar)
-			_t1626 = ptr(_t1627)
+			_t1713 := p.deconstruct_relation_id_string(_dollar_dollar)
+			_t1712 = ptr(_t1713)
 		}
-		deconstruct_result926 := _t1626
-		if deconstruct_result926 != nil {
-			unwrapped927 := *deconstruct_result926
+		deconstruct_result969 := _t1712
+		if deconstruct_result969 != nil {
+			unwrapped970 := *deconstruct_result969
 			p.write(":")
-			p.write(unwrapped927)
+			p.write(unwrapped970)
 		} else {
 			_dollar_dollar := msg
-			_t1628 := p.deconstruct_relation_id_uint128(_dollar_dollar)
-			deconstruct_result924 := _t1628
-			if deconstruct_result924 != nil {
-				unwrapped925 := deconstruct_result924
-				p.write(p.formatUint128(unwrapped925))
+			_t1714 := p.deconstruct_relation_id_uint128(_dollar_dollar)
+			deconstruct_result967 := _t1714
+			if deconstruct_result967 != nil {
+				unwrapped968 := deconstruct_result967
+				p.write(p.formatUint128(unwrapped968))
 			} else {
 				panic(ParseError{msg: "No matching rule for relation_id"})
 			}
@@ -1311,22 +1329,22 @@ func (p *PrettyPrinter) pretty_relation_id(msg *pb.RelationId) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_abstraction(msg *pb.Abstraction) interface{} {
-	flat933 := p.tryFlat(msg, func() { p.pretty_abstraction(msg) })
-	if flat933 != nil {
-		p.write(*flat933)
+	flat976 := p.tryFlat(msg, func() { p.pretty_abstraction(msg) })
+	if flat976 != nil {
+		p.write(*flat976)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1629 := p.deconstruct_bindings(_dollar_dollar)
-		fields929 := []interface{}{_t1629, _dollar_dollar.GetValue()}
-		unwrapped_fields930 := fields929
+		_t1715 := p.deconstruct_bindings(_dollar_dollar)
+		fields972 := []interface{}{_t1715, _dollar_dollar.GetValue()}
+		unwrapped_fields973 := fields972
 		p.write("(")
 		p.indent()
-		field931 := unwrapped_fields930[0].([]interface{})
-		p.pretty_bindings(field931)
+		field974 := unwrapped_fields973[0].([]interface{})
+		p.pretty_bindings(field974)
 		p.newline()
-		field932 := unwrapped_fields930[1].(*pb.Formula)
-		p.pretty_formula(field932)
+		field975 := unwrapped_fields973[1].(*pb.Formula)
+		p.pretty_formula(field975)
 		p.dedent()
 		p.write(")")
 	}
@@ -1334,32 +1352,32 @@ func (p *PrettyPrinter) pretty_abstraction(msg *pb.Abstraction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_bindings(msg []interface{}) interface{} {
-	flat941 := p.tryFlat(msg, func() { p.pretty_bindings(msg) })
-	if flat941 != nil {
-		p.write(*flat941)
+	flat984 := p.tryFlat(msg, func() { p.pretty_bindings(msg) })
+	if flat984 != nil {
+		p.write(*flat984)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1630 []*pb.Binding
+		var _t1716 []*pb.Binding
 		if !(len(_dollar_dollar[1].([]*pb.Binding)) == 0) {
-			_t1630 = _dollar_dollar[1].([]*pb.Binding)
+			_t1716 = _dollar_dollar[1].([]*pb.Binding)
 		}
-		fields934 := []interface{}{_dollar_dollar[0].([]*pb.Binding), _t1630}
-		unwrapped_fields935 := fields934
+		fields977 := []interface{}{_dollar_dollar[0].([]*pb.Binding), _t1716}
+		unwrapped_fields978 := fields977
 		p.write("[")
 		p.indent()
-		field936 := unwrapped_fields935[0].([]*pb.Binding)
-		for i938, elem937 := range field936 {
-			if (i938 > 0) {
+		field979 := unwrapped_fields978[0].([]*pb.Binding)
+		for i981, elem980 := range field979 {
+			if (i981 > 0) {
 				p.newline()
 			}
-			p.pretty_binding(elem937)
+			p.pretty_binding(elem980)
 		}
-		field939 := unwrapped_fields935[1].([]*pb.Binding)
-		if field939 != nil {
+		field982 := unwrapped_fields978[1].([]*pb.Binding)
+		if field982 != nil {
 			p.newline()
-			opt_val940 := field939
-			p.pretty_value_bindings(opt_val940)
+			opt_val983 := field982
+			p.pretty_value_bindings(opt_val983)
 		}
 		p.dedent()
 		p.write("]")
@@ -1368,168 +1386,168 @@ func (p *PrettyPrinter) pretty_bindings(msg []interface{}) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_binding(msg *pb.Binding) interface{} {
-	flat946 := p.tryFlat(msg, func() { p.pretty_binding(msg) })
-	if flat946 != nil {
-		p.write(*flat946)
+	flat989 := p.tryFlat(msg, func() { p.pretty_binding(msg) })
+	if flat989 != nil {
+		p.write(*flat989)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields942 := []interface{}{_dollar_dollar.GetVar().GetName(), _dollar_dollar.GetType()}
-		unwrapped_fields943 := fields942
-		field944 := unwrapped_fields943[0].(string)
-		p.write(field944)
+		fields985 := []interface{}{_dollar_dollar.GetVar().GetName(), _dollar_dollar.GetType()}
+		unwrapped_fields986 := fields985
+		field987 := unwrapped_fields986[0].(string)
+		p.write(field987)
 		p.write("::")
-		field945 := unwrapped_fields943[1].(*pb.Type)
-		p.pretty_type(field945)
+		field988 := unwrapped_fields986[1].(*pb.Type)
+		p.pretty_type(field988)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_type(msg *pb.Type) interface{} {
-	flat975 := p.tryFlat(msg, func() { p.pretty_type(msg) })
-	if flat975 != nil {
-		p.write(*flat975)
+	flat1018 := p.tryFlat(msg, func() { p.pretty_type(msg) })
+	if flat1018 != nil {
+		p.write(*flat1018)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1631 *pb.UnspecifiedType
+		var _t1717 *pb.UnspecifiedType
 		if hasProtoField(_dollar_dollar, "unspecified_type") {
-			_t1631 = _dollar_dollar.GetUnspecifiedType()
+			_t1717 = _dollar_dollar.GetUnspecifiedType()
 		}
-		deconstruct_result973 := _t1631
-		if deconstruct_result973 != nil {
-			unwrapped974 := deconstruct_result973
-			p.pretty_unspecified_type(unwrapped974)
+		deconstruct_result1016 := _t1717
+		if deconstruct_result1016 != nil {
+			unwrapped1017 := deconstruct_result1016
+			p.pretty_unspecified_type(unwrapped1017)
 		} else {
 			_dollar_dollar := msg
-			var _t1632 *pb.StringType
+			var _t1718 *pb.StringType
 			if hasProtoField(_dollar_dollar, "string_type") {
-				_t1632 = _dollar_dollar.GetStringType()
+				_t1718 = _dollar_dollar.GetStringType()
 			}
-			deconstruct_result971 := _t1632
-			if deconstruct_result971 != nil {
-				unwrapped972 := deconstruct_result971
-				p.pretty_string_type(unwrapped972)
+			deconstruct_result1014 := _t1718
+			if deconstruct_result1014 != nil {
+				unwrapped1015 := deconstruct_result1014
+				p.pretty_string_type(unwrapped1015)
 			} else {
 				_dollar_dollar := msg
-				var _t1633 *pb.IntType
+				var _t1719 *pb.IntType
 				if hasProtoField(_dollar_dollar, "int_type") {
-					_t1633 = _dollar_dollar.GetIntType()
+					_t1719 = _dollar_dollar.GetIntType()
 				}
-				deconstruct_result969 := _t1633
-				if deconstruct_result969 != nil {
-					unwrapped970 := deconstruct_result969
-					p.pretty_int_type(unwrapped970)
+				deconstruct_result1012 := _t1719
+				if deconstruct_result1012 != nil {
+					unwrapped1013 := deconstruct_result1012
+					p.pretty_int_type(unwrapped1013)
 				} else {
 					_dollar_dollar := msg
-					var _t1634 *pb.FloatType
+					var _t1720 *pb.FloatType
 					if hasProtoField(_dollar_dollar, "float_type") {
-						_t1634 = _dollar_dollar.GetFloatType()
+						_t1720 = _dollar_dollar.GetFloatType()
 					}
-					deconstruct_result967 := _t1634
-					if deconstruct_result967 != nil {
-						unwrapped968 := deconstruct_result967
-						p.pretty_float_type(unwrapped968)
+					deconstruct_result1010 := _t1720
+					if deconstruct_result1010 != nil {
+						unwrapped1011 := deconstruct_result1010
+						p.pretty_float_type(unwrapped1011)
 					} else {
 						_dollar_dollar := msg
-						var _t1635 *pb.UInt128Type
+						var _t1721 *pb.UInt128Type
 						if hasProtoField(_dollar_dollar, "uint128_type") {
-							_t1635 = _dollar_dollar.GetUint128Type()
+							_t1721 = _dollar_dollar.GetUint128Type()
 						}
-						deconstruct_result965 := _t1635
-						if deconstruct_result965 != nil {
-							unwrapped966 := deconstruct_result965
-							p.pretty_uint128_type(unwrapped966)
+						deconstruct_result1008 := _t1721
+						if deconstruct_result1008 != nil {
+							unwrapped1009 := deconstruct_result1008
+							p.pretty_uint128_type(unwrapped1009)
 						} else {
 							_dollar_dollar := msg
-							var _t1636 *pb.Int128Type
+							var _t1722 *pb.Int128Type
 							if hasProtoField(_dollar_dollar, "int128_type") {
-								_t1636 = _dollar_dollar.GetInt128Type()
+								_t1722 = _dollar_dollar.GetInt128Type()
 							}
-							deconstruct_result963 := _t1636
-							if deconstruct_result963 != nil {
-								unwrapped964 := deconstruct_result963
-								p.pretty_int128_type(unwrapped964)
+							deconstruct_result1006 := _t1722
+							if deconstruct_result1006 != nil {
+								unwrapped1007 := deconstruct_result1006
+								p.pretty_int128_type(unwrapped1007)
 							} else {
 								_dollar_dollar := msg
-								var _t1637 *pb.DateType
+								var _t1723 *pb.DateType
 								if hasProtoField(_dollar_dollar, "date_type") {
-									_t1637 = _dollar_dollar.GetDateType()
+									_t1723 = _dollar_dollar.GetDateType()
 								}
-								deconstruct_result961 := _t1637
-								if deconstruct_result961 != nil {
-									unwrapped962 := deconstruct_result961
-									p.pretty_date_type(unwrapped962)
+								deconstruct_result1004 := _t1723
+								if deconstruct_result1004 != nil {
+									unwrapped1005 := deconstruct_result1004
+									p.pretty_date_type(unwrapped1005)
 								} else {
 									_dollar_dollar := msg
-									var _t1638 *pb.DateTimeType
+									var _t1724 *pb.DateTimeType
 									if hasProtoField(_dollar_dollar, "datetime_type") {
-										_t1638 = _dollar_dollar.GetDatetimeType()
+										_t1724 = _dollar_dollar.GetDatetimeType()
 									}
-									deconstruct_result959 := _t1638
-									if deconstruct_result959 != nil {
-										unwrapped960 := deconstruct_result959
-										p.pretty_datetime_type(unwrapped960)
+									deconstruct_result1002 := _t1724
+									if deconstruct_result1002 != nil {
+										unwrapped1003 := deconstruct_result1002
+										p.pretty_datetime_type(unwrapped1003)
 									} else {
 										_dollar_dollar := msg
-										var _t1639 *pb.MissingType
+										var _t1725 *pb.MissingType
 										if hasProtoField(_dollar_dollar, "missing_type") {
-											_t1639 = _dollar_dollar.GetMissingType()
+											_t1725 = _dollar_dollar.GetMissingType()
 										}
-										deconstruct_result957 := _t1639
-										if deconstruct_result957 != nil {
-											unwrapped958 := deconstruct_result957
-											p.pretty_missing_type(unwrapped958)
+										deconstruct_result1000 := _t1725
+										if deconstruct_result1000 != nil {
+											unwrapped1001 := deconstruct_result1000
+											p.pretty_missing_type(unwrapped1001)
 										} else {
 											_dollar_dollar := msg
-											var _t1640 *pb.DecimalType
+											var _t1726 *pb.DecimalType
 											if hasProtoField(_dollar_dollar, "decimal_type") {
-												_t1640 = _dollar_dollar.GetDecimalType()
+												_t1726 = _dollar_dollar.GetDecimalType()
 											}
-											deconstruct_result955 := _t1640
-											if deconstruct_result955 != nil {
-												unwrapped956 := deconstruct_result955
-												p.pretty_decimal_type(unwrapped956)
+											deconstruct_result998 := _t1726
+											if deconstruct_result998 != nil {
+												unwrapped999 := deconstruct_result998
+												p.pretty_decimal_type(unwrapped999)
 											} else {
 												_dollar_dollar := msg
-												var _t1641 *pb.BooleanType
+												var _t1727 *pb.BooleanType
 												if hasProtoField(_dollar_dollar, "boolean_type") {
-													_t1641 = _dollar_dollar.GetBooleanType()
+													_t1727 = _dollar_dollar.GetBooleanType()
 												}
-												deconstruct_result953 := _t1641
-												if deconstruct_result953 != nil {
-													unwrapped954 := deconstruct_result953
-													p.pretty_boolean_type(unwrapped954)
+												deconstruct_result996 := _t1727
+												if deconstruct_result996 != nil {
+													unwrapped997 := deconstruct_result996
+													p.pretty_boolean_type(unwrapped997)
 												} else {
 													_dollar_dollar := msg
-													var _t1642 *pb.Int32Type
+													var _t1728 *pb.Int32Type
 													if hasProtoField(_dollar_dollar, "int32_type") {
-														_t1642 = _dollar_dollar.GetInt32Type()
+														_t1728 = _dollar_dollar.GetInt32Type()
 													}
-													deconstruct_result951 := _t1642
-													if deconstruct_result951 != nil {
-														unwrapped952 := deconstruct_result951
-														p.pretty_int32_type(unwrapped952)
+													deconstruct_result994 := _t1728
+													if deconstruct_result994 != nil {
+														unwrapped995 := deconstruct_result994
+														p.pretty_int32_type(unwrapped995)
 													} else {
 														_dollar_dollar := msg
-														var _t1643 *pb.Float32Type
+														var _t1729 *pb.Float32Type
 														if hasProtoField(_dollar_dollar, "float32_type") {
-															_t1643 = _dollar_dollar.GetFloat32Type()
+															_t1729 = _dollar_dollar.GetFloat32Type()
 														}
-														deconstruct_result949 := _t1643
-														if deconstruct_result949 != nil {
-															unwrapped950 := deconstruct_result949
-															p.pretty_float32_type(unwrapped950)
+														deconstruct_result992 := _t1729
+														if deconstruct_result992 != nil {
+															unwrapped993 := deconstruct_result992
+															p.pretty_float32_type(unwrapped993)
 														} else {
 															_dollar_dollar := msg
-															var _t1644 *pb.UInt32Type
+															var _t1730 *pb.UInt32Type
 															if hasProtoField(_dollar_dollar, "uint32_type") {
-																_t1644 = _dollar_dollar.GetUint32Type()
+																_t1730 = _dollar_dollar.GetUint32Type()
 															}
-															deconstruct_result947 := _t1644
-															if deconstruct_result947 != nil {
-																unwrapped948 := deconstruct_result947
-																p.pretty_uint32_type(unwrapped948)
+															deconstruct_result990 := _t1730
+															if deconstruct_result990 != nil {
+																unwrapped991 := deconstruct_result990
+																p.pretty_uint32_type(unwrapped991)
 															} else {
 																panic(ParseError{msg: "No matching rule for type"})
 															}
@@ -1551,86 +1569,86 @@ func (p *PrettyPrinter) pretty_type(msg *pb.Type) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_unspecified_type(msg *pb.UnspecifiedType) interface{} {
-	fields976 := msg
-	_ = fields976
+	fields1019 := msg
+	_ = fields1019
 	p.write("UNKNOWN")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_string_type(msg *pb.StringType) interface{} {
-	fields977 := msg
-	_ = fields977
+	fields1020 := msg
+	_ = fields1020
 	p.write("STRING")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_int_type(msg *pb.IntType) interface{} {
-	fields978 := msg
-	_ = fields978
+	fields1021 := msg
+	_ = fields1021
 	p.write("INT")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_float_type(msg *pb.FloatType) interface{} {
-	fields979 := msg
-	_ = fields979
+	fields1022 := msg
+	_ = fields1022
 	p.write("FLOAT")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_uint128_type(msg *pb.UInt128Type) interface{} {
-	fields980 := msg
-	_ = fields980
+	fields1023 := msg
+	_ = fields1023
 	p.write("UINT128")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_int128_type(msg *pb.Int128Type) interface{} {
-	fields981 := msg
-	_ = fields981
+	fields1024 := msg
+	_ = fields1024
 	p.write("INT128")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_date_type(msg *pb.DateType) interface{} {
-	fields982 := msg
-	_ = fields982
+	fields1025 := msg
+	_ = fields1025
 	p.write("DATE")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_datetime_type(msg *pb.DateTimeType) interface{} {
-	fields983 := msg
-	_ = fields983
+	fields1026 := msg
+	_ = fields1026
 	p.write("DATETIME")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_missing_type(msg *pb.MissingType) interface{} {
-	fields984 := msg
-	_ = fields984
+	fields1027 := msg
+	_ = fields1027
 	p.write("MISSING")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_decimal_type(msg *pb.DecimalType) interface{} {
-	flat989 := p.tryFlat(msg, func() { p.pretty_decimal_type(msg) })
-	if flat989 != nil {
-		p.write(*flat989)
+	flat1032 := p.tryFlat(msg, func() { p.pretty_decimal_type(msg) })
+	if flat1032 != nil {
+		p.write(*flat1032)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields985 := []interface{}{int64(_dollar_dollar.GetPrecision()), int64(_dollar_dollar.GetScale())}
-		unwrapped_fields986 := fields985
+		fields1028 := []interface{}{int64(_dollar_dollar.GetPrecision()), int64(_dollar_dollar.GetScale())}
+		unwrapped_fields1029 := fields1028
 		p.write("(")
 		p.write("DECIMAL")
 		p.indentSexp()
 		p.newline()
-		field987 := unwrapped_fields986[0].(int64)
-		p.write(fmt.Sprintf("%d", field987))
+		field1030 := unwrapped_fields1029[0].(int64)
+		p.write(fmt.Sprintf("%d", field1030))
 		p.newline()
-		field988 := unwrapped_fields986[1].(int64)
-		p.write(fmt.Sprintf("%d", field988))
+		field1031 := unwrapped_fields1029[1].(int64)
+		p.write(fmt.Sprintf("%d", field1031))
 		p.dedent()
 		p.write(")")
 	}
@@ -1638,48 +1656,48 @@ func (p *PrettyPrinter) pretty_decimal_type(msg *pb.DecimalType) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_boolean_type(msg *pb.BooleanType) interface{} {
-	fields990 := msg
-	_ = fields990
+	fields1033 := msg
+	_ = fields1033
 	p.write("BOOLEAN")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_int32_type(msg *pb.Int32Type) interface{} {
-	fields991 := msg
-	_ = fields991
+	fields1034 := msg
+	_ = fields1034
 	p.write("INT32")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_float32_type(msg *pb.Float32Type) interface{} {
-	fields992 := msg
-	_ = fields992
+	fields1035 := msg
+	_ = fields1035
 	p.write("FLOAT32")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_uint32_type(msg *pb.UInt32Type) interface{} {
-	fields993 := msg
-	_ = fields993
+	fields1036 := msg
+	_ = fields1036
 	p.write("UINT32")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_value_bindings(msg []*pb.Binding) interface{} {
-	flat997 := p.tryFlat(msg, func() { p.pretty_value_bindings(msg) })
-	if flat997 != nil {
-		p.write(*flat997)
+	flat1040 := p.tryFlat(msg, func() { p.pretty_value_bindings(msg) })
+	if flat1040 != nil {
+		p.write(*flat1040)
 		return nil
 	} else {
-		fields994 := msg
+		fields1037 := msg
 		p.write("|")
-		if !(len(fields994) == 0) {
+		if !(len(fields1037) == 0) {
 			p.write(" ")
-			for i996, elem995 := range fields994 {
-				if (i996 > 0) {
+			for i1039, elem1038 := range fields1037 {
+				if (i1039 > 0) {
 					p.newline()
 				}
-				p.pretty_binding(elem995)
+				p.pretty_binding(elem1038)
 			}
 		}
 	}
@@ -1687,140 +1705,140 @@ func (p *PrettyPrinter) pretty_value_bindings(msg []*pb.Binding) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_formula(msg *pb.Formula) interface{} {
-	flat1024 := p.tryFlat(msg, func() { p.pretty_formula(msg) })
-	if flat1024 != nil {
-		p.write(*flat1024)
+	flat1067 := p.tryFlat(msg, func() { p.pretty_formula(msg) })
+	if flat1067 != nil {
+		p.write(*flat1067)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1645 *pb.Conjunction
+		var _t1731 *pb.Conjunction
 		if (hasProtoField(_dollar_dollar, "conjunction") && len(_dollar_dollar.GetConjunction().GetArgs()) == 0) {
-			_t1645 = _dollar_dollar.GetConjunction()
+			_t1731 = _dollar_dollar.GetConjunction()
 		}
-		deconstruct_result1022 := _t1645
-		if deconstruct_result1022 != nil {
-			unwrapped1023 := deconstruct_result1022
-			p.pretty_true(unwrapped1023)
+		deconstruct_result1065 := _t1731
+		if deconstruct_result1065 != nil {
+			unwrapped1066 := deconstruct_result1065
+			p.pretty_true(unwrapped1066)
 		} else {
 			_dollar_dollar := msg
-			var _t1646 *pb.Disjunction
+			var _t1732 *pb.Disjunction
 			if (hasProtoField(_dollar_dollar, "disjunction") && len(_dollar_dollar.GetDisjunction().GetArgs()) == 0) {
-				_t1646 = _dollar_dollar.GetDisjunction()
+				_t1732 = _dollar_dollar.GetDisjunction()
 			}
-			deconstruct_result1020 := _t1646
-			if deconstruct_result1020 != nil {
-				unwrapped1021 := deconstruct_result1020
-				p.pretty_false(unwrapped1021)
+			deconstruct_result1063 := _t1732
+			if deconstruct_result1063 != nil {
+				unwrapped1064 := deconstruct_result1063
+				p.pretty_false(unwrapped1064)
 			} else {
 				_dollar_dollar := msg
-				var _t1647 *pb.Exists
+				var _t1733 *pb.Exists
 				if hasProtoField(_dollar_dollar, "exists") {
-					_t1647 = _dollar_dollar.GetExists()
+					_t1733 = _dollar_dollar.GetExists()
 				}
-				deconstruct_result1018 := _t1647
-				if deconstruct_result1018 != nil {
-					unwrapped1019 := deconstruct_result1018
-					p.pretty_exists(unwrapped1019)
+				deconstruct_result1061 := _t1733
+				if deconstruct_result1061 != nil {
+					unwrapped1062 := deconstruct_result1061
+					p.pretty_exists(unwrapped1062)
 				} else {
 					_dollar_dollar := msg
-					var _t1648 *pb.Reduce
+					var _t1734 *pb.Reduce
 					if hasProtoField(_dollar_dollar, "reduce") {
-						_t1648 = _dollar_dollar.GetReduce()
+						_t1734 = _dollar_dollar.GetReduce()
 					}
-					deconstruct_result1016 := _t1648
-					if deconstruct_result1016 != nil {
-						unwrapped1017 := deconstruct_result1016
-						p.pretty_reduce(unwrapped1017)
+					deconstruct_result1059 := _t1734
+					if deconstruct_result1059 != nil {
+						unwrapped1060 := deconstruct_result1059
+						p.pretty_reduce(unwrapped1060)
 					} else {
 						_dollar_dollar := msg
-						var _t1649 *pb.Conjunction
+						var _t1735 *pb.Conjunction
 						if (hasProtoField(_dollar_dollar, "conjunction") && !(len(_dollar_dollar.GetConjunction().GetArgs()) == 0)) {
-							_t1649 = _dollar_dollar.GetConjunction()
+							_t1735 = _dollar_dollar.GetConjunction()
 						}
-						deconstruct_result1014 := _t1649
-						if deconstruct_result1014 != nil {
-							unwrapped1015 := deconstruct_result1014
-							p.pretty_conjunction(unwrapped1015)
+						deconstruct_result1057 := _t1735
+						if deconstruct_result1057 != nil {
+							unwrapped1058 := deconstruct_result1057
+							p.pretty_conjunction(unwrapped1058)
 						} else {
 							_dollar_dollar := msg
-							var _t1650 *pb.Disjunction
+							var _t1736 *pb.Disjunction
 							if (hasProtoField(_dollar_dollar, "disjunction") && !(len(_dollar_dollar.GetDisjunction().GetArgs()) == 0)) {
-								_t1650 = _dollar_dollar.GetDisjunction()
+								_t1736 = _dollar_dollar.GetDisjunction()
 							}
-							deconstruct_result1012 := _t1650
-							if deconstruct_result1012 != nil {
-								unwrapped1013 := deconstruct_result1012
-								p.pretty_disjunction(unwrapped1013)
+							deconstruct_result1055 := _t1736
+							if deconstruct_result1055 != nil {
+								unwrapped1056 := deconstruct_result1055
+								p.pretty_disjunction(unwrapped1056)
 							} else {
 								_dollar_dollar := msg
-								var _t1651 *pb.Not
+								var _t1737 *pb.Not
 								if hasProtoField(_dollar_dollar, "not") {
-									_t1651 = _dollar_dollar.GetNot()
+									_t1737 = _dollar_dollar.GetNot()
 								}
-								deconstruct_result1010 := _t1651
-								if deconstruct_result1010 != nil {
-									unwrapped1011 := deconstruct_result1010
-									p.pretty_not(unwrapped1011)
+								deconstruct_result1053 := _t1737
+								if deconstruct_result1053 != nil {
+									unwrapped1054 := deconstruct_result1053
+									p.pretty_not(unwrapped1054)
 								} else {
 									_dollar_dollar := msg
-									var _t1652 *pb.FFI
+									var _t1738 *pb.FFI
 									if hasProtoField(_dollar_dollar, "ffi") {
-										_t1652 = _dollar_dollar.GetFfi()
+										_t1738 = _dollar_dollar.GetFfi()
 									}
-									deconstruct_result1008 := _t1652
-									if deconstruct_result1008 != nil {
-										unwrapped1009 := deconstruct_result1008
-										p.pretty_ffi(unwrapped1009)
+									deconstruct_result1051 := _t1738
+									if deconstruct_result1051 != nil {
+										unwrapped1052 := deconstruct_result1051
+										p.pretty_ffi(unwrapped1052)
 									} else {
 										_dollar_dollar := msg
-										var _t1653 *pb.Atom
+										var _t1739 *pb.Atom
 										if hasProtoField(_dollar_dollar, "atom") {
-											_t1653 = _dollar_dollar.GetAtom()
+											_t1739 = _dollar_dollar.GetAtom()
 										}
-										deconstruct_result1006 := _t1653
-										if deconstruct_result1006 != nil {
-											unwrapped1007 := deconstruct_result1006
-											p.pretty_atom(unwrapped1007)
+										deconstruct_result1049 := _t1739
+										if deconstruct_result1049 != nil {
+											unwrapped1050 := deconstruct_result1049
+											p.pretty_atom(unwrapped1050)
 										} else {
 											_dollar_dollar := msg
-											var _t1654 *pb.Pragma
+											var _t1740 *pb.Pragma
 											if hasProtoField(_dollar_dollar, "pragma") {
-												_t1654 = _dollar_dollar.GetPragma()
+												_t1740 = _dollar_dollar.GetPragma()
 											}
-											deconstruct_result1004 := _t1654
-											if deconstruct_result1004 != nil {
-												unwrapped1005 := deconstruct_result1004
-												p.pretty_pragma(unwrapped1005)
+											deconstruct_result1047 := _t1740
+											if deconstruct_result1047 != nil {
+												unwrapped1048 := deconstruct_result1047
+												p.pretty_pragma(unwrapped1048)
 											} else {
 												_dollar_dollar := msg
-												var _t1655 *pb.Primitive
+												var _t1741 *pb.Primitive
 												if hasProtoField(_dollar_dollar, "primitive") {
-													_t1655 = _dollar_dollar.GetPrimitive()
+													_t1741 = _dollar_dollar.GetPrimitive()
 												}
-												deconstruct_result1002 := _t1655
-												if deconstruct_result1002 != nil {
-													unwrapped1003 := deconstruct_result1002
-													p.pretty_primitive(unwrapped1003)
+												deconstruct_result1045 := _t1741
+												if deconstruct_result1045 != nil {
+													unwrapped1046 := deconstruct_result1045
+													p.pretty_primitive(unwrapped1046)
 												} else {
 													_dollar_dollar := msg
-													var _t1656 *pb.RelAtom
+													var _t1742 *pb.RelAtom
 													if hasProtoField(_dollar_dollar, "rel_atom") {
-														_t1656 = _dollar_dollar.GetRelAtom()
+														_t1742 = _dollar_dollar.GetRelAtom()
 													}
-													deconstruct_result1000 := _t1656
-													if deconstruct_result1000 != nil {
-														unwrapped1001 := deconstruct_result1000
-														p.pretty_rel_atom(unwrapped1001)
+													deconstruct_result1043 := _t1742
+													if deconstruct_result1043 != nil {
+														unwrapped1044 := deconstruct_result1043
+														p.pretty_rel_atom(unwrapped1044)
 													} else {
 														_dollar_dollar := msg
-														var _t1657 *pb.Cast
+														var _t1743 *pb.Cast
 														if hasProtoField(_dollar_dollar, "cast") {
-															_t1657 = _dollar_dollar.GetCast()
+															_t1743 = _dollar_dollar.GetCast()
 														}
-														deconstruct_result998 := _t1657
-														if deconstruct_result998 != nil {
-															unwrapped999 := deconstruct_result998
-															p.pretty_cast(unwrapped999)
+														deconstruct_result1041 := _t1743
+														if deconstruct_result1041 != nil {
+															unwrapped1042 := deconstruct_result1041
+															p.pretty_cast(unwrapped1042)
 														} else {
 															panic(ParseError{msg: "No matching rule for formula"})
 														}
@@ -1841,8 +1859,8 @@ func (p *PrettyPrinter) pretty_formula(msg *pb.Formula) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_true(msg *pb.Conjunction) interface{} {
-	fields1025 := msg
-	_ = fields1025
+	fields1068 := msg
+	_ = fields1068
 	p.write("(")
 	p.write("true")
 	p.write(")")
@@ -1850,8 +1868,8 @@ func (p *PrettyPrinter) pretty_true(msg *pb.Conjunction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_false(msg *pb.Disjunction) interface{} {
-	fields1026 := msg
-	_ = fields1026
+	fields1069 := msg
+	_ = fields1069
 	p.write("(")
 	p.write("false")
 	p.write(")")
@@ -1859,24 +1877,24 @@ func (p *PrettyPrinter) pretty_false(msg *pb.Disjunction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_exists(msg *pb.Exists) interface{} {
-	flat1031 := p.tryFlat(msg, func() { p.pretty_exists(msg) })
-	if flat1031 != nil {
-		p.write(*flat1031)
+	flat1074 := p.tryFlat(msg, func() { p.pretty_exists(msg) })
+	if flat1074 != nil {
+		p.write(*flat1074)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1658 := p.deconstruct_bindings(_dollar_dollar.GetBody())
-		fields1027 := []interface{}{_t1658, _dollar_dollar.GetBody().GetValue()}
-		unwrapped_fields1028 := fields1027
+		_t1744 := p.deconstruct_bindings(_dollar_dollar.GetBody())
+		fields1070 := []interface{}{_t1744, _dollar_dollar.GetBody().GetValue()}
+		unwrapped_fields1071 := fields1070
 		p.write("(")
 		p.write("exists")
 		p.indentSexp()
 		p.newline()
-		field1029 := unwrapped_fields1028[0].([]interface{})
-		p.pretty_bindings(field1029)
+		field1072 := unwrapped_fields1071[0].([]interface{})
+		p.pretty_bindings(field1072)
 		p.newline()
-		field1030 := unwrapped_fields1028[1].(*pb.Formula)
-		p.pretty_formula(field1030)
+		field1073 := unwrapped_fields1071[1].(*pb.Formula)
+		p.pretty_formula(field1073)
 		p.dedent()
 		p.write(")")
 	}
@@ -1884,26 +1902,26 @@ func (p *PrettyPrinter) pretty_exists(msg *pb.Exists) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_reduce(msg *pb.Reduce) interface{} {
-	flat1037 := p.tryFlat(msg, func() { p.pretty_reduce(msg) })
-	if flat1037 != nil {
-		p.write(*flat1037)
+	flat1080 := p.tryFlat(msg, func() { p.pretty_reduce(msg) })
+	if flat1080 != nil {
+		p.write(*flat1080)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1032 := []interface{}{_dollar_dollar.GetOp(), _dollar_dollar.GetBody(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1033 := fields1032
+		fields1075 := []interface{}{_dollar_dollar.GetOp(), _dollar_dollar.GetBody(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1076 := fields1075
 		p.write("(")
 		p.write("reduce")
 		p.indentSexp()
 		p.newline()
-		field1034 := unwrapped_fields1033[0].(*pb.Abstraction)
-		p.pretty_abstraction(field1034)
+		field1077 := unwrapped_fields1076[0].(*pb.Abstraction)
+		p.pretty_abstraction(field1077)
 		p.newline()
-		field1035 := unwrapped_fields1033[1].(*pb.Abstraction)
-		p.pretty_abstraction(field1035)
+		field1078 := unwrapped_fields1076[1].(*pb.Abstraction)
+		p.pretty_abstraction(field1078)
 		p.newline()
-		field1036 := unwrapped_fields1033[2].([]*pb.Term)
-		p.pretty_terms(field1036)
+		field1079 := unwrapped_fields1076[2].([]*pb.Term)
+		p.pretty_terms(field1079)
 		p.dedent()
 		p.write(")")
 	}
@@ -1911,22 +1929,22 @@ func (p *PrettyPrinter) pretty_reduce(msg *pb.Reduce) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_terms(msg []*pb.Term) interface{} {
-	flat1041 := p.tryFlat(msg, func() { p.pretty_terms(msg) })
-	if flat1041 != nil {
-		p.write(*flat1041)
+	flat1084 := p.tryFlat(msg, func() { p.pretty_terms(msg) })
+	if flat1084 != nil {
+		p.write(*flat1084)
 		return nil
 	} else {
-		fields1038 := msg
+		fields1081 := msg
 		p.write("(")
 		p.write("terms")
 		p.indentSexp()
-		if !(len(fields1038) == 0) {
+		if !(len(fields1081) == 0) {
 			p.newline()
-			for i1040, elem1039 := range fields1038 {
-				if (i1040 > 0) {
+			for i1083, elem1082 := range fields1081 {
+				if (i1083 > 0) {
 					p.newline()
 				}
-				p.pretty_term(elem1039)
+				p.pretty_term(elem1082)
 			}
 		}
 		p.dedent()
@@ -1936,30 +1954,30 @@ func (p *PrettyPrinter) pretty_terms(msg []*pb.Term) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_term(msg *pb.Term) interface{} {
-	flat1046 := p.tryFlat(msg, func() { p.pretty_term(msg) })
-	if flat1046 != nil {
-		p.write(*flat1046)
+	flat1089 := p.tryFlat(msg, func() { p.pretty_term(msg) })
+	if flat1089 != nil {
+		p.write(*flat1089)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1659 *pb.Var
+		var _t1745 *pb.Var
 		if hasProtoField(_dollar_dollar, "var") {
-			_t1659 = _dollar_dollar.GetVar()
+			_t1745 = _dollar_dollar.GetVar()
 		}
-		deconstruct_result1044 := _t1659
-		if deconstruct_result1044 != nil {
-			unwrapped1045 := deconstruct_result1044
-			p.pretty_var(unwrapped1045)
+		deconstruct_result1087 := _t1745
+		if deconstruct_result1087 != nil {
+			unwrapped1088 := deconstruct_result1087
+			p.pretty_var(unwrapped1088)
 		} else {
 			_dollar_dollar := msg
-			var _t1660 *pb.Value
+			var _t1746 *pb.Value
 			if hasProtoField(_dollar_dollar, "constant") {
-				_t1660 = _dollar_dollar.GetConstant()
+				_t1746 = _dollar_dollar.GetConstant()
 			}
-			deconstruct_result1042 := _t1660
-			if deconstruct_result1042 != nil {
-				unwrapped1043 := deconstruct_result1042
-				p.pretty_value(unwrapped1043)
+			deconstruct_result1085 := _t1746
+			if deconstruct_result1085 != nil {
+				unwrapped1086 := deconstruct_result1085
+				p.pretty_value(unwrapped1086)
 			} else {
 				panic(ParseError{msg: "No matching rule for term"})
 			}
@@ -1969,147 +1987,147 @@ func (p *PrettyPrinter) pretty_term(msg *pb.Term) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_var(msg *pb.Var) interface{} {
-	flat1049 := p.tryFlat(msg, func() { p.pretty_var(msg) })
-	if flat1049 != nil {
-		p.write(*flat1049)
+	flat1092 := p.tryFlat(msg, func() { p.pretty_var(msg) })
+	if flat1092 != nil {
+		p.write(*flat1092)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1047 := _dollar_dollar.GetName()
-		unwrapped_fields1048 := fields1047
-		p.write(unwrapped_fields1048)
+		fields1090 := _dollar_dollar.GetName()
+		unwrapped_fields1091 := fields1090
+		p.write(unwrapped_fields1091)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_value(msg *pb.Value) interface{} {
-	flat1075 := p.tryFlat(msg, func() { p.pretty_value(msg) })
-	if flat1075 != nil {
-		p.write(*flat1075)
+	flat1118 := p.tryFlat(msg, func() { p.pretty_value(msg) })
+	if flat1118 != nil {
+		p.write(*flat1118)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1661 *pb.DateValue
+		var _t1747 *pb.DateValue
 		if hasProtoField(_dollar_dollar, "date_value") {
-			_t1661 = _dollar_dollar.GetDateValue()
+			_t1747 = _dollar_dollar.GetDateValue()
 		}
-		deconstruct_result1073 := _t1661
-		if deconstruct_result1073 != nil {
-			unwrapped1074 := deconstruct_result1073
-			p.pretty_date(unwrapped1074)
+		deconstruct_result1116 := _t1747
+		if deconstruct_result1116 != nil {
+			unwrapped1117 := deconstruct_result1116
+			p.pretty_date(unwrapped1117)
 		} else {
 			_dollar_dollar := msg
-			var _t1662 *pb.DateTimeValue
+			var _t1748 *pb.DateTimeValue
 			if hasProtoField(_dollar_dollar, "datetime_value") {
-				_t1662 = _dollar_dollar.GetDatetimeValue()
+				_t1748 = _dollar_dollar.GetDatetimeValue()
 			}
-			deconstruct_result1071 := _t1662
-			if deconstruct_result1071 != nil {
-				unwrapped1072 := deconstruct_result1071
-				p.pretty_datetime(unwrapped1072)
+			deconstruct_result1114 := _t1748
+			if deconstruct_result1114 != nil {
+				unwrapped1115 := deconstruct_result1114
+				p.pretty_datetime(unwrapped1115)
 			} else {
 				_dollar_dollar := msg
-				var _t1663 *string
+				var _t1749 *string
 				if hasProtoField(_dollar_dollar, "string_value") {
-					_t1663 = ptr(_dollar_dollar.GetStringValue())
+					_t1749 = ptr(_dollar_dollar.GetStringValue())
 				}
-				deconstruct_result1069 := _t1663
-				if deconstruct_result1069 != nil {
-					unwrapped1070 := *deconstruct_result1069
-					p.write(p.formatStringValue(unwrapped1070))
+				deconstruct_result1112 := _t1749
+				if deconstruct_result1112 != nil {
+					unwrapped1113 := *deconstruct_result1112
+					p.write(p.formatStringValue(unwrapped1113))
 				} else {
 					_dollar_dollar := msg
-					var _t1664 *int32
+					var _t1750 *int32
 					if hasProtoField(_dollar_dollar, "int32_value") {
-						_t1664 = ptr(_dollar_dollar.GetInt32Value())
+						_t1750 = ptr(_dollar_dollar.GetInt32Value())
 					}
-					deconstruct_result1067 := _t1664
-					if deconstruct_result1067 != nil {
-						unwrapped1068 := *deconstruct_result1067
-						p.write(fmt.Sprintf("%di32", unwrapped1068))
+					deconstruct_result1110 := _t1750
+					if deconstruct_result1110 != nil {
+						unwrapped1111 := *deconstruct_result1110
+						p.write(fmt.Sprintf("%di32", unwrapped1111))
 					} else {
 						_dollar_dollar := msg
-						var _t1665 *int64
+						var _t1751 *int64
 						if hasProtoField(_dollar_dollar, "int_value") {
-							_t1665 = ptr(_dollar_dollar.GetIntValue())
+							_t1751 = ptr(_dollar_dollar.GetIntValue())
 						}
-						deconstruct_result1065 := _t1665
-						if deconstruct_result1065 != nil {
-							unwrapped1066 := *deconstruct_result1065
-							p.write(fmt.Sprintf("%d", unwrapped1066))
+						deconstruct_result1108 := _t1751
+						if deconstruct_result1108 != nil {
+							unwrapped1109 := *deconstruct_result1108
+							p.write(fmt.Sprintf("%d", unwrapped1109))
 						} else {
 							_dollar_dollar := msg
-							var _t1666 *float32
+							var _t1752 *float32
 							if hasProtoField(_dollar_dollar, "float32_value") {
-								_t1666 = ptr(_dollar_dollar.GetFloat32Value())
+								_t1752 = ptr(_dollar_dollar.GetFloat32Value())
 							}
-							deconstruct_result1063 := _t1666
-							if deconstruct_result1063 != nil {
-								unwrapped1064 := *deconstruct_result1063
-								p.write(formatFloat32(unwrapped1064))
+							deconstruct_result1106 := _t1752
+							if deconstruct_result1106 != nil {
+								unwrapped1107 := *deconstruct_result1106
+								p.write(formatFloat32(unwrapped1107))
 							} else {
 								_dollar_dollar := msg
-								var _t1667 *float64
+								var _t1753 *float64
 								if hasProtoField(_dollar_dollar, "float_value") {
-									_t1667 = ptr(_dollar_dollar.GetFloatValue())
+									_t1753 = ptr(_dollar_dollar.GetFloatValue())
 								}
-								deconstruct_result1061 := _t1667
-								if deconstruct_result1061 != nil {
-									unwrapped1062 := *deconstruct_result1061
-									p.write(formatFloat64(unwrapped1062))
+								deconstruct_result1104 := _t1753
+								if deconstruct_result1104 != nil {
+									unwrapped1105 := *deconstruct_result1104
+									p.write(formatFloat64(unwrapped1105))
 								} else {
 									_dollar_dollar := msg
-									var _t1668 *uint32
+									var _t1754 *uint32
 									if hasProtoField(_dollar_dollar, "uint32_value") {
-										_t1668 = ptr(_dollar_dollar.GetUint32Value())
+										_t1754 = ptr(_dollar_dollar.GetUint32Value())
 									}
-									deconstruct_result1059 := _t1668
-									if deconstruct_result1059 != nil {
-										unwrapped1060 := *deconstruct_result1059
-										p.write(fmt.Sprintf("%du32", unwrapped1060))
+									deconstruct_result1102 := _t1754
+									if deconstruct_result1102 != nil {
+										unwrapped1103 := *deconstruct_result1102
+										p.write(fmt.Sprintf("%du32", unwrapped1103))
 									} else {
 										_dollar_dollar := msg
-										var _t1669 *pb.UInt128Value
+										var _t1755 *pb.UInt128Value
 										if hasProtoField(_dollar_dollar, "uint128_value") {
-											_t1669 = _dollar_dollar.GetUint128Value()
+											_t1755 = _dollar_dollar.GetUint128Value()
 										}
-										deconstruct_result1057 := _t1669
-										if deconstruct_result1057 != nil {
-											unwrapped1058 := deconstruct_result1057
-											p.write(p.formatUint128(unwrapped1058))
+										deconstruct_result1100 := _t1755
+										if deconstruct_result1100 != nil {
+											unwrapped1101 := deconstruct_result1100
+											p.write(p.formatUint128(unwrapped1101))
 										} else {
 											_dollar_dollar := msg
-											var _t1670 *pb.Int128Value
+											var _t1756 *pb.Int128Value
 											if hasProtoField(_dollar_dollar, "int128_value") {
-												_t1670 = _dollar_dollar.GetInt128Value()
+												_t1756 = _dollar_dollar.GetInt128Value()
 											}
-											deconstruct_result1055 := _t1670
-											if deconstruct_result1055 != nil {
-												unwrapped1056 := deconstruct_result1055
-												p.write(p.formatInt128(unwrapped1056))
+											deconstruct_result1098 := _t1756
+											if deconstruct_result1098 != nil {
+												unwrapped1099 := deconstruct_result1098
+												p.write(p.formatInt128(unwrapped1099))
 											} else {
 												_dollar_dollar := msg
-												var _t1671 *pb.DecimalValue
+												var _t1757 *pb.DecimalValue
 												if hasProtoField(_dollar_dollar, "decimal_value") {
-													_t1671 = _dollar_dollar.GetDecimalValue()
+													_t1757 = _dollar_dollar.GetDecimalValue()
 												}
-												deconstruct_result1053 := _t1671
-												if deconstruct_result1053 != nil {
-													unwrapped1054 := deconstruct_result1053
-													p.write(p.formatDecimal(unwrapped1054))
+												deconstruct_result1096 := _t1757
+												if deconstruct_result1096 != nil {
+													unwrapped1097 := deconstruct_result1096
+													p.write(p.formatDecimal(unwrapped1097))
 												} else {
 													_dollar_dollar := msg
-													var _t1672 *bool
+													var _t1758 *bool
 													if hasProtoField(_dollar_dollar, "boolean_value") {
-														_t1672 = ptr(_dollar_dollar.GetBooleanValue())
+														_t1758 = ptr(_dollar_dollar.GetBooleanValue())
 													}
-													deconstruct_result1051 := _t1672
-													if deconstruct_result1051 != nil {
-														unwrapped1052 := *deconstruct_result1051
-														p.pretty_boolean_value(unwrapped1052)
+													deconstruct_result1094 := _t1758
+													if deconstruct_result1094 != nil {
+														unwrapped1095 := *deconstruct_result1094
+														p.pretty_boolean_value(unwrapped1095)
 													} else {
-														fields1050 := msg
-														_ = fields1050
+														fields1093 := msg
+														_ = fields1093
 														p.write("missing")
 													}
 												}
@@ -2128,26 +2146,26 @@ func (p *PrettyPrinter) pretty_value(msg *pb.Value) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_date(msg *pb.DateValue) interface{} {
-	flat1081 := p.tryFlat(msg, func() { p.pretty_date(msg) })
-	if flat1081 != nil {
-		p.write(*flat1081)
+	flat1124 := p.tryFlat(msg, func() { p.pretty_date(msg) })
+	if flat1124 != nil {
+		p.write(*flat1124)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1076 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay())}
-		unwrapped_fields1077 := fields1076
+		fields1119 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay())}
+		unwrapped_fields1120 := fields1119
 		p.write("(")
 		p.write("date")
 		p.indentSexp()
 		p.newline()
-		field1078 := unwrapped_fields1077[0].(int64)
-		p.write(fmt.Sprintf("%d", field1078))
+		field1121 := unwrapped_fields1120[0].(int64)
+		p.write(fmt.Sprintf("%d", field1121))
 		p.newline()
-		field1079 := unwrapped_fields1077[1].(int64)
-		p.write(fmt.Sprintf("%d", field1079))
+		field1122 := unwrapped_fields1120[1].(int64)
+		p.write(fmt.Sprintf("%d", field1122))
 		p.newline()
-		field1080 := unwrapped_fields1077[2].(int64)
-		p.write(fmt.Sprintf("%d", field1080))
+		field1123 := unwrapped_fields1120[2].(int64)
+		p.write(fmt.Sprintf("%d", field1123))
 		p.dedent()
 		p.write(")")
 	}
@@ -2155,40 +2173,40 @@ func (p *PrettyPrinter) pretty_date(msg *pb.DateValue) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_datetime(msg *pb.DateTimeValue) interface{} {
-	flat1092 := p.tryFlat(msg, func() { p.pretty_datetime(msg) })
-	if flat1092 != nil {
-		p.write(*flat1092)
+	flat1135 := p.tryFlat(msg, func() { p.pretty_datetime(msg) })
+	if flat1135 != nil {
+		p.write(*flat1135)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1082 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay()), int64(_dollar_dollar.GetHour()), int64(_dollar_dollar.GetMinute()), int64(_dollar_dollar.GetSecond()), ptr(int64(_dollar_dollar.GetMicrosecond()))}
-		unwrapped_fields1083 := fields1082
+		fields1125 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay()), int64(_dollar_dollar.GetHour()), int64(_dollar_dollar.GetMinute()), int64(_dollar_dollar.GetSecond()), ptr(int64(_dollar_dollar.GetMicrosecond()))}
+		unwrapped_fields1126 := fields1125
 		p.write("(")
 		p.write("datetime")
 		p.indentSexp()
 		p.newline()
-		field1084 := unwrapped_fields1083[0].(int64)
-		p.write(fmt.Sprintf("%d", field1084))
+		field1127 := unwrapped_fields1126[0].(int64)
+		p.write(fmt.Sprintf("%d", field1127))
 		p.newline()
-		field1085 := unwrapped_fields1083[1].(int64)
-		p.write(fmt.Sprintf("%d", field1085))
+		field1128 := unwrapped_fields1126[1].(int64)
+		p.write(fmt.Sprintf("%d", field1128))
 		p.newline()
-		field1086 := unwrapped_fields1083[2].(int64)
-		p.write(fmt.Sprintf("%d", field1086))
+		field1129 := unwrapped_fields1126[2].(int64)
+		p.write(fmt.Sprintf("%d", field1129))
 		p.newline()
-		field1087 := unwrapped_fields1083[3].(int64)
-		p.write(fmt.Sprintf("%d", field1087))
+		field1130 := unwrapped_fields1126[3].(int64)
+		p.write(fmt.Sprintf("%d", field1130))
 		p.newline()
-		field1088 := unwrapped_fields1083[4].(int64)
-		p.write(fmt.Sprintf("%d", field1088))
+		field1131 := unwrapped_fields1126[4].(int64)
+		p.write(fmt.Sprintf("%d", field1131))
 		p.newline()
-		field1089 := unwrapped_fields1083[5].(int64)
-		p.write(fmt.Sprintf("%d", field1089))
-		field1090 := unwrapped_fields1083[6].(*int64)
-		if field1090 != nil {
+		field1132 := unwrapped_fields1126[5].(int64)
+		p.write(fmt.Sprintf("%d", field1132))
+		field1133 := unwrapped_fields1126[6].(*int64)
+		if field1133 != nil {
 			p.newline()
-			opt_val1091 := *field1090
-			p.write(fmt.Sprintf("%d", opt_val1091))
+			opt_val1134 := *field1133
+			p.write(fmt.Sprintf("%d", opt_val1134))
 		}
 		p.dedent()
 		p.write(")")
@@ -2197,24 +2215,24 @@ func (p *PrettyPrinter) pretty_datetime(msg *pb.DateTimeValue) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_conjunction(msg *pb.Conjunction) interface{} {
-	flat1097 := p.tryFlat(msg, func() { p.pretty_conjunction(msg) })
-	if flat1097 != nil {
-		p.write(*flat1097)
+	flat1140 := p.tryFlat(msg, func() { p.pretty_conjunction(msg) })
+	if flat1140 != nil {
+		p.write(*flat1140)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1093 := _dollar_dollar.GetArgs()
-		unwrapped_fields1094 := fields1093
+		fields1136 := _dollar_dollar.GetArgs()
+		unwrapped_fields1137 := fields1136
 		p.write("(")
 		p.write("and")
 		p.indentSexp()
-		if !(len(unwrapped_fields1094) == 0) {
+		if !(len(unwrapped_fields1137) == 0) {
 			p.newline()
-			for i1096, elem1095 := range unwrapped_fields1094 {
-				if (i1096 > 0) {
+			for i1139, elem1138 := range unwrapped_fields1137 {
+				if (i1139 > 0) {
 					p.newline()
 				}
-				p.pretty_formula(elem1095)
+				p.pretty_formula(elem1138)
 			}
 		}
 		p.dedent()
@@ -2224,24 +2242,24 @@ func (p *PrettyPrinter) pretty_conjunction(msg *pb.Conjunction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_disjunction(msg *pb.Disjunction) interface{} {
-	flat1102 := p.tryFlat(msg, func() { p.pretty_disjunction(msg) })
-	if flat1102 != nil {
-		p.write(*flat1102)
+	flat1145 := p.tryFlat(msg, func() { p.pretty_disjunction(msg) })
+	if flat1145 != nil {
+		p.write(*flat1145)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1098 := _dollar_dollar.GetArgs()
-		unwrapped_fields1099 := fields1098
+		fields1141 := _dollar_dollar.GetArgs()
+		unwrapped_fields1142 := fields1141
 		p.write("(")
 		p.write("or")
 		p.indentSexp()
-		if !(len(unwrapped_fields1099) == 0) {
+		if !(len(unwrapped_fields1142) == 0) {
 			p.newline()
-			for i1101, elem1100 := range unwrapped_fields1099 {
-				if (i1101 > 0) {
+			for i1144, elem1143 := range unwrapped_fields1142 {
+				if (i1144 > 0) {
 					p.newline()
 				}
-				p.pretty_formula(elem1100)
+				p.pretty_formula(elem1143)
 			}
 		}
 		p.dedent()
@@ -2251,19 +2269,19 @@ func (p *PrettyPrinter) pretty_disjunction(msg *pb.Disjunction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_not(msg *pb.Not) interface{} {
-	flat1105 := p.tryFlat(msg, func() { p.pretty_not(msg) })
-	if flat1105 != nil {
-		p.write(*flat1105)
+	flat1148 := p.tryFlat(msg, func() { p.pretty_not(msg) })
+	if flat1148 != nil {
+		p.write(*flat1148)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1103 := _dollar_dollar.GetArg()
-		unwrapped_fields1104 := fields1103
+		fields1146 := _dollar_dollar.GetArg()
+		unwrapped_fields1147 := fields1146
 		p.write("(")
 		p.write("not")
 		p.indentSexp()
 		p.newline()
-		p.pretty_formula(unwrapped_fields1104)
+		p.pretty_formula(unwrapped_fields1147)
 		p.dedent()
 		p.write(")")
 	}
@@ -2271,26 +2289,26 @@ func (p *PrettyPrinter) pretty_not(msg *pb.Not) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_ffi(msg *pb.FFI) interface{} {
-	flat1111 := p.tryFlat(msg, func() { p.pretty_ffi(msg) })
-	if flat1111 != nil {
-		p.write(*flat1111)
+	flat1154 := p.tryFlat(msg, func() { p.pretty_ffi(msg) })
+	if flat1154 != nil {
+		p.write(*flat1154)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1106 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetArgs(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1107 := fields1106
+		fields1149 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetArgs(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1150 := fields1149
 		p.write("(")
 		p.write("ffi")
 		p.indentSexp()
 		p.newline()
-		field1108 := unwrapped_fields1107[0].(string)
-		p.pretty_name(field1108)
+		field1151 := unwrapped_fields1150[0].(string)
+		p.pretty_name(field1151)
 		p.newline()
-		field1109 := unwrapped_fields1107[1].([]*pb.Abstraction)
-		p.pretty_ffi_args(field1109)
+		field1152 := unwrapped_fields1150[1].([]*pb.Abstraction)
+		p.pretty_ffi_args(field1152)
 		p.newline()
-		field1110 := unwrapped_fields1107[2].([]*pb.Term)
-		p.pretty_terms(field1110)
+		field1153 := unwrapped_fields1150[2].([]*pb.Term)
+		p.pretty_terms(field1153)
 		p.dedent()
 		p.write(")")
 	}
@@ -2298,35 +2316,35 @@ func (p *PrettyPrinter) pretty_ffi(msg *pb.FFI) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_name(msg string) interface{} {
-	flat1113 := p.tryFlat(msg, func() { p.pretty_name(msg) })
-	if flat1113 != nil {
-		p.write(*flat1113)
+	flat1156 := p.tryFlat(msg, func() { p.pretty_name(msg) })
+	if flat1156 != nil {
+		p.write(*flat1156)
 		return nil
 	} else {
-		fields1112 := msg
+		fields1155 := msg
 		p.write(":")
-		p.write(fields1112)
+		p.write(fields1155)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_ffi_args(msg []*pb.Abstraction) interface{} {
-	flat1117 := p.tryFlat(msg, func() { p.pretty_ffi_args(msg) })
-	if flat1117 != nil {
-		p.write(*flat1117)
+	flat1160 := p.tryFlat(msg, func() { p.pretty_ffi_args(msg) })
+	if flat1160 != nil {
+		p.write(*flat1160)
 		return nil
 	} else {
-		fields1114 := msg
+		fields1157 := msg
 		p.write("(")
 		p.write("args")
 		p.indentSexp()
-		if !(len(fields1114) == 0) {
+		if !(len(fields1157) == 0) {
 			p.newline()
-			for i1116, elem1115 := range fields1114 {
-				if (i1116 > 0) {
+			for i1159, elem1158 := range fields1157 {
+				if (i1159 > 0) {
 					p.newline()
 				}
-				p.pretty_abstraction(elem1115)
+				p.pretty_abstraction(elem1158)
 			}
 		}
 		p.dedent()
@@ -2336,28 +2354,28 @@ func (p *PrettyPrinter) pretty_ffi_args(msg []*pb.Abstraction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_atom(msg *pb.Atom) interface{} {
-	flat1124 := p.tryFlat(msg, func() { p.pretty_atom(msg) })
-	if flat1124 != nil {
-		p.write(*flat1124)
+	flat1167 := p.tryFlat(msg, func() { p.pretty_atom(msg) })
+	if flat1167 != nil {
+		p.write(*flat1167)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1118 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1119 := fields1118
+		fields1161 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1162 := fields1161
 		p.write("(")
 		p.write("atom")
 		p.indentSexp()
 		p.newline()
-		field1120 := unwrapped_fields1119[0].(*pb.RelationId)
-		p.pretty_relation_id(field1120)
-		field1121 := unwrapped_fields1119[1].([]*pb.Term)
-		if !(len(field1121) == 0) {
+		field1163 := unwrapped_fields1162[0].(*pb.RelationId)
+		p.pretty_relation_id(field1163)
+		field1164 := unwrapped_fields1162[1].([]*pb.Term)
+		if !(len(field1164) == 0) {
 			p.newline()
-			for i1123, elem1122 := range field1121 {
-				if (i1123 > 0) {
+			for i1166, elem1165 := range field1164 {
+				if (i1166 > 0) {
 					p.newline()
 				}
-				p.pretty_term(elem1122)
+				p.pretty_term(elem1165)
 			}
 		}
 		p.dedent()
@@ -2367,28 +2385,28 @@ func (p *PrettyPrinter) pretty_atom(msg *pb.Atom) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_pragma(msg *pb.Pragma) interface{} {
-	flat1131 := p.tryFlat(msg, func() { p.pretty_pragma(msg) })
-	if flat1131 != nil {
-		p.write(*flat1131)
+	flat1174 := p.tryFlat(msg, func() { p.pretty_pragma(msg) })
+	if flat1174 != nil {
+		p.write(*flat1174)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1125 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1126 := fields1125
+		fields1168 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1169 := fields1168
 		p.write("(")
 		p.write("pragma")
 		p.indentSexp()
 		p.newline()
-		field1127 := unwrapped_fields1126[0].(string)
-		p.pretty_name(field1127)
-		field1128 := unwrapped_fields1126[1].([]*pb.Term)
-		if !(len(field1128) == 0) {
+		field1170 := unwrapped_fields1169[0].(string)
+		p.pretty_name(field1170)
+		field1171 := unwrapped_fields1169[1].([]*pb.Term)
+		if !(len(field1171) == 0) {
 			p.newline()
-			for i1130, elem1129 := range field1128 {
-				if (i1130 > 0) {
+			for i1173, elem1172 := range field1171 {
+				if (i1173 > 0) {
 					p.newline()
 				}
-				p.pretty_term(elem1129)
+				p.pretty_term(elem1172)
 			}
 		}
 		p.dedent()
@@ -2398,109 +2416,109 @@ func (p *PrettyPrinter) pretty_pragma(msg *pb.Pragma) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_primitive(msg *pb.Primitive) interface{} {
-	flat1147 := p.tryFlat(msg, func() { p.pretty_primitive(msg) })
-	if flat1147 != nil {
-		p.write(*flat1147)
+	flat1190 := p.tryFlat(msg, func() { p.pretty_primitive(msg) })
+	if flat1190 != nil {
+		p.write(*flat1190)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1673 []interface{}
+		var _t1759 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_eq" {
-			_t1673 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1759 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		guard_result1146 := _t1673
-		if guard_result1146 != nil {
+		guard_result1189 := _t1759
+		if guard_result1189 != nil {
 			p.pretty_eq(msg)
 		} else {
 			_dollar_dollar := msg
-			var _t1674 []interface{}
+			var _t1760 []interface{}
 			if _dollar_dollar.GetName() == "rel_primitive_lt_monotype" {
-				_t1674 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+				_t1760 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 			}
-			guard_result1145 := _t1674
-			if guard_result1145 != nil {
+			guard_result1188 := _t1760
+			if guard_result1188 != nil {
 				p.pretty_lt(msg)
 			} else {
 				_dollar_dollar := msg
-				var _t1675 []interface{}
+				var _t1761 []interface{}
 				if _dollar_dollar.GetName() == "rel_primitive_lt_eq_monotype" {
-					_t1675 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+					_t1761 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 				}
-				guard_result1144 := _t1675
-				if guard_result1144 != nil {
+				guard_result1187 := _t1761
+				if guard_result1187 != nil {
 					p.pretty_lt_eq(msg)
 				} else {
 					_dollar_dollar := msg
-					var _t1676 []interface{}
+					var _t1762 []interface{}
 					if _dollar_dollar.GetName() == "rel_primitive_gt_monotype" {
-						_t1676 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+						_t1762 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 					}
-					guard_result1143 := _t1676
-					if guard_result1143 != nil {
+					guard_result1186 := _t1762
+					if guard_result1186 != nil {
 						p.pretty_gt(msg)
 					} else {
 						_dollar_dollar := msg
-						var _t1677 []interface{}
+						var _t1763 []interface{}
 						if _dollar_dollar.GetName() == "rel_primitive_gt_eq_monotype" {
-							_t1677 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+							_t1763 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 						}
-						guard_result1142 := _t1677
-						if guard_result1142 != nil {
+						guard_result1185 := _t1763
+						if guard_result1185 != nil {
 							p.pretty_gt_eq(msg)
 						} else {
 							_dollar_dollar := msg
-							var _t1678 []interface{}
+							var _t1764 []interface{}
 							if _dollar_dollar.GetName() == "rel_primitive_add_monotype" {
-								_t1678 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+								_t1764 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 							}
-							guard_result1141 := _t1678
-							if guard_result1141 != nil {
+							guard_result1184 := _t1764
+							if guard_result1184 != nil {
 								p.pretty_add(msg)
 							} else {
 								_dollar_dollar := msg
-								var _t1679 []interface{}
+								var _t1765 []interface{}
 								if _dollar_dollar.GetName() == "rel_primitive_subtract_monotype" {
-									_t1679 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+									_t1765 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 								}
-								guard_result1140 := _t1679
-								if guard_result1140 != nil {
+								guard_result1183 := _t1765
+								if guard_result1183 != nil {
 									p.pretty_minus(msg)
 								} else {
 									_dollar_dollar := msg
-									var _t1680 []interface{}
+									var _t1766 []interface{}
 									if _dollar_dollar.GetName() == "rel_primitive_multiply_monotype" {
-										_t1680 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+										_t1766 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 									}
-									guard_result1139 := _t1680
-									if guard_result1139 != nil {
+									guard_result1182 := _t1766
+									if guard_result1182 != nil {
 										p.pretty_multiply(msg)
 									} else {
 										_dollar_dollar := msg
-										var _t1681 []interface{}
+										var _t1767 []interface{}
 										if _dollar_dollar.GetName() == "rel_primitive_divide_monotype" {
-											_t1681 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+											_t1767 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 										}
-										guard_result1138 := _t1681
-										if guard_result1138 != nil {
+										guard_result1181 := _t1767
+										if guard_result1181 != nil {
 											p.pretty_divide(msg)
 										} else {
 											_dollar_dollar := msg
-											fields1132 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
-											unwrapped_fields1133 := fields1132
+											fields1175 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
+											unwrapped_fields1176 := fields1175
 											p.write("(")
 											p.write("primitive")
 											p.indentSexp()
 											p.newline()
-											field1134 := unwrapped_fields1133[0].(string)
-											p.pretty_name(field1134)
-											field1135 := unwrapped_fields1133[1].([]*pb.RelTerm)
-											if !(len(field1135) == 0) {
+											field1177 := unwrapped_fields1176[0].(string)
+											p.pretty_name(field1177)
+											field1178 := unwrapped_fields1176[1].([]*pb.RelTerm)
+											if !(len(field1178) == 0) {
 												p.newline()
-												for i1137, elem1136 := range field1135 {
-													if (i1137 > 0) {
+												for i1180, elem1179 := range field1178 {
+													if (i1180 > 0) {
 														p.newline()
 													}
-													p.pretty_rel_term(elem1136)
+													p.pretty_rel_term(elem1179)
 												}
 											}
 											p.dedent()
@@ -2519,27 +2537,27 @@ func (p *PrettyPrinter) pretty_primitive(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_eq(msg *pb.Primitive) interface{} {
-	flat1152 := p.tryFlat(msg, func() { p.pretty_eq(msg) })
-	if flat1152 != nil {
-		p.write(*flat1152)
+	flat1195 := p.tryFlat(msg, func() { p.pretty_eq(msg) })
+	if flat1195 != nil {
+		p.write(*flat1195)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1682 []interface{}
+		var _t1768 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_eq" {
-			_t1682 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1768 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1148 := _t1682
-		unwrapped_fields1149 := fields1148
+		fields1191 := _t1768
+		unwrapped_fields1192 := fields1191
 		p.write("(")
 		p.write("=")
 		p.indentSexp()
 		p.newline()
-		field1150 := unwrapped_fields1149[0].(*pb.Term)
-		p.pretty_term(field1150)
+		field1193 := unwrapped_fields1192[0].(*pb.Term)
+		p.pretty_term(field1193)
 		p.newline()
-		field1151 := unwrapped_fields1149[1].(*pb.Term)
-		p.pretty_term(field1151)
+		field1194 := unwrapped_fields1192[1].(*pb.Term)
+		p.pretty_term(field1194)
 		p.dedent()
 		p.write(")")
 	}
@@ -2547,27 +2565,27 @@ func (p *PrettyPrinter) pretty_eq(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_lt(msg *pb.Primitive) interface{} {
-	flat1157 := p.tryFlat(msg, func() { p.pretty_lt(msg) })
-	if flat1157 != nil {
-		p.write(*flat1157)
+	flat1200 := p.tryFlat(msg, func() { p.pretty_lt(msg) })
+	if flat1200 != nil {
+		p.write(*flat1200)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1683 []interface{}
+		var _t1769 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_lt_monotype" {
-			_t1683 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1769 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1153 := _t1683
-		unwrapped_fields1154 := fields1153
+		fields1196 := _t1769
+		unwrapped_fields1197 := fields1196
 		p.write("(")
 		p.write("<")
 		p.indentSexp()
 		p.newline()
-		field1155 := unwrapped_fields1154[0].(*pb.Term)
-		p.pretty_term(field1155)
+		field1198 := unwrapped_fields1197[0].(*pb.Term)
+		p.pretty_term(field1198)
 		p.newline()
-		field1156 := unwrapped_fields1154[1].(*pb.Term)
-		p.pretty_term(field1156)
+		field1199 := unwrapped_fields1197[1].(*pb.Term)
+		p.pretty_term(field1199)
 		p.dedent()
 		p.write(")")
 	}
@@ -2575,27 +2593,27 @@ func (p *PrettyPrinter) pretty_lt(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_lt_eq(msg *pb.Primitive) interface{} {
-	flat1162 := p.tryFlat(msg, func() { p.pretty_lt_eq(msg) })
-	if flat1162 != nil {
-		p.write(*flat1162)
+	flat1205 := p.tryFlat(msg, func() { p.pretty_lt_eq(msg) })
+	if flat1205 != nil {
+		p.write(*flat1205)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1684 []interface{}
+		var _t1770 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_lt_eq_monotype" {
-			_t1684 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1770 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1158 := _t1684
-		unwrapped_fields1159 := fields1158
+		fields1201 := _t1770
+		unwrapped_fields1202 := fields1201
 		p.write("(")
 		p.write("<=")
 		p.indentSexp()
 		p.newline()
-		field1160 := unwrapped_fields1159[0].(*pb.Term)
-		p.pretty_term(field1160)
+		field1203 := unwrapped_fields1202[0].(*pb.Term)
+		p.pretty_term(field1203)
 		p.newline()
-		field1161 := unwrapped_fields1159[1].(*pb.Term)
-		p.pretty_term(field1161)
+		field1204 := unwrapped_fields1202[1].(*pb.Term)
+		p.pretty_term(field1204)
 		p.dedent()
 		p.write(")")
 	}
@@ -2603,27 +2621,27 @@ func (p *PrettyPrinter) pretty_lt_eq(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gt(msg *pb.Primitive) interface{} {
-	flat1167 := p.tryFlat(msg, func() { p.pretty_gt(msg) })
-	if flat1167 != nil {
-		p.write(*flat1167)
+	flat1210 := p.tryFlat(msg, func() { p.pretty_gt(msg) })
+	if flat1210 != nil {
+		p.write(*flat1210)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1685 []interface{}
+		var _t1771 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_gt_monotype" {
-			_t1685 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1771 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1163 := _t1685
-		unwrapped_fields1164 := fields1163
+		fields1206 := _t1771
+		unwrapped_fields1207 := fields1206
 		p.write("(")
 		p.write(">")
 		p.indentSexp()
 		p.newline()
-		field1165 := unwrapped_fields1164[0].(*pb.Term)
-		p.pretty_term(field1165)
+		field1208 := unwrapped_fields1207[0].(*pb.Term)
+		p.pretty_term(field1208)
 		p.newline()
-		field1166 := unwrapped_fields1164[1].(*pb.Term)
-		p.pretty_term(field1166)
+		field1209 := unwrapped_fields1207[1].(*pb.Term)
+		p.pretty_term(field1209)
 		p.dedent()
 		p.write(")")
 	}
@@ -2631,27 +2649,27 @@ func (p *PrettyPrinter) pretty_gt(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gt_eq(msg *pb.Primitive) interface{} {
-	flat1172 := p.tryFlat(msg, func() { p.pretty_gt_eq(msg) })
-	if flat1172 != nil {
-		p.write(*flat1172)
+	flat1215 := p.tryFlat(msg, func() { p.pretty_gt_eq(msg) })
+	if flat1215 != nil {
+		p.write(*flat1215)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1686 []interface{}
+		var _t1772 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_gt_eq_monotype" {
-			_t1686 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1772 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1168 := _t1686
-		unwrapped_fields1169 := fields1168
+		fields1211 := _t1772
+		unwrapped_fields1212 := fields1211
 		p.write("(")
 		p.write(">=")
 		p.indentSexp()
 		p.newline()
-		field1170 := unwrapped_fields1169[0].(*pb.Term)
-		p.pretty_term(field1170)
+		field1213 := unwrapped_fields1212[0].(*pb.Term)
+		p.pretty_term(field1213)
 		p.newline()
-		field1171 := unwrapped_fields1169[1].(*pb.Term)
-		p.pretty_term(field1171)
+		field1214 := unwrapped_fields1212[1].(*pb.Term)
+		p.pretty_term(field1214)
 		p.dedent()
 		p.write(")")
 	}
@@ -2659,30 +2677,30 @@ func (p *PrettyPrinter) pretty_gt_eq(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_add(msg *pb.Primitive) interface{} {
-	flat1178 := p.tryFlat(msg, func() { p.pretty_add(msg) })
-	if flat1178 != nil {
-		p.write(*flat1178)
+	flat1221 := p.tryFlat(msg, func() { p.pretty_add(msg) })
+	if flat1221 != nil {
+		p.write(*flat1221)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1687 []interface{}
+		var _t1773 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_add_monotype" {
-			_t1687 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+			_t1773 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 		}
-		fields1173 := _t1687
-		unwrapped_fields1174 := fields1173
+		fields1216 := _t1773
+		unwrapped_fields1217 := fields1216
 		p.write("(")
 		p.write("+")
 		p.indentSexp()
 		p.newline()
-		field1175 := unwrapped_fields1174[0].(*pb.Term)
-		p.pretty_term(field1175)
+		field1218 := unwrapped_fields1217[0].(*pb.Term)
+		p.pretty_term(field1218)
 		p.newline()
-		field1176 := unwrapped_fields1174[1].(*pb.Term)
-		p.pretty_term(field1176)
+		field1219 := unwrapped_fields1217[1].(*pb.Term)
+		p.pretty_term(field1219)
 		p.newline()
-		field1177 := unwrapped_fields1174[2].(*pb.Term)
-		p.pretty_term(field1177)
+		field1220 := unwrapped_fields1217[2].(*pb.Term)
+		p.pretty_term(field1220)
 		p.dedent()
 		p.write(")")
 	}
@@ -2690,30 +2708,30 @@ func (p *PrettyPrinter) pretty_add(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_minus(msg *pb.Primitive) interface{} {
-	flat1184 := p.tryFlat(msg, func() { p.pretty_minus(msg) })
-	if flat1184 != nil {
-		p.write(*flat1184)
+	flat1227 := p.tryFlat(msg, func() { p.pretty_minus(msg) })
+	if flat1227 != nil {
+		p.write(*flat1227)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1688 []interface{}
+		var _t1774 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_subtract_monotype" {
-			_t1688 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+			_t1774 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 		}
-		fields1179 := _t1688
-		unwrapped_fields1180 := fields1179
+		fields1222 := _t1774
+		unwrapped_fields1223 := fields1222
 		p.write("(")
 		p.write("-")
 		p.indentSexp()
 		p.newline()
-		field1181 := unwrapped_fields1180[0].(*pb.Term)
-		p.pretty_term(field1181)
+		field1224 := unwrapped_fields1223[0].(*pb.Term)
+		p.pretty_term(field1224)
 		p.newline()
-		field1182 := unwrapped_fields1180[1].(*pb.Term)
-		p.pretty_term(field1182)
+		field1225 := unwrapped_fields1223[1].(*pb.Term)
+		p.pretty_term(field1225)
 		p.newline()
-		field1183 := unwrapped_fields1180[2].(*pb.Term)
-		p.pretty_term(field1183)
+		field1226 := unwrapped_fields1223[2].(*pb.Term)
+		p.pretty_term(field1226)
 		p.dedent()
 		p.write(")")
 	}
@@ -2721,30 +2739,30 @@ func (p *PrettyPrinter) pretty_minus(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_multiply(msg *pb.Primitive) interface{} {
-	flat1190 := p.tryFlat(msg, func() { p.pretty_multiply(msg) })
-	if flat1190 != nil {
-		p.write(*flat1190)
+	flat1233 := p.tryFlat(msg, func() { p.pretty_multiply(msg) })
+	if flat1233 != nil {
+		p.write(*flat1233)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1689 []interface{}
+		var _t1775 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_multiply_monotype" {
-			_t1689 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+			_t1775 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 		}
-		fields1185 := _t1689
-		unwrapped_fields1186 := fields1185
+		fields1228 := _t1775
+		unwrapped_fields1229 := fields1228
 		p.write("(")
 		p.write("*")
 		p.indentSexp()
 		p.newline()
-		field1187 := unwrapped_fields1186[0].(*pb.Term)
-		p.pretty_term(field1187)
+		field1230 := unwrapped_fields1229[0].(*pb.Term)
+		p.pretty_term(field1230)
 		p.newline()
-		field1188 := unwrapped_fields1186[1].(*pb.Term)
-		p.pretty_term(field1188)
+		field1231 := unwrapped_fields1229[1].(*pb.Term)
+		p.pretty_term(field1231)
 		p.newline()
-		field1189 := unwrapped_fields1186[2].(*pb.Term)
-		p.pretty_term(field1189)
+		field1232 := unwrapped_fields1229[2].(*pb.Term)
+		p.pretty_term(field1232)
 		p.dedent()
 		p.write(")")
 	}
@@ -2752,30 +2770,30 @@ func (p *PrettyPrinter) pretty_multiply(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_divide(msg *pb.Primitive) interface{} {
-	flat1196 := p.tryFlat(msg, func() { p.pretty_divide(msg) })
-	if flat1196 != nil {
-		p.write(*flat1196)
+	flat1239 := p.tryFlat(msg, func() { p.pretty_divide(msg) })
+	if flat1239 != nil {
+		p.write(*flat1239)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1690 []interface{}
+		var _t1776 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_divide_monotype" {
-			_t1690 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+			_t1776 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 		}
-		fields1191 := _t1690
-		unwrapped_fields1192 := fields1191
+		fields1234 := _t1776
+		unwrapped_fields1235 := fields1234
 		p.write("(")
 		p.write("/")
 		p.indentSexp()
 		p.newline()
-		field1193 := unwrapped_fields1192[0].(*pb.Term)
-		p.pretty_term(field1193)
+		field1236 := unwrapped_fields1235[0].(*pb.Term)
+		p.pretty_term(field1236)
 		p.newline()
-		field1194 := unwrapped_fields1192[1].(*pb.Term)
-		p.pretty_term(field1194)
+		field1237 := unwrapped_fields1235[1].(*pb.Term)
+		p.pretty_term(field1237)
 		p.newline()
-		field1195 := unwrapped_fields1192[2].(*pb.Term)
-		p.pretty_term(field1195)
+		field1238 := unwrapped_fields1235[2].(*pb.Term)
+		p.pretty_term(field1238)
 		p.dedent()
 		p.write(")")
 	}
@@ -2783,30 +2801,30 @@ func (p *PrettyPrinter) pretty_divide(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_rel_term(msg *pb.RelTerm) interface{} {
-	flat1201 := p.tryFlat(msg, func() { p.pretty_rel_term(msg) })
-	if flat1201 != nil {
-		p.write(*flat1201)
+	flat1244 := p.tryFlat(msg, func() { p.pretty_rel_term(msg) })
+	if flat1244 != nil {
+		p.write(*flat1244)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1691 *pb.Value
+		var _t1777 *pb.Value
 		if hasProtoField(_dollar_dollar, "specialized_value") {
-			_t1691 = _dollar_dollar.GetSpecializedValue()
+			_t1777 = _dollar_dollar.GetSpecializedValue()
 		}
-		deconstruct_result1199 := _t1691
-		if deconstruct_result1199 != nil {
-			unwrapped1200 := deconstruct_result1199
-			p.pretty_specialized_value(unwrapped1200)
+		deconstruct_result1242 := _t1777
+		if deconstruct_result1242 != nil {
+			unwrapped1243 := deconstruct_result1242
+			p.pretty_specialized_value(unwrapped1243)
 		} else {
 			_dollar_dollar := msg
-			var _t1692 *pb.Term
+			var _t1778 *pb.Term
 			if hasProtoField(_dollar_dollar, "term") {
-				_t1692 = _dollar_dollar.GetTerm()
+				_t1778 = _dollar_dollar.GetTerm()
 			}
-			deconstruct_result1197 := _t1692
-			if deconstruct_result1197 != nil {
-				unwrapped1198 := deconstruct_result1197
-				p.pretty_term(unwrapped1198)
+			deconstruct_result1240 := _t1778
+			if deconstruct_result1240 != nil {
+				unwrapped1241 := deconstruct_result1240
+				p.pretty_term(unwrapped1241)
 			} else {
 				panic(ParseError{msg: "No matching rule for rel_term"})
 			}
@@ -2816,41 +2834,41 @@ func (p *PrettyPrinter) pretty_rel_term(msg *pb.RelTerm) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_specialized_value(msg *pb.Value) interface{} {
-	flat1203 := p.tryFlat(msg, func() { p.pretty_specialized_value(msg) })
-	if flat1203 != nil {
-		p.write(*flat1203)
+	flat1246 := p.tryFlat(msg, func() { p.pretty_specialized_value(msg) })
+	if flat1246 != nil {
+		p.write(*flat1246)
 		return nil
 	} else {
-		fields1202 := msg
+		fields1245 := msg
 		p.write("#")
-		p.pretty_raw_value(fields1202)
+		p.pretty_raw_value(fields1245)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_rel_atom(msg *pb.RelAtom) interface{} {
-	flat1210 := p.tryFlat(msg, func() { p.pretty_rel_atom(msg) })
-	if flat1210 != nil {
-		p.write(*flat1210)
+	flat1253 := p.tryFlat(msg, func() { p.pretty_rel_atom(msg) })
+	if flat1253 != nil {
+		p.write(*flat1253)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1204 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1205 := fields1204
+		fields1247 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1248 := fields1247
 		p.write("(")
 		p.write("relatom")
 		p.indentSexp()
 		p.newline()
-		field1206 := unwrapped_fields1205[0].(string)
-		p.pretty_name(field1206)
-		field1207 := unwrapped_fields1205[1].([]*pb.RelTerm)
-		if !(len(field1207) == 0) {
+		field1249 := unwrapped_fields1248[0].(string)
+		p.pretty_name(field1249)
+		field1250 := unwrapped_fields1248[1].([]*pb.RelTerm)
+		if !(len(field1250) == 0) {
 			p.newline()
-			for i1209, elem1208 := range field1207 {
-				if (i1209 > 0) {
+			for i1252, elem1251 := range field1250 {
+				if (i1252 > 0) {
 					p.newline()
 				}
-				p.pretty_rel_term(elem1208)
+				p.pretty_rel_term(elem1251)
 			}
 		}
 		p.dedent()
@@ -2860,23 +2878,23 @@ func (p *PrettyPrinter) pretty_rel_atom(msg *pb.RelAtom) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_cast(msg *pb.Cast) interface{} {
-	flat1215 := p.tryFlat(msg, func() { p.pretty_cast(msg) })
-	if flat1215 != nil {
-		p.write(*flat1215)
+	flat1258 := p.tryFlat(msg, func() { p.pretty_cast(msg) })
+	if flat1258 != nil {
+		p.write(*flat1258)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1211 := []interface{}{_dollar_dollar.GetInput(), _dollar_dollar.GetResult()}
-		unwrapped_fields1212 := fields1211
+		fields1254 := []interface{}{_dollar_dollar.GetInput(), _dollar_dollar.GetResult()}
+		unwrapped_fields1255 := fields1254
 		p.write("(")
 		p.write("cast")
 		p.indentSexp()
 		p.newline()
-		field1213 := unwrapped_fields1212[0].(*pb.Term)
-		p.pretty_term(field1213)
+		field1256 := unwrapped_fields1255[0].(*pb.Term)
+		p.pretty_term(field1256)
 		p.newline()
-		field1214 := unwrapped_fields1212[1].(*pb.Term)
-		p.pretty_term(field1214)
+		field1257 := unwrapped_fields1255[1].(*pb.Term)
+		p.pretty_term(field1257)
 		p.dedent()
 		p.write(")")
 	}
@@ -2884,22 +2902,22 @@ func (p *PrettyPrinter) pretty_cast(msg *pb.Cast) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_attrs(msg []*pb.Attribute) interface{} {
-	flat1219 := p.tryFlat(msg, func() { p.pretty_attrs(msg) })
-	if flat1219 != nil {
-		p.write(*flat1219)
+	flat1262 := p.tryFlat(msg, func() { p.pretty_attrs(msg) })
+	if flat1262 != nil {
+		p.write(*flat1262)
 		return nil
 	} else {
-		fields1216 := msg
+		fields1259 := msg
 		p.write("(")
 		p.write("attrs")
 		p.indentSexp()
-		if !(len(fields1216) == 0) {
+		if !(len(fields1259) == 0) {
 			p.newline()
-			for i1218, elem1217 := range fields1216 {
-				if (i1218 > 0) {
+			for i1261, elem1260 := range fields1259 {
+				if (i1261 > 0) {
 					p.newline()
 				}
-				p.pretty_attribute(elem1217)
+				p.pretty_attribute(elem1260)
 			}
 		}
 		p.dedent()
@@ -2909,28 +2927,28 @@ func (p *PrettyPrinter) pretty_attrs(msg []*pb.Attribute) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_attribute(msg *pb.Attribute) interface{} {
-	flat1226 := p.tryFlat(msg, func() { p.pretty_attribute(msg) })
-	if flat1226 != nil {
-		p.write(*flat1226)
+	flat1269 := p.tryFlat(msg, func() { p.pretty_attribute(msg) })
+	if flat1269 != nil {
+		p.write(*flat1269)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1220 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetArgs()}
-		unwrapped_fields1221 := fields1220
+		fields1263 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetArgs()}
+		unwrapped_fields1264 := fields1263
 		p.write("(")
 		p.write("attribute")
 		p.indentSexp()
 		p.newline()
-		field1222 := unwrapped_fields1221[0].(string)
-		p.pretty_name(field1222)
-		field1223 := unwrapped_fields1221[1].([]*pb.Value)
-		if !(len(field1223) == 0) {
+		field1265 := unwrapped_fields1264[0].(string)
+		p.pretty_name(field1265)
+		field1266 := unwrapped_fields1264[1].([]*pb.Value)
+		if !(len(field1266) == 0) {
 			p.newline()
-			for i1225, elem1224 := range field1223 {
-				if (i1225 > 0) {
+			for i1268, elem1267 := range field1266 {
+				if (i1268 > 0) {
 					p.newline()
 				}
-				p.pretty_raw_value(elem1224)
+				p.pretty_raw_value(elem1267)
 			}
 		}
 		p.dedent()
@@ -2940,39 +2958,39 @@ func (p *PrettyPrinter) pretty_attribute(msg *pb.Attribute) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_algorithm(msg *pb.Algorithm) interface{} {
-	flat1235 := p.tryFlat(msg, func() { p.pretty_algorithm(msg) })
-	if flat1235 != nil {
-		p.write(*flat1235)
+	flat1278 := p.tryFlat(msg, func() { p.pretty_algorithm(msg) })
+	if flat1278 != nil {
+		p.write(*flat1278)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1693 []*pb.Attribute
+		var _t1779 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1693 = _dollar_dollar.GetAttrs()
+			_t1779 = _dollar_dollar.GetAttrs()
 		}
-		fields1227 := []interface{}{_dollar_dollar.GetGlobal(), _dollar_dollar.GetBody(), _t1693}
-		unwrapped_fields1228 := fields1227
+		fields1270 := []interface{}{_dollar_dollar.GetGlobal(), _dollar_dollar.GetBody(), _t1779}
+		unwrapped_fields1271 := fields1270
 		p.write("(")
 		p.write("algorithm")
 		p.indentSexp()
-		field1229 := unwrapped_fields1228[0].([]*pb.RelationId)
-		if !(len(field1229) == 0) {
+		field1272 := unwrapped_fields1271[0].([]*pb.RelationId)
+		if !(len(field1272) == 0) {
 			p.newline()
-			for i1231, elem1230 := range field1229 {
-				if (i1231 > 0) {
+			for i1274, elem1273 := range field1272 {
+				if (i1274 > 0) {
 					p.newline()
 				}
-				p.pretty_relation_id(elem1230)
+				p.pretty_relation_id(elem1273)
 			}
 		}
 		p.newline()
-		field1232 := unwrapped_fields1228[1].(*pb.Script)
-		p.pretty_script(field1232)
-		field1233 := unwrapped_fields1228[2].([]*pb.Attribute)
-		if field1233 != nil {
+		field1275 := unwrapped_fields1271[1].(*pb.Script)
+		p.pretty_script(field1275)
+		field1276 := unwrapped_fields1271[2].([]*pb.Attribute)
+		if field1276 != nil {
 			p.newline()
-			opt_val1234 := field1233
-			p.pretty_attrs(opt_val1234)
+			opt_val1277 := field1276
+			p.pretty_attrs(opt_val1277)
 		}
 		p.dedent()
 		p.write(")")
@@ -2981,24 +2999,24 @@ func (p *PrettyPrinter) pretty_algorithm(msg *pb.Algorithm) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_script(msg *pb.Script) interface{} {
-	flat1240 := p.tryFlat(msg, func() { p.pretty_script(msg) })
-	if flat1240 != nil {
-		p.write(*flat1240)
+	flat1283 := p.tryFlat(msg, func() { p.pretty_script(msg) })
+	if flat1283 != nil {
+		p.write(*flat1283)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1236 := _dollar_dollar.GetConstructs()
-		unwrapped_fields1237 := fields1236
+		fields1279 := _dollar_dollar.GetConstructs()
+		unwrapped_fields1280 := fields1279
 		p.write("(")
 		p.write("script")
 		p.indentSexp()
-		if !(len(unwrapped_fields1237) == 0) {
+		if !(len(unwrapped_fields1280) == 0) {
 			p.newline()
-			for i1239, elem1238 := range unwrapped_fields1237 {
-				if (i1239 > 0) {
+			for i1282, elem1281 := range unwrapped_fields1280 {
+				if (i1282 > 0) {
 					p.newline()
 				}
-				p.pretty_construct(elem1238)
+				p.pretty_construct(elem1281)
 			}
 		}
 		p.dedent()
@@ -3008,30 +3026,30 @@ func (p *PrettyPrinter) pretty_script(msg *pb.Script) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_construct(msg *pb.Construct) interface{} {
-	flat1245 := p.tryFlat(msg, func() { p.pretty_construct(msg) })
-	if flat1245 != nil {
-		p.write(*flat1245)
+	flat1288 := p.tryFlat(msg, func() { p.pretty_construct(msg) })
+	if flat1288 != nil {
+		p.write(*flat1288)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1694 *pb.Loop
+		var _t1780 *pb.Loop
 		if hasProtoField(_dollar_dollar, "loop") {
-			_t1694 = _dollar_dollar.GetLoop()
+			_t1780 = _dollar_dollar.GetLoop()
 		}
-		deconstruct_result1243 := _t1694
-		if deconstruct_result1243 != nil {
-			unwrapped1244 := deconstruct_result1243
-			p.pretty_loop(unwrapped1244)
+		deconstruct_result1286 := _t1780
+		if deconstruct_result1286 != nil {
+			unwrapped1287 := deconstruct_result1286
+			p.pretty_loop(unwrapped1287)
 		} else {
 			_dollar_dollar := msg
-			var _t1695 *pb.Instruction
+			var _t1781 *pb.Instruction
 			if hasProtoField(_dollar_dollar, "instruction") {
-				_t1695 = _dollar_dollar.GetInstruction()
+				_t1781 = _dollar_dollar.GetInstruction()
 			}
-			deconstruct_result1241 := _t1695
-			if deconstruct_result1241 != nil {
-				unwrapped1242 := deconstruct_result1241
-				p.pretty_instruction(unwrapped1242)
+			deconstruct_result1284 := _t1781
+			if deconstruct_result1284 != nil {
+				unwrapped1285 := deconstruct_result1284
+				p.pretty_instruction(unwrapped1285)
 			} else {
 				panic(ParseError{msg: "No matching rule for construct"})
 			}
@@ -3041,32 +3059,32 @@ func (p *PrettyPrinter) pretty_construct(msg *pb.Construct) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_loop(msg *pb.Loop) interface{} {
-	flat1252 := p.tryFlat(msg, func() { p.pretty_loop(msg) })
-	if flat1252 != nil {
-		p.write(*flat1252)
+	flat1295 := p.tryFlat(msg, func() { p.pretty_loop(msg) })
+	if flat1295 != nil {
+		p.write(*flat1295)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1696 []*pb.Attribute
+		var _t1782 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1696 = _dollar_dollar.GetAttrs()
+			_t1782 = _dollar_dollar.GetAttrs()
 		}
-		fields1246 := []interface{}{_dollar_dollar.GetInit(), _dollar_dollar.GetBody(), _t1696}
-		unwrapped_fields1247 := fields1246
+		fields1289 := []interface{}{_dollar_dollar.GetInit(), _dollar_dollar.GetBody(), _t1782}
+		unwrapped_fields1290 := fields1289
 		p.write("(")
 		p.write("loop")
 		p.indentSexp()
 		p.newline()
-		field1248 := unwrapped_fields1247[0].([]*pb.Instruction)
-		p.pretty_init(field1248)
+		field1291 := unwrapped_fields1290[0].([]*pb.Instruction)
+		p.pretty_init(field1291)
 		p.newline()
-		field1249 := unwrapped_fields1247[1].(*pb.Script)
-		p.pretty_script(field1249)
-		field1250 := unwrapped_fields1247[2].([]*pb.Attribute)
-		if field1250 != nil {
+		field1292 := unwrapped_fields1290[1].(*pb.Script)
+		p.pretty_script(field1292)
+		field1293 := unwrapped_fields1290[2].([]*pb.Attribute)
+		if field1293 != nil {
 			p.newline()
-			opt_val1251 := field1250
-			p.pretty_attrs(opt_val1251)
+			opt_val1294 := field1293
+			p.pretty_attrs(opt_val1294)
 		}
 		p.dedent()
 		p.write(")")
@@ -3075,22 +3093,22 @@ func (p *PrettyPrinter) pretty_loop(msg *pb.Loop) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_init(msg []*pb.Instruction) interface{} {
-	flat1256 := p.tryFlat(msg, func() { p.pretty_init(msg) })
-	if flat1256 != nil {
-		p.write(*flat1256)
+	flat1299 := p.tryFlat(msg, func() { p.pretty_init(msg) })
+	if flat1299 != nil {
+		p.write(*flat1299)
 		return nil
 	} else {
-		fields1253 := msg
+		fields1296 := msg
 		p.write("(")
 		p.write("init")
 		p.indentSexp()
-		if !(len(fields1253) == 0) {
+		if !(len(fields1296) == 0) {
 			p.newline()
-			for i1255, elem1254 := range fields1253 {
-				if (i1255 > 0) {
+			for i1298, elem1297 := range fields1296 {
+				if (i1298 > 0) {
 					p.newline()
 				}
-				p.pretty_instruction(elem1254)
+				p.pretty_instruction(elem1297)
 			}
 		}
 		p.dedent()
@@ -3100,60 +3118,60 @@ func (p *PrettyPrinter) pretty_init(msg []*pb.Instruction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_instruction(msg *pb.Instruction) interface{} {
-	flat1267 := p.tryFlat(msg, func() { p.pretty_instruction(msg) })
-	if flat1267 != nil {
-		p.write(*flat1267)
+	flat1310 := p.tryFlat(msg, func() { p.pretty_instruction(msg) })
+	if flat1310 != nil {
+		p.write(*flat1310)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1697 *pb.Assign
+		var _t1783 *pb.Assign
 		if hasProtoField(_dollar_dollar, "assign") {
-			_t1697 = _dollar_dollar.GetAssign()
+			_t1783 = _dollar_dollar.GetAssign()
 		}
-		deconstruct_result1265 := _t1697
-		if deconstruct_result1265 != nil {
-			unwrapped1266 := deconstruct_result1265
-			p.pretty_assign(unwrapped1266)
+		deconstruct_result1308 := _t1783
+		if deconstruct_result1308 != nil {
+			unwrapped1309 := deconstruct_result1308
+			p.pretty_assign(unwrapped1309)
 		} else {
 			_dollar_dollar := msg
-			var _t1698 *pb.Upsert
+			var _t1784 *pb.Upsert
 			if hasProtoField(_dollar_dollar, "upsert") {
-				_t1698 = _dollar_dollar.GetUpsert()
+				_t1784 = _dollar_dollar.GetUpsert()
 			}
-			deconstruct_result1263 := _t1698
-			if deconstruct_result1263 != nil {
-				unwrapped1264 := deconstruct_result1263
-				p.pretty_upsert(unwrapped1264)
+			deconstruct_result1306 := _t1784
+			if deconstruct_result1306 != nil {
+				unwrapped1307 := deconstruct_result1306
+				p.pretty_upsert(unwrapped1307)
 			} else {
 				_dollar_dollar := msg
-				var _t1699 *pb.Break
+				var _t1785 *pb.Break
 				if hasProtoField(_dollar_dollar, "break") {
-					_t1699 = _dollar_dollar.GetBreak()
+					_t1785 = _dollar_dollar.GetBreak()
 				}
-				deconstruct_result1261 := _t1699
-				if deconstruct_result1261 != nil {
-					unwrapped1262 := deconstruct_result1261
-					p.pretty_break(unwrapped1262)
+				deconstruct_result1304 := _t1785
+				if deconstruct_result1304 != nil {
+					unwrapped1305 := deconstruct_result1304
+					p.pretty_break(unwrapped1305)
 				} else {
 					_dollar_dollar := msg
-					var _t1700 *pb.MonoidDef
+					var _t1786 *pb.MonoidDef
 					if hasProtoField(_dollar_dollar, "monoid_def") {
-						_t1700 = _dollar_dollar.GetMonoidDef()
+						_t1786 = _dollar_dollar.GetMonoidDef()
 					}
-					deconstruct_result1259 := _t1700
-					if deconstruct_result1259 != nil {
-						unwrapped1260 := deconstruct_result1259
-						p.pretty_monoid_def(unwrapped1260)
+					deconstruct_result1302 := _t1786
+					if deconstruct_result1302 != nil {
+						unwrapped1303 := deconstruct_result1302
+						p.pretty_monoid_def(unwrapped1303)
 					} else {
 						_dollar_dollar := msg
-						var _t1701 *pb.MonusDef
+						var _t1787 *pb.MonusDef
 						if hasProtoField(_dollar_dollar, "monus_def") {
-							_t1701 = _dollar_dollar.GetMonusDef()
+							_t1787 = _dollar_dollar.GetMonusDef()
 						}
-						deconstruct_result1257 := _t1701
-						if deconstruct_result1257 != nil {
-							unwrapped1258 := deconstruct_result1257
-							p.pretty_monus_def(unwrapped1258)
+						deconstruct_result1300 := _t1787
+						if deconstruct_result1300 != nil {
+							unwrapped1301 := deconstruct_result1300
+							p.pretty_monus_def(unwrapped1301)
 						} else {
 							panic(ParseError{msg: "No matching rule for instruction"})
 						}
@@ -3166,32 +3184,32 @@ func (p *PrettyPrinter) pretty_instruction(msg *pb.Instruction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_assign(msg *pb.Assign) interface{} {
-	flat1274 := p.tryFlat(msg, func() { p.pretty_assign(msg) })
-	if flat1274 != nil {
-		p.write(*flat1274)
+	flat1317 := p.tryFlat(msg, func() { p.pretty_assign(msg) })
+	if flat1317 != nil {
+		p.write(*flat1317)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1702 []*pb.Attribute
+		var _t1788 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1702 = _dollar_dollar.GetAttrs()
+			_t1788 = _dollar_dollar.GetAttrs()
 		}
-		fields1268 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1702}
-		unwrapped_fields1269 := fields1268
+		fields1311 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1788}
+		unwrapped_fields1312 := fields1311
 		p.write("(")
 		p.write("assign")
 		p.indentSexp()
 		p.newline()
-		field1270 := unwrapped_fields1269[0].(*pb.RelationId)
-		p.pretty_relation_id(field1270)
+		field1313 := unwrapped_fields1312[0].(*pb.RelationId)
+		p.pretty_relation_id(field1313)
 		p.newline()
-		field1271 := unwrapped_fields1269[1].(*pb.Abstraction)
-		p.pretty_abstraction(field1271)
-		field1272 := unwrapped_fields1269[2].([]*pb.Attribute)
-		if field1272 != nil {
+		field1314 := unwrapped_fields1312[1].(*pb.Abstraction)
+		p.pretty_abstraction(field1314)
+		field1315 := unwrapped_fields1312[2].([]*pb.Attribute)
+		if field1315 != nil {
 			p.newline()
-			opt_val1273 := field1272
-			p.pretty_attrs(opt_val1273)
+			opt_val1316 := field1315
+			p.pretty_attrs(opt_val1316)
 		}
 		p.dedent()
 		p.write(")")
@@ -3200,32 +3218,32 @@ func (p *PrettyPrinter) pretty_assign(msg *pb.Assign) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_upsert(msg *pb.Upsert) interface{} {
-	flat1281 := p.tryFlat(msg, func() { p.pretty_upsert(msg) })
-	if flat1281 != nil {
-		p.write(*flat1281)
+	flat1324 := p.tryFlat(msg, func() { p.pretty_upsert(msg) })
+	if flat1324 != nil {
+		p.write(*flat1324)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1703 []*pb.Attribute
+		var _t1789 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1703 = _dollar_dollar.GetAttrs()
+			_t1789 = _dollar_dollar.GetAttrs()
 		}
-		fields1275 := []interface{}{_dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1703}
-		unwrapped_fields1276 := fields1275
+		fields1318 := []interface{}{_dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1789}
+		unwrapped_fields1319 := fields1318
 		p.write("(")
 		p.write("upsert")
 		p.indentSexp()
 		p.newline()
-		field1277 := unwrapped_fields1276[0].(*pb.RelationId)
-		p.pretty_relation_id(field1277)
+		field1320 := unwrapped_fields1319[0].(*pb.RelationId)
+		p.pretty_relation_id(field1320)
 		p.newline()
-		field1278 := unwrapped_fields1276[1].([]interface{})
-		p.pretty_abstraction_with_arity(field1278)
-		field1279 := unwrapped_fields1276[2].([]*pb.Attribute)
-		if field1279 != nil {
+		field1321 := unwrapped_fields1319[1].([]interface{})
+		p.pretty_abstraction_with_arity(field1321)
+		field1322 := unwrapped_fields1319[2].([]*pb.Attribute)
+		if field1322 != nil {
 			p.newline()
-			opt_val1280 := field1279
-			p.pretty_attrs(opt_val1280)
+			opt_val1323 := field1322
+			p.pretty_attrs(opt_val1323)
 		}
 		p.dedent()
 		p.write(")")
@@ -3234,22 +3252,22 @@ func (p *PrettyPrinter) pretty_upsert(msg *pb.Upsert) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_abstraction_with_arity(msg []interface{}) interface{} {
-	flat1286 := p.tryFlat(msg, func() { p.pretty_abstraction_with_arity(msg) })
-	if flat1286 != nil {
-		p.write(*flat1286)
+	flat1329 := p.tryFlat(msg, func() { p.pretty_abstraction_with_arity(msg) })
+	if flat1329 != nil {
+		p.write(*flat1329)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1704 := p.deconstruct_bindings_with_arity(_dollar_dollar[0].(*pb.Abstraction), _dollar_dollar[1].(int64))
-		fields1282 := []interface{}{_t1704, _dollar_dollar[0].(*pb.Abstraction).GetValue()}
-		unwrapped_fields1283 := fields1282
+		_t1790 := p.deconstruct_bindings_with_arity(_dollar_dollar[0].(*pb.Abstraction), _dollar_dollar[1].(int64))
+		fields1325 := []interface{}{_t1790, _dollar_dollar[0].(*pb.Abstraction).GetValue()}
+		unwrapped_fields1326 := fields1325
 		p.write("(")
 		p.indent()
-		field1284 := unwrapped_fields1283[0].([]interface{})
-		p.pretty_bindings(field1284)
+		field1327 := unwrapped_fields1326[0].([]interface{})
+		p.pretty_bindings(field1327)
 		p.newline()
-		field1285 := unwrapped_fields1283[1].(*pb.Formula)
-		p.pretty_formula(field1285)
+		field1328 := unwrapped_fields1326[1].(*pb.Formula)
+		p.pretty_formula(field1328)
 		p.dedent()
 		p.write(")")
 	}
@@ -3257,32 +3275,32 @@ func (p *PrettyPrinter) pretty_abstraction_with_arity(msg []interface{}) interfa
 }
 
 func (p *PrettyPrinter) pretty_break(msg *pb.Break) interface{} {
-	flat1293 := p.tryFlat(msg, func() { p.pretty_break(msg) })
-	if flat1293 != nil {
-		p.write(*flat1293)
+	flat1336 := p.tryFlat(msg, func() { p.pretty_break(msg) })
+	if flat1336 != nil {
+		p.write(*flat1336)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1705 []*pb.Attribute
+		var _t1791 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1705 = _dollar_dollar.GetAttrs()
+			_t1791 = _dollar_dollar.GetAttrs()
 		}
-		fields1287 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1705}
-		unwrapped_fields1288 := fields1287
+		fields1330 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1791}
+		unwrapped_fields1331 := fields1330
 		p.write("(")
 		p.write("break")
 		p.indentSexp()
 		p.newline()
-		field1289 := unwrapped_fields1288[0].(*pb.RelationId)
-		p.pretty_relation_id(field1289)
+		field1332 := unwrapped_fields1331[0].(*pb.RelationId)
+		p.pretty_relation_id(field1332)
 		p.newline()
-		field1290 := unwrapped_fields1288[1].(*pb.Abstraction)
-		p.pretty_abstraction(field1290)
-		field1291 := unwrapped_fields1288[2].([]*pb.Attribute)
-		if field1291 != nil {
+		field1333 := unwrapped_fields1331[1].(*pb.Abstraction)
+		p.pretty_abstraction(field1333)
+		field1334 := unwrapped_fields1331[2].([]*pb.Attribute)
+		if field1334 != nil {
 			p.newline()
-			opt_val1292 := field1291
-			p.pretty_attrs(opt_val1292)
+			opt_val1335 := field1334
+			p.pretty_attrs(opt_val1335)
 		}
 		p.dedent()
 		p.write(")")
@@ -3291,35 +3309,35 @@ func (p *PrettyPrinter) pretty_break(msg *pb.Break) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_monoid_def(msg *pb.MonoidDef) interface{} {
-	flat1301 := p.tryFlat(msg, func() { p.pretty_monoid_def(msg) })
-	if flat1301 != nil {
-		p.write(*flat1301)
+	flat1344 := p.tryFlat(msg, func() { p.pretty_monoid_def(msg) })
+	if flat1344 != nil {
+		p.write(*flat1344)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1706 []*pb.Attribute
+		var _t1792 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1706 = _dollar_dollar.GetAttrs()
+			_t1792 = _dollar_dollar.GetAttrs()
 		}
-		fields1294 := []interface{}{_dollar_dollar.GetMonoid(), _dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1706}
-		unwrapped_fields1295 := fields1294
+		fields1337 := []interface{}{_dollar_dollar.GetMonoid(), _dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1792}
+		unwrapped_fields1338 := fields1337
 		p.write("(")
 		p.write("monoid")
 		p.indentSexp()
 		p.newline()
-		field1296 := unwrapped_fields1295[0].(*pb.Monoid)
-		p.pretty_monoid(field1296)
+		field1339 := unwrapped_fields1338[0].(*pb.Monoid)
+		p.pretty_monoid(field1339)
 		p.newline()
-		field1297 := unwrapped_fields1295[1].(*pb.RelationId)
-		p.pretty_relation_id(field1297)
+		field1340 := unwrapped_fields1338[1].(*pb.RelationId)
+		p.pretty_relation_id(field1340)
 		p.newline()
-		field1298 := unwrapped_fields1295[2].([]interface{})
-		p.pretty_abstraction_with_arity(field1298)
-		field1299 := unwrapped_fields1295[3].([]*pb.Attribute)
-		if field1299 != nil {
+		field1341 := unwrapped_fields1338[2].([]interface{})
+		p.pretty_abstraction_with_arity(field1341)
+		field1342 := unwrapped_fields1338[3].([]*pb.Attribute)
+		if field1342 != nil {
 			p.newline()
-			opt_val1300 := field1299
-			p.pretty_attrs(opt_val1300)
+			opt_val1343 := field1342
+			p.pretty_attrs(opt_val1343)
 		}
 		p.dedent()
 		p.write(")")
@@ -3328,50 +3346,50 @@ func (p *PrettyPrinter) pretty_monoid_def(msg *pb.MonoidDef) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_monoid(msg *pb.Monoid) interface{} {
-	flat1310 := p.tryFlat(msg, func() { p.pretty_monoid(msg) })
-	if flat1310 != nil {
-		p.write(*flat1310)
+	flat1353 := p.tryFlat(msg, func() { p.pretty_monoid(msg) })
+	if flat1353 != nil {
+		p.write(*flat1353)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1707 *pb.OrMonoid
+		var _t1793 *pb.OrMonoid
 		if hasProtoField(_dollar_dollar, "or_monoid") {
-			_t1707 = _dollar_dollar.GetOrMonoid()
+			_t1793 = _dollar_dollar.GetOrMonoid()
 		}
-		deconstruct_result1308 := _t1707
-		if deconstruct_result1308 != nil {
-			unwrapped1309 := deconstruct_result1308
-			p.pretty_or_monoid(unwrapped1309)
+		deconstruct_result1351 := _t1793
+		if deconstruct_result1351 != nil {
+			unwrapped1352 := deconstruct_result1351
+			p.pretty_or_monoid(unwrapped1352)
 		} else {
 			_dollar_dollar := msg
-			var _t1708 *pb.MinMonoid
+			var _t1794 *pb.MinMonoid
 			if hasProtoField(_dollar_dollar, "min_monoid") {
-				_t1708 = _dollar_dollar.GetMinMonoid()
+				_t1794 = _dollar_dollar.GetMinMonoid()
 			}
-			deconstruct_result1306 := _t1708
-			if deconstruct_result1306 != nil {
-				unwrapped1307 := deconstruct_result1306
-				p.pretty_min_monoid(unwrapped1307)
+			deconstruct_result1349 := _t1794
+			if deconstruct_result1349 != nil {
+				unwrapped1350 := deconstruct_result1349
+				p.pretty_min_monoid(unwrapped1350)
 			} else {
 				_dollar_dollar := msg
-				var _t1709 *pb.MaxMonoid
+				var _t1795 *pb.MaxMonoid
 				if hasProtoField(_dollar_dollar, "max_monoid") {
-					_t1709 = _dollar_dollar.GetMaxMonoid()
+					_t1795 = _dollar_dollar.GetMaxMonoid()
 				}
-				deconstruct_result1304 := _t1709
-				if deconstruct_result1304 != nil {
-					unwrapped1305 := deconstruct_result1304
-					p.pretty_max_monoid(unwrapped1305)
+				deconstruct_result1347 := _t1795
+				if deconstruct_result1347 != nil {
+					unwrapped1348 := deconstruct_result1347
+					p.pretty_max_monoid(unwrapped1348)
 				} else {
 					_dollar_dollar := msg
-					var _t1710 *pb.SumMonoid
+					var _t1796 *pb.SumMonoid
 					if hasProtoField(_dollar_dollar, "sum_monoid") {
-						_t1710 = _dollar_dollar.GetSumMonoid()
+						_t1796 = _dollar_dollar.GetSumMonoid()
 					}
-					deconstruct_result1302 := _t1710
-					if deconstruct_result1302 != nil {
-						unwrapped1303 := deconstruct_result1302
-						p.pretty_sum_monoid(unwrapped1303)
+					deconstruct_result1345 := _t1796
+					if deconstruct_result1345 != nil {
+						unwrapped1346 := deconstruct_result1345
+						p.pretty_sum_monoid(unwrapped1346)
 					} else {
 						panic(ParseError{msg: "No matching rule for monoid"})
 					}
@@ -3383,8 +3401,8 @@ func (p *PrettyPrinter) pretty_monoid(msg *pb.Monoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_or_monoid(msg *pb.OrMonoid) interface{} {
-	fields1311 := msg
-	_ = fields1311
+	fields1354 := msg
+	_ = fields1354
 	p.write("(")
 	p.write("or")
 	p.write(")")
@@ -3392,19 +3410,19 @@ func (p *PrettyPrinter) pretty_or_monoid(msg *pb.OrMonoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_min_monoid(msg *pb.MinMonoid) interface{} {
-	flat1314 := p.tryFlat(msg, func() { p.pretty_min_monoid(msg) })
-	if flat1314 != nil {
-		p.write(*flat1314)
+	flat1357 := p.tryFlat(msg, func() { p.pretty_min_monoid(msg) })
+	if flat1357 != nil {
+		p.write(*flat1357)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1312 := _dollar_dollar.GetType()
-		unwrapped_fields1313 := fields1312
+		fields1355 := _dollar_dollar.GetType()
+		unwrapped_fields1356 := fields1355
 		p.write("(")
 		p.write("min")
 		p.indentSexp()
 		p.newline()
-		p.pretty_type(unwrapped_fields1313)
+		p.pretty_type(unwrapped_fields1356)
 		p.dedent()
 		p.write(")")
 	}
@@ -3412,19 +3430,19 @@ func (p *PrettyPrinter) pretty_min_monoid(msg *pb.MinMonoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_max_monoid(msg *pb.MaxMonoid) interface{} {
-	flat1317 := p.tryFlat(msg, func() { p.pretty_max_monoid(msg) })
-	if flat1317 != nil {
-		p.write(*flat1317)
+	flat1360 := p.tryFlat(msg, func() { p.pretty_max_monoid(msg) })
+	if flat1360 != nil {
+		p.write(*flat1360)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1315 := _dollar_dollar.GetType()
-		unwrapped_fields1316 := fields1315
+		fields1358 := _dollar_dollar.GetType()
+		unwrapped_fields1359 := fields1358
 		p.write("(")
 		p.write("max")
 		p.indentSexp()
 		p.newline()
-		p.pretty_type(unwrapped_fields1316)
+		p.pretty_type(unwrapped_fields1359)
 		p.dedent()
 		p.write(")")
 	}
@@ -3432,19 +3450,19 @@ func (p *PrettyPrinter) pretty_max_monoid(msg *pb.MaxMonoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_sum_monoid(msg *pb.SumMonoid) interface{} {
-	flat1320 := p.tryFlat(msg, func() { p.pretty_sum_monoid(msg) })
-	if flat1320 != nil {
-		p.write(*flat1320)
+	flat1363 := p.tryFlat(msg, func() { p.pretty_sum_monoid(msg) })
+	if flat1363 != nil {
+		p.write(*flat1363)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1318 := _dollar_dollar.GetType()
-		unwrapped_fields1319 := fields1318
+		fields1361 := _dollar_dollar.GetType()
+		unwrapped_fields1362 := fields1361
 		p.write("(")
 		p.write("sum")
 		p.indentSexp()
 		p.newline()
-		p.pretty_type(unwrapped_fields1319)
+		p.pretty_type(unwrapped_fields1362)
 		p.dedent()
 		p.write(")")
 	}
@@ -3452,35 +3470,35 @@ func (p *PrettyPrinter) pretty_sum_monoid(msg *pb.SumMonoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_monus_def(msg *pb.MonusDef) interface{} {
-	flat1328 := p.tryFlat(msg, func() { p.pretty_monus_def(msg) })
-	if flat1328 != nil {
-		p.write(*flat1328)
+	flat1371 := p.tryFlat(msg, func() { p.pretty_monus_def(msg) })
+	if flat1371 != nil {
+		p.write(*flat1371)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1711 []*pb.Attribute
+		var _t1797 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1711 = _dollar_dollar.GetAttrs()
+			_t1797 = _dollar_dollar.GetAttrs()
 		}
-		fields1321 := []interface{}{_dollar_dollar.GetMonoid(), _dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1711}
-		unwrapped_fields1322 := fields1321
+		fields1364 := []interface{}{_dollar_dollar.GetMonoid(), _dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1797}
+		unwrapped_fields1365 := fields1364
 		p.write("(")
 		p.write("monus")
 		p.indentSexp()
 		p.newline()
-		field1323 := unwrapped_fields1322[0].(*pb.Monoid)
-		p.pretty_monoid(field1323)
+		field1366 := unwrapped_fields1365[0].(*pb.Monoid)
+		p.pretty_monoid(field1366)
 		p.newline()
-		field1324 := unwrapped_fields1322[1].(*pb.RelationId)
-		p.pretty_relation_id(field1324)
+		field1367 := unwrapped_fields1365[1].(*pb.RelationId)
+		p.pretty_relation_id(field1367)
 		p.newline()
-		field1325 := unwrapped_fields1322[2].([]interface{})
-		p.pretty_abstraction_with_arity(field1325)
-		field1326 := unwrapped_fields1322[3].([]*pb.Attribute)
-		if field1326 != nil {
+		field1368 := unwrapped_fields1365[2].([]interface{})
+		p.pretty_abstraction_with_arity(field1368)
+		field1369 := unwrapped_fields1365[3].([]*pb.Attribute)
+		if field1369 != nil {
 			p.newline()
-			opt_val1327 := field1326
-			p.pretty_attrs(opt_val1327)
+			opt_val1370 := field1369
+			p.pretty_attrs(opt_val1370)
 		}
 		p.dedent()
 		p.write(")")
@@ -3489,29 +3507,29 @@ func (p *PrettyPrinter) pretty_monus_def(msg *pb.MonusDef) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_constraint(msg *pb.Constraint) interface{} {
-	flat1335 := p.tryFlat(msg, func() { p.pretty_constraint(msg) })
-	if flat1335 != nil {
-		p.write(*flat1335)
+	flat1378 := p.tryFlat(msg, func() { p.pretty_constraint(msg) })
+	if flat1378 != nil {
+		p.write(*flat1378)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1329 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetFunctionalDependency().GetGuard(), _dollar_dollar.GetFunctionalDependency().GetKeys(), _dollar_dollar.GetFunctionalDependency().GetValues()}
-		unwrapped_fields1330 := fields1329
+		fields1372 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetFunctionalDependency().GetGuard(), _dollar_dollar.GetFunctionalDependency().GetKeys(), _dollar_dollar.GetFunctionalDependency().GetValues()}
+		unwrapped_fields1373 := fields1372
 		p.write("(")
 		p.write("functional_dependency")
 		p.indentSexp()
 		p.newline()
-		field1331 := unwrapped_fields1330[0].(*pb.RelationId)
-		p.pretty_relation_id(field1331)
+		field1374 := unwrapped_fields1373[0].(*pb.RelationId)
+		p.pretty_relation_id(field1374)
 		p.newline()
-		field1332 := unwrapped_fields1330[1].(*pb.Abstraction)
-		p.pretty_abstraction(field1332)
+		field1375 := unwrapped_fields1373[1].(*pb.Abstraction)
+		p.pretty_abstraction(field1375)
 		p.newline()
-		field1333 := unwrapped_fields1330[2].([]*pb.Var)
-		p.pretty_functional_dependency_keys(field1333)
+		field1376 := unwrapped_fields1373[2].([]*pb.Var)
+		p.pretty_functional_dependency_keys(field1376)
 		p.newline()
-		field1334 := unwrapped_fields1330[3].([]*pb.Var)
-		p.pretty_functional_dependency_values(field1334)
+		field1377 := unwrapped_fields1373[3].([]*pb.Var)
+		p.pretty_functional_dependency_values(field1377)
 		p.dedent()
 		p.write(")")
 	}
@@ -3519,22 +3537,22 @@ func (p *PrettyPrinter) pretty_constraint(msg *pb.Constraint) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_functional_dependency_keys(msg []*pb.Var) interface{} {
-	flat1339 := p.tryFlat(msg, func() { p.pretty_functional_dependency_keys(msg) })
-	if flat1339 != nil {
-		p.write(*flat1339)
+	flat1382 := p.tryFlat(msg, func() { p.pretty_functional_dependency_keys(msg) })
+	if flat1382 != nil {
+		p.write(*flat1382)
 		return nil
 	} else {
-		fields1336 := msg
+		fields1379 := msg
 		p.write("(")
 		p.write("keys")
 		p.indentSexp()
-		if !(len(fields1336) == 0) {
+		if !(len(fields1379) == 0) {
 			p.newline()
-			for i1338, elem1337 := range fields1336 {
-				if (i1338 > 0) {
+			for i1381, elem1380 := range fields1379 {
+				if (i1381 > 0) {
 					p.newline()
 				}
-				p.pretty_var(elem1337)
+				p.pretty_var(elem1380)
 			}
 		}
 		p.dedent()
@@ -3544,22 +3562,22 @@ func (p *PrettyPrinter) pretty_functional_dependency_keys(msg []*pb.Var) interfa
 }
 
 func (p *PrettyPrinter) pretty_functional_dependency_values(msg []*pb.Var) interface{} {
-	flat1343 := p.tryFlat(msg, func() { p.pretty_functional_dependency_values(msg) })
-	if flat1343 != nil {
-		p.write(*flat1343)
+	flat1386 := p.tryFlat(msg, func() { p.pretty_functional_dependency_values(msg) })
+	if flat1386 != nil {
+		p.write(*flat1386)
 		return nil
 	} else {
-		fields1340 := msg
+		fields1383 := msg
 		p.write("(")
 		p.write("values")
 		p.indentSexp()
-		if !(len(fields1340) == 0) {
+		if !(len(fields1383) == 0) {
 			p.newline()
-			for i1342, elem1341 := range fields1340 {
-				if (i1342 > 0) {
+			for i1385, elem1384 := range fields1383 {
+				if (i1385 > 0) {
 					p.newline()
 				}
-				p.pretty_var(elem1341)
+				p.pretty_var(elem1384)
 			}
 		}
 		p.dedent()
@@ -3569,50 +3587,50 @@ func (p *PrettyPrinter) pretty_functional_dependency_values(msg []*pb.Var) inter
 }
 
 func (p *PrettyPrinter) pretty_data(msg *pb.Data) interface{} {
-	flat1352 := p.tryFlat(msg, func() { p.pretty_data(msg) })
-	if flat1352 != nil {
-		p.write(*flat1352)
+	flat1395 := p.tryFlat(msg, func() { p.pretty_data(msg) })
+	if flat1395 != nil {
+		p.write(*flat1395)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1712 *pb.EDB
+		var _t1798 *pb.EDB
 		if hasProtoField(_dollar_dollar, "edb") {
-			_t1712 = _dollar_dollar.GetEdb()
+			_t1798 = _dollar_dollar.GetEdb()
 		}
-		deconstruct_result1350 := _t1712
-		if deconstruct_result1350 != nil {
-			unwrapped1351 := deconstruct_result1350
-			p.pretty_edb(unwrapped1351)
+		deconstruct_result1393 := _t1798
+		if deconstruct_result1393 != nil {
+			unwrapped1394 := deconstruct_result1393
+			p.pretty_edb(unwrapped1394)
 		} else {
 			_dollar_dollar := msg
-			var _t1713 *pb.BeTreeRelation
+			var _t1799 *pb.BeTreeRelation
 			if hasProtoField(_dollar_dollar, "betree_relation") {
-				_t1713 = _dollar_dollar.GetBetreeRelation()
+				_t1799 = _dollar_dollar.GetBetreeRelation()
 			}
-			deconstruct_result1348 := _t1713
-			if deconstruct_result1348 != nil {
-				unwrapped1349 := deconstruct_result1348
-				p.pretty_betree_relation(unwrapped1349)
+			deconstruct_result1391 := _t1799
+			if deconstruct_result1391 != nil {
+				unwrapped1392 := deconstruct_result1391
+				p.pretty_betree_relation(unwrapped1392)
 			} else {
 				_dollar_dollar := msg
-				var _t1714 *pb.CSVData
+				var _t1800 *pb.CSVData
 				if hasProtoField(_dollar_dollar, "csv_data") {
-					_t1714 = _dollar_dollar.GetCsvData()
+					_t1800 = _dollar_dollar.GetCsvData()
 				}
-				deconstruct_result1346 := _t1714
-				if deconstruct_result1346 != nil {
-					unwrapped1347 := deconstruct_result1346
-					p.pretty_csv_data(unwrapped1347)
+				deconstruct_result1389 := _t1800
+				if deconstruct_result1389 != nil {
+					unwrapped1390 := deconstruct_result1389
+					p.pretty_csv_data(unwrapped1390)
 				} else {
 					_dollar_dollar := msg
-					var _t1715 *pb.IcebergData
+					var _t1801 *pb.IcebergData
 					if hasProtoField(_dollar_dollar, "iceberg_data") {
-						_t1715 = _dollar_dollar.GetIcebergData()
+						_t1801 = _dollar_dollar.GetIcebergData()
 					}
-					deconstruct_result1344 := _t1715
-					if deconstruct_result1344 != nil {
-						unwrapped1345 := deconstruct_result1344
-						p.pretty_iceberg_data(unwrapped1345)
+					deconstruct_result1387 := _t1801
+					if deconstruct_result1387 != nil {
+						unwrapped1388 := deconstruct_result1387
+						p.pretty_iceberg_data(unwrapped1388)
 					} else {
 						panic(ParseError{msg: "No matching rule for data"})
 					}
@@ -3624,26 +3642,26 @@ func (p *PrettyPrinter) pretty_data(msg *pb.Data) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_edb(msg *pb.EDB) interface{} {
-	flat1358 := p.tryFlat(msg, func() { p.pretty_edb(msg) })
-	if flat1358 != nil {
-		p.write(*flat1358)
+	flat1401 := p.tryFlat(msg, func() { p.pretty_edb(msg) })
+	if flat1401 != nil {
+		p.write(*flat1401)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1353 := []interface{}{_dollar_dollar.GetTargetId(), _dollar_dollar.GetPath(), _dollar_dollar.GetTypes()}
-		unwrapped_fields1354 := fields1353
+		fields1396 := []interface{}{_dollar_dollar.GetTargetId(), _dollar_dollar.GetPath(), _dollar_dollar.GetTypes()}
+		unwrapped_fields1397 := fields1396
 		p.write("(")
 		p.write("edb")
 		p.indentSexp()
 		p.newline()
-		field1355 := unwrapped_fields1354[0].(*pb.RelationId)
-		p.pretty_relation_id(field1355)
+		field1398 := unwrapped_fields1397[0].(*pb.RelationId)
+		p.pretty_relation_id(field1398)
 		p.newline()
-		field1356 := unwrapped_fields1354[1].([]string)
-		p.pretty_edb_path(field1356)
+		field1399 := unwrapped_fields1397[1].([]string)
+		p.pretty_edb_path(field1399)
 		p.newline()
-		field1357 := unwrapped_fields1354[2].([]*pb.Type)
-		p.pretty_edb_types(field1357)
+		field1400 := unwrapped_fields1397[2].([]*pb.Type)
+		p.pretty_edb_types(field1400)
 		p.dedent()
 		p.write(")")
 	}
@@ -3651,19 +3669,19 @@ func (p *PrettyPrinter) pretty_edb(msg *pb.EDB) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_edb_path(msg []string) interface{} {
-	flat1362 := p.tryFlat(msg, func() { p.pretty_edb_path(msg) })
-	if flat1362 != nil {
-		p.write(*flat1362)
+	flat1405 := p.tryFlat(msg, func() { p.pretty_edb_path(msg) })
+	if flat1405 != nil {
+		p.write(*flat1405)
 		return nil
 	} else {
-		fields1359 := msg
+		fields1402 := msg
 		p.write("[")
 		p.indent()
-		for i1361, elem1360 := range fields1359 {
-			if (i1361 > 0) {
+		for i1404, elem1403 := range fields1402 {
+			if (i1404 > 0) {
 				p.newline()
 			}
-			p.write(p.formatStringValue(elem1360))
+			p.write(p.formatStringValue(elem1403))
 		}
 		p.dedent()
 		p.write("]")
@@ -3672,19 +3690,19 @@ func (p *PrettyPrinter) pretty_edb_path(msg []string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_edb_types(msg []*pb.Type) interface{} {
-	flat1366 := p.tryFlat(msg, func() { p.pretty_edb_types(msg) })
-	if flat1366 != nil {
-		p.write(*flat1366)
+	flat1409 := p.tryFlat(msg, func() { p.pretty_edb_types(msg) })
+	if flat1409 != nil {
+		p.write(*flat1409)
 		return nil
 	} else {
-		fields1363 := msg
+		fields1406 := msg
 		p.write("[")
 		p.indent()
-		for i1365, elem1364 := range fields1363 {
-			if (i1365 > 0) {
+		for i1408, elem1407 := range fields1406 {
+			if (i1408 > 0) {
 				p.newline()
 			}
-			p.pretty_type(elem1364)
+			p.pretty_type(elem1407)
 		}
 		p.dedent()
 		p.write("]")
@@ -3693,23 +3711,23 @@ func (p *PrettyPrinter) pretty_edb_types(msg []*pb.Type) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_betree_relation(msg *pb.BeTreeRelation) interface{} {
-	flat1371 := p.tryFlat(msg, func() { p.pretty_betree_relation(msg) })
-	if flat1371 != nil {
-		p.write(*flat1371)
+	flat1414 := p.tryFlat(msg, func() { p.pretty_betree_relation(msg) })
+	if flat1414 != nil {
+		p.write(*flat1414)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1367 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetRelationInfo()}
-		unwrapped_fields1368 := fields1367
+		fields1410 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetRelationInfo()}
+		unwrapped_fields1411 := fields1410
 		p.write("(")
 		p.write("betree_relation")
 		p.indentSexp()
 		p.newline()
-		field1369 := unwrapped_fields1368[0].(*pb.RelationId)
-		p.pretty_relation_id(field1369)
+		field1412 := unwrapped_fields1411[0].(*pb.RelationId)
+		p.pretty_relation_id(field1412)
 		p.newline()
-		field1370 := unwrapped_fields1368[1].(*pb.BeTreeInfo)
-		p.pretty_betree_info(field1370)
+		field1413 := unwrapped_fields1411[1].(*pb.BeTreeInfo)
+		p.pretty_betree_info(field1413)
 		p.dedent()
 		p.write(")")
 	}
@@ -3717,27 +3735,27 @@ func (p *PrettyPrinter) pretty_betree_relation(msg *pb.BeTreeRelation) interface
 }
 
 func (p *PrettyPrinter) pretty_betree_info(msg *pb.BeTreeInfo) interface{} {
-	flat1377 := p.tryFlat(msg, func() { p.pretty_betree_info(msg) })
-	if flat1377 != nil {
-		p.write(*flat1377)
+	flat1420 := p.tryFlat(msg, func() { p.pretty_betree_info(msg) })
+	if flat1420 != nil {
+		p.write(*flat1420)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1716 := p.deconstruct_betree_info_config(_dollar_dollar)
-		fields1372 := []interface{}{_dollar_dollar.GetKeyTypes(), _dollar_dollar.GetValueTypes(), _t1716}
-		unwrapped_fields1373 := fields1372
+		_t1802 := p.deconstruct_betree_info_config(_dollar_dollar)
+		fields1415 := []interface{}{_dollar_dollar.GetKeyTypes(), _dollar_dollar.GetValueTypes(), _t1802}
+		unwrapped_fields1416 := fields1415
 		p.write("(")
 		p.write("betree_info")
 		p.indentSexp()
 		p.newline()
-		field1374 := unwrapped_fields1373[0].([]*pb.Type)
-		p.pretty_betree_info_key_types(field1374)
+		field1417 := unwrapped_fields1416[0].([]*pb.Type)
+		p.pretty_betree_info_key_types(field1417)
 		p.newline()
-		field1375 := unwrapped_fields1373[1].([]*pb.Type)
-		p.pretty_betree_info_value_types(field1375)
+		field1418 := unwrapped_fields1416[1].([]*pb.Type)
+		p.pretty_betree_info_value_types(field1418)
 		p.newline()
-		field1376 := unwrapped_fields1373[2].([][]interface{})
-		p.pretty_config_dict(field1376)
+		field1419 := unwrapped_fields1416[2].([][]interface{})
+		p.pretty_config_dict(field1419)
 		p.dedent()
 		p.write(")")
 	}
@@ -3745,22 +3763,22 @@ func (p *PrettyPrinter) pretty_betree_info(msg *pb.BeTreeInfo) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_betree_info_key_types(msg []*pb.Type) interface{} {
-	flat1381 := p.tryFlat(msg, func() { p.pretty_betree_info_key_types(msg) })
-	if flat1381 != nil {
-		p.write(*flat1381)
+	flat1424 := p.tryFlat(msg, func() { p.pretty_betree_info_key_types(msg) })
+	if flat1424 != nil {
+		p.write(*flat1424)
 		return nil
 	} else {
-		fields1378 := msg
+		fields1421 := msg
 		p.write("(")
 		p.write("key_types")
 		p.indentSexp()
-		if !(len(fields1378) == 0) {
+		if !(len(fields1421) == 0) {
 			p.newline()
-			for i1380, elem1379 := range fields1378 {
-				if (i1380 > 0) {
+			for i1423, elem1422 := range fields1421 {
+				if (i1423 > 0) {
 					p.newline()
 				}
-				p.pretty_type(elem1379)
+				p.pretty_type(elem1422)
 			}
 		}
 		p.dedent()
@@ -3770,22 +3788,22 @@ func (p *PrettyPrinter) pretty_betree_info_key_types(msg []*pb.Type) interface{}
 }
 
 func (p *PrettyPrinter) pretty_betree_info_value_types(msg []*pb.Type) interface{} {
-	flat1385 := p.tryFlat(msg, func() { p.pretty_betree_info_value_types(msg) })
-	if flat1385 != nil {
-		p.write(*flat1385)
+	flat1428 := p.tryFlat(msg, func() { p.pretty_betree_info_value_types(msg) })
+	if flat1428 != nil {
+		p.write(*flat1428)
 		return nil
 	} else {
-		fields1382 := msg
+		fields1425 := msg
 		p.write("(")
 		p.write("value_types")
 		p.indentSexp()
-		if !(len(fields1382) == 0) {
+		if !(len(fields1425) == 0) {
 			p.newline()
-			for i1384, elem1383 := range fields1382 {
-				if (i1384 > 0) {
+			for i1427, elem1426 := range fields1425 {
+				if (i1427 > 0) {
 					p.newline()
 				}
-				p.pretty_type(elem1383)
+				p.pretty_type(elem1426)
 			}
 		}
 		p.dedent()
@@ -3795,29 +3813,40 @@ func (p *PrettyPrinter) pretty_betree_info_value_types(msg []*pb.Type) interface
 }
 
 func (p *PrettyPrinter) pretty_csv_data(msg *pb.CSVData) interface{} {
-	flat1392 := p.tryFlat(msg, func() { p.pretty_csv_data(msg) })
-	if flat1392 != nil {
-		p.write(*flat1392)
+	flat1438 := p.tryFlat(msg, func() { p.pretty_csv_data(msg) })
+	if flat1438 != nil {
+		p.write(*flat1438)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1386 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetColumns(), _dollar_dollar.GetAsof()}
-		unwrapped_fields1387 := fields1386
+		_t1803 := p.deconstruct_csv_data_columns_optional(_dollar_dollar)
+		_t1804 := p.deconstruct_csv_data_relations_optional(_dollar_dollar)
+		fields1429 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _t1803, _t1804, _dollar_dollar.GetAsof()}
+		unwrapped_fields1430 := fields1429
 		p.write("(")
 		p.write("csv_data")
 		p.indentSexp()
 		p.newline()
-		field1388 := unwrapped_fields1387[0].(*pb.CSVLocator)
-		p.pretty_csvlocator(field1388)
-		p.newline()
-		field1389 := unwrapped_fields1387[1].(*pb.CSVConfig)
-		p.pretty_csv_config(field1389)
+		field1431 := unwrapped_fields1430[0].(*pb.CSVLocator)
+		p.pretty_csvlocator(field1431)
 		p.newline()
-		field1390 := unwrapped_fields1387[2].([]*pb.GNFColumn)
-		p.pretty_gnf_columns(field1390)
+		field1432 := unwrapped_fields1430[1].(*pb.CSVConfig)
+		p.pretty_csv_config(field1432)
+		field1433 := unwrapped_fields1430[2].([]*pb.GNFColumn)
+		if field1433 != nil {
+			p.newline()
+			opt_val1434 := field1433
+			p.pretty_gnf_columns(opt_val1434)
+		}
+		field1435 := unwrapped_fields1430[3].(*pb.TargetRelations)
+		if field1435 != nil {
+			p.newline()
+			opt_val1436 := field1435
+			p.pretty_target_relations(opt_val1436)
+		}
 		p.newline()
-		field1391 := unwrapped_fields1387[3].(string)
-		p.pretty_csv_asof(field1391)
+		field1437 := unwrapped_fields1430[4].(string)
+		p.pretty_csv_asof(field1437)
 		p.dedent()
 		p.write(")")
 	}
@@ -3825,36 +3854,36 @@ func (p *PrettyPrinter) pretty_csv_data(msg *pb.CSVData) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csvlocator(msg *pb.CSVLocator) interface{} {
-	flat1399 := p.tryFlat(msg, func() { p.pretty_csvlocator(msg) })
-	if flat1399 != nil {
-		p.write(*flat1399)
+	flat1445 := p.tryFlat(msg, func() { p.pretty_csvlocator(msg) })
+	if flat1445 != nil {
+		p.write(*flat1445)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1717 []string
+		var _t1805 []string
 		if !(len(_dollar_dollar.GetPaths()) == 0) {
-			_t1717 = _dollar_dollar.GetPaths()
+			_t1805 = _dollar_dollar.GetPaths()
 		}
-		var _t1718 *string
+		var _t1806 *string
 		if string(_dollar_dollar.GetInlineData()) != "" {
-			_t1718 = ptr(string(_dollar_dollar.GetInlineData()))
+			_t1806 = ptr(string(_dollar_dollar.GetInlineData()))
 		}
-		fields1393 := []interface{}{_t1717, _t1718}
-		unwrapped_fields1394 := fields1393
+		fields1439 := []interface{}{_t1805, _t1806}
+		unwrapped_fields1440 := fields1439
 		p.write("(")
 		p.write("csv_locator")
 		p.indentSexp()
-		field1395 := unwrapped_fields1394[0].([]string)
-		if field1395 != nil {
+		field1441 := unwrapped_fields1440[0].([]string)
+		if field1441 != nil {
 			p.newline()
-			opt_val1396 := field1395
-			p.pretty_csv_locator_paths(opt_val1396)
+			opt_val1442 := field1441
+			p.pretty_csv_locator_paths(opt_val1442)
 		}
-		field1397 := unwrapped_fields1394[1].(*string)
-		if field1397 != nil {
+		field1443 := unwrapped_fields1440[1].(*string)
+		if field1443 != nil {
 			p.newline()
-			opt_val1398 := *field1397
-			p.pretty_csv_locator_inline_data(opt_val1398)
+			opt_val1444 := *field1443
+			p.pretty_csv_locator_inline_data(opt_val1444)
 		}
 		p.dedent()
 		p.write(")")
@@ -3863,22 +3892,22 @@ func (p *PrettyPrinter) pretty_csvlocator(msg *pb.CSVLocator) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csv_locator_paths(msg []string) interface{} {
-	flat1403 := p.tryFlat(msg, func() { p.pretty_csv_locator_paths(msg) })
-	if flat1403 != nil {
-		p.write(*flat1403)
+	flat1449 := p.tryFlat(msg, func() { p.pretty_csv_locator_paths(msg) })
+	if flat1449 != nil {
+		p.write(*flat1449)
 		return nil
 	} else {
-		fields1400 := msg
+		fields1446 := msg
 		p.write("(")
 		p.write("paths")
 		p.indentSexp()
-		if !(len(fields1400) == 0) {
+		if !(len(fields1446) == 0) {
 			p.newline()
-			for i1402, elem1401 := range fields1400 {
-				if (i1402 > 0) {
+			for i1448, elem1447 := range fields1446 {
+				if (i1448 > 0) {
 					p.newline()
 				}
-				p.write(p.formatStringValue(elem1401))
+				p.write(p.formatStringValue(elem1447))
 			}
 		}
 		p.dedent()
@@ -3888,17 +3917,17 @@ func (p *PrettyPrinter) pretty_csv_locator_paths(msg []string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csv_locator_inline_data(msg string) interface{} {
-	flat1405 := p.tryFlat(msg, func() { p.pretty_csv_locator_inline_data(msg) })
-	if flat1405 != nil {
-		p.write(*flat1405)
+	flat1451 := p.tryFlat(msg, func() { p.pretty_csv_locator_inline_data(msg) })
+	if flat1451 != nil {
+		p.write(*flat1451)
 		return nil
 	} else {
-		fields1404 := msg
+		fields1450 := msg
 		p.write("(")
 		p.write("inline_data")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1404))
+		p.write(p.formatStringValue(fields1450))
 		p.dedent()
 		p.write(")")
 	}
@@ -3906,27 +3935,27 @@ func (p *PrettyPrinter) pretty_csv_locator_inline_data(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csv_config(msg *pb.CSVConfig) interface{} {
-	flat1411 := p.tryFlat(msg, func() { p.pretty_csv_config(msg) })
-	if flat1411 != nil {
-		p.write(*flat1411)
+	flat1457 := p.tryFlat(msg, func() { p.pretty_csv_config(msg) })
+	if flat1457 != nil {
+		p.write(*flat1457)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1719 := p.deconstruct_csv_config(_dollar_dollar)
-		_t1720 := p.deconstruct_csv_storage_integration_optional(_dollar_dollar)
-		fields1406 := []interface{}{_t1719, _t1720}
-		unwrapped_fields1407 := fields1406
+		_t1807 := p.deconstruct_csv_config(_dollar_dollar)
+		_t1808 := p.deconstruct_csv_storage_integration_optional(_dollar_dollar)
+		fields1452 := []interface{}{_t1807, _t1808}
+		unwrapped_fields1453 := fields1452
 		p.write("(")
 		p.write("csv_config")
 		p.indentSexp()
 		p.newline()
-		field1408 := unwrapped_fields1407[0].([][]interface{})
-		p.pretty_config_dict(field1408)
-		field1409 := unwrapped_fields1407[1].([][]interface{})
-		if field1409 != nil {
+		field1454 := unwrapped_fields1453[0].([][]interface{})
+		p.pretty_config_dict(field1454)
+		field1455 := unwrapped_fields1453[1].([][]interface{})
+		if field1455 != nil {
 			p.newline()
-			opt_val1410 := field1409
-			p.pretty__storage_integration(opt_val1410)
+			opt_val1456 := field1455
+			p.pretty__storage_integration(opt_val1456)
 		}
 		p.dedent()
 		p.write(")")
@@ -3935,17 +3964,17 @@ func (p *PrettyPrinter) pretty_csv_config(msg *pb.CSVConfig) interface{} {
 }
 
 func (p *PrettyPrinter) pretty__storage_integration(msg [][]interface{}) interface{} {
-	flat1413 := p.tryFlat(msg, func() { p.pretty__storage_integration(msg) })
-	if flat1413 != nil {
-		p.write(*flat1413)
+	flat1459 := p.tryFlat(msg, func() { p.pretty__storage_integration(msg) })
+	if flat1459 != nil {
+		p.write(*flat1459)
 		return nil
 	} else {
-		fields1412 := msg
+		fields1458 := msg
 		p.write("(")
 		p.write("storage_integration")
 		p.indentSexp()
 		p.newline()
-		p.pretty_config_dict(fields1412)
+		p.pretty_config_dict(fields1458)
 		p.dedent()
 		p.write(")")
 	}
@@ -3953,22 +3982,22 @@ func (p *PrettyPrinter) pretty__storage_integration(msg [][]interface{}) interfa
 }
 
 func (p *PrettyPrinter) pretty_gnf_columns(msg []*pb.GNFColumn) interface{} {
-	flat1417 := p.tryFlat(msg, func() { p.pretty_gnf_columns(msg) })
-	if flat1417 != nil {
-		p.write(*flat1417)
+	flat1463 := p.tryFlat(msg, func() { p.pretty_gnf_columns(msg) })
+	if flat1463 != nil {
+		p.write(*flat1463)
 		return nil
 	} else {
-		fields1414 := msg
+		fields1460 := msg
 		p.write("(")
 		p.write("columns")
 		p.indentSexp()
-		if !(len(fields1414) == 0) {
+		if !(len(fields1460) == 0) {
 			p.newline()
-			for i1416, elem1415 := range fields1414 {
-				if (i1416 > 0) {
+			for i1462, elem1461 := range fields1460 {
+				if (i1462 > 0) {
 					p.newline()
 				}
-				p.pretty_gnf_column(elem1415)
+				p.pretty_gnf_column(elem1461)
 			}
 		}
 		p.dedent()
@@ -3978,38 +4007,38 @@ func (p *PrettyPrinter) pretty_gnf_columns(msg []*pb.GNFColumn) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gnf_column(msg *pb.GNFColumn) interface{} {
-	flat1426 := p.tryFlat(msg, func() { p.pretty_gnf_column(msg) })
-	if flat1426 != nil {
-		p.write(*flat1426)
+	flat1472 := p.tryFlat(msg, func() { p.pretty_gnf_column(msg) })
+	if flat1472 != nil {
+		p.write(*flat1472)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1721 *pb.RelationId
+		var _t1809 *pb.RelationId
 		if hasProtoField(_dollar_dollar, "target_id") {
-			_t1721 = _dollar_dollar.GetTargetId()
+			_t1809 = _dollar_dollar.GetTargetId()
 		}
-		fields1418 := []interface{}{_dollar_dollar.GetColumnPath(), _t1721, _dollar_dollar.GetTypes()}
-		unwrapped_fields1419 := fields1418
+		fields1464 := []interface{}{_dollar_dollar.GetColumnPath(), _t1809, _dollar_dollar.GetTypes()}
+		unwrapped_fields1465 := fields1464
 		p.write("(")
 		p.write("column")
 		p.indentSexp()
 		p.newline()
-		field1420 := unwrapped_fields1419[0].([]string)
-		p.pretty_gnf_column_path(field1420)
-		field1421 := unwrapped_fields1419[1].(*pb.RelationId)
-		if field1421 != nil {
+		field1466 := unwrapped_fields1465[0].([]string)
+		p.pretty_gnf_column_path(field1466)
+		field1467 := unwrapped_fields1465[1].(*pb.RelationId)
+		if field1467 != nil {
 			p.newline()
-			opt_val1422 := field1421
-			p.pretty_relation_id(opt_val1422)
+			opt_val1468 := field1467
+			p.pretty_relation_id(opt_val1468)
 		}
 		p.newline()
 		p.write("[")
-		field1423 := unwrapped_fields1419[2].([]*pb.Type)
-		for i1425, elem1424 := range field1423 {
-			if (i1425 > 0) {
+		field1469 := unwrapped_fields1465[2].([]*pb.Type)
+		for i1471, elem1470 := range field1469 {
+			if (i1471 > 0) {
 				p.newline()
 			}
-			p.pretty_type(elem1424)
+			p.pretty_type(elem1470)
 		}
 		p.write("]")
 		p.dedent()
@@ -4019,36 +4048,36 @@ func (p *PrettyPrinter) pretty_gnf_column(msg *pb.GNFColumn) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gnf_column_path(msg []string) interface{} {
-	flat1433 := p.tryFlat(msg, func() { p.pretty_gnf_column_path(msg) })
-	if flat1433 != nil {
-		p.write(*flat1433)
+	flat1479 := p.tryFlat(msg, func() { p.pretty_gnf_column_path(msg) })
+	if flat1479 != nil {
+		p.write(*flat1479)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1722 *string
+		var _t1810 *string
 		if int64(len(_dollar_dollar)) == 1 {
-			_t1722 = ptr(_dollar_dollar[0])
+			_t1810 = ptr(_dollar_dollar[0])
 		}
-		deconstruct_result1431 := _t1722
-		if deconstruct_result1431 != nil {
-			unwrapped1432 := *deconstruct_result1431
-			p.write(p.formatStringValue(unwrapped1432))
+		deconstruct_result1477 := _t1810
+		if deconstruct_result1477 != nil {
+			unwrapped1478 := *deconstruct_result1477
+			p.write(p.formatStringValue(unwrapped1478))
 		} else {
 			_dollar_dollar := msg
-			var _t1723 []string
+			var _t1811 []string
 			if int64(len(_dollar_dollar)) != 1 {
-				_t1723 = _dollar_dollar
+				_t1811 = _dollar_dollar
 			}
-			deconstruct_result1427 := _t1723
-			if deconstruct_result1427 != nil {
-				unwrapped1428 := deconstruct_result1427
+			deconstruct_result1473 := _t1811
+			if deconstruct_result1473 != nil {
+				unwrapped1474 := deconstruct_result1473
 				p.write("[")
 				p.indent()
-				for i1430, elem1429 := range unwrapped1428 {
-					if (i1430 > 0) {
+				for i1476, elem1475 := range unwrapped1474 {
+					if (i1476 > 0) {
 						p.newline()
 					}
-					p.write(p.formatStringValue(elem1429))
+					p.write(p.formatStringValue(elem1475))
 				}
 				p.dedent()
 				p.write("]")
@@ -4060,18 +4089,226 @@ func (p *PrettyPrinter) pretty_gnf_column_path(msg []string) interface{} {
 	return nil
 }
 
+func (p *PrettyPrinter) pretty_target_relations(msg *pb.TargetRelations) interface{} {
+	flat1484 := p.tryFlat(msg, func() { p.pretty_target_relations(msg) })
+	if flat1484 != nil {
+		p.write(*flat1484)
+		return nil
+	} else {
+		_dollar_dollar := msg
+		fields1480 := []interface{}{_dollar_dollar.GetKeys(), _dollar_dollar}
+		unwrapped_fields1481 := fields1480
+		p.write("(")
+		p.write("relations")
+		p.indentSexp()
+		p.newline()
+		field1482 := unwrapped_fields1481[0].([]*pb.NamedColumn)
+		p.pretty_relation_keys(field1482)
+		p.newline()
+		field1483 := unwrapped_fields1481[1].(*pb.TargetRelations)
+		p.pretty_relation_body(field1483)
+		p.dedent()
+		p.write(")")
+	}
+	return nil
+}
+
+func (p *PrettyPrinter) pretty_relation_keys(msg []*pb.NamedColumn) interface{} {
+	flat1488 := p.tryFlat(msg, func() { p.pretty_relation_keys(msg) })
+	if flat1488 != nil {
+		p.write(*flat1488)
+		return nil
+	} else {
+		fields1485 := msg
+		p.write("(")
+		p.write("keys")
+		p.indentSexp()
+		if !(len(fields1485) == 0) {
+			p.newline()
+			for i1487, elem1486 := range fields1485 {
+				if (i1487 > 0) {
+					p.newline()
+				}
+				p.pretty_named_column(elem1486)
+			}
+		}
+		p.dedent()
+		p.write(")")
+	}
+	return nil
+}
+
+func (p *PrettyPrinter) pretty_named_column(msg *pb.NamedColumn) interface{} {
+	flat1493 := p.tryFlat(msg, func() { p.pretty_named_column(msg) })
+	if flat1493 != nil {
+		p.write(*flat1493)
+		return nil
+	} else {
+		_dollar_dollar := msg
+		fields1489 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetType()}
+		unwrapped_fields1490 := fields1489
+		p.write("(")
+		p.write("column")
+		p.indentSexp()
+		p.newline()
+		field1491 := unwrapped_fields1490[0].(string)
+		p.write(p.formatStringValue(field1491))
+		p.newline()
+		field1492 := unwrapped_fields1490[1].(*pb.Type)
+		p.pretty_type(field1492)
+		p.dedent()
+		p.write(")")
+	}
+	return nil
+}
+
+func (p *PrettyPrinter) pretty_relation_body(msg *pb.TargetRelations) interface{} {
+	flat1500 := p.tryFlat(msg, func() { p.pretty_relation_body(msg) })
+	if flat1500 != nil {
+		p.write(*flat1500)
+		return nil
+	} else {
+		_dollar_dollar := msg
+		var _t1812 []*pb.TargetRelation
+		if hasProtoField(_dollar_dollar, "plain") {
+			_t1812 = _dollar_dollar.GetPlain().GetTargets()
+		}
+		deconstruct_result1498 := _t1812
+		if deconstruct_result1498 != nil {
+			unwrapped1499 := deconstruct_result1498
+			p.pretty_non_cdc_relations(unwrapped1499)
+		} else {
+			_dollar_dollar := msg
+			var _t1813 []interface{}
+			if hasProtoField(_dollar_dollar, "cdc") {
+				_t1813 = []interface{}{_dollar_dollar.GetCdc().GetInserts(), _dollar_dollar.GetCdc().GetDeletes()}
+			}
+			deconstruct_result1494 := _t1813
+			if deconstruct_result1494 != nil {
+				unwrapped1495 := deconstruct_result1494
+				field1496 := unwrapped1495[0].([]*pb.TargetRelation)
+				p.pretty_cdc_inserts(field1496)
+				p.write(" ")
+				field1497 := unwrapped1495[1].([]*pb.TargetRelation)
+				p.pretty_cdc_deletes(field1497)
+			} else {
+				panic(ParseError{msg: "No matching rule for relation_body"})
+			}
+		}
+	}
+	return nil
+}
+
+func (p *PrettyPrinter) pretty_non_cdc_relations(msg []*pb.TargetRelation) interface{} {
+	flat1504 := p.tryFlat(msg, func() { p.pretty_non_cdc_relations(msg) })
+	if flat1504 != nil {
+		p.write(*flat1504)
+		return nil
+	} else {
+		fields1501 := msg
+		for i1503, elem1502 := range fields1501 {
+			if (i1503 > 0) {
+				p.newline()
+			}
+			p.pretty_target_relation(elem1502)
+		}
+	}
+	return nil
+}
+
+func (p *PrettyPrinter) pretty_target_relation(msg *pb.TargetRelation) interface{} {
+	flat1511 := p.tryFlat(msg, func() { p.pretty_target_relation(msg) })
+	if flat1511 != nil {
+		p.write(*flat1511)
+		return nil
+	} else {
+		_dollar_dollar := msg
+		fields1505 := []interface{}{_dollar_dollar.GetTargetId(), _dollar_dollar.GetValues()}
+		unwrapped_fields1506 := fields1505
+		p.write("(")
+		p.write("relation")
+		p.indentSexp()
+		p.newline()
+		field1507 := unwrapped_fields1506[0].(*pb.RelationId)
+		p.pretty_relation_id(field1507)
+		field1508 := unwrapped_fields1506[1].([]*pb.NamedColumn)
+		if !(len(field1508) == 0) {
+			p.newline()
+			for i1510, elem1509 := range field1508 {
+				if (i1510 > 0) {
+					p.newline()
+				}
+				p.pretty_named_column(elem1509)
+			}
+		}
+		p.dedent()
+		p.write(")")
+	}
+	return nil
+}
+
+func (p *PrettyPrinter) pretty_cdc_inserts(msg []*pb.TargetRelation) interface{} {
+	flat1515 := p.tryFlat(msg, func() { p.pretty_cdc_inserts(msg) })
+	if flat1515 != nil {
+		p.write(*flat1515)
+		return nil
+	} else {
+		fields1512 := msg
+		p.write("(")
+		p.write("inserts")
+		p.indentSexp()
+		if !(len(fields1512) == 0) {
+			p.newline()
+			for i1514, elem1513 := range fields1512 {
+				if (i1514 > 0) {
+					p.newline()
+				}
+				p.pretty_target_relation(elem1513)
+			}
+		}
+		p.dedent()
+		p.write(")")
+	}
+	return nil
+}
+
+func (p *PrettyPrinter) pretty_cdc_deletes(msg []*pb.TargetRelation) interface{} {
+	flat1519 := p.tryFlat(msg, func() { p.pretty_cdc_deletes(msg) })
+	if flat1519 != nil {
+		p.write(*flat1519)
+		return nil
+	} else {
+		fields1516 := msg
+		p.write("(")
+		p.write("deletes")
+		p.indentSexp()
+		if !(len(fields1516) == 0) {
+			p.newline()
+			for i1518, elem1517 := range fields1516 {
+				if (i1518 > 0) {
+					p.newline()
+				}
+				p.pretty_target_relation(elem1517)
+			}
+		}
+		p.dedent()
+		p.write(")")
+	}
+	return nil
+}
+
 func (p *PrettyPrinter) pretty_csv_asof(msg string) interface{} {
-	flat1435 := p.tryFlat(msg, func() { p.pretty_csv_asof(msg) })
-	if flat1435 != nil {
-		p.write(*flat1435)
+	flat1521 := p.tryFlat(msg, func() { p.pretty_csv_asof(msg) })
+	if flat1521 != nil {
+		p.write(*flat1521)
 		return nil
 	} else {
-		fields1434 := msg
+		fields1520 := msg
 		p.write("(")
 		p.write("asof")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1434))
+		p.write(p.formatStringValue(fields1520))
 		p.dedent()
 		p.write(")")
 	}
@@ -4079,43 +4316,43 @@ func (p *PrettyPrinter) pretty_csv_asof(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_iceberg_data(msg *pb.IcebergData) interface{} {
-	flat1446 := p.tryFlat(msg, func() { p.pretty_iceberg_data(msg) })
-	if flat1446 != nil {
-		p.write(*flat1446)
+	flat1532 := p.tryFlat(msg, func() { p.pretty_iceberg_data(msg) })
+	if flat1532 != nil {
+		p.write(*flat1532)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1724 := p.deconstruct_iceberg_data_from_snapshot_optional(_dollar_dollar)
-		_t1725 := p.deconstruct_iceberg_data_to_snapshot_optional(_dollar_dollar)
-		fields1436 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetColumns(), _t1724, _t1725, _dollar_dollar.GetReturnsDelta()}
-		unwrapped_fields1437 := fields1436
+		_t1814 := p.deconstruct_iceberg_data_from_snapshot_optional(_dollar_dollar)
+		_t1815 := p.deconstruct_iceberg_data_to_snapshot_optional(_dollar_dollar)
+		fields1522 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetColumns(), _t1814, _t1815, _dollar_dollar.GetReturnsDelta()}
+		unwrapped_fields1523 := fields1522
 		p.write("(")
 		p.write("iceberg_data")
 		p.indentSexp()
 		p.newline()
-		field1438 := unwrapped_fields1437[0].(*pb.IcebergLocator)
-		p.pretty_iceberg_locator(field1438)
+		field1524 := unwrapped_fields1523[0].(*pb.IcebergLocator)
+		p.pretty_iceberg_locator(field1524)
 		p.newline()
-		field1439 := unwrapped_fields1437[1].(*pb.IcebergCatalogConfig)
-		p.pretty_iceberg_catalog_config(field1439)
+		field1525 := unwrapped_fields1523[1].(*pb.IcebergCatalogConfig)
+		p.pretty_iceberg_catalog_config(field1525)
 		p.newline()
-		field1440 := unwrapped_fields1437[2].([]*pb.GNFColumn)
-		p.pretty_gnf_columns(field1440)
-		field1441 := unwrapped_fields1437[3].(*string)
-		if field1441 != nil {
+		field1526 := unwrapped_fields1523[2].([]*pb.GNFColumn)
+		p.pretty_gnf_columns(field1526)
+		field1527 := unwrapped_fields1523[3].(*string)
+		if field1527 != nil {
 			p.newline()
-			opt_val1442 := *field1441
-			p.pretty_iceberg_from_snapshot(opt_val1442)
+			opt_val1528 := *field1527
+			p.pretty_iceberg_from_snapshot(opt_val1528)
 		}
-		field1443 := unwrapped_fields1437[4].(*string)
-		if field1443 != nil {
+		field1529 := unwrapped_fields1523[4].(*string)
+		if field1529 != nil {
 			p.newline()
-			opt_val1444 := *field1443
-			p.pretty_iceberg_to_snapshot(opt_val1444)
+			opt_val1530 := *field1529
+			p.pretty_iceberg_to_snapshot(opt_val1530)
 		}
 		p.newline()
-		field1445 := unwrapped_fields1437[5].(bool)
-		p.pretty_boolean_value(field1445)
+		field1531 := unwrapped_fields1523[5].(bool)
+		p.pretty_boolean_value(field1531)
 		p.dedent()
 		p.write(")")
 	}
@@ -4123,26 +4360,26 @@ func (p *PrettyPrinter) pretty_iceberg_data(msg *pb.IcebergData) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_iceberg_locator(msg *pb.IcebergLocator) interface{} {
-	flat1452 := p.tryFlat(msg, func() { p.pretty_iceberg_locator(msg) })
-	if flat1452 != nil {
-		p.write(*flat1452)
+	flat1538 := p.tryFlat(msg, func() { p.pretty_iceberg_locator(msg) })
+	if flat1538 != nil {
+		p.write(*flat1538)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1447 := []interface{}{_dollar_dollar.GetTableName(), _dollar_dollar.GetNamespace(), _dollar_dollar.GetWarehouse()}
-		unwrapped_fields1448 := fields1447
+		fields1533 := []interface{}{_dollar_dollar.GetTableName(), _dollar_dollar.GetNamespace(), _dollar_dollar.GetWarehouse()}
+		unwrapped_fields1534 := fields1533
 		p.write("(")
 		p.write("iceberg_locator")
 		p.indentSexp()
 		p.newline()
-		field1449 := unwrapped_fields1448[0].(string)
-		p.pretty_iceberg_locator_table_name(field1449)
+		field1535 := unwrapped_fields1534[0].(string)
+		p.pretty_iceberg_locator_table_name(field1535)
 		p.newline()
-		field1450 := unwrapped_fields1448[1].([]string)
-		p.pretty_iceberg_locator_namespace(field1450)
+		field1536 := unwrapped_fields1534[1].([]string)
+		p.pretty_iceberg_locator_namespace(field1536)
 		p.newline()
-		field1451 := unwrapped_fields1448[2].(string)
-		p.pretty_iceberg_locator_warehouse(field1451)
+		field1537 := unwrapped_fields1534[2].(string)
+		p.pretty_iceberg_locator_warehouse(field1537)
 		p.dedent()
 		p.write(")")
 	}
@@ -4150,17 +4387,17 @@ func (p *PrettyPrinter) pretty_iceberg_locator(msg *pb.IcebergLocator) interface
 }
 
 func (p *PrettyPrinter) pretty_iceberg_locator_table_name(msg string) interface{} {
-	flat1454 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_table_name(msg) })
-	if flat1454 != nil {
-		p.write(*flat1454)
+	flat1540 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_table_name(msg) })
+	if flat1540 != nil {
+		p.write(*flat1540)
 		return nil
 	} else {
-		fields1453 := msg
+		fields1539 := msg
 		p.write("(")
 		p.write("table_name")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1453))
+		p.write(p.formatStringValue(fields1539))
 		p.dedent()
 		p.write(")")
 	}
@@ -4168,22 +4405,22 @@ func (p *PrettyPrinter) pretty_iceberg_locator_table_name(msg string) interface{
 }
 
 func (p *PrettyPrinter) pretty_iceberg_locator_namespace(msg []string) interface{} {
-	flat1458 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_namespace(msg) })
-	if flat1458 != nil {
-		p.write(*flat1458)
+	flat1544 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_namespace(msg) })
+	if flat1544 != nil {
+		p.write(*flat1544)
 		return nil
 	} else {
-		fields1455 := msg
+		fields1541 := msg
 		p.write("(")
 		p.write("namespace")
 		p.indentSexp()
-		if !(len(fields1455) == 0) {
+		if !(len(fields1541) == 0) {
 			p.newline()
-			for i1457, elem1456 := range fields1455 {
-				if (i1457 > 0) {
+			for i1543, elem1542 := range fields1541 {
+				if (i1543 > 0) {
 					p.newline()
 				}
-				p.write(p.formatStringValue(elem1456))
+				p.write(p.formatStringValue(elem1542))
 			}
 		}
 		p.dedent()
@@ -4193,17 +4430,17 @@ func (p *PrettyPrinter) pretty_iceberg_locator_namespace(msg []string) interface
 }
 
 func (p *PrettyPrinter) pretty_iceberg_locator_warehouse(msg string) interface{} {
-	flat1460 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_warehouse(msg) })
-	if flat1460 != nil {
-		p.write(*flat1460)
+	flat1546 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_warehouse(msg) })
+	if flat1546 != nil {
+		p.write(*flat1546)
 		return nil
 	} else {
-		fields1459 := msg
+		fields1545 := msg
 		p.write("(")
 		p.write("warehouse")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1459))
+		p.write(p.formatStringValue(fields1545))
 		p.dedent()
 		p.write(")")
 	}
@@ -4211,33 +4448,33 @@ func (p *PrettyPrinter) pretty_iceberg_locator_warehouse(msg string) interface{}
 }
 
 func (p *PrettyPrinter) pretty_iceberg_catalog_config(msg *pb.IcebergCatalogConfig) interface{} {
-	flat1468 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config(msg) })
-	if flat1468 != nil {
-		p.write(*flat1468)
+	flat1554 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config(msg) })
+	if flat1554 != nil {
+		p.write(*flat1554)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1726 := p.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
-		fields1461 := []interface{}{_dollar_dollar.GetCatalogUri(), _t1726, dictToPairs(_dollar_dollar.GetProperties()), dictToPairs(_dollar_dollar.GetAuthProperties())}
-		unwrapped_fields1462 := fields1461
+		_t1816 := p.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
+		fields1547 := []interface{}{_dollar_dollar.GetCatalogUri(), _t1816, dictToPairs(_dollar_dollar.GetProperties()), dictToPairs(_dollar_dollar.GetAuthProperties())}
+		unwrapped_fields1548 := fields1547
 		p.write("(")
 		p.write("iceberg_catalog_config")
 		p.indentSexp()
 		p.newline()
-		field1463 := unwrapped_fields1462[0].(string)
-		p.pretty_iceberg_catalog_uri(field1463)
-		field1464 := unwrapped_fields1462[1].(*string)
-		if field1464 != nil {
+		field1549 := unwrapped_fields1548[0].(string)
+		p.pretty_iceberg_catalog_uri(field1549)
+		field1550 := unwrapped_fields1548[1].(*string)
+		if field1550 != nil {
 			p.newline()
-			opt_val1465 := *field1464
-			p.pretty_iceberg_catalog_config_scope(opt_val1465)
+			opt_val1551 := *field1550
+			p.pretty_iceberg_catalog_config_scope(opt_val1551)
 		}
 		p.newline()
-		field1466 := unwrapped_fields1462[2].([][]interface{})
-		p.pretty_iceberg_properties(field1466)
+		field1552 := unwrapped_fields1548[2].([][]interface{})
+		p.pretty_iceberg_properties(field1552)
 		p.newline()
-		field1467 := unwrapped_fields1462[3].([][]interface{})
-		p.pretty_iceberg_auth_properties(field1467)
+		field1553 := unwrapped_fields1548[3].([][]interface{})
+		p.pretty_iceberg_auth_properties(field1553)
 		p.dedent()
 		p.write(")")
 	}
@@ -4245,17 +4482,17 @@ func (p *PrettyPrinter) pretty_iceberg_catalog_config(msg *pb.IcebergCatalogConf
 }
 
 func (p *PrettyPrinter) pretty_iceberg_catalog_uri(msg string) interface{} {
-	flat1470 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_uri(msg) })
-	if flat1470 != nil {
-		p.write(*flat1470)
+	flat1556 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_uri(msg) })
+	if flat1556 != nil {
+		p.write(*flat1556)
 		return nil
 	} else {
-		fields1469 := msg
+		fields1555 := msg
 		p.write("(")
 		p.write("catalog_uri")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1469))
+		p.write(p.formatStringValue(fields1555))
 		p.dedent()
 		p.write(")")
 	}
@@ -4263,17 +4500,17 @@ func (p *PrettyPrinter) pretty_iceberg_catalog_uri(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_iceberg_catalog_config_scope(msg string) interface{} {
-	flat1472 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config_scope(msg) })
-	if flat1472 != nil {
-		p.write(*flat1472)
+	flat1558 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config_scope(msg) })
+	if flat1558 != nil {
+		p.write(*flat1558)
 		return nil
 	} else {
-		fields1471 := msg
+		fields1557 := msg
 		p.write("(")
 		p.write("scope")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1471))
+		p.write(p.formatStringValue(fields1557))
 		p.dedent()
 		p.write(")")
 	}
@@ -4281,22 +4518,22 @@ func (p *PrettyPrinter) pretty_iceberg_catalog_config_scope(msg string) interfac
 }
 
 func (p *PrettyPrinter) pretty_iceberg_properties(msg [][]interface{}) interface{} {
-	flat1476 := p.tryFlat(msg, func() { p.pretty_iceberg_properties(msg) })
-	if flat1476 != nil {
-		p.write(*flat1476)
+	flat1562 := p.tryFlat(msg, func() { p.pretty_iceberg_properties(msg) })
+	if flat1562 != nil {
+		p.write(*flat1562)
 		return nil
 	} else {
-		fields1473 := msg
+		fields1559 := msg
 		p.write("(")
 		p.write("properties")
 		p.indentSexp()
-		if !(len(fields1473) == 0) {
+		if !(len(fields1559) == 0) {
 			p.newline()
-			for i1475, elem1474 := range fields1473 {
-				if (i1475 > 0) {
+			for i1561, elem1560 := range fields1559 {
+				if (i1561 > 0) {
 					p.newline()
 				}
-				p.pretty_iceberg_property_entry(elem1474)
+				p.pretty_iceberg_property_entry(elem1560)
 			}
 		}
 		p.dedent()
@@ -4306,23 +4543,23 @@ func (p *PrettyPrinter) pretty_iceberg_properties(msg [][]interface{}) interface
 }
 
 func (p *PrettyPrinter) pretty_iceberg_property_entry(msg []interface{}) interface{} {
-	flat1481 := p.tryFlat(msg, func() { p.pretty_iceberg_property_entry(msg) })
-	if flat1481 != nil {
-		p.write(*flat1481)
+	flat1567 := p.tryFlat(msg, func() { p.pretty_iceberg_property_entry(msg) })
+	if flat1567 != nil {
+		p.write(*flat1567)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1477 := []interface{}{_dollar_dollar[0].(string), _dollar_dollar[1].(string)}
-		unwrapped_fields1478 := fields1477
+		fields1563 := []interface{}{_dollar_dollar[0].(string), _dollar_dollar[1].(string)}
+		unwrapped_fields1564 := fields1563
 		p.write("(")
 		p.write("prop")
 		p.indentSexp()
 		p.newline()
-		field1479 := unwrapped_fields1478[0].(string)
-		p.write(p.formatStringValue(field1479))
+		field1565 := unwrapped_fields1564[0].(string)
+		p.write(p.formatStringValue(field1565))
 		p.newline()
-		field1480 := unwrapped_fields1478[1].(string)
-		p.write(p.formatStringValue(field1480))
+		field1566 := unwrapped_fields1564[1].(string)
+		p.write(p.formatStringValue(field1566))
 		p.dedent()
 		p.write(")")
 	}
@@ -4330,22 +4567,22 @@ func (p *PrettyPrinter) pretty_iceberg_property_entry(msg []interface{}) interfa
 }
 
 func (p *PrettyPrinter) pretty_iceberg_auth_properties(msg [][]interface{}) interface{} {
-	flat1485 := p.tryFlat(msg, func() { p.pretty_iceberg_auth_properties(msg) })
-	if flat1485 != nil {
-		p.write(*flat1485)
+	flat1571 := p.tryFlat(msg, func() { p.pretty_iceberg_auth_properties(msg) })
+	if flat1571 != nil {
+		p.write(*flat1571)
 		return nil
 	} else {
-		fields1482 := msg
+		fields1568 := msg
 		p.write("(")
 		p.write("auth_properties")
 		p.indentSexp()
-		if !(len(fields1482) == 0) {
+		if !(len(fields1568) == 0) {
 			p.newline()
-			for i1484, elem1483 := range fields1482 {
-				if (i1484 > 0) {
+			for i1570, elem1569 := range fields1568 {
+				if (i1570 > 0) {
 					p.newline()
 				}
-				p.pretty_iceberg_masked_property_entry(elem1483)
+				p.pretty_iceberg_masked_property_entry(elem1569)
 			}
 		}
 		p.dedent()
@@ -4355,24 +4592,24 @@ func (p *PrettyPrinter) pretty_iceberg_auth_properties(msg [][]interface{}) inte
 }
 
 func (p *PrettyPrinter) pretty_iceberg_masked_property_entry(msg []interface{}) interface{} {
-	flat1490 := p.tryFlat(msg, func() { p.pretty_iceberg_masked_property_entry(msg) })
-	if flat1490 != nil {
-		p.write(*flat1490)
+	flat1576 := p.tryFlat(msg, func() { p.pretty_iceberg_masked_property_entry(msg) })
+	if flat1576 != nil {
+		p.write(*flat1576)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1727 := p.mask_secret_value(_dollar_dollar)
-		fields1486 := []interface{}{_dollar_dollar[0].(string), _t1727}
-		unwrapped_fields1487 := fields1486
+		_t1817 := p.mask_secret_value(_dollar_dollar)
+		fields1572 := []interface{}{_dollar_dollar[0].(string), _t1817}
+		unwrapped_fields1573 := fields1572
 		p.write("(")
 		p.write("prop")
 		p.indentSexp()
 		p.newline()
-		field1488 := unwrapped_fields1487[0].(string)
-		p.write(p.formatStringValue(field1488))
+		field1574 := unwrapped_fields1573[0].(string)
+		p.write(p.formatStringValue(field1574))
 		p.newline()
-		field1489 := unwrapped_fields1487[1].(string)
-		p.write(p.formatStringValue(field1489))
+		field1575 := unwrapped_fields1573[1].(string)
+		p.write(p.formatStringValue(field1575))
 		p.dedent()
 		p.write(")")
 	}
@@ -4380,17 +4617,17 @@ func (p *PrettyPrinter) pretty_iceberg_masked_property_entry(msg []interface{})
 }
 
 func (p *PrettyPrinter) pretty_iceberg_from_snapshot(msg string) interface{} {
-	flat1492 := p.tryFlat(msg, func() { p.pretty_iceberg_from_snapshot(msg) })
-	if flat1492 != nil {
-		p.write(*flat1492)
+	flat1578 := p.tryFlat(msg, func() { p.pretty_iceberg_from_snapshot(msg) })
+	if flat1578 != nil {
+		p.write(*flat1578)
 		return nil
 	} else {
-		fields1491 := msg
+		fields1577 := msg
 		p.write("(")
 		p.write("from_snapshot")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1491))
+		p.write(p.formatStringValue(fields1577))
 		p.dedent()
 		p.write(")")
 	}
@@ -4398,17 +4635,17 @@ func (p *PrettyPrinter) pretty_iceberg_from_snapshot(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_iceberg_to_snapshot(msg string) interface{} {
-	flat1494 := p.tryFlat(msg, func() { p.pretty_iceberg_to_snapshot(msg) })
-	if flat1494 != nil {
-		p.write(*flat1494)
+	flat1580 := p.tryFlat(msg, func() { p.pretty_iceberg_to_snapshot(msg) })
+	if flat1580 != nil {
+		p.write(*flat1580)
 		return nil
 	} else {
-		fields1493 := msg
+		fields1579 := msg
 		p.write("(")
 		p.write("to_snapshot")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1493))
+		p.write(p.formatStringValue(fields1579))
 		p.dedent()
 		p.write(")")
 	}
@@ -4416,19 +4653,19 @@ func (p *PrettyPrinter) pretty_iceberg_to_snapshot(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_undefine(msg *pb.Undefine) interface{} {
-	flat1497 := p.tryFlat(msg, func() { p.pretty_undefine(msg) })
-	if flat1497 != nil {
-		p.write(*flat1497)
+	flat1583 := p.tryFlat(msg, func() { p.pretty_undefine(msg) })
+	if flat1583 != nil {
+		p.write(*flat1583)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1495 := _dollar_dollar.GetFragmentId()
-		unwrapped_fields1496 := fields1495
+		fields1581 := _dollar_dollar.GetFragmentId()
+		unwrapped_fields1582 := fields1581
 		p.write("(")
 		p.write("undefine")
 		p.indentSexp()
 		p.newline()
-		p.pretty_fragment_id(unwrapped_fields1496)
+		p.pretty_fragment_id(unwrapped_fields1582)
 		p.dedent()
 		p.write(")")
 	}
@@ -4436,24 +4673,24 @@ func (p *PrettyPrinter) pretty_undefine(msg *pb.Undefine) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_context(msg *pb.Context) interface{} {
-	flat1502 := p.tryFlat(msg, func() { p.pretty_context(msg) })
-	if flat1502 != nil {
-		p.write(*flat1502)
+	flat1588 := p.tryFlat(msg, func() { p.pretty_context(msg) })
+	if flat1588 != nil {
+		p.write(*flat1588)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1498 := _dollar_dollar.GetRelations()
-		unwrapped_fields1499 := fields1498
+		fields1584 := _dollar_dollar.GetRelations()
+		unwrapped_fields1585 := fields1584
 		p.write("(")
 		p.write("context")
 		p.indentSexp()
-		if !(len(unwrapped_fields1499) == 0) {
+		if !(len(unwrapped_fields1585) == 0) {
 			p.newline()
-			for i1501, elem1500 := range unwrapped_fields1499 {
-				if (i1501 > 0) {
+			for i1587, elem1586 := range unwrapped_fields1585 {
+				if (i1587 > 0) {
 					p.newline()
 				}
-				p.pretty_relation_id(elem1500)
+				p.pretty_relation_id(elem1586)
 			}
 		}
 		p.dedent()
@@ -4463,28 +4700,28 @@ func (p *PrettyPrinter) pretty_context(msg *pb.Context) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_snapshot(msg *pb.Snapshot) interface{} {
-	flat1509 := p.tryFlat(msg, func() { p.pretty_snapshot(msg) })
-	if flat1509 != nil {
-		p.write(*flat1509)
+	flat1595 := p.tryFlat(msg, func() { p.pretty_snapshot(msg) })
+	if flat1595 != nil {
+		p.write(*flat1595)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1503 := []interface{}{_dollar_dollar.GetPrefix(), _dollar_dollar.GetMappings()}
-		unwrapped_fields1504 := fields1503
+		fields1589 := []interface{}{_dollar_dollar.GetPrefix(), _dollar_dollar.GetMappings()}
+		unwrapped_fields1590 := fields1589
 		p.write("(")
 		p.write("snapshot")
 		p.indentSexp()
 		p.newline()
-		field1505 := unwrapped_fields1504[0].([]string)
-		p.pretty_edb_path(field1505)
-		field1506 := unwrapped_fields1504[1].([]*pb.SnapshotMapping)
-		if !(len(field1506) == 0) {
+		field1591 := unwrapped_fields1590[0].([]string)
+		p.pretty_edb_path(field1591)
+		field1592 := unwrapped_fields1590[1].([]*pb.SnapshotMapping)
+		if !(len(field1592) == 0) {
 			p.newline()
-			for i1508, elem1507 := range field1506 {
-				if (i1508 > 0) {
+			for i1594, elem1593 := range field1592 {
+				if (i1594 > 0) {
 					p.newline()
 				}
-				p.pretty_snapshot_mapping(elem1507)
+				p.pretty_snapshot_mapping(elem1593)
 			}
 		}
 		p.dedent()
@@ -4494,40 +4731,40 @@ func (p *PrettyPrinter) pretty_snapshot(msg *pb.Snapshot) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_snapshot_mapping(msg *pb.SnapshotMapping) interface{} {
-	flat1514 := p.tryFlat(msg, func() { p.pretty_snapshot_mapping(msg) })
-	if flat1514 != nil {
-		p.write(*flat1514)
+	flat1600 := p.tryFlat(msg, func() { p.pretty_snapshot_mapping(msg) })
+	if flat1600 != nil {
+		p.write(*flat1600)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1510 := []interface{}{_dollar_dollar.GetDestinationPath(), _dollar_dollar.GetSourceRelation()}
-		unwrapped_fields1511 := fields1510
-		field1512 := unwrapped_fields1511[0].([]string)
-		p.pretty_edb_path(field1512)
+		fields1596 := []interface{}{_dollar_dollar.GetDestinationPath(), _dollar_dollar.GetSourceRelation()}
+		unwrapped_fields1597 := fields1596
+		field1598 := unwrapped_fields1597[0].([]string)
+		p.pretty_edb_path(field1598)
 		p.write(" ")
-		field1513 := unwrapped_fields1511[1].(*pb.RelationId)
-		p.pretty_relation_id(field1513)
+		field1599 := unwrapped_fields1597[1].(*pb.RelationId)
+		p.pretty_relation_id(field1599)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_epoch_reads(msg []*pb.Read) interface{} {
-	flat1518 := p.tryFlat(msg, func() { p.pretty_epoch_reads(msg) })
-	if flat1518 != nil {
-		p.write(*flat1518)
+	flat1604 := p.tryFlat(msg, func() { p.pretty_epoch_reads(msg) })
+	if flat1604 != nil {
+		p.write(*flat1604)
 		return nil
 	} else {
-		fields1515 := msg
+		fields1601 := msg
 		p.write("(")
 		p.write("reads")
 		p.indentSexp()
-		if !(len(fields1515) == 0) {
+		if !(len(fields1601) == 0) {
 			p.newline()
-			for i1517, elem1516 := range fields1515 {
-				if (i1517 > 0) {
+			for i1603, elem1602 := range fields1601 {
+				if (i1603 > 0) {
 					p.newline()
 				}
-				p.pretty_read(elem1516)
+				p.pretty_read(elem1602)
 			}
 		}
 		p.dedent()
@@ -4537,60 +4774,60 @@ func (p *PrettyPrinter) pretty_epoch_reads(msg []*pb.Read) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_read(msg *pb.Read) interface{} {
-	flat1529 := p.tryFlat(msg, func() { p.pretty_read(msg) })
-	if flat1529 != nil {
-		p.write(*flat1529)
+	flat1615 := p.tryFlat(msg, func() { p.pretty_read(msg) })
+	if flat1615 != nil {
+		p.write(*flat1615)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1728 *pb.Demand
+		var _t1818 *pb.Demand
 		if hasProtoField(_dollar_dollar, "demand") {
-			_t1728 = _dollar_dollar.GetDemand()
+			_t1818 = _dollar_dollar.GetDemand()
 		}
-		deconstruct_result1527 := _t1728
-		if deconstruct_result1527 != nil {
-			unwrapped1528 := deconstruct_result1527
-			p.pretty_demand(unwrapped1528)
+		deconstruct_result1613 := _t1818
+		if deconstruct_result1613 != nil {
+			unwrapped1614 := deconstruct_result1613
+			p.pretty_demand(unwrapped1614)
 		} else {
 			_dollar_dollar := msg
-			var _t1729 *pb.Output
+			var _t1819 *pb.Output
 			if hasProtoField(_dollar_dollar, "output") {
-				_t1729 = _dollar_dollar.GetOutput()
+				_t1819 = _dollar_dollar.GetOutput()
 			}
-			deconstruct_result1525 := _t1729
-			if deconstruct_result1525 != nil {
-				unwrapped1526 := deconstruct_result1525
-				p.pretty_output(unwrapped1526)
+			deconstruct_result1611 := _t1819
+			if deconstruct_result1611 != nil {
+				unwrapped1612 := deconstruct_result1611
+				p.pretty_output(unwrapped1612)
 			} else {
 				_dollar_dollar := msg
-				var _t1730 *pb.WhatIf
+				var _t1820 *pb.WhatIf
 				if hasProtoField(_dollar_dollar, "what_if") {
-					_t1730 = _dollar_dollar.GetWhatIf()
+					_t1820 = _dollar_dollar.GetWhatIf()
 				}
-				deconstruct_result1523 := _t1730
-				if deconstruct_result1523 != nil {
-					unwrapped1524 := deconstruct_result1523
-					p.pretty_what_if(unwrapped1524)
+				deconstruct_result1609 := _t1820
+				if deconstruct_result1609 != nil {
+					unwrapped1610 := deconstruct_result1609
+					p.pretty_what_if(unwrapped1610)
 				} else {
 					_dollar_dollar := msg
-					var _t1731 *pb.Abort
+					var _t1821 *pb.Abort
 					if hasProtoField(_dollar_dollar, "abort") {
-						_t1731 = _dollar_dollar.GetAbort()
+						_t1821 = _dollar_dollar.GetAbort()
 					}
-					deconstruct_result1521 := _t1731
-					if deconstruct_result1521 != nil {
-						unwrapped1522 := deconstruct_result1521
-						p.pretty_abort(unwrapped1522)
+					deconstruct_result1607 := _t1821
+					if deconstruct_result1607 != nil {
+						unwrapped1608 := deconstruct_result1607
+						p.pretty_abort(unwrapped1608)
 					} else {
 						_dollar_dollar := msg
-						var _t1732 *pb.Export
+						var _t1822 *pb.Export
 						if hasProtoField(_dollar_dollar, "export") {
-							_t1732 = _dollar_dollar.GetExport()
+							_t1822 = _dollar_dollar.GetExport()
 						}
-						deconstruct_result1519 := _t1732
-						if deconstruct_result1519 != nil {
-							unwrapped1520 := deconstruct_result1519
-							p.pretty_export(unwrapped1520)
+						deconstruct_result1605 := _t1822
+						if deconstruct_result1605 != nil {
+							unwrapped1606 := deconstruct_result1605
+							p.pretty_export(unwrapped1606)
 						} else {
 							panic(ParseError{msg: "No matching rule for read"})
 						}
@@ -4603,19 +4840,19 @@ func (p *PrettyPrinter) pretty_read(msg *pb.Read) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_demand(msg *pb.Demand) interface{} {
-	flat1532 := p.tryFlat(msg, func() { p.pretty_demand(msg) })
-	if flat1532 != nil {
-		p.write(*flat1532)
+	flat1618 := p.tryFlat(msg, func() { p.pretty_demand(msg) })
+	if flat1618 != nil {
+		p.write(*flat1618)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1530 := _dollar_dollar.GetRelationId()
-		unwrapped_fields1531 := fields1530
+		fields1616 := _dollar_dollar.GetRelationId()
+		unwrapped_fields1617 := fields1616
 		p.write("(")
 		p.write("demand")
 		p.indentSexp()
 		p.newline()
-		p.pretty_relation_id(unwrapped_fields1531)
+		p.pretty_relation_id(unwrapped_fields1617)
 		p.dedent()
 		p.write(")")
 	}
@@ -4623,23 +4860,23 @@ func (p *PrettyPrinter) pretty_demand(msg *pb.Demand) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_output(msg *pb.Output) interface{} {
-	flat1537 := p.tryFlat(msg, func() { p.pretty_output(msg) })
-	if flat1537 != nil {
-		p.write(*flat1537)
+	flat1623 := p.tryFlat(msg, func() { p.pretty_output(msg) })
+	if flat1623 != nil {
+		p.write(*flat1623)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1533 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetRelationId()}
-		unwrapped_fields1534 := fields1533
+		fields1619 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetRelationId()}
+		unwrapped_fields1620 := fields1619
 		p.write("(")
 		p.write("output")
 		p.indentSexp()
 		p.newline()
-		field1535 := unwrapped_fields1534[0].(string)
-		p.pretty_name(field1535)
+		field1621 := unwrapped_fields1620[0].(string)
+		p.pretty_name(field1621)
 		p.newline()
-		field1536 := unwrapped_fields1534[1].(*pb.RelationId)
-		p.pretty_relation_id(field1536)
+		field1622 := unwrapped_fields1620[1].(*pb.RelationId)
+		p.pretty_relation_id(field1622)
 		p.dedent()
 		p.write(")")
 	}
@@ -4647,23 +4884,23 @@ func (p *PrettyPrinter) pretty_output(msg *pb.Output) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_what_if(msg *pb.WhatIf) interface{} {
-	flat1542 := p.tryFlat(msg, func() { p.pretty_what_if(msg) })
-	if flat1542 != nil {
-		p.write(*flat1542)
+	flat1628 := p.tryFlat(msg, func() { p.pretty_what_if(msg) })
+	if flat1628 != nil {
+		p.write(*flat1628)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1538 := []interface{}{_dollar_dollar.GetBranch(), _dollar_dollar.GetEpoch()}
-		unwrapped_fields1539 := fields1538
+		fields1624 := []interface{}{_dollar_dollar.GetBranch(), _dollar_dollar.GetEpoch()}
+		unwrapped_fields1625 := fields1624
 		p.write("(")
 		p.write("what_if")
 		p.indentSexp()
 		p.newline()
-		field1540 := unwrapped_fields1539[0].(string)
-		p.pretty_name(field1540)
+		field1626 := unwrapped_fields1625[0].(string)
+		p.pretty_name(field1626)
 		p.newline()
-		field1541 := unwrapped_fields1539[1].(*pb.Epoch)
-		p.pretty_epoch(field1541)
+		field1627 := unwrapped_fields1625[1].(*pb.Epoch)
+		p.pretty_epoch(field1627)
 		p.dedent()
 		p.write(")")
 	}
@@ -4671,30 +4908,30 @@ func (p *PrettyPrinter) pretty_what_if(msg *pb.WhatIf) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_abort(msg *pb.Abort) interface{} {
-	flat1548 := p.tryFlat(msg, func() { p.pretty_abort(msg) })
-	if flat1548 != nil {
-		p.write(*flat1548)
+	flat1634 := p.tryFlat(msg, func() { p.pretty_abort(msg) })
+	if flat1634 != nil {
+		p.write(*flat1634)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1733 *string
+		var _t1823 *string
 		if _dollar_dollar.GetName() != "abort" {
-			_t1733 = ptr(_dollar_dollar.GetName())
+			_t1823 = ptr(_dollar_dollar.GetName())
 		}
-		fields1543 := []interface{}{_t1733, _dollar_dollar.GetRelationId()}
-		unwrapped_fields1544 := fields1543
+		fields1629 := []interface{}{_t1823, _dollar_dollar.GetRelationId()}
+		unwrapped_fields1630 := fields1629
 		p.write("(")
 		p.write("abort")
 		p.indentSexp()
-		field1545 := unwrapped_fields1544[0].(*string)
-		if field1545 != nil {
+		field1631 := unwrapped_fields1630[0].(*string)
+		if field1631 != nil {
 			p.newline()
-			opt_val1546 := *field1545
-			p.pretty_name(opt_val1546)
+			opt_val1632 := *field1631
+			p.pretty_name(opt_val1632)
 		}
 		p.newline()
-		field1547 := unwrapped_fields1544[1].(*pb.RelationId)
-		p.pretty_relation_id(field1547)
+		field1633 := unwrapped_fields1630[1].(*pb.RelationId)
+		p.pretty_relation_id(field1633)
 		p.dedent()
 		p.write(")")
 	}
@@ -4702,40 +4939,40 @@ func (p *PrettyPrinter) pretty_abort(msg *pb.Abort) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_export(msg *pb.Export) interface{} {
-	flat1553 := p.tryFlat(msg, func() { p.pretty_export(msg) })
-	if flat1553 != nil {
-		p.write(*flat1553)
+	flat1639 := p.tryFlat(msg, func() { p.pretty_export(msg) })
+	if flat1639 != nil {
+		p.write(*flat1639)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1734 *pb.ExportCSVConfig
+		var _t1824 *pb.ExportCSVConfig
 		if hasProtoField(_dollar_dollar, "csv_config") {
-			_t1734 = _dollar_dollar.GetCsvConfig()
+			_t1824 = _dollar_dollar.GetCsvConfig()
 		}
-		deconstruct_result1551 := _t1734
-		if deconstruct_result1551 != nil {
-			unwrapped1552 := deconstruct_result1551
+		deconstruct_result1637 := _t1824
+		if deconstruct_result1637 != nil {
+			unwrapped1638 := deconstruct_result1637
 			p.write("(")
 			p.write("export")
 			p.indentSexp()
 			p.newline()
-			p.pretty_export_csv_config(unwrapped1552)
+			p.pretty_export_csv_config(unwrapped1638)
 			p.dedent()
 			p.write(")")
 		} else {
 			_dollar_dollar := msg
-			var _t1735 *pb.ExportIcebergConfig
+			var _t1825 *pb.ExportIcebergConfig
 			if hasProtoField(_dollar_dollar, "iceberg_config") {
-				_t1735 = _dollar_dollar.GetIcebergConfig()
+				_t1825 = _dollar_dollar.GetIcebergConfig()
 			}
-			deconstruct_result1549 := _t1735
-			if deconstruct_result1549 != nil {
-				unwrapped1550 := deconstruct_result1549
+			deconstruct_result1635 := _t1825
+			if deconstruct_result1635 != nil {
+				unwrapped1636 := deconstruct_result1635
 				p.write("(")
 				p.write("export_iceberg")
 				p.indentSexp()
 				p.newline()
-				p.pretty_export_iceberg_config(unwrapped1550)
+				p.pretty_export_iceberg_config(unwrapped1636)
 				p.dedent()
 				p.write(")")
 			} else {
@@ -4747,55 +4984,55 @@ func (p *PrettyPrinter) pretty_export(msg *pb.Export) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_export_csv_config(msg *pb.ExportCSVConfig) interface{} {
-	flat1564 := p.tryFlat(msg, func() { p.pretty_export_csv_config(msg) })
-	if flat1564 != nil {
-		p.write(*flat1564)
+	flat1650 := p.tryFlat(msg, func() { p.pretty_export_csv_config(msg) })
+	if flat1650 != nil {
+		p.write(*flat1650)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1736 []interface{}
+		var _t1826 []interface{}
 		if int64(len(_dollar_dollar.GetDataColumns())) == 0 {
-			_t1736 = []interface{}{_dollar_dollar.GetPath(), _dollar_dollar.GetCsvSource(), _dollar_dollar.GetCsvConfig()}
+			_t1826 = []interface{}{_dollar_dollar.GetPath(), _dollar_dollar.GetCsvSource(), _dollar_dollar.GetCsvConfig()}
 		}
-		deconstruct_result1559 := _t1736
-		if deconstruct_result1559 != nil {
-			unwrapped1560 := deconstruct_result1559
+		deconstruct_result1645 := _t1826
+		if deconstruct_result1645 != nil {
+			unwrapped1646 := deconstruct_result1645
 			p.write("(")
 			p.write("export_csv_config_v2")
 			p.indentSexp()
 			p.newline()
-			field1561 := unwrapped1560[0].(string)
-			p.pretty_export_csv_path(field1561)
+			field1647 := unwrapped1646[0].(string)
+			p.pretty_export_csv_path(field1647)
 			p.newline()
-			field1562 := unwrapped1560[1].(*pb.ExportCSVSource)
-			p.pretty_export_csv_source(field1562)
+			field1648 := unwrapped1646[1].(*pb.ExportCSVSource)
+			p.pretty_export_csv_source(field1648)
 			p.newline()
-			field1563 := unwrapped1560[2].(*pb.CSVConfig)
-			p.pretty_csv_config(field1563)
+			field1649 := unwrapped1646[2].(*pb.CSVConfig)
+			p.pretty_csv_config(field1649)
 			p.dedent()
 			p.write(")")
 		} else {
 			_dollar_dollar := msg
-			var _t1737 []interface{}
+			var _t1827 []interface{}
 			if int64(len(_dollar_dollar.GetDataColumns())) != 0 {
-				_t1738 := p.deconstruct_export_csv_config(_dollar_dollar)
-				_t1737 = []interface{}{_dollar_dollar.GetPath(), _dollar_dollar.GetDataColumns(), _t1738}
+				_t1828 := p.deconstruct_export_csv_config(_dollar_dollar)
+				_t1827 = []interface{}{_dollar_dollar.GetPath(), _dollar_dollar.GetDataColumns(), _t1828}
 			}
-			deconstruct_result1554 := _t1737
-			if deconstruct_result1554 != nil {
-				unwrapped1555 := deconstruct_result1554
+			deconstruct_result1640 := _t1827
+			if deconstruct_result1640 != nil {
+				unwrapped1641 := deconstruct_result1640
 				p.write("(")
 				p.write("export_csv_config")
 				p.indentSexp()
 				p.newline()
-				field1556 := unwrapped1555[0].(string)
-				p.pretty_export_csv_path(field1556)
+				field1642 := unwrapped1641[0].(string)
+				p.pretty_export_csv_path(field1642)
 				p.newline()
-				field1557 := unwrapped1555[1].([]*pb.ExportCSVColumn)
-				p.pretty_export_csv_columns_list(field1557)
+				field1643 := unwrapped1641[1].([]*pb.ExportCSVColumn)
+				p.pretty_export_csv_columns_list(field1643)
 				p.newline()
-				field1558 := unwrapped1555[2].([][]interface{})
-				p.pretty_config_dict(field1558)
+				field1644 := unwrapped1641[2].([][]interface{})
+				p.pretty_config_dict(field1644)
 				p.dedent()
 				p.write(")")
 			} else {
@@ -4807,17 +5044,17 @@ func (p *PrettyPrinter) pretty_export_csv_config(msg *pb.ExportCSVConfig) interf
 }
 
 func (p *PrettyPrinter) pretty_export_csv_path(msg string) interface{} {
-	flat1566 := p.tryFlat(msg, func() { p.pretty_export_csv_path(msg) })
-	if flat1566 != nil {
-		p.write(*flat1566)
+	flat1652 := p.tryFlat(msg, func() { p.pretty_export_csv_path(msg) })
+	if flat1652 != nil {
+		p.write(*flat1652)
 		return nil
 	} else {
-		fields1565 := msg
+		fields1651 := msg
 		p.write("(")
 		p.write("path")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1565))
+		p.write(p.formatStringValue(fields1651))
 		p.dedent()
 		p.write(")")
 	}
@@ -4825,47 +5062,47 @@ func (p *PrettyPrinter) pretty_export_csv_path(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_export_csv_source(msg *pb.ExportCSVSource) interface{} {
-	flat1573 := p.tryFlat(msg, func() { p.pretty_export_csv_source(msg) })
-	if flat1573 != nil {
-		p.write(*flat1573)
+	flat1659 := p.tryFlat(msg, func() { p.pretty_export_csv_source(msg) })
+	if flat1659 != nil {
+		p.write(*flat1659)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1739 []*pb.ExportCSVColumn
+		var _t1829 []*pb.ExportCSVColumn
 		if hasProtoField(_dollar_dollar, "gnf_columns") {
-			_t1739 = _dollar_dollar.GetGnfColumns().GetColumns()
+			_t1829 = _dollar_dollar.GetGnfColumns().GetColumns()
 		}
-		deconstruct_result1569 := _t1739
-		if deconstruct_result1569 != nil {
-			unwrapped1570 := deconstruct_result1569
+		deconstruct_result1655 := _t1829
+		if deconstruct_result1655 != nil {
+			unwrapped1656 := deconstruct_result1655
 			p.write("(")
 			p.write("gnf_columns")
 			p.indentSexp()
-			if !(len(unwrapped1570) == 0) {
+			if !(len(unwrapped1656) == 0) {
 				p.newline()
-				for i1572, elem1571 := range unwrapped1570 {
-					if (i1572 > 0) {
+				for i1658, elem1657 := range unwrapped1656 {
+					if (i1658 > 0) {
 						p.newline()
 					}
-					p.pretty_export_csv_column(elem1571)
+					p.pretty_export_csv_column(elem1657)
 				}
 			}
 			p.dedent()
 			p.write(")")
 		} else {
 			_dollar_dollar := msg
-			var _t1740 *pb.RelationId
+			var _t1830 *pb.RelationId
 			if hasProtoField(_dollar_dollar, "table_def") {
-				_t1740 = _dollar_dollar.GetTableDef()
+				_t1830 = _dollar_dollar.GetTableDef()
 			}
-			deconstruct_result1567 := _t1740
-			if deconstruct_result1567 != nil {
-				unwrapped1568 := deconstruct_result1567
+			deconstruct_result1653 := _t1830
+			if deconstruct_result1653 != nil {
+				unwrapped1654 := deconstruct_result1653
 				p.write("(")
 				p.write("table_def")
 				p.indentSexp()
 				p.newline()
-				p.pretty_relation_id(unwrapped1568)
+				p.pretty_relation_id(unwrapped1654)
 				p.dedent()
 				p.write(")")
 			} else {
@@ -4877,23 +5114,23 @@ func (p *PrettyPrinter) pretty_export_csv_source(msg *pb.ExportCSVSource) interf
 }
 
 func (p *PrettyPrinter) pretty_export_csv_column(msg *pb.ExportCSVColumn) interface{} {
-	flat1578 := p.tryFlat(msg, func() { p.pretty_export_csv_column(msg) })
-	if flat1578 != nil {
-		p.write(*flat1578)
+	flat1664 := p.tryFlat(msg, func() { p.pretty_export_csv_column(msg) })
+	if flat1664 != nil {
+		p.write(*flat1664)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1574 := []interface{}{_dollar_dollar.GetColumnName(), _dollar_dollar.GetColumnData()}
-		unwrapped_fields1575 := fields1574
+		fields1660 := []interface{}{_dollar_dollar.GetColumnName(), _dollar_dollar.GetColumnData()}
+		unwrapped_fields1661 := fields1660
 		p.write("(")
 		p.write("column")
 		p.indentSexp()
 		p.newline()
-		field1576 := unwrapped_fields1575[0].(string)
-		p.write(p.formatStringValue(field1576))
+		field1662 := unwrapped_fields1661[0].(string)
+		p.write(p.formatStringValue(field1662))
 		p.newline()
-		field1577 := unwrapped_fields1575[1].(*pb.RelationId)
-		p.pretty_relation_id(field1577)
+		field1663 := unwrapped_fields1661[1].(*pb.RelationId)
+		p.pretty_relation_id(field1663)
 		p.dedent()
 		p.write(")")
 	}
@@ -4901,22 +5138,22 @@ func (p *PrettyPrinter) pretty_export_csv_column(msg *pb.ExportCSVColumn) interf
 }
 
 func (p *PrettyPrinter) pretty_export_csv_columns_list(msg []*pb.ExportCSVColumn) interface{} {
-	flat1582 := p.tryFlat(msg, func() { p.pretty_export_csv_columns_list(msg) })
-	if flat1582 != nil {
-		p.write(*flat1582)
+	flat1668 := p.tryFlat(msg, func() { p.pretty_export_csv_columns_list(msg) })
+	if flat1668 != nil {
+		p.write(*flat1668)
 		return nil
 	} else {
-		fields1579 := msg
+		fields1665 := msg
 		p.write("(")
 		p.write("columns")
 		p.indentSexp()
-		if !(len(fields1579) == 0) {
+		if !(len(fields1665) == 0) {
 			p.newline()
-			for i1581, elem1580 := range fields1579 {
-				if (i1581 > 0) {
+			for i1667, elem1666 := range fields1665 {
+				if (i1667 > 0) {
 					p.newline()
 				}
-				p.pretty_export_csv_column(elem1580)
+				p.pretty_export_csv_column(elem1666)
 			}
 		}
 		p.dedent()
@@ -4926,35 +5163,35 @@ func (p *PrettyPrinter) pretty_export_csv_columns_list(msg []*pb.ExportCSVColumn
 }
 
 func (p *PrettyPrinter) pretty_export_iceberg_config(msg *pb.ExportIcebergConfig) interface{} {
-	flat1591 := p.tryFlat(msg, func() { p.pretty_export_iceberg_config(msg) })
-	if flat1591 != nil {
-		p.write(*flat1591)
+	flat1677 := p.tryFlat(msg, func() { p.pretty_export_iceberg_config(msg) })
+	if flat1677 != nil {
+		p.write(*flat1677)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1741 := p.deconstruct_export_iceberg_config_optional(_dollar_dollar)
-		fields1583 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetTableDef(), dictToPairs(_dollar_dollar.GetTableProperties()), _t1741}
-		unwrapped_fields1584 := fields1583
+		_t1831 := p.deconstruct_export_iceberg_config_optional(_dollar_dollar)
+		fields1669 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetTableDef(), dictToPairs(_dollar_dollar.GetTableProperties()), _t1831}
+		unwrapped_fields1670 := fields1669
 		p.write("(")
 		p.write("export_iceberg_config")
 		p.indentSexp()
 		p.newline()
-		field1585 := unwrapped_fields1584[0].(*pb.IcebergLocator)
-		p.pretty_iceberg_locator(field1585)
+		field1671 := unwrapped_fields1670[0].(*pb.IcebergLocator)
+		p.pretty_iceberg_locator(field1671)
 		p.newline()
-		field1586 := unwrapped_fields1584[1].(*pb.IcebergCatalogConfig)
-		p.pretty_iceberg_catalog_config(field1586)
+		field1672 := unwrapped_fields1670[1].(*pb.IcebergCatalogConfig)
+		p.pretty_iceberg_catalog_config(field1672)
 		p.newline()
-		field1587 := unwrapped_fields1584[2].(*pb.RelationId)
-		p.pretty_export_iceberg_table_def(field1587)
+		field1673 := unwrapped_fields1670[2].(*pb.RelationId)
+		p.pretty_export_iceberg_table_def(field1673)
 		p.newline()
-		field1588 := unwrapped_fields1584[3].([][]interface{})
-		p.pretty_iceberg_table_properties(field1588)
-		field1589 := unwrapped_fields1584[4].([][]interface{})
-		if field1589 != nil {
+		field1674 := unwrapped_fields1670[3].([][]interface{})
+		p.pretty_iceberg_table_properties(field1674)
+		field1675 := unwrapped_fields1670[4].([][]interface{})
+		if field1675 != nil {
 			p.newline()
-			opt_val1590 := field1589
-			p.pretty_config_dict(opt_val1590)
+			opt_val1676 := field1675
+			p.pretty_config_dict(opt_val1676)
 		}
 		p.dedent()
 		p.write(")")
@@ -4963,17 +5200,17 @@ func (p *PrettyPrinter) pretty_export_iceberg_config(msg *pb.ExportIcebergConfig
 }
 
 func (p *PrettyPrinter) pretty_export_iceberg_table_def(msg *pb.RelationId) interface{} {
-	flat1593 := p.tryFlat(msg, func() { p.pretty_export_iceberg_table_def(msg) })
-	if flat1593 != nil {
-		p.write(*flat1593)
+	flat1679 := p.tryFlat(msg, func() { p.pretty_export_iceberg_table_def(msg) })
+	if flat1679 != nil {
+		p.write(*flat1679)
 		return nil
 	} else {
-		fields1592 := msg
+		fields1678 := msg
 		p.write("(")
 		p.write("table_def")
 		p.indentSexp()
 		p.newline()
-		p.pretty_relation_id(fields1592)
+		p.pretty_relation_id(fields1678)
 		p.dedent()
 		p.write(")")
 	}
@@ -4981,22 +5218,22 @@ func (p *PrettyPrinter) pretty_export_iceberg_table_def(msg *pb.RelationId) inte
 }
 
 func (p *PrettyPrinter) pretty_iceberg_table_properties(msg [][]interface{}) interface{} {
-	flat1597 := p.tryFlat(msg, func() { p.pretty_iceberg_table_properties(msg) })
-	if flat1597 != nil {
-		p.write(*flat1597)
+	flat1683 := p.tryFlat(msg, func() { p.pretty_iceberg_table_properties(msg) })
+	if flat1683 != nil {
+		p.write(*flat1683)
 		return nil
 	} else {
-		fields1594 := msg
+		fields1680 := msg
 		p.write("(")
 		p.write("table_properties")
 		p.indentSexp()
-		if !(len(fields1594) == 0) {
+		if !(len(fields1680) == 0) {
 			p.newline()
-			for i1596, elem1595 := range fields1594 {
-				if (i1596 > 0) {
+			for i1682, elem1681 := range fields1680 {
+				if (i1682 > 0) {
 					p.newline()
 				}
-				p.pretty_iceberg_property_entry(elem1595)
+				p.pretty_iceberg_property_entry(elem1681)
 			}
 		}
 		p.dedent()
@@ -5014,8 +5251,8 @@ func (p *PrettyPrinter) pretty_debug_info(msg *pb.DebugInfo) interface{} {
 	for _idx, _rid := range msg.GetIds() {
 		p.newline()
 		p.write("(")
-		_t1793 := &pb.UInt128Value{Low: _rid.GetIdLow(), High: _rid.GetIdHigh()}
-		p.pprintDispatch(_t1793)
+		_t1885 := &pb.UInt128Value{Low: _rid.GetIdLow(), High: _rid.GetIdHigh()}
+		p.pprintDispatch(_t1885)
 		p.write(" ")
 		p.write(p.formatStringValue(msg.GetOrigNames()[_idx]))
 		p.write(")")
@@ -5074,6 +5311,34 @@ func (p *PrettyPrinter) pretty_be_tree_locator(msg *pb.BeTreeLocator) interface{
 	return nil
 }
 
+func (p *PrettyPrinter) pretty_cdc_targets(msg *pb.CdcTargets) interface{} {
+	p.write("(cdc_targets")
+	p.indentSexp()
+	p.newline()
+	p.write(":inserts ")
+	p.write("(")
+	for _idx, _elem := range msg.GetInserts() {
+		if (_idx > 0) {
+			p.write(" ")
+		}
+		p.pprintDispatch(_elem)
+	}
+	p.write(")")
+	p.newline()
+	p.write(":deletes ")
+	p.write("(")
+	for _idx, _elem := range msg.GetDeletes() {
+		if (_idx > 0) {
+			p.write(" ")
+		}
+		p.pprintDispatch(_elem)
+	}
+	p.write(")")
+	p.write(")")
+	p.dedent()
+	return nil
+}
+
 func (p *PrettyPrinter) pretty_decimal_value(msg *pb.DecimalValue) interface{} {
 	p.write(p.formatDecimal(msg))
 	return nil
@@ -5120,6 +5385,24 @@ func (p *PrettyPrinter) pretty_missing_value(msg *pb.MissingValue) interface{} {
 	return nil
 }
 
+func (p *PrettyPrinter) pretty_plain_targets(msg *pb.PlainTargets) interface{} {
+	p.write("(plain_targets")
+	p.indentSexp()
+	p.newline()
+	p.write(":targets ")
+	p.write("(")
+	for _idx, _elem := range msg.GetTargets() {
+		if (_idx > 0) {
+			p.write(" ")
+		}
+		p.pprintDispatch(_elem)
+	}
+	p.write(")")
+	p.write(")")
+	p.dedent()
+	return nil
+}
+
 func (p *PrettyPrinter) pretty_storage_integration(msg *pb.StorageIntegration) interface{} {
 	p.write("(storage_integration")
 	p.indentSexp()
@@ -5369,6 +5652,16 @@ func (p *PrettyPrinter) pprintDispatch(msg interface{}) {
 		p.pretty_gnf_columns(m)
 	case *pb.GNFColumn:
 		p.pretty_gnf_column(m)
+	case *pb.TargetRelations:
+		p.pretty_target_relations(m)
+	case []*pb.NamedColumn:
+		p.pretty_relation_keys(m)
+	case *pb.NamedColumn:
+		p.pretty_named_column(m)
+	case []*pb.TargetRelation:
+		p.pretty_non_cdc_relations(m)
+	case *pb.TargetRelation:
+		p.pretty_target_relation(m)
 	case *pb.IcebergData:
 		p.pretty_iceberg_data(m)
 	case *pb.IcebergLocator:
@@ -5413,6 +5706,8 @@ func (p *PrettyPrinter) pprintDispatch(msg interface{}) {
 		p.pretty_be_tree_config(m)
 	case *pb.BeTreeLocator:
 		p.pretty_be_tree_locator(m)
+	case *pb.CdcTargets:
+		p.pretty_cdc_targets(m)
 	case *pb.DecimalValue:
 		p.pretty_decimal_value(m)
 	case *pb.FunctionalDependency:
@@ -5421,6 +5716,8 @@ func (p *PrettyPrinter) pprintDispatch(msg interface{}) {
 		p.pretty_int128_value(m)
 	case *pb.MissingValue:
 		p.pretty_missing_value(m)
+	case *pb.PlainTargets:
+		p.pretty_plain_targets(m)
 	case *pb.StorageIntegration:
 		p.pretty_storage_integration(m)
 	case *pb.UInt128Value:
diff --git a/sdks/julia/LogicalQueryProtocol.jl/src/equality.jl b/sdks/julia/LogicalQueryProtocol.jl/src/equality.jl
index 744d9de7..38e68b0e 100644
--- a/sdks/julia/LogicalQueryProtocol.jl/src/equality.jl
+++ b/sdks/julia/LogicalQueryProtocol.jl/src/equality.jl
@@ -576,10 +576,35 @@ Base.:(==)(a::BeTreeRelation, b::BeTreeRelation) = a.name == b.name && a.relatio
 Base.hash(a::BeTreeRelation, h::UInt) = hash(a.relation_info, hash(a.name, h))
 Base.isequal(a::BeTreeRelation, b::BeTreeRelation) = isequal(a.name, b.name) && isequal(a.relation_info, b.relation_info)
 
+# NamedColumn
+Base.:(==)(a::NamedColumn, b::NamedColumn) = a.name == b.name && a.var"#type" == b.var"#type"
+Base.hash(a::NamedColumn, h::UInt) = hash(a.var"#type", hash(a.name, h))
+Base.isequal(a::NamedColumn, b::NamedColumn) = isequal(a.name, b.name) && isequal(a.var"#type", b.var"#type")
+
+# TargetRelation
+Base.:(==)(a::TargetRelation, b::TargetRelation) = a.target_id == b.target_id && a.values == b.values
+Base.hash(a::TargetRelation, h::UInt) = hash(a.values, hash(a.target_id, h))
+Base.isequal(a::TargetRelation, b::TargetRelation) = isequal(a.target_id, b.target_id) && isequal(a.values, b.values)
+
+# PlainTargets
+Base.:(==)(a::PlainTargets, b::PlainTargets) = a.targets == b.targets
+Base.hash(a::PlainTargets, h::UInt) = hash(a.targets, h)
+Base.isequal(a::PlainTargets, b::PlainTargets) = isequal(a.targets, b.targets)
+
+# CdcTargets
+Base.:(==)(a::CdcTargets, b::CdcTargets) = a.inserts == b.inserts && a.deletes == b.deletes
+Base.hash(a::CdcTargets, h::UInt) = hash(a.deletes, hash(a.inserts, h))
+Base.isequal(a::CdcTargets, b::CdcTargets) = isequal(a.inserts, b.inserts) && isequal(a.deletes, b.deletes)
+
+# TargetRelations
+Base.:(==)(a::TargetRelations, b::TargetRelations) = a.keys == b.keys && _isequal_oneof(a.body, b.body)
+Base.hash(a::TargetRelations, h::UInt) = _hash_oneof(a.body, hash(a.keys, h))
+Base.isequal(a::TargetRelations, b::TargetRelations) = isequal(a.keys, b.keys) && _isequal_oneof(a.body, b.body)
+
 # CSVData
-Base.:(==)(a::CSVData, b::CSVData) = a.locator == b.locator && a.config == b.config && a.columns == b.columns && a.asof == b.asof
-Base.hash(a::CSVData, h::UInt) = hash(a.asof, hash(a.columns, hash(a.config, hash(a.locator, h))))
-Base.isequal(a::CSVData, b::CSVData) = isequal(a.locator, b.locator) && isequal(a.config, b.config) && isequal(a.columns, b.columns) && isequal(a.asof, b.asof)
+Base.:(==)(a::CSVData, b::CSVData) = a.locator == b.locator && a.config == b.config && a.columns == b.columns && a.asof == b.asof && a.relations == b.relations
+Base.hash(a::CSVData, h::UInt) = hash(a.relations, hash(a.asof, hash(a.columns, hash(a.config, hash(a.locator, h)))))
+Base.isequal(a::CSVData, b::CSVData) = isequal(a.locator, b.locator) && isequal(a.config, b.config) && isequal(a.columns, b.columns) && isequal(a.asof, b.asof) && isequal(a.relations, b.relations)
 
 # Data
 function Base.:(==)(a::Data, b::Data)
diff --git a/sdks/julia/LogicalQueryProtocol.jl/src/gen/relationalai/lqp/v1/logic_pb.jl b/sdks/julia/LogicalQueryProtocol.jl/src/gen/relationalai/lqp/v1/logic_pb.jl
index 7865de07..2d08f438 100644
--- a/sdks/julia/LogicalQueryProtocol.jl/src/gen/relationalai/lqp/v1/logic_pb.jl
+++ b/sdks/julia/LogicalQueryProtocol.jl/src/gen/relationalai/lqp/v1/logic_pb.jl
@@ -10,9 +10,10 @@ export Int32Type, Float32Type, BeTreeConfig, DateTimeValue, IcebergLocator, Date
 export OrMonoid, CSVLocator, Int128Type, DecimalType, UnspecifiedType, DateType
 export MissingType, MissingValue, IntType, StringType, Int128Value, UInt128Value
 export StorageIntegration, BooleanType, UInt32Type, DecimalValue, BeTreeLocator, CSVConfig
-export var"#Type", Value, GNFColumn, MinMonoid, SumMonoid, MaxMonoid, BeTreeInfo, Binding
-export EDB, Attribute, Term, CSVData, IcebergData, Monoid, BeTreeRelation, Cast, Pragma
-export Atom, RelTerm, Data, Primitive, RelAtom, Abstraction, Algorithm, Assign, Break
+export var"#Type", Value, NamedColumn, GNFColumn, MinMonoid, SumMonoid, MaxMonoid
+export BeTreeInfo, Binding, EDB, Attribute, Term, TargetRelation, IcebergData, Monoid
+export BeTreeRelation, Cast, Pragma, Atom, RelTerm, CdcTargets, PlainTargets, Primitive
+export RelAtom, TargetRelations, CSVData, Data, Abstraction, Algorithm, Assign, Break
 export Conjunction, Constraint, Def, Disjunction, Exists, FFI, FunctionalDependency
 export MonoidDef, MonusDef, Not, Reduce, Script, Upsert, Construct, Loop, Declaration
 export Instruction, Formula
@@ -1281,6 +1282,43 @@ function PB._encoded_size(x::Value)
     return encoded_size
 end
 
+struct NamedColumn
+    name::String
+    var"#type"::Union{Nothing,var"#Type"}
+end
+NamedColumn(;name = "", var"#type" = nothing) = NamedColumn(name, var"#type")
+PB.default_values(::Type{NamedColumn}) = (;name = "", var"#type" = nothing)
+PB.field_numbers(::Type{NamedColumn}) = (;name = 1, var"#type" = 2)
+
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:NamedColumn}, _endpos::Int=0, _group::Bool=false)
+    name = ""
+    var"#type" = Ref{Union{Nothing,var"#Type"}}(nothing)
+    while !PB.message_done(d, _endpos, _group)
+        field_number, wire_type = PB.decode_tag(d)
+        if field_number == 1
+            name = PB.decode(d, String)
+        elseif field_number == 2
+            PB.decode!(d, var"#type")
+        else
+            Base.skip(d, wire_type)
+        end
+    end
+    return NamedColumn(name, var"#type"[])
+end
+
+function PB.encode(e::PB.AbstractProtoEncoder, x::NamedColumn)
+    initpos = position(e.io)
+    !isempty(x.name) && PB.encode(e, 1, x.name)
+    !isnothing(x.var"#type") && PB.encode(e, 2, x.var"#type")
+    return position(e.io) - initpos
+end
+function PB._encoded_size(x::NamedColumn)
+    encoded_size = 0
+    !isempty(x.name) && (encoded_size += PB._encoded_size(x.name, 1))
+    !isnothing(x.var"#type") && (encoded_size += PB._encoded_size(x.var"#type", 2))
+    return encoded_size
+end
+
 struct GNFColumn
     column_path::Vector{String}
     target_id::Union{Nothing,RelationId}
@@ -1630,52 +1668,40 @@ function PB._encoded_size(x::Term)
     return encoded_size
 end
 
-struct CSVData
-    locator::Union{Nothing,CSVLocator}
-    config::Union{Nothing,CSVConfig}
-    columns::Vector{GNFColumn}
-    asof::String
+struct TargetRelation
+    target_id::Union{Nothing,RelationId}
+    values::Vector{NamedColumn}
 end
-CSVData(;locator = nothing, config = nothing, columns = Vector{GNFColumn}(), asof = "") = CSVData(locator, config, columns, asof)
-PB.default_values(::Type{CSVData}) = (;locator = nothing, config = nothing, columns = Vector{GNFColumn}(), asof = "")
-PB.field_numbers(::Type{CSVData}) = (;locator = 1, config = 2, columns = 3, asof = 4)
+TargetRelation(;target_id = nothing, values = Vector{NamedColumn}()) = TargetRelation(target_id, values)
+PB.default_values(::Type{TargetRelation}) = (;target_id = nothing, values = Vector{NamedColumn}())
+PB.field_numbers(::Type{TargetRelation}) = (;target_id = 1, values = 2)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:CSVData}, _endpos::Int=0, _group::Bool=false)
-    locator = Ref{Union{Nothing,CSVLocator}}(nothing)
-    config = Ref{Union{Nothing,CSVConfig}}(nothing)
-    columns = PB.BufferedVector{GNFColumn}()
-    asof = ""
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:TargetRelation}, _endpos::Int=0, _group::Bool=false)
+    target_id = Ref{Union{Nothing,RelationId}}(nothing)
+    values = PB.BufferedVector{NamedColumn}()
     while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
-            PB.decode!(d, locator)
+            PB.decode!(d, target_id)
         elseif field_number == 2
-            PB.decode!(d, config)
-        elseif field_number == 3
-            PB.decode!(d, columns)
-        elseif field_number == 4
-            asof = PB.decode(d, String)
+            PB.decode!(d, values)
         else
             Base.skip(d, wire_type)
         end
     end
-    return CSVData(locator[], config[], columns[], asof)
+    return TargetRelation(target_id[], values[])
 end
 
-function PB.encode(e::PB.AbstractProtoEncoder, x::CSVData)
+function PB.encode(e::PB.AbstractProtoEncoder, x::TargetRelation)
     initpos = position(e.io)
-    !isnothing(x.locator) && PB.encode(e, 1, x.locator)
-    !isnothing(x.config) && PB.encode(e, 2, x.config)
-    !isempty(x.columns) && PB.encode(e, 3, x.columns)
-    !isempty(x.asof) && PB.encode(e, 4, x.asof)
+    !isnothing(x.target_id) && PB.encode(e, 1, x.target_id)
+    !isempty(x.values) && PB.encode(e, 2, x.values)
     return position(e.io) - initpos
 end
-function PB._encoded_size(x::CSVData)
+function PB._encoded_size(x::TargetRelation)
     encoded_size = 0
-    !isnothing(x.locator) && (encoded_size += PB._encoded_size(x.locator, 1))
-    !isnothing(x.config) && (encoded_size += PB._encoded_size(x.config, 2))
-    !isempty(x.columns) && (encoded_size += PB._encoded_size(x.columns, 3))
-    !isempty(x.asof) && (encoded_size += PB._encoded_size(x.asof, 4))
+    !isnothing(x.target_id) && (encoded_size += PB._encoded_size(x.target_id, 1))
+    !isempty(x.values) && (encoded_size += PB._encoded_size(x.values, 2))
     return encoded_size
 end
 
@@ -1992,61 +2018,71 @@ function PB._encoded_size(x::RelTerm)
     return encoded_size
 end
 
-struct Data
-    data_type::Union{Nothing,OneOf{<:Union{EDB,BeTreeRelation,CSVData,IcebergData}}}
+struct CdcTargets
+    inserts::Vector{TargetRelation}
+    deletes::Vector{TargetRelation}
 end
-Data(;data_type = nothing) = Data(data_type)
-PB.oneof_field_types(::Type{Data}) = (;
-    data_type = (;edb=EDB, betree_relation=BeTreeRelation, csv_data=CSVData, iceberg_data=IcebergData),
-)
-PB.default_values(::Type{Data}) = (;edb = nothing, betree_relation = nothing, csv_data = nothing, iceberg_data = nothing)
-PB.field_numbers(::Type{Data}) = (;edb = 1, betree_relation = 2, csv_data = 3, iceberg_data = 4)
+CdcTargets(;inserts = Vector{TargetRelation}(), deletes = Vector{TargetRelation}()) = CdcTargets(inserts, deletes)
+PB.default_values(::Type{CdcTargets}) = (;inserts = Vector{TargetRelation}(), deletes = Vector{TargetRelation}())
+PB.field_numbers(::Type{CdcTargets}) = (;inserts = 1, deletes = 2)
 
-function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:Data}, _endpos::Int=0, _group::Bool=false)
-    data_type = nothing
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:CdcTargets}, _endpos::Int=0, _group::Bool=false)
+    inserts = PB.BufferedVector{TargetRelation}()
+    deletes = PB.BufferedVector{TargetRelation}()
     while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
-            data_type = OneOf(:edb, PB.decode(d, Ref{EDB}))
+            PB.decode!(d, inserts)
         elseif field_number == 2
-            data_type = OneOf(:betree_relation, PB.decode(d, Ref{BeTreeRelation}))
-        elseif field_number == 3
-            data_type = OneOf(:csv_data, PB.decode(d, Ref{CSVData}))
-        elseif field_number == 4
-            data_type = OneOf(:iceberg_data, PB.decode(d, Ref{IcebergData}))
+            PB.decode!(d, deletes)
         else
             Base.skip(d, wire_type)
         end
     end
-    return Data(data_type)
+    return CdcTargets(inserts[], deletes[])
 end
 
-function PB.encode(e::PB.AbstractProtoEncoder, x::Data)
+function PB.encode(e::PB.AbstractProtoEncoder, x::CdcTargets)
     initpos = position(e.io)
-    if isnothing(x.data_type);
-    elseif x.data_type.name === :edb
-        PB.encode(e, 1, x.data_type[]::EDB)
-    elseif x.data_type.name === :betree_relation
-        PB.encode(e, 2, x.data_type[]::BeTreeRelation)
-    elseif x.data_type.name === :csv_data
-        PB.encode(e, 3, x.data_type[]::CSVData)
-    elseif x.data_type.name === :iceberg_data
-        PB.encode(e, 4, x.data_type[]::IcebergData)
-    end
+    !isempty(x.inserts) && PB.encode(e, 1, x.inserts)
+    !isempty(x.deletes) && PB.encode(e, 2, x.deletes)
     return position(e.io) - initpos
 end
-function PB._encoded_size(x::Data)
+function PB._encoded_size(x::CdcTargets)
     encoded_size = 0
-    if isnothing(x.data_type);
-    elseif x.data_type.name === :edb
-        encoded_size += PB._encoded_size(x.data_type[]::EDB, 1)
-    elseif x.data_type.name === :betree_relation
-        encoded_size += PB._encoded_size(x.data_type[]::BeTreeRelation, 2)
-    elseif x.data_type.name === :csv_data
-        encoded_size += PB._encoded_size(x.data_type[]::CSVData, 3)
-    elseif x.data_type.name === :iceberg_data
-        encoded_size += PB._encoded_size(x.data_type[]::IcebergData, 4)
+    !isempty(x.inserts) && (encoded_size += PB._encoded_size(x.inserts, 1))
+    !isempty(x.deletes) && (encoded_size += PB._encoded_size(x.deletes, 2))
+    return encoded_size
+end
+
+struct PlainTargets
+    targets::Vector{TargetRelation}
+end
+PlainTargets(;targets = Vector{TargetRelation}()) = PlainTargets(targets)
+PB.default_values(::Type{PlainTargets}) = (;targets = Vector{TargetRelation}())
+PB.field_numbers(::Type{PlainTargets}) = (;targets = 1)
+
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:PlainTargets}, _endpos::Int=0, _group::Bool=false)
+    targets = PB.BufferedVector{TargetRelation}()
+    while !PB.message_done(d, _endpos, _group)
+        field_number, wire_type = PB.decode_tag(d)
+        if field_number == 1
+            PB.decode!(d, targets)
+        else
+            Base.skip(d, wire_type)
+        end
     end
+    return PlainTargets(targets[])
+end
+
+function PB.encode(e::PB.AbstractProtoEncoder, x::PlainTargets)
+    initpos = position(e.io)
+    !isempty(x.targets) && PB.encode(e, 1, x.targets)
+    return position(e.io) - initpos
+end
+function PB._encoded_size(x::PlainTargets)
+    encoded_size = 0
+    !isempty(x.targets) && (encoded_size += PB._encoded_size(x.targets, 1))
     return encoded_size
 end
 
@@ -2124,6 +2160,171 @@ function PB._encoded_size(x::RelAtom)
     return encoded_size
 end
 
+struct TargetRelations
+    keys::Vector{NamedColumn}
+    body::Union{Nothing,OneOf{<:Union{PlainTargets,CdcTargets}}}
+end
+TargetRelations(;keys = Vector{NamedColumn}(), body = nothing) = TargetRelations(keys, body)
+PB.oneof_field_types(::Type{TargetRelations}) = (;
+    body = (;plain=PlainTargets, cdc=CdcTargets),
+)
+PB.default_values(::Type{TargetRelations}) = (;keys = Vector{NamedColumn}(), plain = nothing, cdc = nothing)
+PB.field_numbers(::Type{TargetRelations}) = (;keys = 1, plain = 2, cdc = 3)
+
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:TargetRelations}, _endpos::Int=0, _group::Bool=false)
+    keys = PB.BufferedVector{NamedColumn}()
+    body = nothing
+    while !PB.message_done(d, _endpos, _group)
+        field_number, wire_type = PB.decode_tag(d)
+        if field_number == 1
+            PB.decode!(d, keys)
+        elseif field_number == 2
+            body = OneOf(:plain, PB.decode(d, Ref{PlainTargets}))
+        elseif field_number == 3
+            body = OneOf(:cdc, PB.decode(d, Ref{CdcTargets}))
+        else
+            Base.skip(d, wire_type)
+        end
+    end
+    return TargetRelations(keys[], body)
+end
+
+function PB.encode(e::PB.AbstractProtoEncoder, x::TargetRelations)
+    initpos = position(e.io)
+    !isempty(x.keys) && PB.encode(e, 1, x.keys)
+    if isnothing(x.body);
+    elseif x.body.name === :plain
+        PB.encode(e, 2, x.body[]::PlainTargets)
+    elseif x.body.name === :cdc
+        PB.encode(e, 3, x.body[]::CdcTargets)
+    end
+    return position(e.io) - initpos
+end
+function PB._encoded_size(x::TargetRelations)
+    encoded_size = 0
+    !isempty(x.keys) && (encoded_size += PB._encoded_size(x.keys, 1))
+    if isnothing(x.body);
+    elseif x.body.name === :plain
+        encoded_size += PB._encoded_size(x.body[]::PlainTargets, 2)
+    elseif x.body.name === :cdc
+        encoded_size += PB._encoded_size(x.body[]::CdcTargets, 3)
+    end
+    return encoded_size
+end
+
+struct CSVData
+    locator::Union{Nothing,CSVLocator}
+    config::Union{Nothing,CSVConfig}
+    columns::Vector{GNFColumn}
+    asof::String
+    relations::Union{Nothing,TargetRelations}
+end
+CSVData(;locator = nothing, config = nothing, columns = Vector{GNFColumn}(), asof = "", relations = nothing) = CSVData(locator, config, columns, asof, relations)
+PB.default_values(::Type{CSVData}) = (;locator = nothing, config = nothing, columns = Vector{GNFColumn}(), asof = "", relations = nothing)
+PB.field_numbers(::Type{CSVData}) = (;locator = 1, config = 2, columns = 3, asof = 4, relations = 5)
+
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:CSVData}, _endpos::Int=0, _group::Bool=false)
+    locator = Ref{Union{Nothing,CSVLocator}}(nothing)
+    config = Ref{Union{Nothing,CSVConfig}}(nothing)
+    columns = PB.BufferedVector{GNFColumn}()
+    asof = ""
+    relations = Ref{Union{Nothing,TargetRelations}}(nothing)
+    while !PB.message_done(d, _endpos, _group)
+        field_number, wire_type = PB.decode_tag(d)
+        if field_number == 1
+            PB.decode!(d, locator)
+        elseif field_number == 2
+            PB.decode!(d, config)
+        elseif field_number == 3
+            PB.decode!(d, columns)
+        elseif field_number == 4
+            asof = PB.decode(d, String)
+        elseif field_number == 5
+            PB.decode!(d, relations)
+        else
+            Base.skip(d, wire_type)
+        end
+    end
+    return CSVData(locator[], config[], columns[], asof, relations[])
+end
+
+function PB.encode(e::PB.AbstractProtoEncoder, x::CSVData)
+    initpos = position(e.io)
+    !isnothing(x.locator) && PB.encode(e, 1, x.locator)
+    !isnothing(x.config) && PB.encode(e, 2, x.config)
+    !isempty(x.columns) && PB.encode(e, 3, x.columns)
+    !isempty(x.asof) && PB.encode(e, 4, x.asof)
+    !isnothing(x.relations) && PB.encode(e, 5, x.relations)
+    return position(e.io) - initpos
+end
+function PB._encoded_size(x::CSVData)
+    encoded_size = 0
+    !isnothing(x.locator) && (encoded_size += PB._encoded_size(x.locator, 1))
+    !isnothing(x.config) && (encoded_size += PB._encoded_size(x.config, 2))
+    !isempty(x.columns) && (encoded_size += PB._encoded_size(x.columns, 3))
+    !isempty(x.asof) && (encoded_size += PB._encoded_size(x.asof, 4))
+    !isnothing(x.relations) && (encoded_size += PB._encoded_size(x.relations, 5))
+    return encoded_size
+end
+
+struct Data
+    data_type::Union{Nothing,OneOf{<:Union{EDB,BeTreeRelation,CSVData,IcebergData}}}
+end
+Data(;data_type = nothing) = Data(data_type)
+PB.oneof_field_types(::Type{Data}) = (;
+    data_type = (;edb=EDB, betree_relation=BeTreeRelation, csv_data=CSVData, iceberg_data=IcebergData),
+)
+PB.default_values(::Type{Data}) = (;edb = nothing, betree_relation = nothing, csv_data = nothing, iceberg_data = nothing)
+PB.field_numbers(::Type{Data}) = (;edb = 1, betree_relation = 2, csv_data = 3, iceberg_data = 4)
+
+function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:Data}, _endpos::Int=0, _group::Bool=false)
+    data_type = nothing
+    while !PB.message_done(d, _endpos, _group)
+        field_number, wire_type = PB.decode_tag(d)
+        if field_number == 1
+            data_type = OneOf(:edb, PB.decode(d, Ref{EDB}))
+        elseif field_number == 2
+            data_type = OneOf(:betree_relation, PB.decode(d, Ref{BeTreeRelation}))
+        elseif field_number == 3
+            data_type = OneOf(:csv_data, PB.decode(d, Ref{CSVData}))
+        elseif field_number == 4
+            data_type = OneOf(:iceberg_data, PB.decode(d, Ref{IcebergData}))
+        else
+            Base.skip(d, wire_type)
+        end
+    end
+    return Data(data_type)
+end
+
+function PB.encode(e::PB.AbstractProtoEncoder, x::Data)
+    initpos = position(e.io)
+    if isnothing(x.data_type);
+    elseif x.data_type.name === :edb
+        PB.encode(e, 1, x.data_type[]::EDB)
+    elseif x.data_type.name === :betree_relation
+        PB.encode(e, 2, x.data_type[]::BeTreeRelation)
+    elseif x.data_type.name === :csv_data
+        PB.encode(e, 3, x.data_type[]::CSVData)
+    elseif x.data_type.name === :iceberg_data
+        PB.encode(e, 4, x.data_type[]::IcebergData)
+    end
+    return position(e.io) - initpos
+end
+function PB._encoded_size(x::Data)
+    encoded_size = 0
+    if isnothing(x.data_type);
+    elseif x.data_type.name === :edb
+        encoded_size += PB._encoded_size(x.data_type[]::EDB, 1)
+    elseif x.data_type.name === :betree_relation
+        encoded_size += PB._encoded_size(x.data_type[]::BeTreeRelation, 2)
+    elseif x.data_type.name === :csv_data
+        encoded_size += PB._encoded_size(x.data_type[]::CSVData, 3)
+    elseif x.data_type.name === :iceberg_data
+        encoded_size += PB._encoded_size(x.data_type[]::IcebergData, 4)
+    end
+    return encoded_size
+end
+
 # Stub definitions for cyclic types
 struct var"##Stub#Abstraction"{T1<:var"##Abstract#Formula"} <: var"##Abstract#Abstraction"
     vars::Vector{Binding}
diff --git a/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl b/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl
index 3a05e7c1..d9beaa45 100644
--- a/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl
+++ b/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl
@@ -372,7 +372,7 @@ function _extract_value_int32(parser::ParserState, value::Union{Nothing, Proto.V
     if (!isnothing(value) && _has_proto_field(value, Symbol("int32_value")))
         return _get_oneof_field(value, :int32_value)
     else
-        _t2088 = nothing
+        _t2187 = nothing
     end
     return Int32(default)
 end
@@ -381,7 +381,7 @@ function _extract_value_int64(parser::ParserState, value::Union{Nothing, Proto.V
     if (!isnothing(value) && _has_proto_field(value, Symbol("int_value")))
         return _get_oneof_field(value, :int_value)
     else
-        _t2089 = nothing
+        _t2188 = nothing
     end
     return default
 end
@@ -390,7 +390,7 @@ function _extract_value_string(parser::ParserState, value::Union{Nothing, Proto.
     if (!isnothing(value) && _has_proto_field(value, Symbol("string_value")))
         return _get_oneof_field(value, :string_value)
     else
-        _t2090 = nothing
+        _t2189 = nothing
     end
     return default
 end
@@ -399,7 +399,7 @@ function _extract_value_boolean(parser::ParserState, value::Union{Nothing, Proto
     if (!isnothing(value) && _has_proto_field(value, Symbol("boolean_value")))
         return _get_oneof_field(value, :boolean_value)
     else
-        _t2091 = nothing
+        _t2190 = nothing
     end
     return default
 end
@@ -408,7 +408,7 @@ function _extract_value_string_list(parser::ParserState, value::Union{Nothing, P
     if (!isnothing(value) && _has_proto_field(value, Symbol("string_value")))
         return String[_get_oneof_field(value, :string_value)]
     else
-        _t2092 = nothing
+        _t2191 = nothing
     end
     return default
 end
@@ -417,7 +417,7 @@ function _try_extract_value_int64(parser::ParserState, value::Union{Nothing, Pro
     if (!isnothing(value) && _has_proto_field(value, Symbol("int_value")))
         return _get_oneof_field(value, :int_value)
     else
-        _t2093 = nothing
+        _t2192 = nothing
     end
     return nothing
 end
@@ -426,7 +426,7 @@ function _try_extract_value_float64(parser::ParserState, value::Union{Nothing, P
     if (!isnothing(value) && _has_proto_field(value, Symbol("float_value")))
         return _get_oneof_field(value, :float_value)
     else
-        _t2094 = nothing
+        _t2193 = nothing
     end
     return nothing
 end
@@ -435,7 +435,7 @@ function _try_extract_value_bytes(parser::ParserState, value::Union{Nothing, Pro
     if (!isnothing(value) && _has_proto_field(value, Symbol("string_value")))
         return Vector{UInt8}(_get_oneof_field(value, :string_value))
     else
-        _t2095 = nothing
+        _t2194 = nothing
     end
     return nothing
 end
@@ -444,90 +444,118 @@ function _try_extract_value_uint128(parser::ParserState, value::Union{Nothing, P
     if (!isnothing(value) && _has_proto_field(value, Symbol("uint128_value")))
         return _get_oneof_field(value, :uint128_value)
     else
-        _t2096 = nothing
+        _t2195 = nothing
     end
     return nothing
 end
 
+function construct_non_cdc_relations(parser::ParserState, targets::Vector{Proto.TargetRelation})::Proto.TargetRelations
+    _t2196 = Proto.PlainTargets(targets=targets)
+    _t2197 = Proto.TargetRelations(body=OneOf(:plain, _t2196), keys=Proto.NamedColumn[])
+    return _t2197
+end
+
+function construct_cdc_relations(parser::ParserState, inserts::Vector{Proto.TargetRelation}, deletes::Vector{Proto.TargetRelation})::Proto.TargetRelations
+    _t2198 = Proto.CdcTargets(inserts=inserts, deletes=deletes)
+    _t2199 = Proto.TargetRelations(body=OneOf(:cdc, _t2198), keys=Proto.NamedColumn[])
+    return _t2199
+end
+
+function construct_relations(parser::ParserState, keys::Vector{Proto.NamedColumn}, body::Proto.TargetRelations)::Proto.TargetRelations
+    if _has_proto_field(body, Symbol("plain"))
+        _t2201 = Proto.TargetRelations(body=OneOf(:plain, _get_oneof_field(body, :plain)), keys=keys)
+        return _t2201
+    else
+        _t2200 = nothing
+    end
+    _t2202 = Proto.TargetRelations(body=OneOf(:cdc, _get_oneof_field(body, :cdc)), keys=keys)
+    return _t2202
+end
+
+function construct_csv_data(parser::ParserState, locator::Proto.CSVLocator, config::Proto.CSVConfig, columns_opt::Union{Nothing, Vector{Proto.GNFColumn}}, relations_opt::Union{Nothing, Proto.TargetRelations}, asof::String)::Proto.CSVData
+    _t2203 = Proto.CSVData(locator=locator, config=config, columns=(!isnothing(columns_opt) ? columns_opt : Proto.GNFColumn[]), asof=asof, relations=relations_opt)
+    return _t2203
+end
+
 function construct_csv_config(parser::ParserState, config_dict::Vector{Tuple{String, Proto.Value}}, storage_integration_opt::Union{Nothing, Vector{Tuple{String, Proto.Value}}})::Proto.CSVConfig
     config = Dict(config_dict)
-    _t2097 = _extract_value_int32(parser, get(config, "csv_header_row", nothing), 1)
-    header_row = _t2097
-    _t2098 = _extract_value_int64(parser, get(config, "csv_skip", nothing), 0)
-    skip = _t2098
-    _t2099 = _extract_value_string(parser, get(config, "csv_new_line", nothing), "")
-    new_line = _t2099
-    _t2100 = _extract_value_string(parser, get(config, "csv_delimiter", nothing), ",")
-    delimiter = _t2100
-    _t2101 = _extract_value_string(parser, get(config, "csv_quotechar", nothing), "\"")
-    quotechar = _t2101
-    _t2102 = _extract_value_string(parser, get(config, "csv_escapechar", nothing), "\"")
-    escapechar = _t2102
-    _t2103 = _extract_value_string(parser, get(config, "csv_comment", nothing), "")
-    comment = _t2103
-    _t2104 = _extract_value_string_list(parser, get(config, "csv_missing_strings", nothing), String[])
-    missing_strings = _t2104
-    _t2105 = _extract_value_string(parser, get(config, "csv_decimal_separator", nothing), ".")
-    decimal_separator = _t2105
-    _t2106 = _extract_value_string(parser, get(config, "csv_encoding", nothing), "utf-8")
-    encoding = _t2106
-    _t2107 = _extract_value_string(parser, get(config, "csv_compression", nothing), "")
-    compression = _t2107
-    _t2108 = _extract_value_int64(parser, get(config, "csv_partition_size_mb", nothing), 0)
-    partition_size_mb = _t2108
-    _t2109 = construct_csv_storage_integration(parser, storage_integration_opt)
-    storage_integration = _t2109
-    _t2110 = Proto.CSVConfig(header_row=header_row, skip=skip, new_line=new_line, delimiter=delimiter, quotechar=quotechar, escapechar=escapechar, comment=comment, missing_strings=missing_strings, decimal_separator=decimal_separator, encoding=encoding, compression=compression, partition_size_mb=partition_size_mb, storage_integration=storage_integration)
-    return _t2110
+    _t2204 = _extract_value_int32(parser, get(config, "csv_header_row", nothing), 1)
+    header_row = _t2204
+    _t2205 = _extract_value_int64(parser, get(config, "csv_skip", nothing), 0)
+    skip = _t2205
+    _t2206 = _extract_value_string(parser, get(config, "csv_new_line", nothing), "")
+    new_line = _t2206
+    _t2207 = _extract_value_string(parser, get(config, "csv_delimiter", nothing), ",")
+    delimiter = _t2207
+    _t2208 = _extract_value_string(parser, get(config, "csv_quotechar", nothing), "\"")
+    quotechar = _t2208
+    _t2209 = _extract_value_string(parser, get(config, "csv_escapechar", nothing), "\"")
+    escapechar = _t2209
+    _t2210 = _extract_value_string(parser, get(config, "csv_comment", nothing), "")
+    comment = _t2210
+    _t2211 = _extract_value_string_list(parser, get(config, "csv_missing_strings", nothing), String[])
+    missing_strings = _t2211
+    _t2212 = _extract_value_string(parser, get(config, "csv_decimal_separator", nothing), ".")
+    decimal_separator = _t2212
+    _t2213 = _extract_value_string(parser, get(config, "csv_encoding", nothing), "utf-8")
+    encoding = _t2213
+    _t2214 = _extract_value_string(parser, get(config, "csv_compression", nothing), "")
+    compression = _t2214
+    _t2215 = _extract_value_int64(parser, get(config, "csv_partition_size_mb", nothing), 0)
+    partition_size_mb = _t2215
+    _t2216 = construct_csv_storage_integration(parser, storage_integration_opt)
+    storage_integration = _t2216
+    _t2217 = Proto.CSVConfig(header_row=header_row, skip=skip, new_line=new_line, delimiter=delimiter, quotechar=quotechar, escapechar=escapechar, comment=comment, missing_strings=missing_strings, decimal_separator=decimal_separator, encoding=encoding, compression=compression, partition_size_mb=partition_size_mb, storage_integration=storage_integration)
+    return _t2217
 end
 
 function construct_csv_storage_integration(parser::ParserState, storage_integration_opt::Union{Nothing, Vector{Tuple{String, Proto.Value}}})::Union{Nothing, Proto.StorageIntegration}
     if isnothing(storage_integration_opt)
         return nothing
     else
-        _t2111 = nothing
+        _t2218 = nothing
     end
     config = Dict(storage_integration_opt)
-    _t2112 = _extract_value_string(parser, get(config, "provider", nothing), "")
-    _t2113 = _extract_value_string(parser, get(config, "azure_sas_token", nothing), "")
-    _t2114 = _extract_value_string(parser, get(config, "s3_region", nothing), "")
-    _t2115 = _extract_value_string(parser, get(config, "s3_access_key_id", nothing), "")
-    _t2116 = _extract_value_string(parser, get(config, "s3_secret_access_key", nothing), "")
-    _t2117 = Proto.StorageIntegration(provider=_t2112, azure_sas_token=_t2113, s3_region=_t2114, s3_access_key_id=_t2115, s3_secret_access_key=_t2116)
-    return _t2117
+    _t2219 = _extract_value_string(parser, get(config, "provider", nothing), "")
+    _t2220 = _extract_value_string(parser, get(config, "azure_sas_token", nothing), "")
+    _t2221 = _extract_value_string(parser, get(config, "s3_region", nothing), "")
+    _t2222 = _extract_value_string(parser, get(config, "s3_access_key_id", nothing), "")
+    _t2223 = _extract_value_string(parser, get(config, "s3_secret_access_key", nothing), "")
+    _t2224 = Proto.StorageIntegration(provider=_t2219, azure_sas_token=_t2220, s3_region=_t2221, s3_access_key_id=_t2222, s3_secret_access_key=_t2223)
+    return _t2224
 end
 
 function construct_betree_info(parser::ParserState, key_types::Vector{Proto.var"#Type"}, value_types::Vector{Proto.var"#Type"}, config_dict::Vector{Tuple{String, Proto.Value}})::Proto.BeTreeInfo
     config = Dict(config_dict)
-    _t2118 = _try_extract_value_float64(parser, get(config, "betree_config_epsilon", nothing))
-    epsilon = _t2118
-    _t2119 = _try_extract_value_int64(parser, get(config, "betree_config_max_pivots", nothing))
-    max_pivots = _t2119
-    _t2120 = _try_extract_value_int64(parser, get(config, "betree_config_max_deltas", nothing))
-    max_deltas = _t2120
-    _t2121 = _try_extract_value_int64(parser, get(config, "betree_config_max_leaf", nothing))
-    max_leaf = _t2121
-    _t2122 = Proto.BeTreeConfig(epsilon=epsilon, max_pivots=max_pivots, max_deltas=max_deltas, max_leaf=max_leaf)
-    storage_config = _t2122
-    _t2123 = _try_extract_value_uint128(parser, get(config, "betree_locator_root_pageid", nothing))
-    root_pageid = _t2123
-    _t2124 = _try_extract_value_bytes(parser, get(config, "betree_locator_inline_data", nothing))
-    inline_data = _t2124
-    _t2125 = _try_extract_value_int64(parser, get(config, "betree_locator_element_count", nothing))
-    element_count = _t2125
-    _t2126 = _try_extract_value_int64(parser, get(config, "betree_locator_tree_height", nothing))
-    tree_height = _t2126
-    _t2127 = Proto.BeTreeLocator(location=(!isnothing(root_pageid) ? OneOf(:root_pageid, root_pageid) : (!isnothing(inline_data) ? OneOf(:inline_data, inline_data) : nothing)), element_count=element_count, tree_height=tree_height)
-    relation_locator = _t2127
-    _t2128 = Proto.BeTreeInfo(key_types=key_types, value_types=value_types, storage_config=storage_config, relation_locator=relation_locator)
-    return _t2128
+    _t2225 = _try_extract_value_float64(parser, get(config, "betree_config_epsilon", nothing))
+    epsilon = _t2225
+    _t2226 = _try_extract_value_int64(parser, get(config, "betree_config_max_pivots", nothing))
+    max_pivots = _t2226
+    _t2227 = _try_extract_value_int64(parser, get(config, "betree_config_max_deltas", nothing))
+    max_deltas = _t2227
+    _t2228 = _try_extract_value_int64(parser, get(config, "betree_config_max_leaf", nothing))
+    max_leaf = _t2228
+    _t2229 = Proto.BeTreeConfig(epsilon=epsilon, max_pivots=max_pivots, max_deltas=max_deltas, max_leaf=max_leaf)
+    storage_config = _t2229
+    _t2230 = _try_extract_value_uint128(parser, get(config, "betree_locator_root_pageid", nothing))
+    root_pageid = _t2230
+    _t2231 = _try_extract_value_bytes(parser, get(config, "betree_locator_inline_data", nothing))
+    inline_data = _t2231
+    _t2232 = _try_extract_value_int64(parser, get(config, "betree_locator_element_count", nothing))
+    element_count = _t2232
+    _t2233 = _try_extract_value_int64(parser, get(config, "betree_locator_tree_height", nothing))
+    tree_height = _t2233
+    _t2234 = Proto.BeTreeLocator(location=(!isnothing(root_pageid) ? OneOf(:root_pageid, root_pageid) : (!isnothing(inline_data) ? OneOf(:inline_data, inline_data) : nothing)), element_count=element_count, tree_height=tree_height)
+    relation_locator = _t2234
+    _t2235 = Proto.BeTreeInfo(key_types=key_types, value_types=value_types, storage_config=storage_config, relation_locator=relation_locator)
+    return _t2235
 end
 
 function default_configure(parser::ParserState)::Proto.Configure
-    _t2129 = Proto.IVMConfig(level=Proto.MaintenanceLevel.MAINTENANCE_LEVEL_OFF)
-    ivm_config = _t2129
-    _t2130 = Proto.Configure(semantics_version=0, ivm_config=ivm_config)
-    return _t2130
+    _t2236 = Proto.IVMConfig(level=Proto.MaintenanceLevel.MAINTENANCE_LEVEL_OFF)
+    ivm_config = _t2236
+    _t2237 = Proto.Configure(semantics_version=0, ivm_config=ivm_config)
+    return _t2237
 end
 
 function construct_configure(parser::ParserState, config_dict::Vector{Tuple{String, Proto.Value}})::Proto.Configure
@@ -549,3856 +577,4020 @@ function construct_configure(parser::ParserState, config_dict::Vector{Tuple{Stri
             end
         end
     end
-    _t2131 = Proto.IVMConfig(level=maintenance_level)
-    ivm_config = _t2131
-    _t2132 = _extract_value_int64(parser, get(config, "semantics_version", nothing), 0)
-    semantics_version = _t2132
-    _t2133 = Proto.Configure(semantics_version=semantics_version, ivm_config=ivm_config)
-    return _t2133
+    _t2238 = Proto.IVMConfig(level=maintenance_level)
+    ivm_config = _t2238
+    _t2239 = _extract_value_int64(parser, get(config, "semantics_version", nothing), 0)
+    semantics_version = _t2239
+    _t2240 = Proto.Configure(semantics_version=semantics_version, ivm_config=ivm_config)
+    return _t2240
 end
 
 function construct_export_csv_config(parser::ParserState, path::String, columns::Vector{Proto.ExportCSVColumn}, config_dict::Vector{Tuple{String, Proto.Value}})::Proto.ExportCSVConfig
     config = Dict(config_dict)
-    _t2134 = _extract_value_int64(parser, get(config, "partition_size", nothing), 0)
-    partition_size = _t2134
-    _t2135 = _extract_value_string(parser, get(config, "compression", nothing), "")
-    compression = _t2135
-    _t2136 = _extract_value_boolean(parser, get(config, "syntax_header_row", nothing), true)
-    syntax_header_row = _t2136
-    _t2137 = _extract_value_string(parser, get(config, "syntax_missing_string", nothing), "")
-    syntax_missing_string = _t2137
-    _t2138 = _extract_value_string(parser, get(config, "syntax_delim", nothing), ",")
-    syntax_delim = _t2138
-    _t2139 = _extract_value_string(parser, get(config, "syntax_quotechar", nothing), "\"")
-    syntax_quotechar = _t2139
-    _t2140 = _extract_value_string(parser, get(config, "syntax_escapechar", nothing), "\\")
-    syntax_escapechar = _t2140
-    _t2141 = Proto.ExportCSVConfig(path=path, data_columns=columns, partition_size=partition_size, compression=compression, syntax_header_row=syntax_header_row, syntax_missing_string=syntax_missing_string, syntax_delim=syntax_delim, syntax_quotechar=syntax_quotechar, syntax_escapechar=syntax_escapechar)
-    return _t2141
+    _t2241 = _extract_value_int64(parser, get(config, "partition_size", nothing), 0)
+    partition_size = _t2241
+    _t2242 = _extract_value_string(parser, get(config, "compression", nothing), "")
+    compression = _t2242
+    _t2243 = _extract_value_boolean(parser, get(config, "syntax_header_row", nothing), true)
+    syntax_header_row = _t2243
+    _t2244 = _extract_value_string(parser, get(config, "syntax_missing_string", nothing), "")
+    syntax_missing_string = _t2244
+    _t2245 = _extract_value_string(parser, get(config, "syntax_delim", nothing), ",")
+    syntax_delim = _t2245
+    _t2246 = _extract_value_string(parser, get(config, "syntax_quotechar", nothing), "\"")
+    syntax_quotechar = _t2246
+    _t2247 = _extract_value_string(parser, get(config, "syntax_escapechar", nothing), "\\")
+    syntax_escapechar = _t2247
+    _t2248 = Proto.ExportCSVConfig(path=path, data_columns=columns, partition_size=partition_size, compression=compression, syntax_header_row=syntax_header_row, syntax_missing_string=syntax_missing_string, syntax_delim=syntax_delim, syntax_quotechar=syntax_quotechar, syntax_escapechar=syntax_escapechar)
+    return _t2248
 end
 
 function construct_export_csv_config_with_source(parser::ParserState, path::String, csv_source::Proto.ExportCSVSource, csv_config::Proto.CSVConfig)::Proto.ExportCSVConfig
-    _t2142 = Proto.ExportCSVConfig(path=path, csv_source=csv_source, csv_config=csv_config)
-    return _t2142
+    _t2249 = Proto.ExportCSVConfig(path=path, csv_source=csv_source, csv_config=csv_config)
+    return _t2249
 end
 
 function construct_iceberg_catalog_config(parser::ParserState, catalog_uri::String, scope_opt::Union{Nothing, String}, property_pairs::Vector{Tuple{String, String}}, auth_property_pairs::Vector{Tuple{String, String}})::Proto.IcebergCatalogConfig
     props = Dict(property_pairs)
     auth_props = Dict(auth_property_pairs)
-    _t2143 = Proto.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(!isnothing(scope_opt) ? scope_opt : ""), properties=props, auth_properties=auth_props)
-    return _t2143
+    _t2250 = Proto.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(!isnothing(scope_opt) ? scope_opt : ""), properties=props, auth_properties=auth_props)
+    return _t2250
 end
 
 function construct_iceberg_data(parser::ParserState, locator::Proto.IcebergLocator, config::Proto.IcebergCatalogConfig, columns::Vector{Proto.GNFColumn}, from_snapshot_opt::Union{Nothing, String}, to_snapshot_opt::Union{Nothing, String}, returns_delta::Bool)::Proto.IcebergData
-    _t2144 = Proto.IcebergData(locator=locator, config=config, columns=columns, from_snapshot=(!isnothing(from_snapshot_opt) ? from_snapshot_opt : ""), to_snapshot=(!isnothing(to_snapshot_opt) ? to_snapshot_opt : ""), returns_delta=returns_delta)
-    return _t2144
+    _t2251 = Proto.IcebergData(locator=locator, config=config, columns=columns, from_snapshot=(!isnothing(from_snapshot_opt) ? from_snapshot_opt : ""), to_snapshot=(!isnothing(to_snapshot_opt) ? to_snapshot_opt : ""), returns_delta=returns_delta)
+    return _t2251
 end
 
 function construct_export_iceberg_config_full(parser::ParserState, locator::Proto.IcebergLocator, config::Proto.IcebergCatalogConfig, table_def::Proto.RelationId, table_property_pairs::Vector{Tuple{String, String}}, config_dict::Union{Nothing, Vector{Tuple{String, Proto.Value}}})::Proto.ExportIcebergConfig
     cfg = Dict((!isnothing(config_dict) ? config_dict : Tuple{String, Proto.Value}[]))
-    _t2145 = _extract_value_string(parser, get(cfg, "prefix", nothing), "")
-    prefix = _t2145
-    _t2146 = _extract_value_int64(parser, get(cfg, "target_file_size_bytes", nothing), 0)
-    target_file_size_bytes = _t2146
-    _t2147 = _extract_value_string(parser, get(cfg, "compression", nothing), "")
-    compression = _t2147
+    _t2252 = _extract_value_string(parser, get(cfg, "prefix", nothing), "")
+    prefix = _t2252
+    _t2253 = _extract_value_int64(parser, get(cfg, "target_file_size_bytes", nothing), 0)
+    target_file_size_bytes = _t2253
+    _t2254 = _extract_value_string(parser, get(cfg, "compression", nothing), "")
+    compression = _t2254
     table_props = Dict(table_property_pairs)
-    _t2148 = Proto.ExportIcebergConfig(locator=locator, config=config, table_def=table_def, prefix=prefix, target_file_size_bytes=target_file_size_bytes, compression=compression, table_properties=table_props)
-    return _t2148
+    _t2255 = Proto.ExportIcebergConfig(locator=locator, config=config, table_def=table_def, prefix=prefix, target_file_size_bytes=target_file_size_bytes, compression=compression, table_properties=table_props)
+    return _t2255
 end
 
 # --- Parse functions ---
 
 function parse_transaction(parser::ParserState)::Proto.Transaction
-    span_start673 = span_start(parser)
+    span_start710 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "transaction")
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "configure", 1))
-        _t1335 = parse_configure(parser)
-        _t1334 = _t1335
+        _t1409 = parse_configure(parser)
+        _t1408 = _t1409
     else
-        _t1334 = nothing
+        _t1408 = nothing
     end
-    configure667 = _t1334
+    configure704 = _t1408
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "sync", 1))
-        _t1337 = parse_sync(parser)
-        _t1336 = _t1337
+        _t1411 = parse_sync(parser)
+        _t1410 = _t1411
     else
-        _t1336 = nothing
-    end
-    sync668 = _t1336
-    xs669 = Proto.Epoch[]
-    cond670 = match_lookahead_literal(parser, "(", 0)
-    while cond670
-        _t1338 = parse_epoch(parser)
-        item671 = _t1338
-        push!(xs669, item671)
-        cond670 = match_lookahead_literal(parser, "(", 0)
-    end
-    epochs672 = xs669
+        _t1410 = nothing
+    end
+    sync705 = _t1410
+    xs706 = Proto.Epoch[]
+    cond707 = match_lookahead_literal(parser, "(", 0)
+    while cond707
+        _t1412 = parse_epoch(parser)
+        item708 = _t1412
+        push!(xs706, item708)
+        cond707 = match_lookahead_literal(parser, "(", 0)
+    end
+    epochs709 = xs706
     consume_literal!(parser, ")")
-    _t1339 = default_configure(parser)
-    _t1340 = Proto.Transaction(epochs=epochs672, configure=(!isnothing(configure667) ? configure667 : _t1339), sync=sync668)
-    result674 = _t1340
-    record_span!(parser, span_start673, "Transaction")
-    return result674
+    _t1413 = default_configure(parser)
+    _t1414 = Proto.Transaction(epochs=epochs709, configure=(!isnothing(configure704) ? configure704 : _t1413), sync=sync705)
+    result711 = _t1414
+    record_span!(parser, span_start710, "Transaction")
+    return result711
 end
 
 function parse_configure(parser::ParserState)::Proto.Configure
-    span_start676 = span_start(parser)
+    span_start713 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "configure")
-    _t1341 = parse_config_dict(parser)
-    config_dict675 = _t1341
+    _t1415 = parse_config_dict(parser)
+    config_dict712 = _t1415
     consume_literal!(parser, ")")
-    _t1342 = construct_configure(parser, config_dict675)
-    result677 = _t1342
-    record_span!(parser, span_start676, "Configure")
-    return result677
+    _t1416 = construct_configure(parser, config_dict712)
+    result714 = _t1416
+    record_span!(parser, span_start713, "Configure")
+    return result714
 end
 
 function parse_config_dict(parser::ParserState)::Vector{Tuple{String, Proto.Value}}
     consume_literal!(parser, "{")
-    xs678 = Tuple{String, Proto.Value}[]
-    cond679 = match_lookahead_literal(parser, ":", 0)
-    while cond679
-        _t1343 = parse_config_key_value(parser)
-        item680 = _t1343
-        push!(xs678, item680)
-        cond679 = match_lookahead_literal(parser, ":", 0)
-    end
-    config_key_values681 = xs678
+    xs715 = Tuple{String, Proto.Value}[]
+    cond716 = match_lookahead_literal(parser, ":", 0)
+    while cond716
+        _t1417 = parse_config_key_value(parser)
+        item717 = _t1417
+        push!(xs715, item717)
+        cond716 = match_lookahead_literal(parser, ":", 0)
+    end
+    config_key_values718 = xs715
     consume_literal!(parser, "}")
-    return config_key_values681
+    return config_key_values718
 end
 
 function parse_config_key_value(parser::ParserState)::Tuple{String, Proto.Value}
     consume_literal!(parser, ":")
-    symbol682 = consume_terminal!(parser, "SYMBOL")
-    _t1344 = parse_raw_value(parser)
-    raw_value683 = _t1344
-    return (symbol682, raw_value683,)
+    symbol719 = consume_terminal!(parser, "SYMBOL")
+    _t1418 = parse_raw_value(parser)
+    raw_value720 = _t1418
+    return (symbol719, raw_value720,)
 end
 
 function parse_raw_value(parser::ParserState)::Proto.Value
-    span_start697 = span_start(parser)
+    span_start734 = span_start(parser)
     if match_lookahead_literal(parser, "true", 0)
-        _t1345 = 12
+        _t1419 = 12
     else
         if match_lookahead_literal(parser, "missing", 0)
-            _t1346 = 11
+            _t1420 = 11
         else
             if match_lookahead_literal(parser, "false", 0)
-                _t1347 = 12
+                _t1421 = 12
             else
                 if match_lookahead_literal(parser, "(", 0)
                     if match_lookahead_literal(parser, "datetime", 1)
-                        _t1349 = 1
+                        _t1423 = 1
                     else
                         if match_lookahead_literal(parser, "date", 1)
-                            _t1350 = 0
+                            _t1424 = 0
                         else
-                            _t1350 = -1
+                            _t1424 = -1
                         end
-                        _t1349 = _t1350
+                        _t1423 = _t1424
                     end
-                    _t1348 = _t1349
+                    _t1422 = _t1423
                 else
                     if match_lookahead_terminal(parser, "UINT32", 0)
-                        _t1351 = 7
+                        _t1425 = 7
                     else
                         if match_lookahead_terminal(parser, "UINT128", 0)
-                            _t1352 = 8
+                            _t1426 = 8
                         else
                             if match_lookahead_terminal(parser, "STRING", 0)
-                                _t1353 = 2
+                                _t1427 = 2
                             else
                                 if match_lookahead_terminal(parser, "INT32", 0)
-                                    _t1354 = 3
+                                    _t1428 = 3
                                 else
                                     if match_lookahead_terminal(parser, "INT128", 0)
-                                        _t1355 = 9
+                                        _t1429 = 9
                                     else
                                         if match_lookahead_terminal(parser, "INT", 0)
-                                            _t1356 = 4
+                                            _t1430 = 4
                                         else
                                             if match_lookahead_terminal(parser, "FLOAT32", 0)
-                                                _t1357 = 5
+                                                _t1431 = 5
                                             else
                                                 if match_lookahead_terminal(parser, "FLOAT", 0)
-                                                    _t1358 = 6
+                                                    _t1432 = 6
                                                 else
                                                     if match_lookahead_terminal(parser, "DECIMAL", 0)
-                                                        _t1359 = 10
+                                                        _t1433 = 10
                                                     else
-                                                        _t1359 = -1
+                                                        _t1433 = -1
                                                     end
-                                                    _t1358 = _t1359
+                                                    _t1432 = _t1433
                                                 end
-                                                _t1357 = _t1358
+                                                _t1431 = _t1432
                                             end
-                                            _t1356 = _t1357
+                                            _t1430 = _t1431
                                         end
-                                        _t1355 = _t1356
+                                        _t1429 = _t1430
                                     end
-                                    _t1354 = _t1355
+                                    _t1428 = _t1429
                                 end
-                                _t1353 = _t1354
+                                _t1427 = _t1428
                             end
-                            _t1352 = _t1353
+                            _t1426 = _t1427
                         end
-                        _t1351 = _t1352
+                        _t1425 = _t1426
                     end
-                    _t1348 = _t1351
+                    _t1422 = _t1425
                 end
-                _t1347 = _t1348
+                _t1421 = _t1422
             end
-            _t1346 = _t1347
+            _t1420 = _t1421
         end
-        _t1345 = _t1346
-    end
-    prediction684 = _t1345
-    if prediction684 == 12
-        _t1361 = parse_boolean_value(parser)
-        boolean_value696 = _t1361
-        _t1362 = Proto.Value(value=OneOf(:boolean_value, boolean_value696))
-        _t1360 = _t1362
+        _t1419 = _t1420
+    end
+    prediction721 = _t1419
+    if prediction721 == 12
+        _t1435 = parse_boolean_value(parser)
+        boolean_value733 = _t1435
+        _t1436 = Proto.Value(value=OneOf(:boolean_value, boolean_value733))
+        _t1434 = _t1436
     else
-        if prediction684 == 11
+        if prediction721 == 11
             consume_literal!(parser, "missing")
-            _t1364 = Proto.MissingValue()
-            _t1365 = Proto.Value(value=OneOf(:missing_value, _t1364))
-            _t1363 = _t1365
+            _t1438 = Proto.MissingValue()
+            _t1439 = Proto.Value(value=OneOf(:missing_value, _t1438))
+            _t1437 = _t1439
         else
-            if prediction684 == 10
-                decimal695 = consume_terminal!(parser, "DECIMAL")
-                _t1367 = Proto.Value(value=OneOf(:decimal_value, decimal695))
-                _t1366 = _t1367
+            if prediction721 == 10
+                decimal732 = consume_terminal!(parser, "DECIMAL")
+                _t1441 = Proto.Value(value=OneOf(:decimal_value, decimal732))
+                _t1440 = _t1441
             else
-                if prediction684 == 9
-                    int128694 = consume_terminal!(parser, "INT128")
-                    _t1369 = Proto.Value(value=OneOf(:int128_value, int128694))
-                    _t1368 = _t1369
+                if prediction721 == 9
+                    int128731 = consume_terminal!(parser, "INT128")
+                    _t1443 = Proto.Value(value=OneOf(:int128_value, int128731))
+                    _t1442 = _t1443
                 else
-                    if prediction684 == 8
-                        uint128693 = consume_terminal!(parser, "UINT128")
-                        _t1371 = Proto.Value(value=OneOf(:uint128_value, uint128693))
-                        _t1370 = _t1371
+                    if prediction721 == 8
+                        uint128730 = consume_terminal!(parser, "UINT128")
+                        _t1445 = Proto.Value(value=OneOf(:uint128_value, uint128730))
+                        _t1444 = _t1445
                     else
-                        if prediction684 == 7
-                            uint32692 = consume_terminal!(parser, "UINT32")
-                            _t1373 = Proto.Value(value=OneOf(:uint32_value, uint32692))
-                            _t1372 = _t1373
+                        if prediction721 == 7
+                            uint32729 = consume_terminal!(parser, "UINT32")
+                            _t1447 = Proto.Value(value=OneOf(:uint32_value, uint32729))
+                            _t1446 = _t1447
                         else
-                            if prediction684 == 6
-                                float691 = consume_terminal!(parser, "FLOAT")
-                                _t1375 = Proto.Value(value=OneOf(:float_value, float691))
-                                _t1374 = _t1375
+                            if prediction721 == 6
+                                float728 = consume_terminal!(parser, "FLOAT")
+                                _t1449 = Proto.Value(value=OneOf(:float_value, float728))
+                                _t1448 = _t1449
                             else
-                                if prediction684 == 5
-                                    float32690 = consume_terminal!(parser, "FLOAT32")
-                                    _t1377 = Proto.Value(value=OneOf(:float32_value, float32690))
-                                    _t1376 = _t1377
+                                if prediction721 == 5
+                                    float32727 = consume_terminal!(parser, "FLOAT32")
+                                    _t1451 = Proto.Value(value=OneOf(:float32_value, float32727))
+                                    _t1450 = _t1451
                                 else
-                                    if prediction684 == 4
-                                        int689 = consume_terminal!(parser, "INT")
-                                        _t1379 = Proto.Value(value=OneOf(:int_value, int689))
-                                        _t1378 = _t1379
+                                    if prediction721 == 4
+                                        int726 = consume_terminal!(parser, "INT")
+                                        _t1453 = Proto.Value(value=OneOf(:int_value, int726))
+                                        _t1452 = _t1453
                                     else
-                                        if prediction684 == 3
-                                            int32688 = consume_terminal!(parser, "INT32")
-                                            _t1381 = Proto.Value(value=OneOf(:int32_value, int32688))
-                                            _t1380 = _t1381
+                                        if prediction721 == 3
+                                            int32725 = consume_terminal!(parser, "INT32")
+                                            _t1455 = Proto.Value(value=OneOf(:int32_value, int32725))
+                                            _t1454 = _t1455
                                         else
-                                            if prediction684 == 2
-                                                string687 = consume_terminal!(parser, "STRING")
-                                                _t1383 = Proto.Value(value=OneOf(:string_value, string687))
-                                                _t1382 = _t1383
+                                            if prediction721 == 2
+                                                string724 = consume_terminal!(parser, "STRING")
+                                                _t1457 = Proto.Value(value=OneOf(:string_value, string724))
+                                                _t1456 = _t1457
                                             else
-                                                if prediction684 == 1
-                                                    _t1385 = parse_raw_datetime(parser)
-                                                    raw_datetime686 = _t1385
-                                                    _t1386 = Proto.Value(value=OneOf(:datetime_value, raw_datetime686))
-                                                    _t1384 = _t1386
+                                                if prediction721 == 1
+                                                    _t1459 = parse_raw_datetime(parser)
+                                                    raw_datetime723 = _t1459
+                                                    _t1460 = Proto.Value(value=OneOf(:datetime_value, raw_datetime723))
+                                                    _t1458 = _t1460
                                                 else
-                                                    if prediction684 == 0
-                                                        _t1388 = parse_raw_date(parser)
-                                                        raw_date685 = _t1388
-                                                        _t1389 = Proto.Value(value=OneOf(:date_value, raw_date685))
-                                                        _t1387 = _t1389
+                                                    if prediction721 == 0
+                                                        _t1462 = parse_raw_date(parser)
+                                                        raw_date722 = _t1462
+                                                        _t1463 = Proto.Value(value=OneOf(:date_value, raw_date722))
+                                                        _t1461 = _t1463
                                                     else
                                                         throw(ParseError("Unexpected token in raw_value" * ": " * string(lookahead(parser, 0))))
                                                     end
-                                                    _t1384 = _t1387
+                                                    _t1458 = _t1461
                                                 end
-                                                _t1382 = _t1384
+                                                _t1456 = _t1458
                                             end
-                                            _t1380 = _t1382
+                                            _t1454 = _t1456
                                         end
-                                        _t1378 = _t1380
+                                        _t1452 = _t1454
                                     end
-                                    _t1376 = _t1378
+                                    _t1450 = _t1452
                                 end
-                                _t1374 = _t1376
+                                _t1448 = _t1450
                             end
-                            _t1372 = _t1374
+                            _t1446 = _t1448
                         end
-                        _t1370 = _t1372
+                        _t1444 = _t1446
                     end
-                    _t1368 = _t1370
+                    _t1442 = _t1444
                 end
-                _t1366 = _t1368
+                _t1440 = _t1442
             end
-            _t1363 = _t1366
+            _t1437 = _t1440
         end
-        _t1360 = _t1363
+        _t1434 = _t1437
     end
-    result698 = _t1360
-    record_span!(parser, span_start697, "Value")
-    return result698
+    result735 = _t1434
+    record_span!(parser, span_start734, "Value")
+    return result735
 end
 
 function parse_raw_date(parser::ParserState)::Proto.DateValue
-    span_start702 = span_start(parser)
+    span_start739 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "date")
-    int699 = consume_terminal!(parser, "INT")
-    int_3700 = consume_terminal!(parser, "INT")
-    int_4701 = consume_terminal!(parser, "INT")
+    int736 = consume_terminal!(parser, "INT")
+    int_3737 = consume_terminal!(parser, "INT")
+    int_4738 = consume_terminal!(parser, "INT")
     consume_literal!(parser, ")")
-    _t1390 = Proto.DateValue(year=Int32(int699), month=Int32(int_3700), day=Int32(int_4701))
-    result703 = _t1390
-    record_span!(parser, span_start702, "DateValue")
-    return result703
+    _t1464 = Proto.DateValue(year=Int32(int736), month=Int32(int_3737), day=Int32(int_4738))
+    result740 = _t1464
+    record_span!(parser, span_start739, "DateValue")
+    return result740
 end
 
 function parse_raw_datetime(parser::ParserState)::Proto.DateTimeValue
-    span_start711 = span_start(parser)
+    span_start748 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "datetime")
-    int704 = consume_terminal!(parser, "INT")
-    int_3705 = consume_terminal!(parser, "INT")
-    int_4706 = consume_terminal!(parser, "INT")
-    int_5707 = consume_terminal!(parser, "INT")
-    int_6708 = consume_terminal!(parser, "INT")
-    int_7709 = consume_terminal!(parser, "INT")
+    int741 = consume_terminal!(parser, "INT")
+    int_3742 = consume_terminal!(parser, "INT")
+    int_4743 = consume_terminal!(parser, "INT")
+    int_5744 = consume_terminal!(parser, "INT")
+    int_6745 = consume_terminal!(parser, "INT")
+    int_7746 = consume_terminal!(parser, "INT")
     if match_lookahead_terminal(parser, "INT", 0)
-        _t1391 = consume_terminal!(parser, "INT")
+        _t1465 = consume_terminal!(parser, "INT")
     else
-        _t1391 = nothing
+        _t1465 = nothing
     end
-    int_8710 = _t1391
+    int_8747 = _t1465
     consume_literal!(parser, ")")
-    _t1392 = Proto.DateTimeValue(year=Int32(int704), month=Int32(int_3705), day=Int32(int_4706), hour=Int32(int_5707), minute=Int32(int_6708), second=Int32(int_7709), microsecond=Int32((!isnothing(int_8710) ? int_8710 : 0)))
-    result712 = _t1392
-    record_span!(parser, span_start711, "DateTimeValue")
-    return result712
+    _t1466 = Proto.DateTimeValue(year=Int32(int741), month=Int32(int_3742), day=Int32(int_4743), hour=Int32(int_5744), minute=Int32(int_6745), second=Int32(int_7746), microsecond=Int32((!isnothing(int_8747) ? int_8747 : 0)))
+    result749 = _t1466
+    record_span!(parser, span_start748, "DateTimeValue")
+    return result749
 end
 
 function parse_boolean_value(parser::ParserState)::Bool
     if match_lookahead_literal(parser, "true", 0)
-        _t1393 = 0
+        _t1467 = 0
     else
         if match_lookahead_literal(parser, "false", 0)
-            _t1394 = 1
+            _t1468 = 1
         else
-            _t1394 = -1
+            _t1468 = -1
         end
-        _t1393 = _t1394
+        _t1467 = _t1468
     end
-    prediction713 = _t1393
-    if prediction713 == 1
+    prediction750 = _t1467
+    if prediction750 == 1
         consume_literal!(parser, "false")
-        _t1395 = false
+        _t1469 = false
     else
-        if prediction713 == 0
+        if prediction750 == 0
             consume_literal!(parser, "true")
-            _t1396 = true
+            _t1470 = true
         else
             throw(ParseError("Unexpected token in boolean_value" * ": " * string(lookahead(parser, 0))))
         end
-        _t1395 = _t1396
+        _t1469 = _t1470
     end
-    return _t1395
+    return _t1469
 end
 
 function parse_sync(parser::ParserState)::Proto.Sync
-    span_start718 = span_start(parser)
+    span_start755 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "sync")
-    xs714 = Proto.FragmentId[]
-    cond715 = match_lookahead_literal(parser, ":", 0)
-    while cond715
-        _t1397 = parse_fragment_id(parser)
-        item716 = _t1397
-        push!(xs714, item716)
-        cond715 = match_lookahead_literal(parser, ":", 0)
-    end
-    fragment_ids717 = xs714
+    xs751 = Proto.FragmentId[]
+    cond752 = match_lookahead_literal(parser, ":", 0)
+    while cond752
+        _t1471 = parse_fragment_id(parser)
+        item753 = _t1471
+        push!(xs751, item753)
+        cond752 = match_lookahead_literal(parser, ":", 0)
+    end
+    fragment_ids754 = xs751
     consume_literal!(parser, ")")
-    _t1398 = Proto.Sync(fragments=fragment_ids717)
-    result719 = _t1398
-    record_span!(parser, span_start718, "Sync")
-    return result719
+    _t1472 = Proto.Sync(fragments=fragment_ids754)
+    result756 = _t1472
+    record_span!(parser, span_start755, "Sync")
+    return result756
 end
 
 function parse_fragment_id(parser::ParserState)::Proto.FragmentId
-    span_start721 = span_start(parser)
+    span_start758 = span_start(parser)
     consume_literal!(parser, ":")
-    symbol720 = consume_terminal!(parser, "SYMBOL")
-    result722 = Proto.FragmentId(Vector{UInt8}(symbol720))
-    record_span!(parser, span_start721, "FragmentId")
-    return result722
+    symbol757 = consume_terminal!(parser, "SYMBOL")
+    result759 = Proto.FragmentId(Vector{UInt8}(symbol757))
+    record_span!(parser, span_start758, "FragmentId")
+    return result759
 end
 
 function parse_epoch(parser::ParserState)::Proto.Epoch
-    span_start725 = span_start(parser)
+    span_start762 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "epoch")
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "writes", 1))
-        _t1400 = parse_epoch_writes(parser)
-        _t1399 = _t1400
+        _t1474 = parse_epoch_writes(parser)
+        _t1473 = _t1474
     else
-        _t1399 = nothing
+        _t1473 = nothing
     end
-    epoch_writes723 = _t1399
+    epoch_writes760 = _t1473
     if match_lookahead_literal(parser, "(", 0)
-        _t1402 = parse_epoch_reads(parser)
-        _t1401 = _t1402
+        _t1476 = parse_epoch_reads(parser)
+        _t1475 = _t1476
     else
-        _t1401 = nothing
+        _t1475 = nothing
     end
-    epoch_reads724 = _t1401
+    epoch_reads761 = _t1475
     consume_literal!(parser, ")")
-    _t1403 = Proto.Epoch(writes=(!isnothing(epoch_writes723) ? epoch_writes723 : Proto.Write[]), reads=(!isnothing(epoch_reads724) ? epoch_reads724 : Proto.Read[]))
-    result726 = _t1403
-    record_span!(parser, span_start725, "Epoch")
-    return result726
+    _t1477 = Proto.Epoch(writes=(!isnothing(epoch_writes760) ? epoch_writes760 : Proto.Write[]), reads=(!isnothing(epoch_reads761) ? epoch_reads761 : Proto.Read[]))
+    result763 = _t1477
+    record_span!(parser, span_start762, "Epoch")
+    return result763
 end
 
 function parse_epoch_writes(parser::ParserState)::Vector{Proto.Write}
     consume_literal!(parser, "(")
     consume_literal!(parser, "writes")
-    xs727 = Proto.Write[]
-    cond728 = match_lookahead_literal(parser, "(", 0)
-    while cond728
-        _t1404 = parse_write(parser)
-        item729 = _t1404
-        push!(xs727, item729)
-        cond728 = match_lookahead_literal(parser, "(", 0)
-    end
-    writes730 = xs727
+    xs764 = Proto.Write[]
+    cond765 = match_lookahead_literal(parser, "(", 0)
+    while cond765
+        _t1478 = parse_write(parser)
+        item766 = _t1478
+        push!(xs764, item766)
+        cond765 = match_lookahead_literal(parser, "(", 0)
+    end
+    writes767 = xs764
     consume_literal!(parser, ")")
-    return writes730
+    return writes767
 end
 
 function parse_write(parser::ParserState)::Proto.Write
-    span_start736 = span_start(parser)
+    span_start773 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "undefine", 1)
-            _t1406 = 1
+            _t1480 = 1
         else
             if match_lookahead_literal(parser, "snapshot", 1)
-                _t1407 = 3
+                _t1481 = 3
             else
                 if match_lookahead_literal(parser, "define", 1)
-                    _t1408 = 0
+                    _t1482 = 0
                 else
                     if match_lookahead_literal(parser, "context", 1)
-                        _t1409 = 2
+                        _t1483 = 2
                     else
-                        _t1409 = -1
+                        _t1483 = -1
                     end
-                    _t1408 = _t1409
+                    _t1482 = _t1483
                 end
-                _t1407 = _t1408
+                _t1481 = _t1482
             end
-            _t1406 = _t1407
+            _t1480 = _t1481
         end
-        _t1405 = _t1406
+        _t1479 = _t1480
     else
-        _t1405 = -1
-    end
-    prediction731 = _t1405
-    if prediction731 == 3
-        _t1411 = parse_snapshot(parser)
-        snapshot735 = _t1411
-        _t1412 = Proto.Write(write_type=OneOf(:snapshot, snapshot735))
-        _t1410 = _t1412
+        _t1479 = -1
+    end
+    prediction768 = _t1479
+    if prediction768 == 3
+        _t1485 = parse_snapshot(parser)
+        snapshot772 = _t1485
+        _t1486 = Proto.Write(write_type=OneOf(:snapshot, snapshot772))
+        _t1484 = _t1486
     else
-        if prediction731 == 2
-            _t1414 = parse_context(parser)
-            context734 = _t1414
-            _t1415 = Proto.Write(write_type=OneOf(:context, context734))
-            _t1413 = _t1415
+        if prediction768 == 2
+            _t1488 = parse_context(parser)
+            context771 = _t1488
+            _t1489 = Proto.Write(write_type=OneOf(:context, context771))
+            _t1487 = _t1489
         else
-            if prediction731 == 1
-                _t1417 = parse_undefine(parser)
-                undefine733 = _t1417
-                _t1418 = Proto.Write(write_type=OneOf(:undefine, undefine733))
-                _t1416 = _t1418
+            if prediction768 == 1
+                _t1491 = parse_undefine(parser)
+                undefine770 = _t1491
+                _t1492 = Proto.Write(write_type=OneOf(:undefine, undefine770))
+                _t1490 = _t1492
             else
-                if prediction731 == 0
-                    _t1420 = parse_define(parser)
-                    define732 = _t1420
-                    _t1421 = Proto.Write(write_type=OneOf(:define, define732))
-                    _t1419 = _t1421
+                if prediction768 == 0
+                    _t1494 = parse_define(parser)
+                    define769 = _t1494
+                    _t1495 = Proto.Write(write_type=OneOf(:define, define769))
+                    _t1493 = _t1495
                 else
                     throw(ParseError("Unexpected token in write" * ": " * string(lookahead(parser, 0))))
                 end
-                _t1416 = _t1419
+                _t1490 = _t1493
             end
-            _t1413 = _t1416
+            _t1487 = _t1490
         end
-        _t1410 = _t1413
+        _t1484 = _t1487
     end
-    result737 = _t1410
-    record_span!(parser, span_start736, "Write")
-    return result737
+    result774 = _t1484
+    record_span!(parser, span_start773, "Write")
+    return result774
 end
 
 function parse_define(parser::ParserState)::Proto.Define
-    span_start739 = span_start(parser)
+    span_start776 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "define")
-    _t1422 = parse_fragment(parser)
-    fragment738 = _t1422
+    _t1496 = parse_fragment(parser)
+    fragment775 = _t1496
     consume_literal!(parser, ")")
-    _t1423 = Proto.Define(fragment=fragment738)
-    result740 = _t1423
-    record_span!(parser, span_start739, "Define")
-    return result740
+    _t1497 = Proto.Define(fragment=fragment775)
+    result777 = _t1497
+    record_span!(parser, span_start776, "Define")
+    return result777
 end
 
 function parse_fragment(parser::ParserState)::Proto.Fragment
-    span_start746 = span_start(parser)
+    span_start783 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "fragment")
-    _t1424 = parse_new_fragment_id(parser)
-    new_fragment_id741 = _t1424
-    xs742 = Proto.Declaration[]
-    cond743 = match_lookahead_literal(parser, "(", 0)
-    while cond743
-        _t1425 = parse_declaration(parser)
-        item744 = _t1425
-        push!(xs742, item744)
-        cond743 = match_lookahead_literal(parser, "(", 0)
-    end
-    declarations745 = xs742
+    _t1498 = parse_new_fragment_id(parser)
+    new_fragment_id778 = _t1498
+    xs779 = Proto.Declaration[]
+    cond780 = match_lookahead_literal(parser, "(", 0)
+    while cond780
+        _t1499 = parse_declaration(parser)
+        item781 = _t1499
+        push!(xs779, item781)
+        cond780 = match_lookahead_literal(parser, "(", 0)
+    end
+    declarations782 = xs779
     consume_literal!(parser, ")")
-    result747 = construct_fragment(parser, new_fragment_id741, declarations745)
-    record_span!(parser, span_start746, "Fragment")
-    return result747
+    result784 = construct_fragment(parser, new_fragment_id778, declarations782)
+    record_span!(parser, span_start783, "Fragment")
+    return result784
 end
 
 function parse_new_fragment_id(parser::ParserState)::Proto.FragmentId
-    span_start749 = span_start(parser)
-    _t1426 = parse_fragment_id(parser)
-    fragment_id748 = _t1426
-    start_fragment!(parser, fragment_id748)
-    result750 = fragment_id748
-    record_span!(parser, span_start749, "FragmentId")
-    return result750
+    span_start786 = span_start(parser)
+    _t1500 = parse_fragment_id(parser)
+    fragment_id785 = _t1500
+    start_fragment!(parser, fragment_id785)
+    result787 = fragment_id785
+    record_span!(parser, span_start786, "FragmentId")
+    return result787
 end
 
 function parse_declaration(parser::ParserState)::Proto.Declaration
-    span_start756 = span_start(parser)
+    span_start793 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "iceberg_data", 1)
-            _t1428 = 3
+            _t1502 = 3
         else
             if match_lookahead_literal(parser, "functional_dependency", 1)
-                _t1429 = 2
+                _t1503 = 2
             else
                 if match_lookahead_literal(parser, "edb", 1)
-                    _t1430 = 3
+                    _t1504 = 3
                 else
                     if match_lookahead_literal(parser, "def", 1)
-                        _t1431 = 0
+                        _t1505 = 0
                     else
                         if match_lookahead_literal(parser, "csv_data", 1)
-                            _t1432 = 3
+                            _t1506 = 3
                         else
                             if match_lookahead_literal(parser, "betree_relation", 1)
-                                _t1433 = 3
+                                _t1507 = 3
                             else
                                 if match_lookahead_literal(parser, "algorithm", 1)
-                                    _t1434 = 1
+                                    _t1508 = 1
                                 else
-                                    _t1434 = -1
+                                    _t1508 = -1
                                 end
-                                _t1433 = _t1434
+                                _t1507 = _t1508
                             end
-                            _t1432 = _t1433
+                            _t1506 = _t1507
                         end
-                        _t1431 = _t1432
+                        _t1505 = _t1506
                     end
-                    _t1430 = _t1431
+                    _t1504 = _t1505
                 end
-                _t1429 = _t1430
+                _t1503 = _t1504
             end
-            _t1428 = _t1429
+            _t1502 = _t1503
         end
-        _t1427 = _t1428
+        _t1501 = _t1502
     else
-        _t1427 = -1
-    end
-    prediction751 = _t1427
-    if prediction751 == 3
-        _t1436 = parse_data(parser)
-        data755 = _t1436
-        _t1437 = Proto.Declaration(declaration_type=OneOf(:data, data755))
-        _t1435 = _t1437
+        _t1501 = -1
+    end
+    prediction788 = _t1501
+    if prediction788 == 3
+        _t1510 = parse_data(parser)
+        data792 = _t1510
+        _t1511 = Proto.Declaration(declaration_type=OneOf(:data, data792))
+        _t1509 = _t1511
     else
-        if prediction751 == 2
-            _t1439 = parse_constraint(parser)
-            constraint754 = _t1439
-            _t1440 = Proto.Declaration(declaration_type=OneOf(:constraint, constraint754))
-            _t1438 = _t1440
+        if prediction788 == 2
+            _t1513 = parse_constraint(parser)
+            constraint791 = _t1513
+            _t1514 = Proto.Declaration(declaration_type=OneOf(:constraint, constraint791))
+            _t1512 = _t1514
         else
-            if prediction751 == 1
-                _t1442 = parse_algorithm(parser)
-                algorithm753 = _t1442
-                _t1443 = Proto.Declaration(declaration_type=OneOf(:algorithm, algorithm753))
-                _t1441 = _t1443
+            if prediction788 == 1
+                _t1516 = parse_algorithm(parser)
+                algorithm790 = _t1516
+                _t1517 = Proto.Declaration(declaration_type=OneOf(:algorithm, algorithm790))
+                _t1515 = _t1517
             else
-                if prediction751 == 0
-                    _t1445 = parse_def(parser)
-                    def752 = _t1445
-                    _t1446 = Proto.Declaration(declaration_type=OneOf(:def, def752))
-                    _t1444 = _t1446
+                if prediction788 == 0
+                    _t1519 = parse_def(parser)
+                    def789 = _t1519
+                    _t1520 = Proto.Declaration(declaration_type=OneOf(:def, def789))
+                    _t1518 = _t1520
                 else
                     throw(ParseError("Unexpected token in declaration" * ": " * string(lookahead(parser, 0))))
                 end
-                _t1441 = _t1444
+                _t1515 = _t1518
             end
-            _t1438 = _t1441
+            _t1512 = _t1515
         end
-        _t1435 = _t1438
+        _t1509 = _t1512
     end
-    result757 = _t1435
-    record_span!(parser, span_start756, "Declaration")
-    return result757
+    result794 = _t1509
+    record_span!(parser, span_start793, "Declaration")
+    return result794
 end
 
 function parse_def(parser::ParserState)::Proto.Def
-    span_start761 = span_start(parser)
+    span_start798 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "def")
-    _t1447 = parse_relation_id(parser)
-    relation_id758 = _t1447
-    _t1448 = parse_abstraction(parser)
-    abstraction759 = _t1448
+    _t1521 = parse_relation_id(parser)
+    relation_id795 = _t1521
+    _t1522 = parse_abstraction(parser)
+    abstraction796 = _t1522
     if match_lookahead_literal(parser, "(", 0)
-        _t1450 = parse_attrs(parser)
-        _t1449 = _t1450
+        _t1524 = parse_attrs(parser)
+        _t1523 = _t1524
     else
-        _t1449 = nothing
+        _t1523 = nothing
     end
-    attrs760 = _t1449
+    attrs797 = _t1523
     consume_literal!(parser, ")")
-    _t1451 = Proto.Def(name=relation_id758, body=abstraction759, attrs=(!isnothing(attrs760) ? attrs760 : Proto.Attribute[]))
-    result762 = _t1451
-    record_span!(parser, span_start761, "Def")
-    return result762
+    _t1525 = Proto.Def(name=relation_id795, body=abstraction796, attrs=(!isnothing(attrs797) ? attrs797 : Proto.Attribute[]))
+    result799 = _t1525
+    record_span!(parser, span_start798, "Def")
+    return result799
 end
 
 function parse_relation_id(parser::ParserState)::Proto.RelationId
-    span_start766 = span_start(parser)
+    span_start803 = span_start(parser)
     if match_lookahead_literal(parser, ":", 0)
-        _t1452 = 0
+        _t1526 = 0
     else
         if match_lookahead_terminal(parser, "UINT128", 0)
-            _t1453 = 1
+            _t1527 = 1
         else
-            _t1453 = -1
+            _t1527 = -1
         end
-        _t1452 = _t1453
+        _t1526 = _t1527
     end
-    prediction763 = _t1452
-    if prediction763 == 1
-        uint128765 = consume_terminal!(parser, "UINT128")
-        _t1454 = Proto.RelationId(uint128765.low, uint128765.high)
+    prediction800 = _t1526
+    if prediction800 == 1
+        uint128802 = consume_terminal!(parser, "UINT128")
+        _t1528 = Proto.RelationId(uint128802.low, uint128802.high)
     else
-        if prediction763 == 0
+        if prediction800 == 0
             consume_literal!(parser, ":")
-            symbol764 = consume_terminal!(parser, "SYMBOL")
-            _t1455 = relation_id_from_string(parser, symbol764)
+            symbol801 = consume_terminal!(parser, "SYMBOL")
+            _t1529 = relation_id_from_string(parser, symbol801)
         else
             throw(ParseError("Unexpected token in relation_id" * ": " * string(lookahead(parser, 0))))
         end
-        _t1454 = _t1455
+        _t1528 = _t1529
     end
-    result767 = _t1454
-    record_span!(parser, span_start766, "RelationId")
-    return result767
+    result804 = _t1528
+    record_span!(parser, span_start803, "RelationId")
+    return result804
 end
 
 function parse_abstraction(parser::ParserState)::Proto.Abstraction
-    span_start770 = span_start(parser)
+    span_start807 = span_start(parser)
     consume_literal!(parser, "(")
-    _t1456 = parse_bindings(parser)
-    bindings768 = _t1456
-    _t1457 = parse_formula(parser)
-    formula769 = _t1457
+    _t1530 = parse_bindings(parser)
+    bindings805 = _t1530
+    _t1531 = parse_formula(parser)
+    formula806 = _t1531
     consume_literal!(parser, ")")
-    _t1458 = Proto.Abstraction(vars=vcat(bindings768[1], !isnothing(bindings768[2]) ? bindings768[2] : []), value=formula769)
-    result771 = _t1458
-    record_span!(parser, span_start770, "Abstraction")
-    return result771
+    _t1532 = Proto.Abstraction(vars=vcat(bindings805[1], !isnothing(bindings805[2]) ? bindings805[2] : []), value=formula806)
+    result808 = _t1532
+    record_span!(parser, span_start807, "Abstraction")
+    return result808
 end
 
 function parse_bindings(parser::ParserState)::Tuple{Vector{Proto.Binding}, Vector{Proto.Binding}}
     consume_literal!(parser, "[")
-    xs772 = Proto.Binding[]
-    cond773 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    while cond773
-        _t1459 = parse_binding(parser)
-        item774 = _t1459
-        push!(xs772, item774)
-        cond773 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    end
-    bindings775 = xs772
+    xs809 = Proto.Binding[]
+    cond810 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    while cond810
+        _t1533 = parse_binding(parser)
+        item811 = _t1533
+        push!(xs809, item811)
+        cond810 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    end
+    bindings812 = xs809
     if match_lookahead_literal(parser, "|", 0)
-        _t1461 = parse_value_bindings(parser)
-        _t1460 = _t1461
+        _t1535 = parse_value_bindings(parser)
+        _t1534 = _t1535
     else
-        _t1460 = nothing
+        _t1534 = nothing
     end
-    value_bindings776 = _t1460
+    value_bindings813 = _t1534
     consume_literal!(parser, "]")
-    return (bindings775, (!isnothing(value_bindings776) ? value_bindings776 : Proto.Binding[]),)
+    return (bindings812, (!isnothing(value_bindings813) ? value_bindings813 : Proto.Binding[]),)
 end
 
 function parse_binding(parser::ParserState)::Proto.Binding
-    span_start779 = span_start(parser)
-    symbol777 = consume_terminal!(parser, "SYMBOL")
+    span_start816 = span_start(parser)
+    symbol814 = consume_terminal!(parser, "SYMBOL")
     consume_literal!(parser, "::")
-    _t1462 = parse_type(parser)
-    type778 = _t1462
-    _t1463 = Proto.Var(name=symbol777)
-    _t1464 = Proto.Binding(var=_t1463, var"#type"=type778)
-    result780 = _t1464
-    record_span!(parser, span_start779, "Binding")
-    return result780
+    _t1536 = parse_type(parser)
+    type815 = _t1536
+    _t1537 = Proto.Var(name=symbol814)
+    _t1538 = Proto.Binding(var=_t1537, var"#type"=type815)
+    result817 = _t1538
+    record_span!(parser, span_start816, "Binding")
+    return result817
 end
 
 function parse_type(parser::ParserState)::Proto.var"#Type"
-    span_start796 = span_start(parser)
+    span_start833 = span_start(parser)
     if match_lookahead_literal(parser, "UNKNOWN", 0)
-        _t1465 = 0
+        _t1539 = 0
     else
         if match_lookahead_literal(parser, "UINT32", 0)
-            _t1466 = 13
+            _t1540 = 13
         else
             if match_lookahead_literal(parser, "UINT128", 0)
-                _t1467 = 4
+                _t1541 = 4
             else
                 if match_lookahead_literal(parser, "STRING", 0)
-                    _t1468 = 1
+                    _t1542 = 1
                 else
                     if match_lookahead_literal(parser, "MISSING", 0)
-                        _t1469 = 8
+                        _t1543 = 8
                     else
                         if match_lookahead_literal(parser, "INT32", 0)
-                            _t1470 = 11
+                            _t1544 = 11
                         else
                             if match_lookahead_literal(parser, "INT128", 0)
-                                _t1471 = 5
+                                _t1545 = 5
                             else
                                 if match_lookahead_literal(parser, "INT", 0)
-                                    _t1472 = 2
+                                    _t1546 = 2
                                 else
                                     if match_lookahead_literal(parser, "FLOAT32", 0)
-                                        _t1473 = 12
+                                        _t1547 = 12
                                     else
                                         if match_lookahead_literal(parser, "FLOAT", 0)
-                                            _t1474 = 3
+                                            _t1548 = 3
                                         else
                                             if match_lookahead_literal(parser, "DATETIME", 0)
-                                                _t1475 = 7
+                                                _t1549 = 7
                                             else
                                                 if match_lookahead_literal(parser, "DATE", 0)
-                                                    _t1476 = 6
+                                                    _t1550 = 6
                                                 else
                                                     if match_lookahead_literal(parser, "BOOLEAN", 0)
-                                                        _t1477 = 10
+                                                        _t1551 = 10
                                                     else
                                                         if match_lookahead_literal(parser, "(", 0)
-                                                            _t1478 = 9
+                                                            _t1552 = 9
                                                         else
-                                                            _t1478 = -1
+                                                            _t1552 = -1
                                                         end
-                                                        _t1477 = _t1478
+                                                        _t1551 = _t1552
                                                     end
-                                                    _t1476 = _t1477
+                                                    _t1550 = _t1551
                                                 end
-                                                _t1475 = _t1476
+                                                _t1549 = _t1550
                                             end
-                                            _t1474 = _t1475
+                                            _t1548 = _t1549
                                         end
-                                        _t1473 = _t1474
+                                        _t1547 = _t1548
                                     end
-                                    _t1472 = _t1473
+                                    _t1546 = _t1547
                                 end
-                                _t1471 = _t1472
+                                _t1545 = _t1546
                             end
-                            _t1470 = _t1471
+                            _t1544 = _t1545
                         end
-                        _t1469 = _t1470
+                        _t1543 = _t1544
                     end
-                    _t1468 = _t1469
+                    _t1542 = _t1543
                 end
-                _t1467 = _t1468
+                _t1541 = _t1542
             end
-            _t1466 = _t1467
+            _t1540 = _t1541
         end
-        _t1465 = _t1466
-    end
-    prediction781 = _t1465
-    if prediction781 == 13
-        _t1480 = parse_uint32_type(parser)
-        uint32_type795 = _t1480
-        _t1481 = Proto.var"#Type"(var"#type"=OneOf(:uint32_type, uint32_type795))
-        _t1479 = _t1481
+        _t1539 = _t1540
+    end
+    prediction818 = _t1539
+    if prediction818 == 13
+        _t1554 = parse_uint32_type(parser)
+        uint32_type832 = _t1554
+        _t1555 = Proto.var"#Type"(var"#type"=OneOf(:uint32_type, uint32_type832))
+        _t1553 = _t1555
     else
-        if prediction781 == 12
-            _t1483 = parse_float32_type(parser)
-            float32_type794 = _t1483
-            _t1484 = Proto.var"#Type"(var"#type"=OneOf(:float32_type, float32_type794))
-            _t1482 = _t1484
+        if prediction818 == 12
+            _t1557 = parse_float32_type(parser)
+            float32_type831 = _t1557
+            _t1558 = Proto.var"#Type"(var"#type"=OneOf(:float32_type, float32_type831))
+            _t1556 = _t1558
         else
-            if prediction781 == 11
-                _t1486 = parse_int32_type(parser)
-                int32_type793 = _t1486
-                _t1487 = Proto.var"#Type"(var"#type"=OneOf(:int32_type, int32_type793))
-                _t1485 = _t1487
+            if prediction818 == 11
+                _t1560 = parse_int32_type(parser)
+                int32_type830 = _t1560
+                _t1561 = Proto.var"#Type"(var"#type"=OneOf(:int32_type, int32_type830))
+                _t1559 = _t1561
             else
-                if prediction781 == 10
-                    _t1489 = parse_boolean_type(parser)
-                    boolean_type792 = _t1489
-                    _t1490 = Proto.var"#Type"(var"#type"=OneOf(:boolean_type, boolean_type792))
-                    _t1488 = _t1490
+                if prediction818 == 10
+                    _t1563 = parse_boolean_type(parser)
+                    boolean_type829 = _t1563
+                    _t1564 = Proto.var"#Type"(var"#type"=OneOf(:boolean_type, boolean_type829))
+                    _t1562 = _t1564
                 else
-                    if prediction781 == 9
-                        _t1492 = parse_decimal_type(parser)
-                        decimal_type791 = _t1492
-                        _t1493 = Proto.var"#Type"(var"#type"=OneOf(:decimal_type, decimal_type791))
-                        _t1491 = _t1493
+                    if prediction818 == 9
+                        _t1566 = parse_decimal_type(parser)
+                        decimal_type828 = _t1566
+                        _t1567 = Proto.var"#Type"(var"#type"=OneOf(:decimal_type, decimal_type828))
+                        _t1565 = _t1567
                     else
-                        if prediction781 == 8
-                            _t1495 = parse_missing_type(parser)
-                            missing_type790 = _t1495
-                            _t1496 = Proto.var"#Type"(var"#type"=OneOf(:missing_type, missing_type790))
-                            _t1494 = _t1496
+                        if prediction818 == 8
+                            _t1569 = parse_missing_type(parser)
+                            missing_type827 = _t1569
+                            _t1570 = Proto.var"#Type"(var"#type"=OneOf(:missing_type, missing_type827))
+                            _t1568 = _t1570
                         else
-                            if prediction781 == 7
-                                _t1498 = parse_datetime_type(parser)
-                                datetime_type789 = _t1498
-                                _t1499 = Proto.var"#Type"(var"#type"=OneOf(:datetime_type, datetime_type789))
-                                _t1497 = _t1499
+                            if prediction818 == 7
+                                _t1572 = parse_datetime_type(parser)
+                                datetime_type826 = _t1572
+                                _t1573 = Proto.var"#Type"(var"#type"=OneOf(:datetime_type, datetime_type826))
+                                _t1571 = _t1573
                             else
-                                if prediction781 == 6
-                                    _t1501 = parse_date_type(parser)
-                                    date_type788 = _t1501
-                                    _t1502 = Proto.var"#Type"(var"#type"=OneOf(:date_type, date_type788))
-                                    _t1500 = _t1502
+                                if prediction818 == 6
+                                    _t1575 = parse_date_type(parser)
+                                    date_type825 = _t1575
+                                    _t1576 = Proto.var"#Type"(var"#type"=OneOf(:date_type, date_type825))
+                                    _t1574 = _t1576
                                 else
-                                    if prediction781 == 5
-                                        _t1504 = parse_int128_type(parser)
-                                        int128_type787 = _t1504
-                                        _t1505 = Proto.var"#Type"(var"#type"=OneOf(:int128_type, int128_type787))
-                                        _t1503 = _t1505
+                                    if prediction818 == 5
+                                        _t1578 = parse_int128_type(parser)
+                                        int128_type824 = _t1578
+                                        _t1579 = Proto.var"#Type"(var"#type"=OneOf(:int128_type, int128_type824))
+                                        _t1577 = _t1579
                                     else
-                                        if prediction781 == 4
-                                            _t1507 = parse_uint128_type(parser)
-                                            uint128_type786 = _t1507
-                                            _t1508 = Proto.var"#Type"(var"#type"=OneOf(:uint128_type, uint128_type786))
-                                            _t1506 = _t1508
+                                        if prediction818 == 4
+                                            _t1581 = parse_uint128_type(parser)
+                                            uint128_type823 = _t1581
+                                            _t1582 = Proto.var"#Type"(var"#type"=OneOf(:uint128_type, uint128_type823))
+                                            _t1580 = _t1582
                                         else
-                                            if prediction781 == 3
-                                                _t1510 = parse_float_type(parser)
-                                                float_type785 = _t1510
-                                                _t1511 = Proto.var"#Type"(var"#type"=OneOf(:float_type, float_type785))
-                                                _t1509 = _t1511
+                                            if prediction818 == 3
+                                                _t1584 = parse_float_type(parser)
+                                                float_type822 = _t1584
+                                                _t1585 = Proto.var"#Type"(var"#type"=OneOf(:float_type, float_type822))
+                                                _t1583 = _t1585
                                             else
-                                                if prediction781 == 2
-                                                    _t1513 = parse_int_type(parser)
-                                                    int_type784 = _t1513
-                                                    _t1514 = Proto.var"#Type"(var"#type"=OneOf(:int_type, int_type784))
-                                                    _t1512 = _t1514
+                                                if prediction818 == 2
+                                                    _t1587 = parse_int_type(parser)
+                                                    int_type821 = _t1587
+                                                    _t1588 = Proto.var"#Type"(var"#type"=OneOf(:int_type, int_type821))
+                                                    _t1586 = _t1588
                                                 else
-                                                    if prediction781 == 1
-                                                        _t1516 = parse_string_type(parser)
-                                                        string_type783 = _t1516
-                                                        _t1517 = Proto.var"#Type"(var"#type"=OneOf(:string_type, string_type783))
-                                                        _t1515 = _t1517
+                                                    if prediction818 == 1
+                                                        _t1590 = parse_string_type(parser)
+                                                        string_type820 = _t1590
+                                                        _t1591 = Proto.var"#Type"(var"#type"=OneOf(:string_type, string_type820))
+                                                        _t1589 = _t1591
                                                     else
-                                                        if prediction781 == 0
-                                                            _t1519 = parse_unspecified_type(parser)
-                                                            unspecified_type782 = _t1519
-                                                            _t1520 = Proto.var"#Type"(var"#type"=OneOf(:unspecified_type, unspecified_type782))
-                                                            _t1518 = _t1520
+                                                        if prediction818 == 0
+                                                            _t1593 = parse_unspecified_type(parser)
+                                                            unspecified_type819 = _t1593
+                                                            _t1594 = Proto.var"#Type"(var"#type"=OneOf(:unspecified_type, unspecified_type819))
+                                                            _t1592 = _t1594
                                                         else
                                                             throw(ParseError("Unexpected token in type" * ": " * string(lookahead(parser, 0))))
                                                         end
-                                                        _t1515 = _t1518
+                                                        _t1589 = _t1592
                                                     end
-                                                    _t1512 = _t1515
+                                                    _t1586 = _t1589
                                                 end
-                                                _t1509 = _t1512
+                                                _t1583 = _t1586
                                             end
-                                            _t1506 = _t1509
+                                            _t1580 = _t1583
                                         end
-                                        _t1503 = _t1506
+                                        _t1577 = _t1580
                                     end
-                                    _t1500 = _t1503
+                                    _t1574 = _t1577
                                 end
-                                _t1497 = _t1500
+                                _t1571 = _t1574
                             end
-                            _t1494 = _t1497
+                            _t1568 = _t1571
                         end
-                        _t1491 = _t1494
+                        _t1565 = _t1568
                     end
-                    _t1488 = _t1491
+                    _t1562 = _t1565
                 end
-                _t1485 = _t1488
+                _t1559 = _t1562
             end
-            _t1482 = _t1485
+            _t1556 = _t1559
         end
-        _t1479 = _t1482
+        _t1553 = _t1556
     end
-    result797 = _t1479
-    record_span!(parser, span_start796, "Type")
-    return result797
+    result834 = _t1553
+    record_span!(parser, span_start833, "Type")
+    return result834
 end
 
 function parse_unspecified_type(parser::ParserState)::Proto.UnspecifiedType
-    span_start798 = span_start(parser)
+    span_start835 = span_start(parser)
     consume_literal!(parser, "UNKNOWN")
-    _t1521 = Proto.UnspecifiedType()
-    result799 = _t1521
-    record_span!(parser, span_start798, "UnspecifiedType")
-    return result799
+    _t1595 = Proto.UnspecifiedType()
+    result836 = _t1595
+    record_span!(parser, span_start835, "UnspecifiedType")
+    return result836
 end
 
 function parse_string_type(parser::ParserState)::Proto.StringType
-    span_start800 = span_start(parser)
+    span_start837 = span_start(parser)
     consume_literal!(parser, "STRING")
-    _t1522 = Proto.StringType()
-    result801 = _t1522
-    record_span!(parser, span_start800, "StringType")
-    return result801
+    _t1596 = Proto.StringType()
+    result838 = _t1596
+    record_span!(parser, span_start837, "StringType")
+    return result838
 end
 
 function parse_int_type(parser::ParserState)::Proto.IntType
-    span_start802 = span_start(parser)
+    span_start839 = span_start(parser)
     consume_literal!(parser, "INT")
-    _t1523 = Proto.IntType()
-    result803 = _t1523
-    record_span!(parser, span_start802, "IntType")
-    return result803
+    _t1597 = Proto.IntType()
+    result840 = _t1597
+    record_span!(parser, span_start839, "IntType")
+    return result840
 end
 
 function parse_float_type(parser::ParserState)::Proto.FloatType
-    span_start804 = span_start(parser)
+    span_start841 = span_start(parser)
     consume_literal!(parser, "FLOAT")
-    _t1524 = Proto.FloatType()
-    result805 = _t1524
-    record_span!(parser, span_start804, "FloatType")
-    return result805
+    _t1598 = Proto.FloatType()
+    result842 = _t1598
+    record_span!(parser, span_start841, "FloatType")
+    return result842
 end
 
 function parse_uint128_type(parser::ParserState)::Proto.UInt128Type
-    span_start806 = span_start(parser)
+    span_start843 = span_start(parser)
     consume_literal!(parser, "UINT128")
-    _t1525 = Proto.UInt128Type()
-    result807 = _t1525
-    record_span!(parser, span_start806, "UInt128Type")
-    return result807
+    _t1599 = Proto.UInt128Type()
+    result844 = _t1599
+    record_span!(parser, span_start843, "UInt128Type")
+    return result844
 end
 
 function parse_int128_type(parser::ParserState)::Proto.Int128Type
-    span_start808 = span_start(parser)
+    span_start845 = span_start(parser)
     consume_literal!(parser, "INT128")
-    _t1526 = Proto.Int128Type()
-    result809 = _t1526
-    record_span!(parser, span_start808, "Int128Type")
-    return result809
+    _t1600 = Proto.Int128Type()
+    result846 = _t1600
+    record_span!(parser, span_start845, "Int128Type")
+    return result846
 end
 
 function parse_date_type(parser::ParserState)::Proto.DateType
-    span_start810 = span_start(parser)
+    span_start847 = span_start(parser)
     consume_literal!(parser, "DATE")
-    _t1527 = Proto.DateType()
-    result811 = _t1527
-    record_span!(parser, span_start810, "DateType")
-    return result811
+    _t1601 = Proto.DateType()
+    result848 = _t1601
+    record_span!(parser, span_start847, "DateType")
+    return result848
 end
 
 function parse_datetime_type(parser::ParserState)::Proto.DateTimeType
-    span_start812 = span_start(parser)
+    span_start849 = span_start(parser)
     consume_literal!(parser, "DATETIME")
-    _t1528 = Proto.DateTimeType()
-    result813 = _t1528
-    record_span!(parser, span_start812, "DateTimeType")
-    return result813
+    _t1602 = Proto.DateTimeType()
+    result850 = _t1602
+    record_span!(parser, span_start849, "DateTimeType")
+    return result850
 end
 
 function parse_missing_type(parser::ParserState)::Proto.MissingType
-    span_start814 = span_start(parser)
+    span_start851 = span_start(parser)
     consume_literal!(parser, "MISSING")
-    _t1529 = Proto.MissingType()
-    result815 = _t1529
-    record_span!(parser, span_start814, "MissingType")
-    return result815
+    _t1603 = Proto.MissingType()
+    result852 = _t1603
+    record_span!(parser, span_start851, "MissingType")
+    return result852
 end
 
 function parse_decimal_type(parser::ParserState)::Proto.DecimalType
-    span_start818 = span_start(parser)
+    span_start855 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "DECIMAL")
-    int816 = consume_terminal!(parser, "INT")
-    int_3817 = consume_terminal!(parser, "INT")
+    int853 = consume_terminal!(parser, "INT")
+    int_3854 = consume_terminal!(parser, "INT")
     consume_literal!(parser, ")")
-    _t1530 = Proto.DecimalType(precision=Int32(int816), scale=Int32(int_3817))
-    result819 = _t1530
-    record_span!(parser, span_start818, "DecimalType")
-    return result819
+    _t1604 = Proto.DecimalType(precision=Int32(int853), scale=Int32(int_3854))
+    result856 = _t1604
+    record_span!(parser, span_start855, "DecimalType")
+    return result856
 end
 
 function parse_boolean_type(parser::ParserState)::Proto.BooleanType
-    span_start820 = span_start(parser)
+    span_start857 = span_start(parser)
     consume_literal!(parser, "BOOLEAN")
-    _t1531 = Proto.BooleanType()
-    result821 = _t1531
-    record_span!(parser, span_start820, "BooleanType")
-    return result821
+    _t1605 = Proto.BooleanType()
+    result858 = _t1605
+    record_span!(parser, span_start857, "BooleanType")
+    return result858
 end
 
 function parse_int32_type(parser::ParserState)::Proto.Int32Type
-    span_start822 = span_start(parser)
+    span_start859 = span_start(parser)
     consume_literal!(parser, "INT32")
-    _t1532 = Proto.Int32Type()
-    result823 = _t1532
-    record_span!(parser, span_start822, "Int32Type")
-    return result823
+    _t1606 = Proto.Int32Type()
+    result860 = _t1606
+    record_span!(parser, span_start859, "Int32Type")
+    return result860
 end
 
 function parse_float32_type(parser::ParserState)::Proto.Float32Type
-    span_start824 = span_start(parser)
+    span_start861 = span_start(parser)
     consume_literal!(parser, "FLOAT32")
-    _t1533 = Proto.Float32Type()
-    result825 = _t1533
-    record_span!(parser, span_start824, "Float32Type")
-    return result825
+    _t1607 = Proto.Float32Type()
+    result862 = _t1607
+    record_span!(parser, span_start861, "Float32Type")
+    return result862
 end
 
 function parse_uint32_type(parser::ParserState)::Proto.UInt32Type
-    span_start826 = span_start(parser)
+    span_start863 = span_start(parser)
     consume_literal!(parser, "UINT32")
-    _t1534 = Proto.UInt32Type()
-    result827 = _t1534
-    record_span!(parser, span_start826, "UInt32Type")
-    return result827
+    _t1608 = Proto.UInt32Type()
+    result864 = _t1608
+    record_span!(parser, span_start863, "UInt32Type")
+    return result864
 end
 
 function parse_value_bindings(parser::ParserState)::Vector{Proto.Binding}
     consume_literal!(parser, "|")
-    xs828 = Proto.Binding[]
-    cond829 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    while cond829
-        _t1535 = parse_binding(parser)
-        item830 = _t1535
-        push!(xs828, item830)
-        cond829 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    xs865 = Proto.Binding[]
+    cond866 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    while cond866
+        _t1609 = parse_binding(parser)
+        item867 = _t1609
+        push!(xs865, item867)
+        cond866 = match_lookahead_terminal(parser, "SYMBOL", 0)
     end
-    bindings831 = xs828
-    return bindings831
+    bindings868 = xs865
+    return bindings868
 end
 
 function parse_formula(parser::ParserState)::Proto.Formula
-    span_start846 = span_start(parser)
+    span_start883 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "true", 1)
-            _t1537 = 0
+            _t1611 = 0
         else
             if match_lookahead_literal(parser, "relatom", 1)
-                _t1538 = 11
+                _t1612 = 11
             else
                 if match_lookahead_literal(parser, "reduce", 1)
-                    _t1539 = 3
+                    _t1613 = 3
                 else
                     if match_lookahead_literal(parser, "primitive", 1)
-                        _t1540 = 10
+                        _t1614 = 10
                     else
                         if match_lookahead_literal(parser, "pragma", 1)
-                            _t1541 = 9
+                            _t1615 = 9
                         else
                             if match_lookahead_literal(parser, "or", 1)
-                                _t1542 = 5
+                                _t1616 = 5
                             else
                                 if match_lookahead_literal(parser, "not", 1)
-                                    _t1543 = 6
+                                    _t1617 = 6
                                 else
                                     if match_lookahead_literal(parser, "ffi", 1)
-                                        _t1544 = 7
+                                        _t1618 = 7
                                     else
                                         if match_lookahead_literal(parser, "false", 1)
-                                            _t1545 = 1
+                                            _t1619 = 1
                                         else
                                             if match_lookahead_literal(parser, "exists", 1)
-                                                _t1546 = 2
+                                                _t1620 = 2
                                             else
                                                 if match_lookahead_literal(parser, "cast", 1)
-                                                    _t1547 = 12
+                                                    _t1621 = 12
                                                 else
                                                     if match_lookahead_literal(parser, "atom", 1)
-                                                        _t1548 = 8
+                                                        _t1622 = 8
                                                     else
                                                         if match_lookahead_literal(parser, "and", 1)
-                                                            _t1549 = 4
+                                                            _t1623 = 4
                                                         else
                                                             if match_lookahead_literal(parser, ">=", 1)
-                                                                _t1550 = 10
+                                                                _t1624 = 10
                                                             else
                                                                 if match_lookahead_literal(parser, ">", 1)
-                                                                    _t1551 = 10
+                                                                    _t1625 = 10
                                                                 else
                                                                     if match_lookahead_literal(parser, "=", 1)
-                                                                        _t1552 = 10
+                                                                        _t1626 = 10
                                                                     else
                                                                         if match_lookahead_literal(parser, "<=", 1)
-                                                                            _t1553 = 10
+                                                                            _t1627 = 10
                                                                         else
                                                                             if match_lookahead_literal(parser, "<", 1)
-                                                                                _t1554 = 10
+                                                                                _t1628 = 10
                                                                             else
                                                                                 if match_lookahead_literal(parser, "/", 1)
-                                                                                    _t1555 = 10
+                                                                                    _t1629 = 10
                                                                                 else
                                                                                     if match_lookahead_literal(parser, "-", 1)
-                                                                                        _t1556 = 10
+                                                                                        _t1630 = 10
                                                                                     else
                                                                                         if match_lookahead_literal(parser, "+", 1)
-                                                                                            _t1557 = 10
+                                                                                            _t1631 = 10
                                                                                         else
                                                                                             if match_lookahead_literal(parser, "*", 1)
-                                                                                                _t1558 = 10
+                                                                                                _t1632 = 10
                                                                                             else
-                                                                                                _t1558 = -1
+                                                                                                _t1632 = -1
                                                                                             end
-                                                                                            _t1557 = _t1558
+                                                                                            _t1631 = _t1632
                                                                                         end
-                                                                                        _t1556 = _t1557
+                                                                                        _t1630 = _t1631
                                                                                     end
-                                                                                    _t1555 = _t1556
+                                                                                    _t1629 = _t1630
                                                                                 end
-                                                                                _t1554 = _t1555
+                                                                                _t1628 = _t1629
                                                                             end
-                                                                            _t1553 = _t1554
+                                                                            _t1627 = _t1628
                                                                         end
-                                                                        _t1552 = _t1553
+                                                                        _t1626 = _t1627
                                                                     end
-                                                                    _t1551 = _t1552
+                                                                    _t1625 = _t1626
                                                                 end
-                                                                _t1550 = _t1551
+                                                                _t1624 = _t1625
                                                             end
-                                                            _t1549 = _t1550
+                                                            _t1623 = _t1624
                                                         end
-                                                        _t1548 = _t1549
+                                                        _t1622 = _t1623
                                                     end
-                                                    _t1547 = _t1548
+                                                    _t1621 = _t1622
                                                 end
-                                                _t1546 = _t1547
+                                                _t1620 = _t1621
                                             end
-                                            _t1545 = _t1546
+                                            _t1619 = _t1620
                                         end
-                                        _t1544 = _t1545
+                                        _t1618 = _t1619
                                     end
-                                    _t1543 = _t1544
+                                    _t1617 = _t1618
                                 end
-                                _t1542 = _t1543
+                                _t1616 = _t1617
                             end
-                            _t1541 = _t1542
+                            _t1615 = _t1616
                         end
-                        _t1540 = _t1541
+                        _t1614 = _t1615
                     end
-                    _t1539 = _t1540
+                    _t1613 = _t1614
                 end
-                _t1538 = _t1539
+                _t1612 = _t1613
             end
-            _t1537 = _t1538
+            _t1611 = _t1612
         end
-        _t1536 = _t1537
+        _t1610 = _t1611
     else
-        _t1536 = -1
-    end
-    prediction832 = _t1536
-    if prediction832 == 12
-        _t1560 = parse_cast(parser)
-        cast845 = _t1560
-        _t1561 = Proto.Formula(formula_type=OneOf(:cast, cast845))
-        _t1559 = _t1561
+        _t1610 = -1
+    end
+    prediction869 = _t1610
+    if prediction869 == 12
+        _t1634 = parse_cast(parser)
+        cast882 = _t1634
+        _t1635 = Proto.Formula(formula_type=OneOf(:cast, cast882))
+        _t1633 = _t1635
     else
-        if prediction832 == 11
-            _t1563 = parse_rel_atom(parser)
-            rel_atom844 = _t1563
-            _t1564 = Proto.Formula(formula_type=OneOf(:rel_atom, rel_atom844))
-            _t1562 = _t1564
+        if prediction869 == 11
+            _t1637 = parse_rel_atom(parser)
+            rel_atom881 = _t1637
+            _t1638 = Proto.Formula(formula_type=OneOf(:rel_atom, rel_atom881))
+            _t1636 = _t1638
         else
-            if prediction832 == 10
-                _t1566 = parse_primitive(parser)
-                primitive843 = _t1566
-                _t1567 = Proto.Formula(formula_type=OneOf(:primitive, primitive843))
-                _t1565 = _t1567
+            if prediction869 == 10
+                _t1640 = parse_primitive(parser)
+                primitive880 = _t1640
+                _t1641 = Proto.Formula(formula_type=OneOf(:primitive, primitive880))
+                _t1639 = _t1641
             else
-                if prediction832 == 9
-                    _t1569 = parse_pragma(parser)
-                    pragma842 = _t1569
-                    _t1570 = Proto.Formula(formula_type=OneOf(:pragma, pragma842))
-                    _t1568 = _t1570
+                if prediction869 == 9
+                    _t1643 = parse_pragma(parser)
+                    pragma879 = _t1643
+                    _t1644 = Proto.Formula(formula_type=OneOf(:pragma, pragma879))
+                    _t1642 = _t1644
                 else
-                    if prediction832 == 8
-                        _t1572 = parse_atom(parser)
-                        atom841 = _t1572
-                        _t1573 = Proto.Formula(formula_type=OneOf(:atom, atom841))
-                        _t1571 = _t1573
+                    if prediction869 == 8
+                        _t1646 = parse_atom(parser)
+                        atom878 = _t1646
+                        _t1647 = Proto.Formula(formula_type=OneOf(:atom, atom878))
+                        _t1645 = _t1647
                     else
-                        if prediction832 == 7
-                            _t1575 = parse_ffi(parser)
-                            ffi840 = _t1575
-                            _t1576 = Proto.Formula(formula_type=OneOf(:ffi, ffi840))
-                            _t1574 = _t1576
+                        if prediction869 == 7
+                            _t1649 = parse_ffi(parser)
+                            ffi877 = _t1649
+                            _t1650 = Proto.Formula(formula_type=OneOf(:ffi, ffi877))
+                            _t1648 = _t1650
                         else
-                            if prediction832 == 6
-                                _t1578 = parse_not(parser)
-                                not839 = _t1578
-                                _t1579 = Proto.Formula(formula_type=OneOf(:not, not839))
-                                _t1577 = _t1579
+                            if prediction869 == 6
+                                _t1652 = parse_not(parser)
+                                not876 = _t1652
+                                _t1653 = Proto.Formula(formula_type=OneOf(:not, not876))
+                                _t1651 = _t1653
                             else
-                                if prediction832 == 5
-                                    _t1581 = parse_disjunction(parser)
-                                    disjunction838 = _t1581
-                                    _t1582 = Proto.Formula(formula_type=OneOf(:disjunction, disjunction838))
-                                    _t1580 = _t1582
+                                if prediction869 == 5
+                                    _t1655 = parse_disjunction(parser)
+                                    disjunction875 = _t1655
+                                    _t1656 = Proto.Formula(formula_type=OneOf(:disjunction, disjunction875))
+                                    _t1654 = _t1656
                                 else
-                                    if prediction832 == 4
-                                        _t1584 = parse_conjunction(parser)
-                                        conjunction837 = _t1584
-                                        _t1585 = Proto.Formula(formula_type=OneOf(:conjunction, conjunction837))
-                                        _t1583 = _t1585
+                                    if prediction869 == 4
+                                        _t1658 = parse_conjunction(parser)
+                                        conjunction874 = _t1658
+                                        _t1659 = Proto.Formula(formula_type=OneOf(:conjunction, conjunction874))
+                                        _t1657 = _t1659
                                     else
-                                        if prediction832 == 3
-                                            _t1587 = parse_reduce(parser)
-                                            reduce836 = _t1587
-                                            _t1588 = Proto.Formula(formula_type=OneOf(:reduce, reduce836))
-                                            _t1586 = _t1588
+                                        if prediction869 == 3
+                                            _t1661 = parse_reduce(parser)
+                                            reduce873 = _t1661
+                                            _t1662 = Proto.Formula(formula_type=OneOf(:reduce, reduce873))
+                                            _t1660 = _t1662
                                         else
-                                            if prediction832 == 2
-                                                _t1590 = parse_exists(parser)
-                                                exists835 = _t1590
-                                                _t1591 = Proto.Formula(formula_type=OneOf(:exists, exists835))
-                                                _t1589 = _t1591
+                                            if prediction869 == 2
+                                                _t1664 = parse_exists(parser)
+                                                exists872 = _t1664
+                                                _t1665 = Proto.Formula(formula_type=OneOf(:exists, exists872))
+                                                _t1663 = _t1665
                                             else
-                                                if prediction832 == 1
-                                                    _t1593 = parse_false(parser)
-                                                    false834 = _t1593
-                                                    _t1594 = Proto.Formula(formula_type=OneOf(:disjunction, false834))
-                                                    _t1592 = _t1594
+                                                if prediction869 == 1
+                                                    _t1667 = parse_false(parser)
+                                                    false871 = _t1667
+                                                    _t1668 = Proto.Formula(formula_type=OneOf(:disjunction, false871))
+                                                    _t1666 = _t1668
                                                 else
-                                                    if prediction832 == 0
-                                                        _t1596 = parse_true(parser)
-                                                        true833 = _t1596
-                                                        _t1597 = Proto.Formula(formula_type=OneOf(:conjunction, true833))
-                                                        _t1595 = _t1597
+                                                    if prediction869 == 0
+                                                        _t1670 = parse_true(parser)
+                                                        true870 = _t1670
+                                                        _t1671 = Proto.Formula(formula_type=OneOf(:conjunction, true870))
+                                                        _t1669 = _t1671
                                                     else
                                                         throw(ParseError("Unexpected token in formula" * ": " * string(lookahead(parser, 0))))
                                                     end
-                                                    _t1592 = _t1595
+                                                    _t1666 = _t1669
                                                 end
-                                                _t1589 = _t1592
+                                                _t1663 = _t1666
                                             end
-                                            _t1586 = _t1589
+                                            _t1660 = _t1663
                                         end
-                                        _t1583 = _t1586
+                                        _t1657 = _t1660
                                     end
-                                    _t1580 = _t1583
+                                    _t1654 = _t1657
                                 end
-                                _t1577 = _t1580
+                                _t1651 = _t1654
                             end
-                            _t1574 = _t1577
+                            _t1648 = _t1651
                         end
-                        _t1571 = _t1574
+                        _t1645 = _t1648
                     end
-                    _t1568 = _t1571
+                    _t1642 = _t1645
                 end
-                _t1565 = _t1568
+                _t1639 = _t1642
             end
-            _t1562 = _t1565
+            _t1636 = _t1639
         end
-        _t1559 = _t1562
+        _t1633 = _t1636
     end
-    result847 = _t1559
-    record_span!(parser, span_start846, "Formula")
-    return result847
+    result884 = _t1633
+    record_span!(parser, span_start883, "Formula")
+    return result884
 end
 
 function parse_true(parser::ParserState)::Proto.Conjunction
-    span_start848 = span_start(parser)
+    span_start885 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "true")
     consume_literal!(parser, ")")
-    _t1598 = Proto.Conjunction(args=Proto.Formula[])
-    result849 = _t1598
-    record_span!(parser, span_start848, "Conjunction")
-    return result849
+    _t1672 = Proto.Conjunction(args=Proto.Formula[])
+    result886 = _t1672
+    record_span!(parser, span_start885, "Conjunction")
+    return result886
 end
 
 function parse_false(parser::ParserState)::Proto.Disjunction
-    span_start850 = span_start(parser)
+    span_start887 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "false")
     consume_literal!(parser, ")")
-    _t1599 = Proto.Disjunction(args=Proto.Formula[])
-    result851 = _t1599
-    record_span!(parser, span_start850, "Disjunction")
-    return result851
+    _t1673 = Proto.Disjunction(args=Proto.Formula[])
+    result888 = _t1673
+    record_span!(parser, span_start887, "Disjunction")
+    return result888
 end
 
 function parse_exists(parser::ParserState)::Proto.Exists
-    span_start854 = span_start(parser)
+    span_start891 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "exists")
-    _t1600 = parse_bindings(parser)
-    bindings852 = _t1600
-    _t1601 = parse_formula(parser)
-    formula853 = _t1601
+    _t1674 = parse_bindings(parser)
+    bindings889 = _t1674
+    _t1675 = parse_formula(parser)
+    formula890 = _t1675
     consume_literal!(parser, ")")
-    _t1602 = Proto.Abstraction(vars=vcat(bindings852[1], !isnothing(bindings852[2]) ? bindings852[2] : []), value=formula853)
-    _t1603 = Proto.Exists(body=_t1602)
-    result855 = _t1603
-    record_span!(parser, span_start854, "Exists")
-    return result855
+    _t1676 = Proto.Abstraction(vars=vcat(bindings889[1], !isnothing(bindings889[2]) ? bindings889[2] : []), value=formula890)
+    _t1677 = Proto.Exists(body=_t1676)
+    result892 = _t1677
+    record_span!(parser, span_start891, "Exists")
+    return result892
 end
 
 function parse_reduce(parser::ParserState)::Proto.Reduce
-    span_start859 = span_start(parser)
+    span_start896 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "reduce")
-    _t1604 = parse_abstraction(parser)
-    abstraction856 = _t1604
-    _t1605 = parse_abstraction(parser)
-    abstraction_3857 = _t1605
-    _t1606 = parse_terms(parser)
-    terms858 = _t1606
+    _t1678 = parse_abstraction(parser)
+    abstraction893 = _t1678
+    _t1679 = parse_abstraction(parser)
+    abstraction_3894 = _t1679
+    _t1680 = parse_terms(parser)
+    terms895 = _t1680
     consume_literal!(parser, ")")
-    _t1607 = Proto.Reduce(op=abstraction856, body=abstraction_3857, terms=terms858)
-    result860 = _t1607
-    record_span!(parser, span_start859, "Reduce")
-    return result860
+    _t1681 = Proto.Reduce(op=abstraction893, body=abstraction_3894, terms=terms895)
+    result897 = _t1681
+    record_span!(parser, span_start896, "Reduce")
+    return result897
 end
 
 function parse_terms(parser::ParserState)::Vector{Proto.Term}
     consume_literal!(parser, "(")
     consume_literal!(parser, "terms")
-    xs861 = Proto.Term[]
-    cond862 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-    while cond862
-        _t1608 = parse_term(parser)
-        item863 = _t1608
-        push!(xs861, item863)
-        cond862 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-    end
-    terms864 = xs861
+    xs898 = Proto.Term[]
+    cond899 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+    while cond899
+        _t1682 = parse_term(parser)
+        item900 = _t1682
+        push!(xs898, item900)
+        cond899 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+    end
+    terms901 = xs898
     consume_literal!(parser, ")")
-    return terms864
+    return terms901
 end
 
 function parse_term(parser::ParserState)::Proto.Term
-    span_start868 = span_start(parser)
+    span_start905 = span_start(parser)
     if match_lookahead_literal(parser, "true", 0)
-        _t1609 = 1
+        _t1683 = 1
     else
         if match_lookahead_literal(parser, "missing", 0)
-            _t1610 = 1
+            _t1684 = 1
         else
             if match_lookahead_literal(parser, "false", 0)
-                _t1611 = 1
+                _t1685 = 1
             else
                 if match_lookahead_literal(parser, "(", 0)
-                    _t1612 = 1
+                    _t1686 = 1
                 else
                     if match_lookahead_terminal(parser, "SYMBOL", 0)
-                        _t1613 = 0
+                        _t1687 = 0
                     else
                         if match_lookahead_terminal(parser, "UINT32", 0)
-                            _t1614 = 1
+                            _t1688 = 1
                         else
                             if match_lookahead_terminal(parser, "UINT128", 0)
-                                _t1615 = 1
+                                _t1689 = 1
                             else
                                 if match_lookahead_terminal(parser, "STRING", 0)
-                                    _t1616 = 1
+                                    _t1690 = 1
                                 else
                                     if match_lookahead_terminal(parser, "INT32", 0)
-                                        _t1617 = 1
+                                        _t1691 = 1
                                     else
                                         if match_lookahead_terminal(parser, "INT128", 0)
-                                            _t1618 = 1
+                                            _t1692 = 1
                                         else
                                             if match_lookahead_terminal(parser, "INT", 0)
-                                                _t1619 = 1
+                                                _t1693 = 1
                                             else
                                                 if match_lookahead_terminal(parser, "FLOAT32", 0)
-                                                    _t1620 = 1
+                                                    _t1694 = 1
                                                 else
                                                     if match_lookahead_terminal(parser, "FLOAT", 0)
-                                                        _t1621 = 1
+                                                        _t1695 = 1
                                                     else
                                                         if match_lookahead_terminal(parser, "DECIMAL", 0)
-                                                            _t1622 = 1
+                                                            _t1696 = 1
                                                         else
-                                                            _t1622 = -1
+                                                            _t1696 = -1
                                                         end
-                                                        _t1621 = _t1622
+                                                        _t1695 = _t1696
                                                     end
-                                                    _t1620 = _t1621
+                                                    _t1694 = _t1695
                                                 end
-                                                _t1619 = _t1620
+                                                _t1693 = _t1694
                                             end
-                                            _t1618 = _t1619
+                                            _t1692 = _t1693
                                         end
-                                        _t1617 = _t1618
+                                        _t1691 = _t1692
                                     end
-                                    _t1616 = _t1617
+                                    _t1690 = _t1691
                                 end
-                                _t1615 = _t1616
+                                _t1689 = _t1690
                             end
-                            _t1614 = _t1615
+                            _t1688 = _t1689
                         end
-                        _t1613 = _t1614
+                        _t1687 = _t1688
                     end
-                    _t1612 = _t1613
+                    _t1686 = _t1687
                 end
-                _t1611 = _t1612
+                _t1685 = _t1686
             end
-            _t1610 = _t1611
+            _t1684 = _t1685
         end
-        _t1609 = _t1610
-    end
-    prediction865 = _t1609
-    if prediction865 == 1
-        _t1624 = parse_value(parser)
-        value867 = _t1624
-        _t1625 = Proto.Term(term_type=OneOf(:constant, value867))
-        _t1623 = _t1625
+        _t1683 = _t1684
+    end
+    prediction902 = _t1683
+    if prediction902 == 1
+        _t1698 = parse_value(parser)
+        value904 = _t1698
+        _t1699 = Proto.Term(term_type=OneOf(:constant, value904))
+        _t1697 = _t1699
     else
-        if prediction865 == 0
-            _t1627 = parse_var(parser)
-            var866 = _t1627
-            _t1628 = Proto.Term(term_type=OneOf(:var, var866))
-            _t1626 = _t1628
+        if prediction902 == 0
+            _t1701 = parse_var(parser)
+            var903 = _t1701
+            _t1702 = Proto.Term(term_type=OneOf(:var, var903))
+            _t1700 = _t1702
         else
             throw(ParseError("Unexpected token in term" * ": " * string(lookahead(parser, 0))))
         end
-        _t1623 = _t1626
+        _t1697 = _t1700
     end
-    result869 = _t1623
-    record_span!(parser, span_start868, "Term")
-    return result869
+    result906 = _t1697
+    record_span!(parser, span_start905, "Term")
+    return result906
 end
 
 function parse_var(parser::ParserState)::Proto.Var
-    span_start871 = span_start(parser)
-    symbol870 = consume_terminal!(parser, "SYMBOL")
-    _t1629 = Proto.Var(name=symbol870)
-    result872 = _t1629
-    record_span!(parser, span_start871, "Var")
-    return result872
+    span_start908 = span_start(parser)
+    symbol907 = consume_terminal!(parser, "SYMBOL")
+    _t1703 = Proto.Var(name=symbol907)
+    result909 = _t1703
+    record_span!(parser, span_start908, "Var")
+    return result909
 end
 
 function parse_value(parser::ParserState)::Proto.Value
-    span_start886 = span_start(parser)
+    span_start923 = span_start(parser)
     if match_lookahead_literal(parser, "true", 0)
-        _t1630 = 12
+        _t1704 = 12
     else
         if match_lookahead_literal(parser, "missing", 0)
-            _t1631 = 11
+            _t1705 = 11
         else
             if match_lookahead_literal(parser, "false", 0)
-                _t1632 = 12
+                _t1706 = 12
             else
                 if match_lookahead_literal(parser, "(", 0)
                     if match_lookahead_literal(parser, "datetime", 1)
-                        _t1634 = 1
+                        _t1708 = 1
                     else
                         if match_lookahead_literal(parser, "date", 1)
-                            _t1635 = 0
+                            _t1709 = 0
                         else
-                            _t1635 = -1
+                            _t1709 = -1
                         end
-                        _t1634 = _t1635
+                        _t1708 = _t1709
                     end
-                    _t1633 = _t1634
+                    _t1707 = _t1708
                 else
                     if match_lookahead_terminal(parser, "UINT32", 0)
-                        _t1636 = 7
+                        _t1710 = 7
                     else
                         if match_lookahead_terminal(parser, "UINT128", 0)
-                            _t1637 = 8
+                            _t1711 = 8
                         else
                             if match_lookahead_terminal(parser, "STRING", 0)
-                                _t1638 = 2
+                                _t1712 = 2
                             else
                                 if match_lookahead_terminal(parser, "INT32", 0)
-                                    _t1639 = 3
+                                    _t1713 = 3
                                 else
                                     if match_lookahead_terminal(parser, "INT128", 0)
-                                        _t1640 = 9
+                                        _t1714 = 9
                                     else
                                         if match_lookahead_terminal(parser, "INT", 0)
-                                            _t1641 = 4
+                                            _t1715 = 4
                                         else
                                             if match_lookahead_terminal(parser, "FLOAT32", 0)
-                                                _t1642 = 5
+                                                _t1716 = 5
                                             else
                                                 if match_lookahead_terminal(parser, "FLOAT", 0)
-                                                    _t1643 = 6
+                                                    _t1717 = 6
                                                 else
                                                     if match_lookahead_terminal(parser, "DECIMAL", 0)
-                                                        _t1644 = 10
+                                                        _t1718 = 10
                                                     else
-                                                        _t1644 = -1
+                                                        _t1718 = -1
                                                     end
-                                                    _t1643 = _t1644
+                                                    _t1717 = _t1718
                                                 end
-                                                _t1642 = _t1643
+                                                _t1716 = _t1717
                                             end
-                                            _t1641 = _t1642
+                                            _t1715 = _t1716
                                         end
-                                        _t1640 = _t1641
+                                        _t1714 = _t1715
                                     end
-                                    _t1639 = _t1640
+                                    _t1713 = _t1714
                                 end
-                                _t1638 = _t1639
+                                _t1712 = _t1713
                             end
-                            _t1637 = _t1638
+                            _t1711 = _t1712
                         end
-                        _t1636 = _t1637
+                        _t1710 = _t1711
                     end
-                    _t1633 = _t1636
+                    _t1707 = _t1710
                 end
-                _t1632 = _t1633
+                _t1706 = _t1707
             end
-            _t1631 = _t1632
+            _t1705 = _t1706
         end
-        _t1630 = _t1631
-    end
-    prediction873 = _t1630
-    if prediction873 == 12
-        _t1646 = parse_boolean_value(parser)
-        boolean_value885 = _t1646
-        _t1647 = Proto.Value(value=OneOf(:boolean_value, boolean_value885))
-        _t1645 = _t1647
+        _t1704 = _t1705
+    end
+    prediction910 = _t1704
+    if prediction910 == 12
+        _t1720 = parse_boolean_value(parser)
+        boolean_value922 = _t1720
+        _t1721 = Proto.Value(value=OneOf(:boolean_value, boolean_value922))
+        _t1719 = _t1721
     else
-        if prediction873 == 11
+        if prediction910 == 11
             consume_literal!(parser, "missing")
-            _t1649 = Proto.MissingValue()
-            _t1650 = Proto.Value(value=OneOf(:missing_value, _t1649))
-            _t1648 = _t1650
+            _t1723 = Proto.MissingValue()
+            _t1724 = Proto.Value(value=OneOf(:missing_value, _t1723))
+            _t1722 = _t1724
         else
-            if prediction873 == 10
-                formatted_decimal884 = consume_terminal!(parser, "DECIMAL")
-                _t1652 = Proto.Value(value=OneOf(:decimal_value, formatted_decimal884))
-                _t1651 = _t1652
+            if prediction910 == 10
+                formatted_decimal921 = consume_terminal!(parser, "DECIMAL")
+                _t1726 = Proto.Value(value=OneOf(:decimal_value, formatted_decimal921))
+                _t1725 = _t1726
             else
-                if prediction873 == 9
-                    formatted_int128883 = consume_terminal!(parser, "INT128")
-                    _t1654 = Proto.Value(value=OneOf(:int128_value, formatted_int128883))
-                    _t1653 = _t1654
+                if prediction910 == 9
+                    formatted_int128920 = consume_terminal!(parser, "INT128")
+                    _t1728 = Proto.Value(value=OneOf(:int128_value, formatted_int128920))
+                    _t1727 = _t1728
                 else
-                    if prediction873 == 8
-                        formatted_uint128882 = consume_terminal!(parser, "UINT128")
-                        _t1656 = Proto.Value(value=OneOf(:uint128_value, formatted_uint128882))
-                        _t1655 = _t1656
+                    if prediction910 == 8
+                        formatted_uint128919 = consume_terminal!(parser, "UINT128")
+                        _t1730 = Proto.Value(value=OneOf(:uint128_value, formatted_uint128919))
+                        _t1729 = _t1730
                     else
-                        if prediction873 == 7
-                            formatted_uint32881 = consume_terminal!(parser, "UINT32")
-                            _t1658 = Proto.Value(value=OneOf(:uint32_value, formatted_uint32881))
-                            _t1657 = _t1658
+                        if prediction910 == 7
+                            formatted_uint32918 = consume_terminal!(parser, "UINT32")
+                            _t1732 = Proto.Value(value=OneOf(:uint32_value, formatted_uint32918))
+                            _t1731 = _t1732
                         else
-                            if prediction873 == 6
-                                formatted_float880 = consume_terminal!(parser, "FLOAT")
-                                _t1660 = Proto.Value(value=OneOf(:float_value, formatted_float880))
-                                _t1659 = _t1660
+                            if prediction910 == 6
+                                formatted_float917 = consume_terminal!(parser, "FLOAT")
+                                _t1734 = Proto.Value(value=OneOf(:float_value, formatted_float917))
+                                _t1733 = _t1734
                             else
-                                if prediction873 == 5
-                                    formatted_float32879 = consume_terminal!(parser, "FLOAT32")
-                                    _t1662 = Proto.Value(value=OneOf(:float32_value, formatted_float32879))
-                                    _t1661 = _t1662
+                                if prediction910 == 5
+                                    formatted_float32916 = consume_terminal!(parser, "FLOAT32")
+                                    _t1736 = Proto.Value(value=OneOf(:float32_value, formatted_float32916))
+                                    _t1735 = _t1736
                                 else
-                                    if prediction873 == 4
-                                        formatted_int878 = consume_terminal!(parser, "INT")
-                                        _t1664 = Proto.Value(value=OneOf(:int_value, formatted_int878))
-                                        _t1663 = _t1664
+                                    if prediction910 == 4
+                                        formatted_int915 = consume_terminal!(parser, "INT")
+                                        _t1738 = Proto.Value(value=OneOf(:int_value, formatted_int915))
+                                        _t1737 = _t1738
                                     else
-                                        if prediction873 == 3
-                                            formatted_int32877 = consume_terminal!(parser, "INT32")
-                                            _t1666 = Proto.Value(value=OneOf(:int32_value, formatted_int32877))
-                                            _t1665 = _t1666
+                                        if prediction910 == 3
+                                            formatted_int32914 = consume_terminal!(parser, "INT32")
+                                            _t1740 = Proto.Value(value=OneOf(:int32_value, formatted_int32914))
+                                            _t1739 = _t1740
                                         else
-                                            if prediction873 == 2
-                                                formatted_string876 = consume_terminal!(parser, "STRING")
-                                                _t1668 = Proto.Value(value=OneOf(:string_value, formatted_string876))
-                                                _t1667 = _t1668
+                                            if prediction910 == 2
+                                                formatted_string913 = consume_terminal!(parser, "STRING")
+                                                _t1742 = Proto.Value(value=OneOf(:string_value, formatted_string913))
+                                                _t1741 = _t1742
                                             else
-                                                if prediction873 == 1
-                                                    _t1670 = parse_datetime(parser)
-                                                    datetime875 = _t1670
-                                                    _t1671 = Proto.Value(value=OneOf(:datetime_value, datetime875))
-                                                    _t1669 = _t1671
+                                                if prediction910 == 1
+                                                    _t1744 = parse_datetime(parser)
+                                                    datetime912 = _t1744
+                                                    _t1745 = Proto.Value(value=OneOf(:datetime_value, datetime912))
+                                                    _t1743 = _t1745
                                                 else
-                                                    if prediction873 == 0
-                                                        _t1673 = parse_date(parser)
-                                                        date874 = _t1673
-                                                        _t1674 = Proto.Value(value=OneOf(:date_value, date874))
-                                                        _t1672 = _t1674
+                                                    if prediction910 == 0
+                                                        _t1747 = parse_date(parser)
+                                                        date911 = _t1747
+                                                        _t1748 = Proto.Value(value=OneOf(:date_value, date911))
+                                                        _t1746 = _t1748
                                                     else
                                                         throw(ParseError("Unexpected token in value" * ": " * string(lookahead(parser, 0))))
                                                     end
-                                                    _t1669 = _t1672
+                                                    _t1743 = _t1746
                                                 end
-                                                _t1667 = _t1669
+                                                _t1741 = _t1743
                                             end
-                                            _t1665 = _t1667
+                                            _t1739 = _t1741
                                         end
-                                        _t1663 = _t1665
+                                        _t1737 = _t1739
                                     end
-                                    _t1661 = _t1663
+                                    _t1735 = _t1737
                                 end
-                                _t1659 = _t1661
+                                _t1733 = _t1735
                             end
-                            _t1657 = _t1659
+                            _t1731 = _t1733
                         end
-                        _t1655 = _t1657
+                        _t1729 = _t1731
                     end
-                    _t1653 = _t1655
+                    _t1727 = _t1729
                 end
-                _t1651 = _t1653
+                _t1725 = _t1727
             end
-            _t1648 = _t1651
+            _t1722 = _t1725
         end
-        _t1645 = _t1648
+        _t1719 = _t1722
     end
-    result887 = _t1645
-    record_span!(parser, span_start886, "Value")
-    return result887
+    result924 = _t1719
+    record_span!(parser, span_start923, "Value")
+    return result924
 end
 
 function parse_date(parser::ParserState)::Proto.DateValue
-    span_start891 = span_start(parser)
+    span_start928 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "date")
-    formatted_int888 = consume_terminal!(parser, "INT")
-    formatted_int_3889 = consume_terminal!(parser, "INT")
-    formatted_int_4890 = consume_terminal!(parser, "INT")
+    formatted_int925 = consume_terminal!(parser, "INT")
+    formatted_int_3926 = consume_terminal!(parser, "INT")
+    formatted_int_4927 = consume_terminal!(parser, "INT")
     consume_literal!(parser, ")")
-    _t1675 = Proto.DateValue(year=Int32(formatted_int888), month=Int32(formatted_int_3889), day=Int32(formatted_int_4890))
-    result892 = _t1675
-    record_span!(parser, span_start891, "DateValue")
-    return result892
+    _t1749 = Proto.DateValue(year=Int32(formatted_int925), month=Int32(formatted_int_3926), day=Int32(formatted_int_4927))
+    result929 = _t1749
+    record_span!(parser, span_start928, "DateValue")
+    return result929
 end
 
 function parse_datetime(parser::ParserState)::Proto.DateTimeValue
-    span_start900 = span_start(parser)
+    span_start937 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "datetime")
-    formatted_int893 = consume_terminal!(parser, "INT")
-    formatted_int_3894 = consume_terminal!(parser, "INT")
-    formatted_int_4895 = consume_terminal!(parser, "INT")
-    formatted_int_5896 = consume_terminal!(parser, "INT")
-    formatted_int_6897 = consume_terminal!(parser, "INT")
-    formatted_int_7898 = consume_terminal!(parser, "INT")
+    formatted_int930 = consume_terminal!(parser, "INT")
+    formatted_int_3931 = consume_terminal!(parser, "INT")
+    formatted_int_4932 = consume_terminal!(parser, "INT")
+    formatted_int_5933 = consume_terminal!(parser, "INT")
+    formatted_int_6934 = consume_terminal!(parser, "INT")
+    formatted_int_7935 = consume_terminal!(parser, "INT")
     if match_lookahead_terminal(parser, "INT", 0)
-        _t1676 = consume_terminal!(parser, "INT")
+        _t1750 = consume_terminal!(parser, "INT")
     else
-        _t1676 = nothing
+        _t1750 = nothing
     end
-    formatted_int_8899 = _t1676
+    formatted_int_8936 = _t1750
     consume_literal!(parser, ")")
-    _t1677 = Proto.DateTimeValue(year=Int32(formatted_int893), month=Int32(formatted_int_3894), day=Int32(formatted_int_4895), hour=Int32(formatted_int_5896), minute=Int32(formatted_int_6897), second=Int32(formatted_int_7898), microsecond=Int32((!isnothing(formatted_int_8899) ? formatted_int_8899 : 0)))
-    result901 = _t1677
-    record_span!(parser, span_start900, "DateTimeValue")
-    return result901
+    _t1751 = Proto.DateTimeValue(year=Int32(formatted_int930), month=Int32(formatted_int_3931), day=Int32(formatted_int_4932), hour=Int32(formatted_int_5933), minute=Int32(formatted_int_6934), second=Int32(formatted_int_7935), microsecond=Int32((!isnothing(formatted_int_8936) ? formatted_int_8936 : 0)))
+    result938 = _t1751
+    record_span!(parser, span_start937, "DateTimeValue")
+    return result938
 end
 
 function parse_conjunction(parser::ParserState)::Proto.Conjunction
-    span_start906 = span_start(parser)
+    span_start943 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "and")
-    xs902 = Proto.Formula[]
-    cond903 = match_lookahead_literal(parser, "(", 0)
-    while cond903
-        _t1678 = parse_formula(parser)
-        item904 = _t1678
-        push!(xs902, item904)
-        cond903 = match_lookahead_literal(parser, "(", 0)
-    end
-    formulas905 = xs902
+    xs939 = Proto.Formula[]
+    cond940 = match_lookahead_literal(parser, "(", 0)
+    while cond940
+        _t1752 = parse_formula(parser)
+        item941 = _t1752
+        push!(xs939, item941)
+        cond940 = match_lookahead_literal(parser, "(", 0)
+    end
+    formulas942 = xs939
     consume_literal!(parser, ")")
-    _t1679 = Proto.Conjunction(args=formulas905)
-    result907 = _t1679
-    record_span!(parser, span_start906, "Conjunction")
-    return result907
+    _t1753 = Proto.Conjunction(args=formulas942)
+    result944 = _t1753
+    record_span!(parser, span_start943, "Conjunction")
+    return result944
 end
 
 function parse_disjunction(parser::ParserState)::Proto.Disjunction
-    span_start912 = span_start(parser)
+    span_start949 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "or")
-    xs908 = Proto.Formula[]
-    cond909 = match_lookahead_literal(parser, "(", 0)
-    while cond909
-        _t1680 = parse_formula(parser)
-        item910 = _t1680
-        push!(xs908, item910)
-        cond909 = match_lookahead_literal(parser, "(", 0)
-    end
-    formulas911 = xs908
+    xs945 = Proto.Formula[]
+    cond946 = match_lookahead_literal(parser, "(", 0)
+    while cond946
+        _t1754 = parse_formula(parser)
+        item947 = _t1754
+        push!(xs945, item947)
+        cond946 = match_lookahead_literal(parser, "(", 0)
+    end
+    formulas948 = xs945
     consume_literal!(parser, ")")
-    _t1681 = Proto.Disjunction(args=formulas911)
-    result913 = _t1681
-    record_span!(parser, span_start912, "Disjunction")
-    return result913
+    _t1755 = Proto.Disjunction(args=formulas948)
+    result950 = _t1755
+    record_span!(parser, span_start949, "Disjunction")
+    return result950
 end
 
 function parse_not(parser::ParserState)::Proto.Not
-    span_start915 = span_start(parser)
+    span_start952 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "not")
-    _t1682 = parse_formula(parser)
-    formula914 = _t1682
+    _t1756 = parse_formula(parser)
+    formula951 = _t1756
     consume_literal!(parser, ")")
-    _t1683 = Proto.Not(arg=formula914)
-    result916 = _t1683
-    record_span!(parser, span_start915, "Not")
-    return result916
+    _t1757 = Proto.Not(arg=formula951)
+    result953 = _t1757
+    record_span!(parser, span_start952, "Not")
+    return result953
 end
 
 function parse_ffi(parser::ParserState)::Proto.FFI
-    span_start920 = span_start(parser)
+    span_start957 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "ffi")
-    _t1684 = parse_name(parser)
-    name917 = _t1684
-    _t1685 = parse_ffi_args(parser)
-    ffi_args918 = _t1685
-    _t1686 = parse_terms(parser)
-    terms919 = _t1686
+    _t1758 = parse_name(parser)
+    name954 = _t1758
+    _t1759 = parse_ffi_args(parser)
+    ffi_args955 = _t1759
+    _t1760 = parse_terms(parser)
+    terms956 = _t1760
     consume_literal!(parser, ")")
-    _t1687 = Proto.FFI(name=name917, args=ffi_args918, terms=terms919)
-    result921 = _t1687
-    record_span!(parser, span_start920, "FFI")
-    return result921
+    _t1761 = Proto.FFI(name=name954, args=ffi_args955, terms=terms956)
+    result958 = _t1761
+    record_span!(parser, span_start957, "FFI")
+    return result958
 end
 
 function parse_name(parser::ParserState)::String
     consume_literal!(parser, ":")
-    symbol922 = consume_terminal!(parser, "SYMBOL")
-    return symbol922
+    symbol959 = consume_terminal!(parser, "SYMBOL")
+    return symbol959
 end
 
 function parse_ffi_args(parser::ParserState)::Vector{Proto.Abstraction}
     consume_literal!(parser, "(")
     consume_literal!(parser, "args")
-    xs923 = Proto.Abstraction[]
-    cond924 = match_lookahead_literal(parser, "(", 0)
-    while cond924
-        _t1688 = parse_abstraction(parser)
-        item925 = _t1688
-        push!(xs923, item925)
-        cond924 = match_lookahead_literal(parser, "(", 0)
-    end
-    abstractions926 = xs923
+    xs960 = Proto.Abstraction[]
+    cond961 = match_lookahead_literal(parser, "(", 0)
+    while cond961
+        _t1762 = parse_abstraction(parser)
+        item962 = _t1762
+        push!(xs960, item962)
+        cond961 = match_lookahead_literal(parser, "(", 0)
+    end
+    abstractions963 = xs960
     consume_literal!(parser, ")")
-    return abstractions926
+    return abstractions963
 end
 
 function parse_atom(parser::ParserState)::Proto.Atom
-    span_start932 = span_start(parser)
+    span_start969 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "atom")
-    _t1689 = parse_relation_id(parser)
-    relation_id927 = _t1689
-    xs928 = Proto.Term[]
-    cond929 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-    while cond929
-        _t1690 = parse_term(parser)
-        item930 = _t1690
-        push!(xs928, item930)
-        cond929 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-    end
-    terms931 = xs928
+    _t1763 = parse_relation_id(parser)
+    relation_id964 = _t1763
+    xs965 = Proto.Term[]
+    cond966 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+    while cond966
+        _t1764 = parse_term(parser)
+        item967 = _t1764
+        push!(xs965, item967)
+        cond966 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+    end
+    terms968 = xs965
     consume_literal!(parser, ")")
-    _t1691 = Proto.Atom(name=relation_id927, terms=terms931)
-    result933 = _t1691
-    record_span!(parser, span_start932, "Atom")
-    return result933
+    _t1765 = Proto.Atom(name=relation_id964, terms=terms968)
+    result970 = _t1765
+    record_span!(parser, span_start969, "Atom")
+    return result970
 end
 
 function parse_pragma(parser::ParserState)::Proto.Pragma
-    span_start939 = span_start(parser)
+    span_start976 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "pragma")
-    _t1692 = parse_name(parser)
-    name934 = _t1692
-    xs935 = Proto.Term[]
-    cond936 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-    while cond936
-        _t1693 = parse_term(parser)
-        item937 = _t1693
-        push!(xs935, item937)
-        cond936 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-    end
-    terms938 = xs935
+    _t1766 = parse_name(parser)
+    name971 = _t1766
+    xs972 = Proto.Term[]
+    cond973 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+    while cond973
+        _t1767 = parse_term(parser)
+        item974 = _t1767
+        push!(xs972, item974)
+        cond973 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+    end
+    terms975 = xs972
     consume_literal!(parser, ")")
-    _t1694 = Proto.Pragma(name=name934, terms=terms938)
-    result940 = _t1694
-    record_span!(parser, span_start939, "Pragma")
-    return result940
+    _t1768 = Proto.Pragma(name=name971, terms=terms975)
+    result977 = _t1768
+    record_span!(parser, span_start976, "Pragma")
+    return result977
 end
 
 function parse_primitive(parser::ParserState)::Proto.Primitive
-    span_start956 = span_start(parser)
+    span_start993 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "primitive", 1)
-            _t1696 = 9
+            _t1770 = 9
         else
             if match_lookahead_literal(parser, ">=", 1)
-                _t1697 = 4
+                _t1771 = 4
             else
                 if match_lookahead_literal(parser, ">", 1)
-                    _t1698 = 3
+                    _t1772 = 3
                 else
                     if match_lookahead_literal(parser, "=", 1)
-                        _t1699 = 0
+                        _t1773 = 0
                     else
                         if match_lookahead_literal(parser, "<=", 1)
-                            _t1700 = 2
+                            _t1774 = 2
                         else
                             if match_lookahead_literal(parser, "<", 1)
-                                _t1701 = 1
+                                _t1775 = 1
                             else
                                 if match_lookahead_literal(parser, "/", 1)
-                                    _t1702 = 8
+                                    _t1776 = 8
                                 else
                                     if match_lookahead_literal(parser, "-", 1)
-                                        _t1703 = 6
+                                        _t1777 = 6
                                     else
                                         if match_lookahead_literal(parser, "+", 1)
-                                            _t1704 = 5
+                                            _t1778 = 5
                                         else
                                             if match_lookahead_literal(parser, "*", 1)
-                                                _t1705 = 7
+                                                _t1779 = 7
                                             else
-                                                _t1705 = -1
+                                                _t1779 = -1
                                             end
-                                            _t1704 = _t1705
+                                            _t1778 = _t1779
                                         end
-                                        _t1703 = _t1704
+                                        _t1777 = _t1778
                                     end
-                                    _t1702 = _t1703
+                                    _t1776 = _t1777
                                 end
-                                _t1701 = _t1702
+                                _t1775 = _t1776
                             end
-                            _t1700 = _t1701
+                            _t1774 = _t1775
                         end
-                        _t1699 = _t1700
+                        _t1773 = _t1774
                     end
-                    _t1698 = _t1699
+                    _t1772 = _t1773
                 end
-                _t1697 = _t1698
+                _t1771 = _t1772
             end
-            _t1696 = _t1697
+            _t1770 = _t1771
         end
-        _t1695 = _t1696
+        _t1769 = _t1770
     else
-        _t1695 = -1
+        _t1769 = -1
     end
-    prediction941 = _t1695
-    if prediction941 == 9
+    prediction978 = _t1769
+    if prediction978 == 9
         consume_literal!(parser, "(")
         consume_literal!(parser, "primitive")
-        _t1707 = parse_name(parser)
-        name951 = _t1707
-        xs952 = Proto.RelTerm[]
-        cond953 = ((((((((((((((match_lookahead_literal(parser, "#", 0) || match_lookahead_literal(parser, "(", 0)) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-        while cond953
-            _t1708 = parse_rel_term(parser)
-            item954 = _t1708
-            push!(xs952, item954)
-            cond953 = ((((((((((((((match_lookahead_literal(parser, "#", 0) || match_lookahead_literal(parser, "(", 0)) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+        _t1781 = parse_name(parser)
+        name988 = _t1781
+        xs989 = Proto.RelTerm[]
+        cond990 = ((((((((((((((match_lookahead_literal(parser, "#", 0) || match_lookahead_literal(parser, "(", 0)) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+        while cond990
+            _t1782 = parse_rel_term(parser)
+            item991 = _t1782
+            push!(xs989, item991)
+            cond990 = ((((((((((((((match_lookahead_literal(parser, "#", 0) || match_lookahead_literal(parser, "(", 0)) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
         end
-        rel_terms955 = xs952
+        rel_terms992 = xs989
         consume_literal!(parser, ")")
-        _t1709 = Proto.Primitive(name=name951, terms=rel_terms955)
-        _t1706 = _t1709
+        _t1783 = Proto.Primitive(name=name988, terms=rel_terms992)
+        _t1780 = _t1783
     else
-        if prediction941 == 8
-            _t1711 = parse_divide(parser)
-            divide950 = _t1711
-            _t1710 = divide950
+        if prediction978 == 8
+            _t1785 = parse_divide(parser)
+            divide987 = _t1785
+            _t1784 = divide987
         else
-            if prediction941 == 7
-                _t1713 = parse_multiply(parser)
-                multiply949 = _t1713
-                _t1712 = multiply949
+            if prediction978 == 7
+                _t1787 = parse_multiply(parser)
+                multiply986 = _t1787
+                _t1786 = multiply986
             else
-                if prediction941 == 6
-                    _t1715 = parse_minus(parser)
-                    minus948 = _t1715
-                    _t1714 = minus948
+                if prediction978 == 6
+                    _t1789 = parse_minus(parser)
+                    minus985 = _t1789
+                    _t1788 = minus985
                 else
-                    if prediction941 == 5
-                        _t1717 = parse_add(parser)
-                        add947 = _t1717
-                        _t1716 = add947
+                    if prediction978 == 5
+                        _t1791 = parse_add(parser)
+                        add984 = _t1791
+                        _t1790 = add984
                     else
-                        if prediction941 == 4
-                            _t1719 = parse_gt_eq(parser)
-                            gt_eq946 = _t1719
-                            _t1718 = gt_eq946
+                        if prediction978 == 4
+                            _t1793 = parse_gt_eq(parser)
+                            gt_eq983 = _t1793
+                            _t1792 = gt_eq983
                         else
-                            if prediction941 == 3
-                                _t1721 = parse_gt(parser)
-                                gt945 = _t1721
-                                _t1720 = gt945
+                            if prediction978 == 3
+                                _t1795 = parse_gt(parser)
+                                gt982 = _t1795
+                                _t1794 = gt982
                             else
-                                if prediction941 == 2
-                                    _t1723 = parse_lt_eq(parser)
-                                    lt_eq944 = _t1723
-                                    _t1722 = lt_eq944
+                                if prediction978 == 2
+                                    _t1797 = parse_lt_eq(parser)
+                                    lt_eq981 = _t1797
+                                    _t1796 = lt_eq981
                                 else
-                                    if prediction941 == 1
-                                        _t1725 = parse_lt(parser)
-                                        lt943 = _t1725
-                                        _t1724 = lt943
+                                    if prediction978 == 1
+                                        _t1799 = parse_lt(parser)
+                                        lt980 = _t1799
+                                        _t1798 = lt980
                                     else
-                                        if prediction941 == 0
-                                            _t1727 = parse_eq(parser)
-                                            eq942 = _t1727
-                                            _t1726 = eq942
+                                        if prediction978 == 0
+                                            _t1801 = parse_eq(parser)
+                                            eq979 = _t1801
+                                            _t1800 = eq979
                                         else
                                             throw(ParseError("Unexpected token in primitive" * ": " * string(lookahead(parser, 0))))
                                         end
-                                        _t1724 = _t1726
+                                        _t1798 = _t1800
                                     end
-                                    _t1722 = _t1724
+                                    _t1796 = _t1798
                                 end
-                                _t1720 = _t1722
+                                _t1794 = _t1796
                             end
-                            _t1718 = _t1720
+                            _t1792 = _t1794
                         end
-                        _t1716 = _t1718
+                        _t1790 = _t1792
                     end
-                    _t1714 = _t1716
+                    _t1788 = _t1790
                 end
-                _t1712 = _t1714
+                _t1786 = _t1788
             end
-            _t1710 = _t1712
+            _t1784 = _t1786
         end
-        _t1706 = _t1710
+        _t1780 = _t1784
     end
-    result957 = _t1706
-    record_span!(parser, span_start956, "Primitive")
-    return result957
+    result994 = _t1780
+    record_span!(parser, span_start993, "Primitive")
+    return result994
 end
 
 function parse_eq(parser::ParserState)::Proto.Primitive
-    span_start960 = span_start(parser)
+    span_start997 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "=")
-    _t1728 = parse_term(parser)
-    term958 = _t1728
-    _t1729 = parse_term(parser)
-    term_3959 = _t1729
+    _t1802 = parse_term(parser)
+    term995 = _t1802
+    _t1803 = parse_term(parser)
+    term_3996 = _t1803
     consume_literal!(parser, ")")
-    _t1730 = Proto.RelTerm(rel_term_type=OneOf(:term, term958))
-    _t1731 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3959))
-    _t1732 = Proto.Primitive(name="rel_primitive_eq", terms=Proto.RelTerm[_t1730, _t1731])
-    result961 = _t1732
-    record_span!(parser, span_start960, "Primitive")
-    return result961
+    _t1804 = Proto.RelTerm(rel_term_type=OneOf(:term, term995))
+    _t1805 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3996))
+    _t1806 = Proto.Primitive(name="rel_primitive_eq", terms=Proto.RelTerm[_t1804, _t1805])
+    result998 = _t1806
+    record_span!(parser, span_start997, "Primitive")
+    return result998
 end
 
 function parse_lt(parser::ParserState)::Proto.Primitive
-    span_start964 = span_start(parser)
+    span_start1001 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "<")
-    _t1733 = parse_term(parser)
-    term962 = _t1733
-    _t1734 = parse_term(parser)
-    term_3963 = _t1734
+    _t1807 = parse_term(parser)
+    term999 = _t1807
+    _t1808 = parse_term(parser)
+    term_31000 = _t1808
     consume_literal!(parser, ")")
-    _t1735 = Proto.RelTerm(rel_term_type=OneOf(:term, term962))
-    _t1736 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3963))
-    _t1737 = Proto.Primitive(name="rel_primitive_lt_monotype", terms=Proto.RelTerm[_t1735, _t1736])
-    result965 = _t1737
-    record_span!(parser, span_start964, "Primitive")
-    return result965
+    _t1809 = Proto.RelTerm(rel_term_type=OneOf(:term, term999))
+    _t1810 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31000))
+    _t1811 = Proto.Primitive(name="rel_primitive_lt_monotype", terms=Proto.RelTerm[_t1809, _t1810])
+    result1002 = _t1811
+    record_span!(parser, span_start1001, "Primitive")
+    return result1002
 end
 
 function parse_lt_eq(parser::ParserState)::Proto.Primitive
-    span_start968 = span_start(parser)
+    span_start1005 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "<=")
-    _t1738 = parse_term(parser)
-    term966 = _t1738
-    _t1739 = parse_term(parser)
-    term_3967 = _t1739
+    _t1812 = parse_term(parser)
+    term1003 = _t1812
+    _t1813 = parse_term(parser)
+    term_31004 = _t1813
     consume_literal!(parser, ")")
-    _t1740 = Proto.RelTerm(rel_term_type=OneOf(:term, term966))
-    _t1741 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3967))
-    _t1742 = Proto.Primitive(name="rel_primitive_lt_eq_monotype", terms=Proto.RelTerm[_t1740, _t1741])
-    result969 = _t1742
-    record_span!(parser, span_start968, "Primitive")
-    return result969
+    _t1814 = Proto.RelTerm(rel_term_type=OneOf(:term, term1003))
+    _t1815 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31004))
+    _t1816 = Proto.Primitive(name="rel_primitive_lt_eq_monotype", terms=Proto.RelTerm[_t1814, _t1815])
+    result1006 = _t1816
+    record_span!(parser, span_start1005, "Primitive")
+    return result1006
 end
 
 function parse_gt(parser::ParserState)::Proto.Primitive
-    span_start972 = span_start(parser)
+    span_start1009 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, ">")
-    _t1743 = parse_term(parser)
-    term970 = _t1743
-    _t1744 = parse_term(parser)
-    term_3971 = _t1744
+    _t1817 = parse_term(parser)
+    term1007 = _t1817
+    _t1818 = parse_term(parser)
+    term_31008 = _t1818
     consume_literal!(parser, ")")
-    _t1745 = Proto.RelTerm(rel_term_type=OneOf(:term, term970))
-    _t1746 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3971))
-    _t1747 = Proto.Primitive(name="rel_primitive_gt_monotype", terms=Proto.RelTerm[_t1745, _t1746])
-    result973 = _t1747
-    record_span!(parser, span_start972, "Primitive")
-    return result973
+    _t1819 = Proto.RelTerm(rel_term_type=OneOf(:term, term1007))
+    _t1820 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31008))
+    _t1821 = Proto.Primitive(name="rel_primitive_gt_monotype", terms=Proto.RelTerm[_t1819, _t1820])
+    result1010 = _t1821
+    record_span!(parser, span_start1009, "Primitive")
+    return result1010
 end
 
 function parse_gt_eq(parser::ParserState)::Proto.Primitive
-    span_start976 = span_start(parser)
+    span_start1013 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, ">=")
-    _t1748 = parse_term(parser)
-    term974 = _t1748
-    _t1749 = parse_term(parser)
-    term_3975 = _t1749
+    _t1822 = parse_term(parser)
+    term1011 = _t1822
+    _t1823 = parse_term(parser)
+    term_31012 = _t1823
     consume_literal!(parser, ")")
-    _t1750 = Proto.RelTerm(rel_term_type=OneOf(:term, term974))
-    _t1751 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3975))
-    _t1752 = Proto.Primitive(name="rel_primitive_gt_eq_monotype", terms=Proto.RelTerm[_t1750, _t1751])
-    result977 = _t1752
-    record_span!(parser, span_start976, "Primitive")
-    return result977
+    _t1824 = Proto.RelTerm(rel_term_type=OneOf(:term, term1011))
+    _t1825 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31012))
+    _t1826 = Proto.Primitive(name="rel_primitive_gt_eq_monotype", terms=Proto.RelTerm[_t1824, _t1825])
+    result1014 = _t1826
+    record_span!(parser, span_start1013, "Primitive")
+    return result1014
 end
 
 function parse_add(parser::ParserState)::Proto.Primitive
-    span_start981 = span_start(parser)
+    span_start1018 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "+")
-    _t1753 = parse_term(parser)
-    term978 = _t1753
-    _t1754 = parse_term(parser)
-    term_3979 = _t1754
-    _t1755 = parse_term(parser)
-    term_4980 = _t1755
+    _t1827 = parse_term(parser)
+    term1015 = _t1827
+    _t1828 = parse_term(parser)
+    term_31016 = _t1828
+    _t1829 = parse_term(parser)
+    term_41017 = _t1829
     consume_literal!(parser, ")")
-    _t1756 = Proto.RelTerm(rel_term_type=OneOf(:term, term978))
-    _t1757 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3979))
-    _t1758 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4980))
-    _t1759 = Proto.Primitive(name="rel_primitive_add_monotype", terms=Proto.RelTerm[_t1756, _t1757, _t1758])
-    result982 = _t1759
-    record_span!(parser, span_start981, "Primitive")
-    return result982
+    _t1830 = Proto.RelTerm(rel_term_type=OneOf(:term, term1015))
+    _t1831 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31016))
+    _t1832 = Proto.RelTerm(rel_term_type=OneOf(:term, term_41017))
+    _t1833 = Proto.Primitive(name="rel_primitive_add_monotype", terms=Proto.RelTerm[_t1830, _t1831, _t1832])
+    result1019 = _t1833
+    record_span!(parser, span_start1018, "Primitive")
+    return result1019
 end
 
 function parse_minus(parser::ParserState)::Proto.Primitive
-    span_start986 = span_start(parser)
+    span_start1023 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "-")
-    _t1760 = parse_term(parser)
-    term983 = _t1760
-    _t1761 = parse_term(parser)
-    term_3984 = _t1761
-    _t1762 = parse_term(parser)
-    term_4985 = _t1762
+    _t1834 = parse_term(parser)
+    term1020 = _t1834
+    _t1835 = parse_term(parser)
+    term_31021 = _t1835
+    _t1836 = parse_term(parser)
+    term_41022 = _t1836
     consume_literal!(parser, ")")
-    _t1763 = Proto.RelTerm(rel_term_type=OneOf(:term, term983))
-    _t1764 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3984))
-    _t1765 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4985))
-    _t1766 = Proto.Primitive(name="rel_primitive_subtract_monotype", terms=Proto.RelTerm[_t1763, _t1764, _t1765])
-    result987 = _t1766
-    record_span!(parser, span_start986, "Primitive")
-    return result987
+    _t1837 = Proto.RelTerm(rel_term_type=OneOf(:term, term1020))
+    _t1838 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31021))
+    _t1839 = Proto.RelTerm(rel_term_type=OneOf(:term, term_41022))
+    _t1840 = Proto.Primitive(name="rel_primitive_subtract_monotype", terms=Proto.RelTerm[_t1837, _t1838, _t1839])
+    result1024 = _t1840
+    record_span!(parser, span_start1023, "Primitive")
+    return result1024
 end
 
 function parse_multiply(parser::ParserState)::Proto.Primitive
-    span_start991 = span_start(parser)
+    span_start1028 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "*")
-    _t1767 = parse_term(parser)
-    term988 = _t1767
-    _t1768 = parse_term(parser)
-    term_3989 = _t1768
-    _t1769 = parse_term(parser)
-    term_4990 = _t1769
+    _t1841 = parse_term(parser)
+    term1025 = _t1841
+    _t1842 = parse_term(parser)
+    term_31026 = _t1842
+    _t1843 = parse_term(parser)
+    term_41027 = _t1843
     consume_literal!(parser, ")")
-    _t1770 = Proto.RelTerm(rel_term_type=OneOf(:term, term988))
-    _t1771 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3989))
-    _t1772 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4990))
-    _t1773 = Proto.Primitive(name="rel_primitive_multiply_monotype", terms=Proto.RelTerm[_t1770, _t1771, _t1772])
-    result992 = _t1773
-    record_span!(parser, span_start991, "Primitive")
-    return result992
+    _t1844 = Proto.RelTerm(rel_term_type=OneOf(:term, term1025))
+    _t1845 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31026))
+    _t1846 = Proto.RelTerm(rel_term_type=OneOf(:term, term_41027))
+    _t1847 = Proto.Primitive(name="rel_primitive_multiply_monotype", terms=Proto.RelTerm[_t1844, _t1845, _t1846])
+    result1029 = _t1847
+    record_span!(parser, span_start1028, "Primitive")
+    return result1029
 end
 
 function parse_divide(parser::ParserState)::Proto.Primitive
-    span_start996 = span_start(parser)
+    span_start1033 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "/")
-    _t1774 = parse_term(parser)
-    term993 = _t1774
-    _t1775 = parse_term(parser)
-    term_3994 = _t1775
-    _t1776 = parse_term(parser)
-    term_4995 = _t1776
+    _t1848 = parse_term(parser)
+    term1030 = _t1848
+    _t1849 = parse_term(parser)
+    term_31031 = _t1849
+    _t1850 = parse_term(parser)
+    term_41032 = _t1850
     consume_literal!(parser, ")")
-    _t1777 = Proto.RelTerm(rel_term_type=OneOf(:term, term993))
-    _t1778 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3994))
-    _t1779 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4995))
-    _t1780 = Proto.Primitive(name="rel_primitive_divide_monotype", terms=Proto.RelTerm[_t1777, _t1778, _t1779])
-    result997 = _t1780
-    record_span!(parser, span_start996, "Primitive")
-    return result997
+    _t1851 = Proto.RelTerm(rel_term_type=OneOf(:term, term1030))
+    _t1852 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31031))
+    _t1853 = Proto.RelTerm(rel_term_type=OneOf(:term, term_41032))
+    _t1854 = Proto.Primitive(name="rel_primitive_divide_monotype", terms=Proto.RelTerm[_t1851, _t1852, _t1853])
+    result1034 = _t1854
+    record_span!(parser, span_start1033, "Primitive")
+    return result1034
 end
 
 function parse_rel_term(parser::ParserState)::Proto.RelTerm
-    span_start1001 = span_start(parser)
+    span_start1038 = span_start(parser)
     if match_lookahead_literal(parser, "true", 0)
-        _t1781 = 1
+        _t1855 = 1
     else
         if match_lookahead_literal(parser, "missing", 0)
-            _t1782 = 1
+            _t1856 = 1
         else
             if match_lookahead_literal(parser, "false", 0)
-                _t1783 = 1
+                _t1857 = 1
             else
                 if match_lookahead_literal(parser, "(", 0)
-                    _t1784 = 1
+                    _t1858 = 1
                 else
                     if match_lookahead_literal(parser, "#", 0)
-                        _t1785 = 0
+                        _t1859 = 0
                     else
                         if match_lookahead_terminal(parser, "SYMBOL", 0)
-                            _t1786 = 1
+                            _t1860 = 1
                         else
                             if match_lookahead_terminal(parser, "UINT32", 0)
-                                _t1787 = 1
+                                _t1861 = 1
                             else
                                 if match_lookahead_terminal(parser, "UINT128", 0)
-                                    _t1788 = 1
+                                    _t1862 = 1
                                 else
                                     if match_lookahead_terminal(parser, "STRING", 0)
-                                        _t1789 = 1
+                                        _t1863 = 1
                                     else
                                         if match_lookahead_terminal(parser, "INT32", 0)
-                                            _t1790 = 1
+                                            _t1864 = 1
                                         else
                                             if match_lookahead_terminal(parser, "INT128", 0)
-                                                _t1791 = 1
+                                                _t1865 = 1
                                             else
                                                 if match_lookahead_terminal(parser, "INT", 0)
-                                                    _t1792 = 1
+                                                    _t1866 = 1
                                                 else
                                                     if match_lookahead_terminal(parser, "FLOAT32", 0)
-                                                        _t1793 = 1
+                                                        _t1867 = 1
                                                     else
                                                         if match_lookahead_terminal(parser, "FLOAT", 0)
-                                                            _t1794 = 1
+                                                            _t1868 = 1
                                                         else
                                                             if match_lookahead_terminal(parser, "DECIMAL", 0)
-                                                                _t1795 = 1
+                                                                _t1869 = 1
                                                             else
-                                                                _t1795 = -1
+                                                                _t1869 = -1
                                                             end
-                                                            _t1794 = _t1795
+                                                            _t1868 = _t1869
                                                         end
-                                                        _t1793 = _t1794
+                                                        _t1867 = _t1868
                                                     end
-                                                    _t1792 = _t1793
+                                                    _t1866 = _t1867
                                                 end
-                                                _t1791 = _t1792
+                                                _t1865 = _t1866
                                             end
-                                            _t1790 = _t1791
+                                            _t1864 = _t1865
                                         end
-                                        _t1789 = _t1790
+                                        _t1863 = _t1864
                                     end
-                                    _t1788 = _t1789
+                                    _t1862 = _t1863
                                 end
-                                _t1787 = _t1788
+                                _t1861 = _t1862
                             end
-                            _t1786 = _t1787
+                            _t1860 = _t1861
                         end
-                        _t1785 = _t1786
+                        _t1859 = _t1860
                     end
-                    _t1784 = _t1785
+                    _t1858 = _t1859
                 end
-                _t1783 = _t1784
+                _t1857 = _t1858
             end
-            _t1782 = _t1783
+            _t1856 = _t1857
         end
-        _t1781 = _t1782
-    end
-    prediction998 = _t1781
-    if prediction998 == 1
-        _t1797 = parse_term(parser)
-        term1000 = _t1797
-        _t1798 = Proto.RelTerm(rel_term_type=OneOf(:term, term1000))
-        _t1796 = _t1798
+        _t1855 = _t1856
+    end
+    prediction1035 = _t1855
+    if prediction1035 == 1
+        _t1871 = parse_term(parser)
+        term1037 = _t1871
+        _t1872 = Proto.RelTerm(rel_term_type=OneOf(:term, term1037))
+        _t1870 = _t1872
     else
-        if prediction998 == 0
-            _t1800 = parse_specialized_value(parser)
-            specialized_value999 = _t1800
-            _t1801 = Proto.RelTerm(rel_term_type=OneOf(:specialized_value, specialized_value999))
-            _t1799 = _t1801
+        if prediction1035 == 0
+            _t1874 = parse_specialized_value(parser)
+            specialized_value1036 = _t1874
+            _t1875 = Proto.RelTerm(rel_term_type=OneOf(:specialized_value, specialized_value1036))
+            _t1873 = _t1875
         else
             throw(ParseError("Unexpected token in rel_term" * ": " * string(lookahead(parser, 0))))
         end
-        _t1796 = _t1799
+        _t1870 = _t1873
     end
-    result1002 = _t1796
-    record_span!(parser, span_start1001, "RelTerm")
-    return result1002
+    result1039 = _t1870
+    record_span!(parser, span_start1038, "RelTerm")
+    return result1039
 end
 
 function parse_specialized_value(parser::ParserState)::Proto.Value
-    span_start1004 = span_start(parser)
+    span_start1041 = span_start(parser)
     consume_literal!(parser, "#")
-    _t1802 = parse_raw_value(parser)
-    raw_value1003 = _t1802
-    result1005 = raw_value1003
-    record_span!(parser, span_start1004, "Value")
-    return result1005
+    _t1876 = parse_raw_value(parser)
+    raw_value1040 = _t1876
+    result1042 = raw_value1040
+    record_span!(parser, span_start1041, "Value")
+    return result1042
 end
 
 function parse_rel_atom(parser::ParserState)::Proto.RelAtom
-    span_start1011 = span_start(parser)
+    span_start1048 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "relatom")
-    _t1803 = parse_name(parser)
-    name1006 = _t1803
-    xs1007 = Proto.RelTerm[]
-    cond1008 = ((((((((((((((match_lookahead_literal(parser, "#", 0) || match_lookahead_literal(parser, "(", 0)) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-    while cond1008
-        _t1804 = parse_rel_term(parser)
-        item1009 = _t1804
-        push!(xs1007, item1009)
-        cond1008 = ((((((((((((((match_lookahead_literal(parser, "#", 0) || match_lookahead_literal(parser, "(", 0)) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
-    end
-    rel_terms1010 = xs1007
+    _t1877 = parse_name(parser)
+    name1043 = _t1877
+    xs1044 = Proto.RelTerm[]
+    cond1045 = ((((((((((((((match_lookahead_literal(parser, "#", 0) || match_lookahead_literal(parser, "(", 0)) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+    while cond1045
+        _t1878 = parse_rel_term(parser)
+        item1046 = _t1878
+        push!(xs1044, item1046)
+        cond1045 = ((((((((((((((match_lookahead_literal(parser, "#", 0) || match_lookahead_literal(parser, "(", 0)) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0)) || match_lookahead_terminal(parser, "SYMBOL", 0))
+    end
+    rel_terms1047 = xs1044
     consume_literal!(parser, ")")
-    _t1805 = Proto.RelAtom(name=name1006, terms=rel_terms1010)
-    result1012 = _t1805
-    record_span!(parser, span_start1011, "RelAtom")
-    return result1012
+    _t1879 = Proto.RelAtom(name=name1043, terms=rel_terms1047)
+    result1049 = _t1879
+    record_span!(parser, span_start1048, "RelAtom")
+    return result1049
 end
 
 function parse_cast(parser::ParserState)::Proto.Cast
-    span_start1015 = span_start(parser)
+    span_start1052 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "cast")
-    _t1806 = parse_term(parser)
-    term1013 = _t1806
-    _t1807 = parse_term(parser)
-    term_31014 = _t1807
+    _t1880 = parse_term(parser)
+    term1050 = _t1880
+    _t1881 = parse_term(parser)
+    term_31051 = _t1881
     consume_literal!(parser, ")")
-    _t1808 = Proto.Cast(input=term1013, result=term_31014)
-    result1016 = _t1808
-    record_span!(parser, span_start1015, "Cast")
-    return result1016
+    _t1882 = Proto.Cast(input=term1050, result=term_31051)
+    result1053 = _t1882
+    record_span!(parser, span_start1052, "Cast")
+    return result1053
 end
 
 function parse_attrs(parser::ParserState)::Vector{Proto.Attribute}
     consume_literal!(parser, "(")
     consume_literal!(parser, "attrs")
-    xs1017 = Proto.Attribute[]
-    cond1018 = match_lookahead_literal(parser, "(", 0)
-    while cond1018
-        _t1809 = parse_attribute(parser)
-        item1019 = _t1809
-        push!(xs1017, item1019)
-        cond1018 = match_lookahead_literal(parser, "(", 0)
-    end
-    attributes1020 = xs1017
+    xs1054 = Proto.Attribute[]
+    cond1055 = match_lookahead_literal(parser, "(", 0)
+    while cond1055
+        _t1883 = parse_attribute(parser)
+        item1056 = _t1883
+        push!(xs1054, item1056)
+        cond1055 = match_lookahead_literal(parser, "(", 0)
+    end
+    attributes1057 = xs1054
     consume_literal!(parser, ")")
-    return attributes1020
+    return attributes1057
 end
 
 function parse_attribute(parser::ParserState)::Proto.Attribute
-    span_start1026 = span_start(parser)
+    span_start1063 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "attribute")
-    _t1810 = parse_name(parser)
-    name1021 = _t1810
-    xs1022 = Proto.Value[]
-    cond1023 = ((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0))
-    while cond1023
-        _t1811 = parse_raw_value(parser)
-        item1024 = _t1811
-        push!(xs1022, item1024)
-        cond1023 = ((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0))
-    end
-    raw_values1025 = xs1022
+    _t1884 = parse_name(parser)
+    name1058 = _t1884
+    xs1059 = Proto.Value[]
+    cond1060 = ((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0))
+    while cond1060
+        _t1885 = parse_raw_value(parser)
+        item1061 = _t1885
+        push!(xs1059, item1061)
+        cond1060 = ((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "false", 0)) || match_lookahead_literal(parser, "missing", 0)) || match_lookahead_literal(parser, "true", 0)) || match_lookahead_terminal(parser, "DECIMAL", 0)) || match_lookahead_terminal(parser, "FLOAT", 0)) || match_lookahead_terminal(parser, "FLOAT32", 0)) || match_lookahead_terminal(parser, "INT", 0)) || match_lookahead_terminal(parser, "INT128", 0)) || match_lookahead_terminal(parser, "INT32", 0)) || match_lookahead_terminal(parser, "STRING", 0)) || match_lookahead_terminal(parser, "UINT128", 0)) || match_lookahead_terminal(parser, "UINT32", 0))
+    end
+    raw_values1062 = xs1059
     consume_literal!(parser, ")")
-    _t1812 = Proto.Attribute(name=name1021, args=raw_values1025)
-    result1027 = _t1812
-    record_span!(parser, span_start1026, "Attribute")
-    return result1027
+    _t1886 = Proto.Attribute(name=name1058, args=raw_values1062)
+    result1064 = _t1886
+    record_span!(parser, span_start1063, "Attribute")
+    return result1064
 end
 
 function parse_algorithm(parser::ParserState)::Proto.Algorithm
-    span_start1034 = span_start(parser)
+    span_start1071 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "algorithm")
-    xs1028 = Proto.RelationId[]
-    cond1029 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
-    while cond1029
-        _t1813 = parse_relation_id(parser)
-        item1030 = _t1813
-        push!(xs1028, item1030)
-        cond1029 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
-    end
-    relation_ids1031 = xs1028
-    _t1814 = parse_script(parser)
-    script1032 = _t1814
+    xs1065 = Proto.RelationId[]
+    cond1066 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    while cond1066
+        _t1887 = parse_relation_id(parser)
+        item1067 = _t1887
+        push!(xs1065, item1067)
+        cond1066 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    end
+    relation_ids1068 = xs1065
+    _t1888 = parse_script(parser)
+    script1069 = _t1888
     if match_lookahead_literal(parser, "(", 0)
-        _t1816 = parse_attrs(parser)
-        _t1815 = _t1816
+        _t1890 = parse_attrs(parser)
+        _t1889 = _t1890
     else
-        _t1815 = nothing
+        _t1889 = nothing
     end
-    attrs1033 = _t1815
+    attrs1070 = _t1889
     consume_literal!(parser, ")")
-    _t1817 = Proto.Algorithm(var"#global"=relation_ids1031, body=script1032, attrs=(!isnothing(attrs1033) ? attrs1033 : Proto.Attribute[]))
-    result1035 = _t1817
-    record_span!(parser, span_start1034, "Algorithm")
-    return result1035
+    _t1891 = Proto.Algorithm(var"#global"=relation_ids1068, body=script1069, attrs=(!isnothing(attrs1070) ? attrs1070 : Proto.Attribute[]))
+    result1072 = _t1891
+    record_span!(parser, span_start1071, "Algorithm")
+    return result1072
 end
 
 function parse_script(parser::ParserState)::Proto.Script
-    span_start1040 = span_start(parser)
+    span_start1077 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "script")
-    xs1036 = Proto.Construct[]
-    cond1037 = match_lookahead_literal(parser, "(", 0)
-    while cond1037
-        _t1818 = parse_construct(parser)
-        item1038 = _t1818
-        push!(xs1036, item1038)
-        cond1037 = match_lookahead_literal(parser, "(", 0)
-    end
-    constructs1039 = xs1036
+    xs1073 = Proto.Construct[]
+    cond1074 = match_lookahead_literal(parser, "(", 0)
+    while cond1074
+        _t1892 = parse_construct(parser)
+        item1075 = _t1892
+        push!(xs1073, item1075)
+        cond1074 = match_lookahead_literal(parser, "(", 0)
+    end
+    constructs1076 = xs1073
     consume_literal!(parser, ")")
-    _t1819 = Proto.Script(constructs=constructs1039)
-    result1041 = _t1819
-    record_span!(parser, span_start1040, "Script")
-    return result1041
+    _t1893 = Proto.Script(constructs=constructs1076)
+    result1078 = _t1893
+    record_span!(parser, span_start1077, "Script")
+    return result1078
 end
 
 function parse_construct(parser::ParserState)::Proto.Construct
-    span_start1045 = span_start(parser)
+    span_start1082 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "upsert", 1)
-            _t1821 = 1
+            _t1895 = 1
         else
             if match_lookahead_literal(parser, "monus", 1)
-                _t1822 = 1
+                _t1896 = 1
             else
                 if match_lookahead_literal(parser, "monoid", 1)
-                    _t1823 = 1
+                    _t1897 = 1
                 else
                     if match_lookahead_literal(parser, "loop", 1)
-                        _t1824 = 0
+                        _t1898 = 0
                     else
                         if match_lookahead_literal(parser, "break", 1)
-                            _t1825 = 1
+                            _t1899 = 1
                         else
                             if match_lookahead_literal(parser, "assign", 1)
-                                _t1826 = 1
+                                _t1900 = 1
                             else
-                                _t1826 = -1
+                                _t1900 = -1
                             end
-                            _t1825 = _t1826
+                            _t1899 = _t1900
                         end
-                        _t1824 = _t1825
+                        _t1898 = _t1899
                     end
-                    _t1823 = _t1824
+                    _t1897 = _t1898
                 end
-                _t1822 = _t1823
+                _t1896 = _t1897
             end
-            _t1821 = _t1822
+            _t1895 = _t1896
         end
-        _t1820 = _t1821
+        _t1894 = _t1895
     else
-        _t1820 = -1
-    end
-    prediction1042 = _t1820
-    if prediction1042 == 1
-        _t1828 = parse_instruction(parser)
-        instruction1044 = _t1828
-        _t1829 = Proto.Construct(construct_type=OneOf(:instruction, instruction1044))
-        _t1827 = _t1829
+        _t1894 = -1
+    end
+    prediction1079 = _t1894
+    if prediction1079 == 1
+        _t1902 = parse_instruction(parser)
+        instruction1081 = _t1902
+        _t1903 = Proto.Construct(construct_type=OneOf(:instruction, instruction1081))
+        _t1901 = _t1903
     else
-        if prediction1042 == 0
-            _t1831 = parse_loop(parser)
-            loop1043 = _t1831
-            _t1832 = Proto.Construct(construct_type=OneOf(:loop, loop1043))
-            _t1830 = _t1832
+        if prediction1079 == 0
+            _t1905 = parse_loop(parser)
+            loop1080 = _t1905
+            _t1906 = Proto.Construct(construct_type=OneOf(:loop, loop1080))
+            _t1904 = _t1906
         else
             throw(ParseError("Unexpected token in construct" * ": " * string(lookahead(parser, 0))))
         end
-        _t1827 = _t1830
+        _t1901 = _t1904
     end
-    result1046 = _t1827
-    record_span!(parser, span_start1045, "Construct")
-    return result1046
+    result1083 = _t1901
+    record_span!(parser, span_start1082, "Construct")
+    return result1083
 end
 
 function parse_loop(parser::ParserState)::Proto.Loop
-    span_start1050 = span_start(parser)
+    span_start1087 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "loop")
-    _t1833 = parse_init(parser)
-    init1047 = _t1833
-    _t1834 = parse_script(parser)
-    script1048 = _t1834
+    _t1907 = parse_init(parser)
+    init1084 = _t1907
+    _t1908 = parse_script(parser)
+    script1085 = _t1908
     if match_lookahead_literal(parser, "(", 0)
-        _t1836 = parse_attrs(parser)
-        _t1835 = _t1836
+        _t1910 = parse_attrs(parser)
+        _t1909 = _t1910
     else
-        _t1835 = nothing
+        _t1909 = nothing
     end
-    attrs1049 = _t1835
+    attrs1086 = _t1909
     consume_literal!(parser, ")")
-    _t1837 = Proto.Loop(init=init1047, body=script1048, attrs=(!isnothing(attrs1049) ? attrs1049 : Proto.Attribute[]))
-    result1051 = _t1837
-    record_span!(parser, span_start1050, "Loop")
-    return result1051
+    _t1911 = Proto.Loop(init=init1084, body=script1085, attrs=(!isnothing(attrs1086) ? attrs1086 : Proto.Attribute[]))
+    result1088 = _t1911
+    record_span!(parser, span_start1087, "Loop")
+    return result1088
 end
 
 function parse_init(parser::ParserState)::Vector{Proto.Instruction}
     consume_literal!(parser, "(")
     consume_literal!(parser, "init")
-    xs1052 = Proto.Instruction[]
-    cond1053 = match_lookahead_literal(parser, "(", 0)
-    while cond1053
-        _t1838 = parse_instruction(parser)
-        item1054 = _t1838
-        push!(xs1052, item1054)
-        cond1053 = match_lookahead_literal(parser, "(", 0)
-    end
-    instructions1055 = xs1052
+    xs1089 = Proto.Instruction[]
+    cond1090 = match_lookahead_literal(parser, "(", 0)
+    while cond1090
+        _t1912 = parse_instruction(parser)
+        item1091 = _t1912
+        push!(xs1089, item1091)
+        cond1090 = match_lookahead_literal(parser, "(", 0)
+    end
+    instructions1092 = xs1089
     consume_literal!(parser, ")")
-    return instructions1055
+    return instructions1092
 end
 
 function parse_instruction(parser::ParserState)::Proto.Instruction
-    span_start1062 = span_start(parser)
+    span_start1099 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "upsert", 1)
-            _t1840 = 1
+            _t1914 = 1
         else
             if match_lookahead_literal(parser, "monus", 1)
-                _t1841 = 4
+                _t1915 = 4
             else
                 if match_lookahead_literal(parser, "monoid", 1)
-                    _t1842 = 3
+                    _t1916 = 3
                 else
                     if match_lookahead_literal(parser, "break", 1)
-                        _t1843 = 2
+                        _t1917 = 2
                     else
                         if match_lookahead_literal(parser, "assign", 1)
-                            _t1844 = 0
+                            _t1918 = 0
                         else
-                            _t1844 = -1
+                            _t1918 = -1
                         end
-                        _t1843 = _t1844
+                        _t1917 = _t1918
                     end
-                    _t1842 = _t1843
+                    _t1916 = _t1917
                 end
-                _t1841 = _t1842
+                _t1915 = _t1916
             end
-            _t1840 = _t1841
+            _t1914 = _t1915
         end
-        _t1839 = _t1840
+        _t1913 = _t1914
     else
-        _t1839 = -1
-    end
-    prediction1056 = _t1839
-    if prediction1056 == 4
-        _t1846 = parse_monus_def(parser)
-        monus_def1061 = _t1846
-        _t1847 = Proto.Instruction(instr_type=OneOf(:monus_def, monus_def1061))
-        _t1845 = _t1847
+        _t1913 = -1
+    end
+    prediction1093 = _t1913
+    if prediction1093 == 4
+        _t1920 = parse_monus_def(parser)
+        monus_def1098 = _t1920
+        _t1921 = Proto.Instruction(instr_type=OneOf(:monus_def, monus_def1098))
+        _t1919 = _t1921
     else
-        if prediction1056 == 3
-            _t1849 = parse_monoid_def(parser)
-            monoid_def1060 = _t1849
-            _t1850 = Proto.Instruction(instr_type=OneOf(:monoid_def, monoid_def1060))
-            _t1848 = _t1850
+        if prediction1093 == 3
+            _t1923 = parse_monoid_def(parser)
+            monoid_def1097 = _t1923
+            _t1924 = Proto.Instruction(instr_type=OneOf(:monoid_def, monoid_def1097))
+            _t1922 = _t1924
         else
-            if prediction1056 == 2
-                _t1852 = parse_break(parser)
-                break1059 = _t1852
-                _t1853 = Proto.Instruction(instr_type=OneOf(:var"#break", break1059))
-                _t1851 = _t1853
+            if prediction1093 == 2
+                _t1926 = parse_break(parser)
+                break1096 = _t1926
+                _t1927 = Proto.Instruction(instr_type=OneOf(:var"#break", break1096))
+                _t1925 = _t1927
             else
-                if prediction1056 == 1
-                    _t1855 = parse_upsert(parser)
-                    upsert1058 = _t1855
-                    _t1856 = Proto.Instruction(instr_type=OneOf(:upsert, upsert1058))
-                    _t1854 = _t1856
+                if prediction1093 == 1
+                    _t1929 = parse_upsert(parser)
+                    upsert1095 = _t1929
+                    _t1930 = Proto.Instruction(instr_type=OneOf(:upsert, upsert1095))
+                    _t1928 = _t1930
                 else
-                    if prediction1056 == 0
-                        _t1858 = parse_assign(parser)
-                        assign1057 = _t1858
-                        _t1859 = Proto.Instruction(instr_type=OneOf(:assign, assign1057))
-                        _t1857 = _t1859
+                    if prediction1093 == 0
+                        _t1932 = parse_assign(parser)
+                        assign1094 = _t1932
+                        _t1933 = Proto.Instruction(instr_type=OneOf(:assign, assign1094))
+                        _t1931 = _t1933
                     else
                         throw(ParseError("Unexpected token in instruction" * ": " * string(lookahead(parser, 0))))
                     end
-                    _t1854 = _t1857
+                    _t1928 = _t1931
                 end
-                _t1851 = _t1854
+                _t1925 = _t1928
             end
-            _t1848 = _t1851
+            _t1922 = _t1925
         end
-        _t1845 = _t1848
+        _t1919 = _t1922
     end
-    result1063 = _t1845
-    record_span!(parser, span_start1062, "Instruction")
-    return result1063
+    result1100 = _t1919
+    record_span!(parser, span_start1099, "Instruction")
+    return result1100
 end
 
 function parse_assign(parser::ParserState)::Proto.Assign
-    span_start1067 = span_start(parser)
+    span_start1104 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "assign")
-    _t1860 = parse_relation_id(parser)
-    relation_id1064 = _t1860
-    _t1861 = parse_abstraction(parser)
-    abstraction1065 = _t1861
+    _t1934 = parse_relation_id(parser)
+    relation_id1101 = _t1934
+    _t1935 = parse_abstraction(parser)
+    abstraction1102 = _t1935
     if match_lookahead_literal(parser, "(", 0)
-        _t1863 = parse_attrs(parser)
-        _t1862 = _t1863
+        _t1937 = parse_attrs(parser)
+        _t1936 = _t1937
     else
-        _t1862 = nothing
+        _t1936 = nothing
     end
-    attrs1066 = _t1862
+    attrs1103 = _t1936
     consume_literal!(parser, ")")
-    _t1864 = Proto.Assign(name=relation_id1064, body=abstraction1065, attrs=(!isnothing(attrs1066) ? attrs1066 : Proto.Attribute[]))
-    result1068 = _t1864
-    record_span!(parser, span_start1067, "Assign")
-    return result1068
+    _t1938 = Proto.Assign(name=relation_id1101, body=abstraction1102, attrs=(!isnothing(attrs1103) ? attrs1103 : Proto.Attribute[]))
+    result1105 = _t1938
+    record_span!(parser, span_start1104, "Assign")
+    return result1105
 end
 
 function parse_upsert(parser::ParserState)::Proto.Upsert
-    span_start1072 = span_start(parser)
+    span_start1109 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "upsert")
-    _t1865 = parse_relation_id(parser)
-    relation_id1069 = _t1865
-    _t1866 = parse_abstraction_with_arity(parser)
-    abstraction_with_arity1070 = _t1866
+    _t1939 = parse_relation_id(parser)
+    relation_id1106 = _t1939
+    _t1940 = parse_abstraction_with_arity(parser)
+    abstraction_with_arity1107 = _t1940
     if match_lookahead_literal(parser, "(", 0)
-        _t1868 = parse_attrs(parser)
-        _t1867 = _t1868
+        _t1942 = parse_attrs(parser)
+        _t1941 = _t1942
     else
-        _t1867 = nothing
+        _t1941 = nothing
     end
-    attrs1071 = _t1867
+    attrs1108 = _t1941
     consume_literal!(parser, ")")
-    _t1869 = Proto.Upsert(name=relation_id1069, body=abstraction_with_arity1070[1], attrs=(!isnothing(attrs1071) ? attrs1071 : Proto.Attribute[]), value_arity=abstraction_with_arity1070[2])
-    result1073 = _t1869
-    record_span!(parser, span_start1072, "Upsert")
-    return result1073
+    _t1943 = Proto.Upsert(name=relation_id1106, body=abstraction_with_arity1107[1], attrs=(!isnothing(attrs1108) ? attrs1108 : Proto.Attribute[]), value_arity=abstraction_with_arity1107[2])
+    result1110 = _t1943
+    record_span!(parser, span_start1109, "Upsert")
+    return result1110
 end
 
 function parse_abstraction_with_arity(parser::ParserState)::Tuple{Proto.Abstraction, Int64}
     consume_literal!(parser, "(")
-    _t1870 = parse_bindings(parser)
-    bindings1074 = _t1870
-    _t1871 = parse_formula(parser)
-    formula1075 = _t1871
+    _t1944 = parse_bindings(parser)
+    bindings1111 = _t1944
+    _t1945 = parse_formula(parser)
+    formula1112 = _t1945
     consume_literal!(parser, ")")
-    _t1872 = Proto.Abstraction(vars=vcat(bindings1074[1], !isnothing(bindings1074[2]) ? bindings1074[2] : []), value=formula1075)
-    return (_t1872, length(bindings1074[2]),)
+    _t1946 = Proto.Abstraction(vars=vcat(bindings1111[1], !isnothing(bindings1111[2]) ? bindings1111[2] : []), value=formula1112)
+    return (_t1946, length(bindings1111[2]),)
 end
 
 function parse_break(parser::ParserState)::Proto.Break
-    span_start1079 = span_start(parser)
+    span_start1116 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "break")
-    _t1873 = parse_relation_id(parser)
-    relation_id1076 = _t1873
-    _t1874 = parse_abstraction(parser)
-    abstraction1077 = _t1874
+    _t1947 = parse_relation_id(parser)
+    relation_id1113 = _t1947
+    _t1948 = parse_abstraction(parser)
+    abstraction1114 = _t1948
     if match_lookahead_literal(parser, "(", 0)
-        _t1876 = parse_attrs(parser)
-        _t1875 = _t1876
+        _t1950 = parse_attrs(parser)
+        _t1949 = _t1950
     else
-        _t1875 = nothing
+        _t1949 = nothing
     end
-    attrs1078 = _t1875
+    attrs1115 = _t1949
     consume_literal!(parser, ")")
-    _t1877 = Proto.Break(name=relation_id1076, body=abstraction1077, attrs=(!isnothing(attrs1078) ? attrs1078 : Proto.Attribute[]))
-    result1080 = _t1877
-    record_span!(parser, span_start1079, "Break")
-    return result1080
+    _t1951 = Proto.Break(name=relation_id1113, body=abstraction1114, attrs=(!isnothing(attrs1115) ? attrs1115 : Proto.Attribute[]))
+    result1117 = _t1951
+    record_span!(parser, span_start1116, "Break")
+    return result1117
 end
 
 function parse_monoid_def(parser::ParserState)::Proto.MonoidDef
-    span_start1085 = span_start(parser)
+    span_start1122 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "monoid")
-    _t1878 = parse_monoid(parser)
-    monoid1081 = _t1878
-    _t1879 = parse_relation_id(parser)
-    relation_id1082 = _t1879
-    _t1880 = parse_abstraction_with_arity(parser)
-    abstraction_with_arity1083 = _t1880
+    _t1952 = parse_monoid(parser)
+    monoid1118 = _t1952
+    _t1953 = parse_relation_id(parser)
+    relation_id1119 = _t1953
+    _t1954 = parse_abstraction_with_arity(parser)
+    abstraction_with_arity1120 = _t1954
     if match_lookahead_literal(parser, "(", 0)
-        _t1882 = parse_attrs(parser)
-        _t1881 = _t1882
+        _t1956 = parse_attrs(parser)
+        _t1955 = _t1956
     else
-        _t1881 = nothing
+        _t1955 = nothing
     end
-    attrs1084 = _t1881
+    attrs1121 = _t1955
     consume_literal!(parser, ")")
-    _t1883 = Proto.MonoidDef(monoid=monoid1081, name=relation_id1082, body=abstraction_with_arity1083[1], attrs=(!isnothing(attrs1084) ? attrs1084 : Proto.Attribute[]), value_arity=abstraction_with_arity1083[2])
-    result1086 = _t1883
-    record_span!(parser, span_start1085, "MonoidDef")
-    return result1086
+    _t1957 = Proto.MonoidDef(monoid=monoid1118, name=relation_id1119, body=abstraction_with_arity1120[1], attrs=(!isnothing(attrs1121) ? attrs1121 : Proto.Attribute[]), value_arity=abstraction_with_arity1120[2])
+    result1123 = _t1957
+    record_span!(parser, span_start1122, "MonoidDef")
+    return result1123
 end
 
 function parse_monoid(parser::ParserState)::Proto.Monoid
-    span_start1092 = span_start(parser)
+    span_start1129 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "sum", 1)
-            _t1885 = 3
+            _t1959 = 3
         else
             if match_lookahead_literal(parser, "or", 1)
-                _t1886 = 0
+                _t1960 = 0
             else
                 if match_lookahead_literal(parser, "min", 1)
-                    _t1887 = 1
+                    _t1961 = 1
                 else
                     if match_lookahead_literal(parser, "max", 1)
-                        _t1888 = 2
+                        _t1962 = 2
                     else
-                        _t1888 = -1
+                        _t1962 = -1
                     end
-                    _t1887 = _t1888
+                    _t1961 = _t1962
                 end
-                _t1886 = _t1887
+                _t1960 = _t1961
             end
-            _t1885 = _t1886
+            _t1959 = _t1960
         end
-        _t1884 = _t1885
+        _t1958 = _t1959
     else
-        _t1884 = -1
-    end
-    prediction1087 = _t1884
-    if prediction1087 == 3
-        _t1890 = parse_sum_monoid(parser)
-        sum_monoid1091 = _t1890
-        _t1891 = Proto.Monoid(value=OneOf(:sum_monoid, sum_monoid1091))
-        _t1889 = _t1891
+        _t1958 = -1
+    end
+    prediction1124 = _t1958
+    if prediction1124 == 3
+        _t1964 = parse_sum_monoid(parser)
+        sum_monoid1128 = _t1964
+        _t1965 = Proto.Monoid(value=OneOf(:sum_monoid, sum_monoid1128))
+        _t1963 = _t1965
     else
-        if prediction1087 == 2
-            _t1893 = parse_max_monoid(parser)
-            max_monoid1090 = _t1893
-            _t1894 = Proto.Monoid(value=OneOf(:max_monoid, max_monoid1090))
-            _t1892 = _t1894
+        if prediction1124 == 2
+            _t1967 = parse_max_monoid(parser)
+            max_monoid1127 = _t1967
+            _t1968 = Proto.Monoid(value=OneOf(:max_monoid, max_monoid1127))
+            _t1966 = _t1968
         else
-            if prediction1087 == 1
-                _t1896 = parse_min_monoid(parser)
-                min_monoid1089 = _t1896
-                _t1897 = Proto.Monoid(value=OneOf(:min_monoid, min_monoid1089))
-                _t1895 = _t1897
+            if prediction1124 == 1
+                _t1970 = parse_min_monoid(parser)
+                min_monoid1126 = _t1970
+                _t1971 = Proto.Monoid(value=OneOf(:min_monoid, min_monoid1126))
+                _t1969 = _t1971
             else
-                if prediction1087 == 0
-                    _t1899 = parse_or_monoid(parser)
-                    or_monoid1088 = _t1899
-                    _t1900 = Proto.Monoid(value=OneOf(:or_monoid, or_monoid1088))
-                    _t1898 = _t1900
+                if prediction1124 == 0
+                    _t1973 = parse_or_monoid(parser)
+                    or_monoid1125 = _t1973
+                    _t1974 = Proto.Monoid(value=OneOf(:or_monoid, or_monoid1125))
+                    _t1972 = _t1974
                 else
                     throw(ParseError("Unexpected token in monoid" * ": " * string(lookahead(parser, 0))))
                 end
-                _t1895 = _t1898
+                _t1969 = _t1972
             end
-            _t1892 = _t1895
+            _t1966 = _t1969
         end
-        _t1889 = _t1892
+        _t1963 = _t1966
     end
-    result1093 = _t1889
-    record_span!(parser, span_start1092, "Monoid")
-    return result1093
+    result1130 = _t1963
+    record_span!(parser, span_start1129, "Monoid")
+    return result1130
 end
 
 function parse_or_monoid(parser::ParserState)::Proto.OrMonoid
-    span_start1094 = span_start(parser)
+    span_start1131 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "or")
     consume_literal!(parser, ")")
-    _t1901 = Proto.OrMonoid()
-    result1095 = _t1901
-    record_span!(parser, span_start1094, "OrMonoid")
-    return result1095
+    _t1975 = Proto.OrMonoid()
+    result1132 = _t1975
+    record_span!(parser, span_start1131, "OrMonoid")
+    return result1132
 end
 
 function parse_min_monoid(parser::ParserState)::Proto.MinMonoid
-    span_start1097 = span_start(parser)
+    span_start1134 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "min")
-    _t1902 = parse_type(parser)
-    type1096 = _t1902
+    _t1976 = parse_type(parser)
+    type1133 = _t1976
     consume_literal!(parser, ")")
-    _t1903 = Proto.MinMonoid(var"#type"=type1096)
-    result1098 = _t1903
-    record_span!(parser, span_start1097, "MinMonoid")
-    return result1098
+    _t1977 = Proto.MinMonoid(var"#type"=type1133)
+    result1135 = _t1977
+    record_span!(parser, span_start1134, "MinMonoid")
+    return result1135
 end
 
 function parse_max_monoid(parser::ParserState)::Proto.MaxMonoid
-    span_start1100 = span_start(parser)
+    span_start1137 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "max")
-    _t1904 = parse_type(parser)
-    type1099 = _t1904
+    _t1978 = parse_type(parser)
+    type1136 = _t1978
     consume_literal!(parser, ")")
-    _t1905 = Proto.MaxMonoid(var"#type"=type1099)
-    result1101 = _t1905
-    record_span!(parser, span_start1100, "MaxMonoid")
-    return result1101
+    _t1979 = Proto.MaxMonoid(var"#type"=type1136)
+    result1138 = _t1979
+    record_span!(parser, span_start1137, "MaxMonoid")
+    return result1138
 end
 
 function parse_sum_monoid(parser::ParserState)::Proto.SumMonoid
-    span_start1103 = span_start(parser)
+    span_start1140 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "sum")
-    _t1906 = parse_type(parser)
-    type1102 = _t1906
+    _t1980 = parse_type(parser)
+    type1139 = _t1980
     consume_literal!(parser, ")")
-    _t1907 = Proto.SumMonoid(var"#type"=type1102)
-    result1104 = _t1907
-    record_span!(parser, span_start1103, "SumMonoid")
-    return result1104
+    _t1981 = Proto.SumMonoid(var"#type"=type1139)
+    result1141 = _t1981
+    record_span!(parser, span_start1140, "SumMonoid")
+    return result1141
 end
 
 function parse_monus_def(parser::ParserState)::Proto.MonusDef
-    span_start1109 = span_start(parser)
+    span_start1146 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "monus")
-    _t1908 = parse_monoid(parser)
-    monoid1105 = _t1908
-    _t1909 = parse_relation_id(parser)
-    relation_id1106 = _t1909
-    _t1910 = parse_abstraction_with_arity(parser)
-    abstraction_with_arity1107 = _t1910
+    _t1982 = parse_monoid(parser)
+    monoid1142 = _t1982
+    _t1983 = parse_relation_id(parser)
+    relation_id1143 = _t1983
+    _t1984 = parse_abstraction_with_arity(parser)
+    abstraction_with_arity1144 = _t1984
     if match_lookahead_literal(parser, "(", 0)
-        _t1912 = parse_attrs(parser)
-        _t1911 = _t1912
+        _t1986 = parse_attrs(parser)
+        _t1985 = _t1986
     else
-        _t1911 = nothing
+        _t1985 = nothing
     end
-    attrs1108 = _t1911
+    attrs1145 = _t1985
     consume_literal!(parser, ")")
-    _t1913 = Proto.MonusDef(monoid=monoid1105, name=relation_id1106, body=abstraction_with_arity1107[1], attrs=(!isnothing(attrs1108) ? attrs1108 : Proto.Attribute[]), value_arity=abstraction_with_arity1107[2])
-    result1110 = _t1913
-    record_span!(parser, span_start1109, "MonusDef")
-    return result1110
+    _t1987 = Proto.MonusDef(monoid=monoid1142, name=relation_id1143, body=abstraction_with_arity1144[1], attrs=(!isnothing(attrs1145) ? attrs1145 : Proto.Attribute[]), value_arity=abstraction_with_arity1144[2])
+    result1147 = _t1987
+    record_span!(parser, span_start1146, "MonusDef")
+    return result1147
 end
 
 function parse_constraint(parser::ParserState)::Proto.Constraint
-    span_start1115 = span_start(parser)
+    span_start1152 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "functional_dependency")
-    _t1914 = parse_relation_id(parser)
-    relation_id1111 = _t1914
-    _t1915 = parse_abstraction(parser)
-    abstraction1112 = _t1915
-    _t1916 = parse_functional_dependency_keys(parser)
-    functional_dependency_keys1113 = _t1916
-    _t1917 = parse_functional_dependency_values(parser)
-    functional_dependency_values1114 = _t1917
+    _t1988 = parse_relation_id(parser)
+    relation_id1148 = _t1988
+    _t1989 = parse_abstraction(parser)
+    abstraction1149 = _t1989
+    _t1990 = parse_functional_dependency_keys(parser)
+    functional_dependency_keys1150 = _t1990
+    _t1991 = parse_functional_dependency_values(parser)
+    functional_dependency_values1151 = _t1991
     consume_literal!(parser, ")")
-    _t1918 = Proto.FunctionalDependency(guard=abstraction1112, keys=functional_dependency_keys1113, values=functional_dependency_values1114)
-    _t1919 = Proto.Constraint(constraint_type=OneOf(:functional_dependency, _t1918), name=relation_id1111)
-    result1116 = _t1919
-    record_span!(parser, span_start1115, "Constraint")
-    return result1116
+    _t1992 = Proto.FunctionalDependency(guard=abstraction1149, keys=functional_dependency_keys1150, values=functional_dependency_values1151)
+    _t1993 = Proto.Constraint(constraint_type=OneOf(:functional_dependency, _t1992), name=relation_id1148)
+    result1153 = _t1993
+    record_span!(parser, span_start1152, "Constraint")
+    return result1153
 end
 
 function parse_functional_dependency_keys(parser::ParserState)::Vector{Proto.Var}
     consume_literal!(parser, "(")
     consume_literal!(parser, "keys")
-    xs1117 = Proto.Var[]
-    cond1118 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    while cond1118
-        _t1920 = parse_var(parser)
-        item1119 = _t1920
-        push!(xs1117, item1119)
-        cond1118 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    end
-    vars1120 = xs1117
+    xs1154 = Proto.Var[]
+    cond1155 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    while cond1155
+        _t1994 = parse_var(parser)
+        item1156 = _t1994
+        push!(xs1154, item1156)
+        cond1155 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    end
+    vars1157 = xs1154
     consume_literal!(parser, ")")
-    return vars1120
+    return vars1157
 end
 
 function parse_functional_dependency_values(parser::ParserState)::Vector{Proto.Var}
     consume_literal!(parser, "(")
     consume_literal!(parser, "values")
-    xs1121 = Proto.Var[]
-    cond1122 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    while cond1122
-        _t1921 = parse_var(parser)
-        item1123 = _t1921
-        push!(xs1121, item1123)
-        cond1122 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    end
-    vars1124 = xs1121
+    xs1158 = Proto.Var[]
+    cond1159 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    while cond1159
+        _t1995 = parse_var(parser)
+        item1160 = _t1995
+        push!(xs1158, item1160)
+        cond1159 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    end
+    vars1161 = xs1158
     consume_literal!(parser, ")")
-    return vars1124
+    return vars1161
 end
 
 function parse_data(parser::ParserState)::Proto.Data
-    span_start1130 = span_start(parser)
+    span_start1167 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "iceberg_data", 1)
-            _t1923 = 3
+            _t1997 = 3
         else
             if match_lookahead_literal(parser, "edb", 1)
-                _t1924 = 0
+                _t1998 = 0
             else
                 if match_lookahead_literal(parser, "csv_data", 1)
-                    _t1925 = 2
+                    _t1999 = 2
                 else
                     if match_lookahead_literal(parser, "betree_relation", 1)
-                        _t1926 = 1
+                        _t2000 = 1
                     else
-                        _t1926 = -1
+                        _t2000 = -1
                     end
-                    _t1925 = _t1926
+                    _t1999 = _t2000
                 end
-                _t1924 = _t1925
+                _t1998 = _t1999
             end
-            _t1923 = _t1924
+            _t1997 = _t1998
         end
-        _t1922 = _t1923
+        _t1996 = _t1997
     else
-        _t1922 = -1
-    end
-    prediction1125 = _t1922
-    if prediction1125 == 3
-        _t1928 = parse_iceberg_data(parser)
-        iceberg_data1129 = _t1928
-        _t1929 = Proto.Data(data_type=OneOf(:iceberg_data, iceberg_data1129))
-        _t1927 = _t1929
+        _t1996 = -1
+    end
+    prediction1162 = _t1996
+    if prediction1162 == 3
+        _t2002 = parse_iceberg_data(parser)
+        iceberg_data1166 = _t2002
+        _t2003 = Proto.Data(data_type=OneOf(:iceberg_data, iceberg_data1166))
+        _t2001 = _t2003
     else
-        if prediction1125 == 2
-            _t1931 = parse_csv_data(parser)
-            csv_data1128 = _t1931
-            _t1932 = Proto.Data(data_type=OneOf(:csv_data, csv_data1128))
-            _t1930 = _t1932
+        if prediction1162 == 2
+            _t2005 = parse_csv_data(parser)
+            csv_data1165 = _t2005
+            _t2006 = Proto.Data(data_type=OneOf(:csv_data, csv_data1165))
+            _t2004 = _t2006
         else
-            if prediction1125 == 1
-                _t1934 = parse_betree_relation(parser)
-                betree_relation1127 = _t1934
-                _t1935 = Proto.Data(data_type=OneOf(:betree_relation, betree_relation1127))
-                _t1933 = _t1935
+            if prediction1162 == 1
+                _t2008 = parse_betree_relation(parser)
+                betree_relation1164 = _t2008
+                _t2009 = Proto.Data(data_type=OneOf(:betree_relation, betree_relation1164))
+                _t2007 = _t2009
             else
-                if prediction1125 == 0
-                    _t1937 = parse_edb(parser)
-                    edb1126 = _t1937
-                    _t1938 = Proto.Data(data_type=OneOf(:edb, edb1126))
-                    _t1936 = _t1938
+                if prediction1162 == 0
+                    _t2011 = parse_edb(parser)
+                    edb1163 = _t2011
+                    _t2012 = Proto.Data(data_type=OneOf(:edb, edb1163))
+                    _t2010 = _t2012
                 else
                     throw(ParseError("Unexpected token in data" * ": " * string(lookahead(parser, 0))))
                 end
-                _t1933 = _t1936
+                _t2007 = _t2010
             end
-            _t1930 = _t1933
+            _t2004 = _t2007
         end
-        _t1927 = _t1930
+        _t2001 = _t2004
     end
-    result1131 = _t1927
-    record_span!(parser, span_start1130, "Data")
-    return result1131
+    result1168 = _t2001
+    record_span!(parser, span_start1167, "Data")
+    return result1168
 end
 
 function parse_edb(parser::ParserState)::Proto.EDB
-    span_start1135 = span_start(parser)
+    span_start1172 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "edb")
-    _t1939 = parse_relation_id(parser)
-    relation_id1132 = _t1939
-    _t1940 = parse_edb_path(parser)
-    edb_path1133 = _t1940
-    _t1941 = parse_edb_types(parser)
-    edb_types1134 = _t1941
+    _t2013 = parse_relation_id(parser)
+    relation_id1169 = _t2013
+    _t2014 = parse_edb_path(parser)
+    edb_path1170 = _t2014
+    _t2015 = parse_edb_types(parser)
+    edb_types1171 = _t2015
     consume_literal!(parser, ")")
-    _t1942 = Proto.EDB(target_id=relation_id1132, path=edb_path1133, types=edb_types1134)
-    result1136 = _t1942
-    record_span!(parser, span_start1135, "EDB")
-    return result1136
+    _t2016 = Proto.EDB(target_id=relation_id1169, path=edb_path1170, types=edb_types1171)
+    result1173 = _t2016
+    record_span!(parser, span_start1172, "EDB")
+    return result1173
 end
 
 function parse_edb_path(parser::ParserState)::Vector{String}
     consume_literal!(parser, "[")
-    xs1137 = String[]
-    cond1138 = match_lookahead_terminal(parser, "STRING", 0)
-    while cond1138
-        item1139 = consume_terminal!(parser, "STRING")
-        push!(xs1137, item1139)
-        cond1138 = match_lookahead_terminal(parser, "STRING", 0)
-    end
-    strings1140 = xs1137
+    xs1174 = String[]
+    cond1175 = match_lookahead_terminal(parser, "STRING", 0)
+    while cond1175
+        item1176 = consume_terminal!(parser, "STRING")
+        push!(xs1174, item1176)
+        cond1175 = match_lookahead_terminal(parser, "STRING", 0)
+    end
+    strings1177 = xs1174
     consume_literal!(parser, "]")
-    return strings1140
+    return strings1177
 end
 
 function parse_edb_types(parser::ParserState)::Vector{Proto.var"#Type"}
     consume_literal!(parser, "[")
-    xs1141 = Proto.var"#Type"[]
-    cond1142 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
-    while cond1142
-        _t1943 = parse_type(parser)
-        item1143 = _t1943
-        push!(xs1141, item1143)
-        cond1142 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
-    end
-    types1144 = xs1141
+    xs1178 = Proto.var"#Type"[]
+    cond1179 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
+    while cond1179
+        _t2017 = parse_type(parser)
+        item1180 = _t2017
+        push!(xs1178, item1180)
+        cond1179 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
+    end
+    types1181 = xs1178
     consume_literal!(parser, "]")
-    return types1144
+    return types1181
 end
 
 function parse_betree_relation(parser::ParserState)::Proto.BeTreeRelation
-    span_start1147 = span_start(parser)
+    span_start1184 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "betree_relation")
-    _t1944 = parse_relation_id(parser)
-    relation_id1145 = _t1944
-    _t1945 = parse_betree_info(parser)
-    betree_info1146 = _t1945
+    _t2018 = parse_relation_id(parser)
+    relation_id1182 = _t2018
+    _t2019 = parse_betree_info(parser)
+    betree_info1183 = _t2019
     consume_literal!(parser, ")")
-    _t1946 = Proto.BeTreeRelation(name=relation_id1145, relation_info=betree_info1146)
-    result1148 = _t1946
-    record_span!(parser, span_start1147, "BeTreeRelation")
-    return result1148
+    _t2020 = Proto.BeTreeRelation(name=relation_id1182, relation_info=betree_info1183)
+    result1185 = _t2020
+    record_span!(parser, span_start1184, "BeTreeRelation")
+    return result1185
 end
 
 function parse_betree_info(parser::ParserState)::Proto.BeTreeInfo
-    span_start1152 = span_start(parser)
+    span_start1189 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "betree_info")
-    _t1947 = parse_betree_info_key_types(parser)
-    betree_info_key_types1149 = _t1947
-    _t1948 = parse_betree_info_value_types(parser)
-    betree_info_value_types1150 = _t1948
-    _t1949 = parse_config_dict(parser)
-    config_dict1151 = _t1949
+    _t2021 = parse_betree_info_key_types(parser)
+    betree_info_key_types1186 = _t2021
+    _t2022 = parse_betree_info_value_types(parser)
+    betree_info_value_types1187 = _t2022
+    _t2023 = parse_config_dict(parser)
+    config_dict1188 = _t2023
     consume_literal!(parser, ")")
-    _t1950 = construct_betree_info(parser, betree_info_key_types1149, betree_info_value_types1150, config_dict1151)
-    result1153 = _t1950
-    record_span!(parser, span_start1152, "BeTreeInfo")
-    return result1153
+    _t2024 = construct_betree_info(parser, betree_info_key_types1186, betree_info_value_types1187, config_dict1188)
+    result1190 = _t2024
+    record_span!(parser, span_start1189, "BeTreeInfo")
+    return result1190
 end
 
 function parse_betree_info_key_types(parser::ParserState)::Vector{Proto.var"#Type"}
     consume_literal!(parser, "(")
     consume_literal!(parser, "key_types")
-    xs1154 = Proto.var"#Type"[]
-    cond1155 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
-    while cond1155
-        _t1951 = parse_type(parser)
-        item1156 = _t1951
-        push!(xs1154, item1156)
-        cond1155 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
+    xs1191 = Proto.var"#Type"[]
+    cond1192 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
+    while cond1192
+        _t2025 = parse_type(parser)
+        item1193 = _t2025
+        push!(xs1191, item1193)
+        cond1192 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
     end
-    types1157 = xs1154
+    types1194 = xs1191
     consume_literal!(parser, ")")
-    return types1157
+    return types1194
 end
 
 function parse_betree_info_value_types(parser::ParserState)::Vector{Proto.var"#Type"}
     consume_literal!(parser, "(")
     consume_literal!(parser, "value_types")
-    xs1158 = Proto.var"#Type"[]
-    cond1159 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
-    while cond1159
-        _t1952 = parse_type(parser)
-        item1160 = _t1952
-        push!(xs1158, item1160)
-        cond1159 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
+    xs1195 = Proto.var"#Type"[]
+    cond1196 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
+    while cond1196
+        _t2026 = parse_type(parser)
+        item1197 = _t2026
+        push!(xs1195, item1197)
+        cond1196 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
     end
-    types1161 = xs1158
+    types1198 = xs1195
     consume_literal!(parser, ")")
-    return types1161
+    return types1198
 end
 
 function parse_csv_data(parser::ParserState)::Proto.CSVData
-    span_start1166 = span_start(parser)
+    span_start1204 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "csv_data")
-    _t1953 = parse_csvlocator(parser)
-    csvlocator1162 = _t1953
-    _t1954 = parse_csv_config(parser)
-    csv_config1163 = _t1954
-    _t1955 = parse_gnf_columns(parser)
-    gnf_columns1164 = _t1955
-    _t1956 = parse_csv_asof(parser)
-    csv_asof1165 = _t1956
+    _t2027 = parse_csvlocator(parser)
+    csvlocator1199 = _t2027
+    _t2028 = parse_csv_config(parser)
+    csv_config1200 = _t2028
+    if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "columns", 1))
+        _t2030 = parse_gnf_columns(parser)
+        _t2029 = _t2030
+    else
+        _t2029 = nothing
+    end
+    gnf_columns1201 = _t2029
+    if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "relations", 1))
+        _t2032 = parse_target_relations(parser)
+        _t2031 = _t2032
+    else
+        _t2031 = nothing
+    end
+    target_relations1202 = _t2031
+    _t2033 = parse_csv_asof(parser)
+    csv_asof1203 = _t2033
     consume_literal!(parser, ")")
-    _t1957 = Proto.CSVData(locator=csvlocator1162, config=csv_config1163, columns=gnf_columns1164, asof=csv_asof1165)
-    result1167 = _t1957
-    record_span!(parser, span_start1166, "CSVData")
-    return result1167
+    _t2034 = construct_csv_data(parser, csvlocator1199, csv_config1200, gnf_columns1201, target_relations1202, csv_asof1203)
+    result1205 = _t2034
+    record_span!(parser, span_start1204, "CSVData")
+    return result1205
 end
 
 function parse_csvlocator(parser::ParserState)::Proto.CSVLocator
-    span_start1170 = span_start(parser)
+    span_start1208 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "csv_locator")
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "paths", 1))
-        _t1959 = parse_csv_locator_paths(parser)
-        _t1958 = _t1959
+        _t2036 = parse_csv_locator_paths(parser)
+        _t2035 = _t2036
     else
-        _t1958 = nothing
+        _t2035 = nothing
     end
-    csv_locator_paths1168 = _t1958
+    csv_locator_paths1206 = _t2035
     if match_lookahead_literal(parser, "(", 0)
-        _t1961 = parse_csv_locator_inline_data(parser)
-        _t1960 = _t1961
+        _t2038 = parse_csv_locator_inline_data(parser)
+        _t2037 = _t2038
     else
-        _t1960 = nothing
+        _t2037 = nothing
     end
-    csv_locator_inline_data1169 = _t1960
+    csv_locator_inline_data1207 = _t2037
     consume_literal!(parser, ")")
-    _t1962 = Proto.CSVLocator(paths=(!isnothing(csv_locator_paths1168) ? csv_locator_paths1168 : String[]), inline_data=Vector{UInt8}((!isnothing(csv_locator_inline_data1169) ? csv_locator_inline_data1169 : "")))
-    result1171 = _t1962
-    record_span!(parser, span_start1170, "CSVLocator")
-    return result1171
+    _t2039 = Proto.CSVLocator(paths=(!isnothing(csv_locator_paths1206) ? csv_locator_paths1206 : String[]), inline_data=Vector{UInt8}((!isnothing(csv_locator_inline_data1207) ? csv_locator_inline_data1207 : "")))
+    result1209 = _t2039
+    record_span!(parser, span_start1208, "CSVLocator")
+    return result1209
 end
 
 function parse_csv_locator_paths(parser::ParserState)::Vector{String}
     consume_literal!(parser, "(")
     consume_literal!(parser, "paths")
-    xs1172 = String[]
-    cond1173 = match_lookahead_terminal(parser, "STRING", 0)
-    while cond1173
-        item1174 = consume_terminal!(parser, "STRING")
-        push!(xs1172, item1174)
-        cond1173 = match_lookahead_terminal(parser, "STRING", 0)
-    end
-    strings1175 = xs1172
+    xs1210 = String[]
+    cond1211 = match_lookahead_terminal(parser, "STRING", 0)
+    while cond1211
+        item1212 = consume_terminal!(parser, "STRING")
+        push!(xs1210, item1212)
+        cond1211 = match_lookahead_terminal(parser, "STRING", 0)
+    end
+    strings1213 = xs1210
     consume_literal!(parser, ")")
-    return strings1175
+    return strings1213
 end
 
 function parse_csv_locator_inline_data(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "inline_data")
-    formatted_string1176 = consume_terminal!(parser, "STRING")
+    formatted_string1214 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return formatted_string1176
+    return formatted_string1214
 end
 
 function parse_csv_config(parser::ParserState)::Proto.CSVConfig
-    span_start1179 = span_start(parser)
+    span_start1217 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "csv_config")
-    _t1963 = parse_config_dict(parser)
-    config_dict1177 = _t1963
+    _t2040 = parse_config_dict(parser)
+    config_dict1215 = _t2040
     if match_lookahead_literal(parser, "(", 0)
-        _t1965 = parse__storage_integration(parser)
-        _t1964 = _t1965
+        _t2042 = parse__storage_integration(parser)
+        _t2041 = _t2042
     else
-        _t1964 = nothing
+        _t2041 = nothing
     end
-    _storage_integration1178 = _t1964
+    _storage_integration1216 = _t2041
     consume_literal!(parser, ")")
-    _t1966 = construct_csv_config(parser, config_dict1177, _storage_integration1178)
-    result1180 = _t1966
-    record_span!(parser, span_start1179, "CSVConfig")
-    return result1180
+    _t2043 = construct_csv_config(parser, config_dict1215, _storage_integration1216)
+    result1218 = _t2043
+    record_span!(parser, span_start1217, "CSVConfig")
+    return result1218
 end
 
 function parse__storage_integration(parser::ParserState)::Vector{Tuple{String, Proto.Value}}
     consume_literal!(parser, "(")
     consume_literal!(parser, "storage_integration")
-    _t1967 = parse_config_dict(parser)
-    config_dict1181 = _t1967
+    _t2044 = parse_config_dict(parser)
+    config_dict1219 = _t2044
     consume_literal!(parser, ")")
-    return config_dict1181
+    return config_dict1219
 end
 
 function parse_gnf_columns(parser::ParserState)::Vector{Proto.GNFColumn}
     consume_literal!(parser, "(")
     consume_literal!(parser, "columns")
-    xs1182 = Proto.GNFColumn[]
-    cond1183 = match_lookahead_literal(parser, "(", 0)
-    while cond1183
-        _t1968 = parse_gnf_column(parser)
-        item1184 = _t1968
-        push!(xs1182, item1184)
-        cond1183 = match_lookahead_literal(parser, "(", 0)
-    end
-    gnf_columns1185 = xs1182
+    xs1220 = Proto.GNFColumn[]
+    cond1221 = match_lookahead_literal(parser, "(", 0)
+    while cond1221
+        _t2045 = parse_gnf_column(parser)
+        item1222 = _t2045
+        push!(xs1220, item1222)
+        cond1221 = match_lookahead_literal(parser, "(", 0)
+    end
+    gnf_columns1223 = xs1220
     consume_literal!(parser, ")")
-    return gnf_columns1185
+    return gnf_columns1223
 end
 
 function parse_gnf_column(parser::ParserState)::Proto.GNFColumn
-    span_start1192 = span_start(parser)
+    span_start1230 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "column")
-    _t1969 = parse_gnf_column_path(parser)
-    gnf_column_path1186 = _t1969
+    _t2046 = parse_gnf_column_path(parser)
+    gnf_column_path1224 = _t2046
     if (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
-        _t1971 = parse_relation_id(parser)
-        _t1970 = _t1971
+        _t2048 = parse_relation_id(parser)
+        _t2047 = _t2048
     else
-        _t1970 = nothing
+        _t2047 = nothing
     end
-    relation_id1187 = _t1970
+    relation_id1225 = _t2047
     consume_literal!(parser, "[")
-    xs1188 = Proto.var"#Type"[]
-    cond1189 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
-    while cond1189
-        _t1972 = parse_type(parser)
-        item1190 = _t1972
-        push!(xs1188, item1190)
-        cond1189 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
-    end
-    types1191 = xs1188
+    xs1226 = Proto.var"#Type"[]
+    cond1227 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
+    while cond1227
+        _t2049 = parse_type(parser)
+        item1228 = _t2049
+        push!(xs1226, item1228)
+        cond1227 = (((((((((((((match_lookahead_literal(parser, "(", 0) || match_lookahead_literal(parser, "BOOLEAN", 0)) || match_lookahead_literal(parser, "DATE", 0)) || match_lookahead_literal(parser, "DATETIME", 0)) || match_lookahead_literal(parser, "FLOAT", 0)) || match_lookahead_literal(parser, "FLOAT32", 0)) || match_lookahead_literal(parser, "INT", 0)) || match_lookahead_literal(parser, "INT128", 0)) || match_lookahead_literal(parser, "INT32", 0)) || match_lookahead_literal(parser, "MISSING", 0)) || match_lookahead_literal(parser, "STRING", 0)) || match_lookahead_literal(parser, "UINT128", 0)) || match_lookahead_literal(parser, "UINT32", 0)) || match_lookahead_literal(parser, "UNKNOWN", 0))
+    end
+    types1229 = xs1226
     consume_literal!(parser, "]")
     consume_literal!(parser, ")")
-    _t1973 = Proto.GNFColumn(column_path=gnf_column_path1186, target_id=relation_id1187, types=types1191)
-    result1193 = _t1973
-    record_span!(parser, span_start1192, "GNFColumn")
-    return result1193
+    _t2050 = Proto.GNFColumn(column_path=gnf_column_path1224, target_id=relation_id1225, types=types1229)
+    result1231 = _t2050
+    record_span!(parser, span_start1230, "GNFColumn")
+    return result1231
 end
 
 function parse_gnf_column_path(parser::ParserState)::Vector{String}
     if match_lookahead_literal(parser, "[", 0)
-        _t1974 = 1
+        _t2051 = 1
     else
         if match_lookahead_terminal(parser, "STRING", 0)
-            _t1975 = 0
+            _t2052 = 0
         else
-            _t1975 = -1
+            _t2052 = -1
         end
-        _t1974 = _t1975
+        _t2051 = _t2052
     end
-    prediction1194 = _t1974
-    if prediction1194 == 1
+    prediction1232 = _t2051
+    if prediction1232 == 1
         consume_literal!(parser, "[")
-        xs1196 = String[]
-        cond1197 = match_lookahead_terminal(parser, "STRING", 0)
-        while cond1197
-            item1198 = consume_terminal!(parser, "STRING")
-            push!(xs1196, item1198)
-            cond1197 = match_lookahead_terminal(parser, "STRING", 0)
+        xs1234 = String[]
+        cond1235 = match_lookahead_terminal(parser, "STRING", 0)
+        while cond1235
+            item1236 = consume_terminal!(parser, "STRING")
+            push!(xs1234, item1236)
+            cond1235 = match_lookahead_terminal(parser, "STRING", 0)
         end
-        strings1199 = xs1196
+        strings1237 = xs1234
         consume_literal!(parser, "]")
-        _t1976 = strings1199
+        _t2053 = strings1237
     else
-        if prediction1194 == 0
-            string1195 = consume_terminal!(parser, "STRING")
-            _t1977 = String[string1195]
+        if prediction1232 == 0
+            string1233 = consume_terminal!(parser, "STRING")
+            _t2054 = String[string1233]
         else
             throw(ParseError("Unexpected token in gnf_column_path" * ": " * string(lookahead(parser, 0))))
         end
-        _t1976 = _t1977
+        _t2053 = _t2054
+    end
+    return _t2053
+end
+
+function parse_target_relations(parser::ParserState)::Proto.TargetRelations
+    span_start1240 = span_start(parser)
+    consume_literal!(parser, "(")
+    consume_literal!(parser, "relations")
+    _t2055 = parse_relation_keys(parser)
+    relation_keys1238 = _t2055
+    _t2056 = parse_relation_body(parser)
+    relation_body1239 = _t2056
+    consume_literal!(parser, ")")
+    _t2057 = construct_relations(parser, relation_keys1238, relation_body1239)
+    result1241 = _t2057
+    record_span!(parser, span_start1240, "TargetRelations")
+    return result1241
+end
+
+function parse_relation_keys(parser::ParserState)::Vector{Proto.NamedColumn}
+    consume_literal!(parser, "(")
+    consume_literal!(parser, "keys")
+    xs1242 = Proto.NamedColumn[]
+    cond1243 = match_lookahead_literal(parser, "(", 0)
+    while cond1243
+        _t2058 = parse_named_column(parser)
+        item1244 = _t2058
+        push!(xs1242, item1244)
+        cond1243 = match_lookahead_literal(parser, "(", 0)
+    end
+    named_columns1245 = xs1242
+    consume_literal!(parser, ")")
+    return named_columns1245
+end
+
+function parse_named_column(parser::ParserState)::Proto.NamedColumn
+    span_start1248 = span_start(parser)
+    consume_literal!(parser, "(")
+    consume_literal!(parser, "column")
+    string1246 = consume_terminal!(parser, "STRING")
+    _t2059 = parse_type(parser)
+    type1247 = _t2059
+    consume_literal!(parser, ")")
+    _t2060 = Proto.NamedColumn(name=string1246, var"#type"=type1247)
+    result1249 = _t2060
+    record_span!(parser, span_start1248, "NamedColumn")
+    return result1249
+end
+
+function parse_relation_body(parser::ParserState)::Proto.TargetRelations
+    span_start1254 = span_start(parser)
+    if match_lookahead_literal(parser, "(", 0)
+        if match_lookahead_literal(parser, "relation", 1)
+            _t2062 = 0
+        else
+            if match_lookahead_literal(parser, "inserts", 1)
+                _t2063 = 1
+            else
+                _t2063 = 0
+            end
+            _t2062 = _t2063
+        end
+        _t2061 = _t2062
+    else
+        _t2061 = 0
+    end
+    prediction1250 = _t2061
+    if prediction1250 == 1
+        _t2065 = parse_cdc_inserts(parser)
+        cdc_inserts1252 = _t2065
+        _t2066 = parse_cdc_deletes(parser)
+        cdc_deletes1253 = _t2066
+        _t2067 = construct_cdc_relations(parser, cdc_inserts1252, cdc_deletes1253)
+        _t2064 = _t2067
+    else
+        if prediction1250 == 0
+            _t2069 = parse_non_cdc_relations(parser)
+            non_cdc_relations1251 = _t2069
+            _t2070 = construct_non_cdc_relations(parser, non_cdc_relations1251)
+            _t2068 = _t2070
+        else
+            throw(ParseError("Unexpected token in relation_body" * ": " * string(lookahead(parser, 0))))
+        end
+        _t2064 = _t2068
     end
-    return _t1976
+    result1255 = _t2064
+    record_span!(parser, span_start1254, "TargetRelations")
+    return result1255
+end
+
+function parse_non_cdc_relations(parser::ParserState)::Vector{Proto.TargetRelation}
+    xs1256 = Proto.TargetRelation[]
+    cond1257 = match_lookahead_literal(parser, "(", 0)
+    while cond1257
+        _t2071 = parse_target_relation(parser)
+        item1258 = _t2071
+        push!(xs1256, item1258)
+        cond1257 = match_lookahead_literal(parser, "(", 0)
+    end
+    return xs1256
+end
+
+function parse_target_relation(parser::ParserState)::Proto.TargetRelation
+    span_start1264 = span_start(parser)
+    consume_literal!(parser, "(")
+    consume_literal!(parser, "relation")
+    _t2072 = parse_relation_id(parser)
+    relation_id1259 = _t2072
+    xs1260 = Proto.NamedColumn[]
+    cond1261 = match_lookahead_literal(parser, "(", 0)
+    while cond1261
+        _t2073 = parse_named_column(parser)
+        item1262 = _t2073
+        push!(xs1260, item1262)
+        cond1261 = match_lookahead_literal(parser, "(", 0)
+    end
+    named_columns1263 = xs1260
+    consume_literal!(parser, ")")
+    _t2074 = Proto.TargetRelation(target_id=relation_id1259, values=named_columns1263)
+    result1265 = _t2074
+    record_span!(parser, span_start1264, "TargetRelation")
+    return result1265
+end
+
+function parse_cdc_inserts(parser::ParserState)::Vector{Proto.TargetRelation}
+    consume_literal!(parser, "(")
+    consume_literal!(parser, "inserts")
+    xs1266 = Proto.TargetRelation[]
+    cond1267 = match_lookahead_literal(parser, "(", 0)
+    while cond1267
+        _t2075 = parse_target_relation(parser)
+        item1268 = _t2075
+        push!(xs1266, item1268)
+        cond1267 = match_lookahead_literal(parser, "(", 0)
+    end
+    target_relations1269 = xs1266
+    consume_literal!(parser, ")")
+    return target_relations1269
+end
+
+function parse_cdc_deletes(parser::ParserState)::Vector{Proto.TargetRelation}
+    consume_literal!(parser, "(")
+    consume_literal!(parser, "deletes")
+    xs1270 = Proto.TargetRelation[]
+    cond1271 = match_lookahead_literal(parser, "(", 0)
+    while cond1271
+        _t2076 = parse_target_relation(parser)
+        item1272 = _t2076
+        push!(xs1270, item1272)
+        cond1271 = match_lookahead_literal(parser, "(", 0)
+    end
+    target_relations1273 = xs1270
+    consume_literal!(parser, ")")
+    return target_relations1273
 end
 
 function parse_csv_asof(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "asof")
-    string1200 = consume_terminal!(parser, "STRING")
+    string1274 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1200
+    return string1274
 end
 
 function parse_iceberg_data(parser::ParserState)::Proto.IcebergData
-    span_start1207 = span_start(parser)
+    span_start1281 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "iceberg_data")
-    _t1978 = parse_iceberg_locator(parser)
-    iceberg_locator1201 = _t1978
-    _t1979 = parse_iceberg_catalog_config(parser)
-    iceberg_catalog_config1202 = _t1979
-    _t1980 = parse_gnf_columns(parser)
-    gnf_columns1203 = _t1980
+    _t2077 = parse_iceberg_locator(parser)
+    iceberg_locator1275 = _t2077
+    _t2078 = parse_iceberg_catalog_config(parser)
+    iceberg_catalog_config1276 = _t2078
+    _t2079 = parse_gnf_columns(parser)
+    gnf_columns1277 = _t2079
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "from_snapshot", 1))
-        _t1982 = parse_iceberg_from_snapshot(parser)
-        _t1981 = _t1982
+        _t2081 = parse_iceberg_from_snapshot(parser)
+        _t2080 = _t2081
     else
-        _t1981 = nothing
+        _t2080 = nothing
     end
-    iceberg_from_snapshot1204 = _t1981
+    iceberg_from_snapshot1278 = _t2080
     if match_lookahead_literal(parser, "(", 0)
-        _t1984 = parse_iceberg_to_snapshot(parser)
-        _t1983 = _t1984
+        _t2083 = parse_iceberg_to_snapshot(parser)
+        _t2082 = _t2083
     else
-        _t1983 = nothing
+        _t2082 = nothing
     end
-    iceberg_to_snapshot1205 = _t1983
-    _t1985 = parse_boolean_value(parser)
-    boolean_value1206 = _t1985
+    iceberg_to_snapshot1279 = _t2082
+    _t2084 = parse_boolean_value(parser)
+    boolean_value1280 = _t2084
     consume_literal!(parser, ")")
-    _t1986 = construct_iceberg_data(parser, iceberg_locator1201, iceberg_catalog_config1202, gnf_columns1203, iceberg_from_snapshot1204, iceberg_to_snapshot1205, boolean_value1206)
-    result1208 = _t1986
-    record_span!(parser, span_start1207, "IcebergData")
-    return result1208
+    _t2085 = construct_iceberg_data(parser, iceberg_locator1275, iceberg_catalog_config1276, gnf_columns1277, iceberg_from_snapshot1278, iceberg_to_snapshot1279, boolean_value1280)
+    result1282 = _t2085
+    record_span!(parser, span_start1281, "IcebergData")
+    return result1282
 end
 
 function parse_iceberg_locator(parser::ParserState)::Proto.IcebergLocator
-    span_start1212 = span_start(parser)
+    span_start1286 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "iceberg_locator")
-    _t1987 = parse_iceberg_locator_table_name(parser)
-    iceberg_locator_table_name1209 = _t1987
-    _t1988 = parse_iceberg_locator_namespace(parser)
-    iceberg_locator_namespace1210 = _t1988
-    _t1989 = parse_iceberg_locator_warehouse(parser)
-    iceberg_locator_warehouse1211 = _t1989
+    _t2086 = parse_iceberg_locator_table_name(parser)
+    iceberg_locator_table_name1283 = _t2086
+    _t2087 = parse_iceberg_locator_namespace(parser)
+    iceberg_locator_namespace1284 = _t2087
+    _t2088 = parse_iceberg_locator_warehouse(parser)
+    iceberg_locator_warehouse1285 = _t2088
     consume_literal!(parser, ")")
-    _t1990 = Proto.IcebergLocator(table_name=iceberg_locator_table_name1209, namespace=iceberg_locator_namespace1210, warehouse=iceberg_locator_warehouse1211)
-    result1213 = _t1990
-    record_span!(parser, span_start1212, "IcebergLocator")
-    return result1213
+    _t2089 = Proto.IcebergLocator(table_name=iceberg_locator_table_name1283, namespace=iceberg_locator_namespace1284, warehouse=iceberg_locator_warehouse1285)
+    result1287 = _t2089
+    record_span!(parser, span_start1286, "IcebergLocator")
+    return result1287
 end
 
 function parse_iceberg_locator_table_name(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "table_name")
-    string1214 = consume_terminal!(parser, "STRING")
+    string1288 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1214
+    return string1288
 end
 
 function parse_iceberg_locator_namespace(parser::ParserState)::Vector{String}
     consume_literal!(parser, "(")
     consume_literal!(parser, "namespace")
-    xs1215 = String[]
-    cond1216 = match_lookahead_terminal(parser, "STRING", 0)
-    while cond1216
-        item1217 = consume_terminal!(parser, "STRING")
-        push!(xs1215, item1217)
-        cond1216 = match_lookahead_terminal(parser, "STRING", 0)
-    end
-    strings1218 = xs1215
+    xs1289 = String[]
+    cond1290 = match_lookahead_terminal(parser, "STRING", 0)
+    while cond1290
+        item1291 = consume_terminal!(parser, "STRING")
+        push!(xs1289, item1291)
+        cond1290 = match_lookahead_terminal(parser, "STRING", 0)
+    end
+    strings1292 = xs1289
     consume_literal!(parser, ")")
-    return strings1218
+    return strings1292
 end
 
 function parse_iceberg_locator_warehouse(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "warehouse")
-    string1219 = consume_terminal!(parser, "STRING")
+    string1293 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1219
+    return string1293
 end
 
 function parse_iceberg_catalog_config(parser::ParserState)::Proto.IcebergCatalogConfig
-    span_start1224 = span_start(parser)
+    span_start1298 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "iceberg_catalog_config")
-    _t1991 = parse_iceberg_catalog_uri(parser)
-    iceberg_catalog_uri1220 = _t1991
+    _t2090 = parse_iceberg_catalog_uri(parser)
+    iceberg_catalog_uri1294 = _t2090
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "scope", 1))
-        _t1993 = parse_iceberg_catalog_config_scope(parser)
-        _t1992 = _t1993
+        _t2092 = parse_iceberg_catalog_config_scope(parser)
+        _t2091 = _t2092
     else
-        _t1992 = nothing
+        _t2091 = nothing
     end
-    iceberg_catalog_config_scope1221 = _t1992
-    _t1994 = parse_iceberg_properties(parser)
-    iceberg_properties1222 = _t1994
-    _t1995 = parse_iceberg_auth_properties(parser)
-    iceberg_auth_properties1223 = _t1995
+    iceberg_catalog_config_scope1295 = _t2091
+    _t2093 = parse_iceberg_properties(parser)
+    iceberg_properties1296 = _t2093
+    _t2094 = parse_iceberg_auth_properties(parser)
+    iceberg_auth_properties1297 = _t2094
     consume_literal!(parser, ")")
-    _t1996 = construct_iceberg_catalog_config(parser, iceberg_catalog_uri1220, iceberg_catalog_config_scope1221, iceberg_properties1222, iceberg_auth_properties1223)
-    result1225 = _t1996
-    record_span!(parser, span_start1224, "IcebergCatalogConfig")
-    return result1225
+    _t2095 = construct_iceberg_catalog_config(parser, iceberg_catalog_uri1294, iceberg_catalog_config_scope1295, iceberg_properties1296, iceberg_auth_properties1297)
+    result1299 = _t2095
+    record_span!(parser, span_start1298, "IcebergCatalogConfig")
+    return result1299
 end
 
 function parse_iceberg_catalog_uri(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "catalog_uri")
-    string1226 = consume_terminal!(parser, "STRING")
+    string1300 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1226
+    return string1300
 end
 
 function parse_iceberg_catalog_config_scope(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "scope")
-    string1227 = consume_terminal!(parser, "STRING")
+    string1301 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1227
+    return string1301
 end
 
 function parse_iceberg_properties(parser::ParserState)::Vector{Tuple{String, String}}
     consume_literal!(parser, "(")
     consume_literal!(parser, "properties")
-    xs1228 = Tuple{String, String}[]
-    cond1229 = match_lookahead_literal(parser, "(", 0)
-    while cond1229
-        _t1997 = parse_iceberg_property_entry(parser)
-        item1230 = _t1997
-        push!(xs1228, item1230)
-        cond1229 = match_lookahead_literal(parser, "(", 0)
-    end
-    iceberg_property_entrys1231 = xs1228
+    xs1302 = Tuple{String, String}[]
+    cond1303 = match_lookahead_literal(parser, "(", 0)
+    while cond1303
+        _t2096 = parse_iceberg_property_entry(parser)
+        item1304 = _t2096
+        push!(xs1302, item1304)
+        cond1303 = match_lookahead_literal(parser, "(", 0)
+    end
+    iceberg_property_entrys1305 = xs1302
     consume_literal!(parser, ")")
-    return iceberg_property_entrys1231
+    return iceberg_property_entrys1305
 end
 
 function parse_iceberg_property_entry(parser::ParserState)::Tuple{String, String}
     consume_literal!(parser, "(")
     consume_literal!(parser, "prop")
-    string1232 = consume_terminal!(parser, "STRING")
-    string_31233 = consume_terminal!(parser, "STRING")
+    string1306 = consume_terminal!(parser, "STRING")
+    string_31307 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return (string1232, string_31233,)
+    return (string1306, string_31307,)
 end
 
 function parse_iceberg_auth_properties(parser::ParserState)::Vector{Tuple{String, String}}
     consume_literal!(parser, "(")
     consume_literal!(parser, "auth_properties")
-    xs1234 = Tuple{String, String}[]
-    cond1235 = match_lookahead_literal(parser, "(", 0)
-    while cond1235
-        _t1998 = parse_iceberg_masked_property_entry(parser)
-        item1236 = _t1998
-        push!(xs1234, item1236)
-        cond1235 = match_lookahead_literal(parser, "(", 0)
-    end
-    iceberg_masked_property_entrys1237 = xs1234
+    xs1308 = Tuple{String, String}[]
+    cond1309 = match_lookahead_literal(parser, "(", 0)
+    while cond1309
+        _t2097 = parse_iceberg_masked_property_entry(parser)
+        item1310 = _t2097
+        push!(xs1308, item1310)
+        cond1309 = match_lookahead_literal(parser, "(", 0)
+    end
+    iceberg_masked_property_entrys1311 = xs1308
     consume_literal!(parser, ")")
-    return iceberg_masked_property_entrys1237
+    return iceberg_masked_property_entrys1311
 end
 
 function parse_iceberg_masked_property_entry(parser::ParserState)::Tuple{String, String}
     consume_literal!(parser, "(")
     consume_literal!(parser, "prop")
-    string1238 = consume_terminal!(parser, "STRING")
-    string_31239 = consume_terminal!(parser, "STRING")
+    string1312 = consume_terminal!(parser, "STRING")
+    string_31313 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return (string1238, string_31239,)
+    return (string1312, string_31313,)
 end
 
 function parse_iceberg_from_snapshot(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "from_snapshot")
-    string1240 = consume_terminal!(parser, "STRING")
+    string1314 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1240
+    return string1314
 end
 
 function parse_iceberg_to_snapshot(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "to_snapshot")
-    string1241 = consume_terminal!(parser, "STRING")
+    string1315 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1241
+    return string1315
 end
 
 function parse_undefine(parser::ParserState)::Proto.Undefine
-    span_start1243 = span_start(parser)
+    span_start1317 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "undefine")
-    _t1999 = parse_fragment_id(parser)
-    fragment_id1242 = _t1999
+    _t2098 = parse_fragment_id(parser)
+    fragment_id1316 = _t2098
     consume_literal!(parser, ")")
-    _t2000 = Proto.Undefine(fragment_id=fragment_id1242)
-    result1244 = _t2000
-    record_span!(parser, span_start1243, "Undefine")
-    return result1244
+    _t2099 = Proto.Undefine(fragment_id=fragment_id1316)
+    result1318 = _t2099
+    record_span!(parser, span_start1317, "Undefine")
+    return result1318
 end
 
 function parse_context(parser::ParserState)::Proto.Context
-    span_start1249 = span_start(parser)
+    span_start1323 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "context")
-    xs1245 = Proto.RelationId[]
-    cond1246 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
-    while cond1246
-        _t2001 = parse_relation_id(parser)
-        item1247 = _t2001
-        push!(xs1245, item1247)
-        cond1246 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
-    end
-    relation_ids1248 = xs1245
+    xs1319 = Proto.RelationId[]
+    cond1320 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    while cond1320
+        _t2100 = parse_relation_id(parser)
+        item1321 = _t2100
+        push!(xs1319, item1321)
+        cond1320 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    end
+    relation_ids1322 = xs1319
     consume_literal!(parser, ")")
-    _t2002 = Proto.Context(relations=relation_ids1248)
-    result1250 = _t2002
-    record_span!(parser, span_start1249, "Context")
-    return result1250
+    _t2101 = Proto.Context(relations=relation_ids1322)
+    result1324 = _t2101
+    record_span!(parser, span_start1323, "Context")
+    return result1324
 end
 
 function parse_snapshot(parser::ParserState)::Proto.Snapshot
-    span_start1256 = span_start(parser)
+    span_start1330 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "snapshot")
-    _t2003 = parse_edb_path(parser)
-    edb_path1251 = _t2003
-    xs1252 = Proto.SnapshotMapping[]
-    cond1253 = match_lookahead_literal(parser, "[", 0)
-    while cond1253
-        _t2004 = parse_snapshot_mapping(parser)
-        item1254 = _t2004
-        push!(xs1252, item1254)
-        cond1253 = match_lookahead_literal(parser, "[", 0)
-    end
-    snapshot_mappings1255 = xs1252
+    _t2102 = parse_edb_path(parser)
+    edb_path1325 = _t2102
+    xs1326 = Proto.SnapshotMapping[]
+    cond1327 = match_lookahead_literal(parser, "[", 0)
+    while cond1327
+        _t2103 = parse_snapshot_mapping(parser)
+        item1328 = _t2103
+        push!(xs1326, item1328)
+        cond1327 = match_lookahead_literal(parser, "[", 0)
+    end
+    snapshot_mappings1329 = xs1326
     consume_literal!(parser, ")")
-    _t2005 = Proto.Snapshot(mappings=snapshot_mappings1255, prefix=edb_path1251)
-    result1257 = _t2005
-    record_span!(parser, span_start1256, "Snapshot")
-    return result1257
+    _t2104 = Proto.Snapshot(mappings=snapshot_mappings1329, prefix=edb_path1325)
+    result1331 = _t2104
+    record_span!(parser, span_start1330, "Snapshot")
+    return result1331
 end
 
 function parse_snapshot_mapping(parser::ParserState)::Proto.SnapshotMapping
-    span_start1260 = span_start(parser)
-    _t2006 = parse_edb_path(parser)
-    edb_path1258 = _t2006
-    _t2007 = parse_relation_id(parser)
-    relation_id1259 = _t2007
-    _t2008 = Proto.SnapshotMapping(destination_path=edb_path1258, source_relation=relation_id1259)
-    result1261 = _t2008
-    record_span!(parser, span_start1260, "SnapshotMapping")
-    return result1261
+    span_start1334 = span_start(parser)
+    _t2105 = parse_edb_path(parser)
+    edb_path1332 = _t2105
+    _t2106 = parse_relation_id(parser)
+    relation_id1333 = _t2106
+    _t2107 = Proto.SnapshotMapping(destination_path=edb_path1332, source_relation=relation_id1333)
+    result1335 = _t2107
+    record_span!(parser, span_start1334, "SnapshotMapping")
+    return result1335
 end
 
 function parse_epoch_reads(parser::ParserState)::Vector{Proto.Read}
     consume_literal!(parser, "(")
     consume_literal!(parser, "reads")
-    xs1262 = Proto.Read[]
-    cond1263 = match_lookahead_literal(parser, "(", 0)
-    while cond1263
-        _t2009 = parse_read(parser)
-        item1264 = _t2009
-        push!(xs1262, item1264)
-        cond1263 = match_lookahead_literal(parser, "(", 0)
-    end
-    reads1265 = xs1262
+    xs1336 = Proto.Read[]
+    cond1337 = match_lookahead_literal(parser, "(", 0)
+    while cond1337
+        _t2108 = parse_read(parser)
+        item1338 = _t2108
+        push!(xs1336, item1338)
+        cond1337 = match_lookahead_literal(parser, "(", 0)
+    end
+    reads1339 = xs1336
     consume_literal!(parser, ")")
-    return reads1265
+    return reads1339
 end
 
 function parse_read(parser::ParserState)::Proto.Read
-    span_start1272 = span_start(parser)
+    span_start1346 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "what_if", 1)
-            _t2011 = 2
+            _t2110 = 2
         else
             if match_lookahead_literal(parser, "output", 1)
-                _t2012 = 1
+                _t2111 = 1
             else
                 if match_lookahead_literal(parser, "export_iceberg", 1)
-                    _t2013 = 4
+                    _t2112 = 4
                 else
                     if match_lookahead_literal(parser, "export", 1)
-                        _t2014 = 4
+                        _t2113 = 4
                     else
                         if match_lookahead_literal(parser, "demand", 1)
-                            _t2015 = 0
+                            _t2114 = 0
                         else
                             if match_lookahead_literal(parser, "abort", 1)
-                                _t2016 = 3
+                                _t2115 = 3
                             else
-                                _t2016 = -1
+                                _t2115 = -1
                             end
-                            _t2015 = _t2016
+                            _t2114 = _t2115
                         end
-                        _t2014 = _t2015
+                        _t2113 = _t2114
                     end
-                    _t2013 = _t2014
+                    _t2112 = _t2113
                 end
-                _t2012 = _t2013
+                _t2111 = _t2112
             end
-            _t2011 = _t2012
+            _t2110 = _t2111
         end
-        _t2010 = _t2011
+        _t2109 = _t2110
     else
-        _t2010 = -1
-    end
-    prediction1266 = _t2010
-    if prediction1266 == 4
-        _t2018 = parse_export(parser)
-        export1271 = _t2018
-        _t2019 = Proto.Read(read_type=OneOf(:var"#export", export1271))
-        _t2017 = _t2019
+        _t2109 = -1
+    end
+    prediction1340 = _t2109
+    if prediction1340 == 4
+        _t2117 = parse_export(parser)
+        export1345 = _t2117
+        _t2118 = Proto.Read(read_type=OneOf(:var"#export", export1345))
+        _t2116 = _t2118
     else
-        if prediction1266 == 3
-            _t2021 = parse_abort(parser)
-            abort1270 = _t2021
-            _t2022 = Proto.Read(read_type=OneOf(:abort, abort1270))
-            _t2020 = _t2022
+        if prediction1340 == 3
+            _t2120 = parse_abort(parser)
+            abort1344 = _t2120
+            _t2121 = Proto.Read(read_type=OneOf(:abort, abort1344))
+            _t2119 = _t2121
         else
-            if prediction1266 == 2
-                _t2024 = parse_what_if(parser)
-                what_if1269 = _t2024
-                _t2025 = Proto.Read(read_type=OneOf(:what_if, what_if1269))
-                _t2023 = _t2025
+            if prediction1340 == 2
+                _t2123 = parse_what_if(parser)
+                what_if1343 = _t2123
+                _t2124 = Proto.Read(read_type=OneOf(:what_if, what_if1343))
+                _t2122 = _t2124
             else
-                if prediction1266 == 1
-                    _t2027 = parse_output(parser)
-                    output1268 = _t2027
-                    _t2028 = Proto.Read(read_type=OneOf(:output, output1268))
-                    _t2026 = _t2028
+                if prediction1340 == 1
+                    _t2126 = parse_output(parser)
+                    output1342 = _t2126
+                    _t2127 = Proto.Read(read_type=OneOf(:output, output1342))
+                    _t2125 = _t2127
                 else
-                    if prediction1266 == 0
-                        _t2030 = parse_demand(parser)
-                        demand1267 = _t2030
-                        _t2031 = Proto.Read(read_type=OneOf(:demand, demand1267))
-                        _t2029 = _t2031
+                    if prediction1340 == 0
+                        _t2129 = parse_demand(parser)
+                        demand1341 = _t2129
+                        _t2130 = Proto.Read(read_type=OneOf(:demand, demand1341))
+                        _t2128 = _t2130
                     else
                         throw(ParseError("Unexpected token in read" * ": " * string(lookahead(parser, 0))))
                     end
-                    _t2026 = _t2029
+                    _t2125 = _t2128
                 end
-                _t2023 = _t2026
+                _t2122 = _t2125
             end
-            _t2020 = _t2023
+            _t2119 = _t2122
         end
-        _t2017 = _t2020
+        _t2116 = _t2119
     end
-    result1273 = _t2017
-    record_span!(parser, span_start1272, "Read")
-    return result1273
+    result1347 = _t2116
+    record_span!(parser, span_start1346, "Read")
+    return result1347
 end
 
 function parse_demand(parser::ParserState)::Proto.Demand
-    span_start1275 = span_start(parser)
+    span_start1349 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "demand")
-    _t2032 = parse_relation_id(parser)
-    relation_id1274 = _t2032
+    _t2131 = parse_relation_id(parser)
+    relation_id1348 = _t2131
     consume_literal!(parser, ")")
-    _t2033 = Proto.Demand(relation_id=relation_id1274)
-    result1276 = _t2033
-    record_span!(parser, span_start1275, "Demand")
-    return result1276
+    _t2132 = Proto.Demand(relation_id=relation_id1348)
+    result1350 = _t2132
+    record_span!(parser, span_start1349, "Demand")
+    return result1350
 end
 
 function parse_output(parser::ParserState)::Proto.Output
-    span_start1279 = span_start(parser)
+    span_start1353 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "output")
-    _t2034 = parse_name(parser)
-    name1277 = _t2034
-    _t2035 = parse_relation_id(parser)
-    relation_id1278 = _t2035
+    _t2133 = parse_name(parser)
+    name1351 = _t2133
+    _t2134 = parse_relation_id(parser)
+    relation_id1352 = _t2134
     consume_literal!(parser, ")")
-    _t2036 = Proto.Output(name=name1277, relation_id=relation_id1278)
-    result1280 = _t2036
-    record_span!(parser, span_start1279, "Output")
-    return result1280
+    _t2135 = Proto.Output(name=name1351, relation_id=relation_id1352)
+    result1354 = _t2135
+    record_span!(parser, span_start1353, "Output")
+    return result1354
 end
 
 function parse_what_if(parser::ParserState)::Proto.WhatIf
-    span_start1283 = span_start(parser)
+    span_start1357 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "what_if")
-    _t2037 = parse_name(parser)
-    name1281 = _t2037
-    _t2038 = parse_epoch(parser)
-    epoch1282 = _t2038
+    _t2136 = parse_name(parser)
+    name1355 = _t2136
+    _t2137 = parse_epoch(parser)
+    epoch1356 = _t2137
     consume_literal!(parser, ")")
-    _t2039 = Proto.WhatIf(branch=name1281, epoch=epoch1282)
-    result1284 = _t2039
-    record_span!(parser, span_start1283, "WhatIf")
-    return result1284
+    _t2138 = Proto.WhatIf(branch=name1355, epoch=epoch1356)
+    result1358 = _t2138
+    record_span!(parser, span_start1357, "WhatIf")
+    return result1358
 end
 
 function parse_abort(parser::ParserState)::Proto.Abort
-    span_start1287 = span_start(parser)
+    span_start1361 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "abort")
     if (match_lookahead_literal(parser, ":", 0) && match_lookahead_terminal(parser, "SYMBOL", 1))
-        _t2041 = parse_name(parser)
-        _t2040 = _t2041
+        _t2140 = parse_name(parser)
+        _t2139 = _t2140
     else
-        _t2040 = nothing
+        _t2139 = nothing
     end
-    name1285 = _t2040
-    _t2042 = parse_relation_id(parser)
-    relation_id1286 = _t2042
+    name1359 = _t2139
+    _t2141 = parse_relation_id(parser)
+    relation_id1360 = _t2141
     consume_literal!(parser, ")")
-    _t2043 = Proto.Abort(name=(!isnothing(name1285) ? name1285 : "abort"), relation_id=relation_id1286)
-    result1288 = _t2043
-    record_span!(parser, span_start1287, "Abort")
-    return result1288
+    _t2142 = Proto.Abort(name=(!isnothing(name1359) ? name1359 : "abort"), relation_id=relation_id1360)
+    result1362 = _t2142
+    record_span!(parser, span_start1361, "Abort")
+    return result1362
 end
 
 function parse_export(parser::ParserState)::Proto.Export
-    span_start1292 = span_start(parser)
+    span_start1366 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "export_iceberg", 1)
-            _t2045 = 1
+            _t2144 = 1
         else
             if match_lookahead_literal(parser, "export", 1)
-                _t2046 = 0
+                _t2145 = 0
             else
-                _t2046 = -1
+                _t2145 = -1
             end
-            _t2045 = _t2046
+            _t2144 = _t2145
         end
-        _t2044 = _t2045
+        _t2143 = _t2144
     else
-        _t2044 = -1
+        _t2143 = -1
     end
-    prediction1289 = _t2044
-    if prediction1289 == 1
+    prediction1363 = _t2143
+    if prediction1363 == 1
         consume_literal!(parser, "(")
         consume_literal!(parser, "export_iceberg")
-        _t2048 = parse_export_iceberg_config(parser)
-        export_iceberg_config1291 = _t2048
+        _t2147 = parse_export_iceberg_config(parser)
+        export_iceberg_config1365 = _t2147
         consume_literal!(parser, ")")
-        _t2049 = Proto.Export(export_config=OneOf(:iceberg_config, export_iceberg_config1291))
-        _t2047 = _t2049
+        _t2148 = Proto.Export(export_config=OneOf(:iceberg_config, export_iceberg_config1365))
+        _t2146 = _t2148
     else
-        if prediction1289 == 0
+        if prediction1363 == 0
             consume_literal!(parser, "(")
             consume_literal!(parser, "export")
-            _t2051 = parse_export_csv_config(parser)
-            export_csv_config1290 = _t2051
+            _t2150 = parse_export_csv_config(parser)
+            export_csv_config1364 = _t2150
             consume_literal!(parser, ")")
-            _t2052 = Proto.Export(export_config=OneOf(:csv_config, export_csv_config1290))
-            _t2050 = _t2052
+            _t2151 = Proto.Export(export_config=OneOf(:csv_config, export_csv_config1364))
+            _t2149 = _t2151
         else
             throw(ParseError("Unexpected token in export" * ": " * string(lookahead(parser, 0))))
         end
-        _t2047 = _t2050
+        _t2146 = _t2149
     end
-    result1293 = _t2047
-    record_span!(parser, span_start1292, "Export")
-    return result1293
+    result1367 = _t2146
+    record_span!(parser, span_start1366, "Export")
+    return result1367
 end
 
 function parse_export_csv_config(parser::ParserState)::Proto.ExportCSVConfig
-    span_start1301 = span_start(parser)
+    span_start1375 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "export_csv_config_v2", 1)
-            _t2054 = 0
+            _t2153 = 0
         else
             if match_lookahead_literal(parser, "export_csv_config", 1)
-                _t2055 = 1
+                _t2154 = 1
             else
-                _t2055 = -1
+                _t2154 = -1
             end
-            _t2054 = _t2055
+            _t2153 = _t2154
         end
-        _t2053 = _t2054
+        _t2152 = _t2153
     else
-        _t2053 = -1
+        _t2152 = -1
     end
-    prediction1294 = _t2053
-    if prediction1294 == 1
+    prediction1368 = _t2152
+    if prediction1368 == 1
         consume_literal!(parser, "(")
         consume_literal!(parser, "export_csv_config")
-        _t2057 = parse_export_csv_path(parser)
-        export_csv_path1298 = _t2057
-        _t2058 = parse_export_csv_columns_list(parser)
-        export_csv_columns_list1299 = _t2058
-        _t2059 = parse_config_dict(parser)
-        config_dict1300 = _t2059
+        _t2156 = parse_export_csv_path(parser)
+        export_csv_path1372 = _t2156
+        _t2157 = parse_export_csv_columns_list(parser)
+        export_csv_columns_list1373 = _t2157
+        _t2158 = parse_config_dict(parser)
+        config_dict1374 = _t2158
         consume_literal!(parser, ")")
-        _t2060 = construct_export_csv_config(parser, export_csv_path1298, export_csv_columns_list1299, config_dict1300)
-        _t2056 = _t2060
+        _t2159 = construct_export_csv_config(parser, export_csv_path1372, export_csv_columns_list1373, config_dict1374)
+        _t2155 = _t2159
     else
-        if prediction1294 == 0
+        if prediction1368 == 0
             consume_literal!(parser, "(")
             consume_literal!(parser, "export_csv_config_v2")
-            _t2062 = parse_export_csv_path(parser)
-            export_csv_path1295 = _t2062
-            _t2063 = parse_export_csv_source(parser)
-            export_csv_source1296 = _t2063
-            _t2064 = parse_csv_config(parser)
-            csv_config1297 = _t2064
+            _t2161 = parse_export_csv_path(parser)
+            export_csv_path1369 = _t2161
+            _t2162 = parse_export_csv_source(parser)
+            export_csv_source1370 = _t2162
+            _t2163 = parse_csv_config(parser)
+            csv_config1371 = _t2163
             consume_literal!(parser, ")")
-            _t2065 = construct_export_csv_config_with_source(parser, export_csv_path1295, export_csv_source1296, csv_config1297)
-            _t2061 = _t2065
+            _t2164 = construct_export_csv_config_with_source(parser, export_csv_path1369, export_csv_source1370, csv_config1371)
+            _t2160 = _t2164
         else
             throw(ParseError("Unexpected token in export_csv_config" * ": " * string(lookahead(parser, 0))))
         end
-        _t2056 = _t2061
+        _t2155 = _t2160
     end
-    result1302 = _t2056
-    record_span!(parser, span_start1301, "ExportCSVConfig")
-    return result1302
+    result1376 = _t2155
+    record_span!(parser, span_start1375, "ExportCSVConfig")
+    return result1376
 end
 
 function parse_export_csv_path(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "path")
-    string1303 = consume_terminal!(parser, "STRING")
+    string1377 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1303
+    return string1377
 end
 
 function parse_export_csv_source(parser::ParserState)::Proto.ExportCSVSource
-    span_start1310 = span_start(parser)
+    span_start1384 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "table_def", 1)
-            _t2067 = 1
+            _t2166 = 1
         else
             if match_lookahead_literal(parser, "gnf_columns", 1)
-                _t2068 = 0
+                _t2167 = 0
             else
-                _t2068 = -1
+                _t2167 = -1
             end
-            _t2067 = _t2068
+            _t2166 = _t2167
         end
-        _t2066 = _t2067
+        _t2165 = _t2166
     else
-        _t2066 = -1
+        _t2165 = -1
     end
-    prediction1304 = _t2066
-    if prediction1304 == 1
+    prediction1378 = _t2165
+    if prediction1378 == 1
         consume_literal!(parser, "(")
         consume_literal!(parser, "table_def")
-        _t2070 = parse_relation_id(parser)
-        relation_id1309 = _t2070
+        _t2169 = parse_relation_id(parser)
+        relation_id1383 = _t2169
         consume_literal!(parser, ")")
-        _t2071 = Proto.ExportCSVSource(csv_source=OneOf(:table_def, relation_id1309))
-        _t2069 = _t2071
+        _t2170 = Proto.ExportCSVSource(csv_source=OneOf(:table_def, relation_id1383))
+        _t2168 = _t2170
     else
-        if prediction1304 == 0
+        if prediction1378 == 0
             consume_literal!(parser, "(")
             consume_literal!(parser, "gnf_columns")
-            xs1305 = Proto.ExportCSVColumn[]
-            cond1306 = match_lookahead_literal(parser, "(", 0)
-            while cond1306
-                _t2073 = parse_export_csv_column(parser)
-                item1307 = _t2073
-                push!(xs1305, item1307)
-                cond1306 = match_lookahead_literal(parser, "(", 0)
+            xs1379 = Proto.ExportCSVColumn[]
+            cond1380 = match_lookahead_literal(parser, "(", 0)
+            while cond1380
+                _t2172 = parse_export_csv_column(parser)
+                item1381 = _t2172
+                push!(xs1379, item1381)
+                cond1380 = match_lookahead_literal(parser, "(", 0)
             end
-            export_csv_columns1308 = xs1305
+            export_csv_columns1382 = xs1379
             consume_literal!(parser, ")")
-            _t2074 = Proto.ExportCSVColumns(columns=export_csv_columns1308)
-            _t2075 = Proto.ExportCSVSource(csv_source=OneOf(:gnf_columns, _t2074))
-            _t2072 = _t2075
+            _t2173 = Proto.ExportCSVColumns(columns=export_csv_columns1382)
+            _t2174 = Proto.ExportCSVSource(csv_source=OneOf(:gnf_columns, _t2173))
+            _t2171 = _t2174
         else
             throw(ParseError("Unexpected token in export_csv_source" * ": " * string(lookahead(parser, 0))))
         end
-        _t2069 = _t2072
+        _t2168 = _t2171
     end
-    result1311 = _t2069
-    record_span!(parser, span_start1310, "ExportCSVSource")
-    return result1311
+    result1385 = _t2168
+    record_span!(parser, span_start1384, "ExportCSVSource")
+    return result1385
 end
 
 function parse_export_csv_column(parser::ParserState)::Proto.ExportCSVColumn
-    span_start1314 = span_start(parser)
+    span_start1388 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "column")
-    string1312 = consume_terminal!(parser, "STRING")
-    _t2076 = parse_relation_id(parser)
-    relation_id1313 = _t2076
+    string1386 = consume_terminal!(parser, "STRING")
+    _t2175 = parse_relation_id(parser)
+    relation_id1387 = _t2175
     consume_literal!(parser, ")")
-    _t2077 = Proto.ExportCSVColumn(column_name=string1312, column_data=relation_id1313)
-    result1315 = _t2077
-    record_span!(parser, span_start1314, "ExportCSVColumn")
-    return result1315
+    _t2176 = Proto.ExportCSVColumn(column_name=string1386, column_data=relation_id1387)
+    result1389 = _t2176
+    record_span!(parser, span_start1388, "ExportCSVColumn")
+    return result1389
 end
 
 function parse_export_csv_columns_list(parser::ParserState)::Vector{Proto.ExportCSVColumn}
     consume_literal!(parser, "(")
     consume_literal!(parser, "columns")
-    xs1316 = Proto.ExportCSVColumn[]
-    cond1317 = match_lookahead_literal(parser, "(", 0)
-    while cond1317
-        _t2078 = parse_export_csv_column(parser)
-        item1318 = _t2078
-        push!(xs1316, item1318)
-        cond1317 = match_lookahead_literal(parser, "(", 0)
-    end
-    export_csv_columns1319 = xs1316
+    xs1390 = Proto.ExportCSVColumn[]
+    cond1391 = match_lookahead_literal(parser, "(", 0)
+    while cond1391
+        _t2177 = parse_export_csv_column(parser)
+        item1392 = _t2177
+        push!(xs1390, item1392)
+        cond1391 = match_lookahead_literal(parser, "(", 0)
+    end
+    export_csv_columns1393 = xs1390
     consume_literal!(parser, ")")
-    return export_csv_columns1319
+    return export_csv_columns1393
 end
 
 function parse_export_iceberg_config(parser::ParserState)::Proto.ExportIcebergConfig
-    span_start1325 = span_start(parser)
+    span_start1399 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "export_iceberg_config")
-    _t2079 = parse_iceberg_locator(parser)
-    iceberg_locator1320 = _t2079
-    _t2080 = parse_iceberg_catalog_config(parser)
-    iceberg_catalog_config1321 = _t2080
-    _t2081 = parse_export_iceberg_table_def(parser)
-    export_iceberg_table_def1322 = _t2081
-    _t2082 = parse_iceberg_table_properties(parser)
-    iceberg_table_properties1323 = _t2082
+    _t2178 = parse_iceberg_locator(parser)
+    iceberg_locator1394 = _t2178
+    _t2179 = parse_iceberg_catalog_config(parser)
+    iceberg_catalog_config1395 = _t2179
+    _t2180 = parse_export_iceberg_table_def(parser)
+    export_iceberg_table_def1396 = _t2180
+    _t2181 = parse_iceberg_table_properties(parser)
+    iceberg_table_properties1397 = _t2181
     if match_lookahead_literal(parser, "{", 0)
-        _t2084 = parse_config_dict(parser)
-        _t2083 = _t2084
+        _t2183 = parse_config_dict(parser)
+        _t2182 = _t2183
     else
-        _t2083 = nothing
+        _t2182 = nothing
     end
-    config_dict1324 = _t2083
+    config_dict1398 = _t2182
     consume_literal!(parser, ")")
-    _t2085 = construct_export_iceberg_config_full(parser, iceberg_locator1320, iceberg_catalog_config1321, export_iceberg_table_def1322, iceberg_table_properties1323, config_dict1324)
-    result1326 = _t2085
-    record_span!(parser, span_start1325, "ExportIcebergConfig")
-    return result1326
+    _t2184 = construct_export_iceberg_config_full(parser, iceberg_locator1394, iceberg_catalog_config1395, export_iceberg_table_def1396, iceberg_table_properties1397, config_dict1398)
+    result1400 = _t2184
+    record_span!(parser, span_start1399, "ExportIcebergConfig")
+    return result1400
 end
 
 function parse_export_iceberg_table_def(parser::ParserState)::Proto.RelationId
-    span_start1328 = span_start(parser)
+    span_start1402 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "table_def")
-    _t2086 = parse_relation_id(parser)
-    relation_id1327 = _t2086
+    _t2185 = parse_relation_id(parser)
+    relation_id1401 = _t2185
     consume_literal!(parser, ")")
-    result1329 = relation_id1327
-    record_span!(parser, span_start1328, "RelationId")
-    return result1329
+    result1403 = relation_id1401
+    record_span!(parser, span_start1402, "RelationId")
+    return result1403
 end
 
 function parse_iceberg_table_properties(parser::ParserState)::Vector{Tuple{String, String}}
     consume_literal!(parser, "(")
     consume_literal!(parser, "table_properties")
-    xs1330 = Tuple{String, String}[]
-    cond1331 = match_lookahead_literal(parser, "(", 0)
-    while cond1331
-        _t2087 = parse_iceberg_property_entry(parser)
-        item1332 = _t2087
-        push!(xs1330, item1332)
-        cond1331 = match_lookahead_literal(parser, "(", 0)
-    end
-    iceberg_property_entrys1333 = xs1330
+    xs1404 = Tuple{String, String}[]
+    cond1405 = match_lookahead_literal(parser, "(", 0)
+    while cond1405
+        _t2186 = parse_iceberg_property_entry(parser)
+        item1406 = _t2186
+        push!(xs1404, item1406)
+        cond1405 = match_lookahead_literal(parser, "(", 0)
+    end
+    iceberg_property_entrys1407 = xs1404
     consume_literal!(parser, ")")
-    return iceberg_property_entrys1333
+    return iceberg_property_entrys1407
 end
 
 
diff --git a/sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl b/sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl
index 68914d6e..6287426e 100644
--- a/sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl
+++ b/sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl
@@ -376,90 +376,108 @@ end
 
 # --- Helper functions ---
 
+function deconstruct_csv_data_columns_optional(pp::PrettyPrinter, msg::Proto.CSVData)::Union{Nothing, Vector{Proto.GNFColumn}}
+    if _has_proto_field(msg, Symbol("relations"))
+        return nothing
+    else
+        _t1876 = nothing
+    end
+    return msg.columns
+end
+
+function deconstruct_csv_data_relations_optional(pp::PrettyPrinter, msg::Proto.CSVData)::Union{Nothing, Proto.TargetRelations}
+    if _has_proto_field(msg, Symbol("relations"))
+        return msg.relations
+    else
+        _t1877 = nothing
+    end
+    return nothing
+end
+
 function _make_value_int32(pp::PrettyPrinter, v::Int32)::Proto.Value
-    _t1781 = Proto.Value(value=OneOf(:int32_value, v))
-    return _t1781
+    _t1878 = Proto.Value(value=OneOf(:int32_value, v))
+    return _t1878
 end
 
 function _make_value_int64(pp::PrettyPrinter, v::Int64)::Proto.Value
-    _t1782 = Proto.Value(value=OneOf(:int_value, v))
-    return _t1782
+    _t1879 = Proto.Value(value=OneOf(:int_value, v))
+    return _t1879
 end
 
 function _make_value_float64(pp::PrettyPrinter, v::Float64)::Proto.Value
-    _t1783 = Proto.Value(value=OneOf(:float_value, v))
-    return _t1783
+    _t1880 = Proto.Value(value=OneOf(:float_value, v))
+    return _t1880
 end
 
 function _make_value_string(pp::PrettyPrinter, v::String)::Proto.Value
-    _t1784 = Proto.Value(value=OneOf(:string_value, v))
-    return _t1784
+    _t1881 = Proto.Value(value=OneOf(:string_value, v))
+    return _t1881
 end
 
 function _make_value_boolean(pp::PrettyPrinter, v::Bool)::Proto.Value
-    _t1785 = Proto.Value(value=OneOf(:boolean_value, v))
-    return _t1785
+    _t1882 = Proto.Value(value=OneOf(:boolean_value, v))
+    return _t1882
 end
 
 function _make_value_uint128(pp::PrettyPrinter, v::Proto.UInt128Value)::Proto.Value
-    _t1786 = Proto.Value(value=OneOf(:uint128_value, v))
-    return _t1786
+    _t1883 = Proto.Value(value=OneOf(:uint128_value, v))
+    return _t1883
 end
 
 function deconstruct_configure(pp::PrettyPrinter, msg::Proto.Configure)::Vector{Tuple{String, Proto.Value}}
     result = Tuple{String, Proto.Value}[]
     if msg.ivm_config.level == Proto.MaintenanceLevel.MAINTENANCE_LEVEL_AUTO
-        _t1787 = _make_value_string(pp, "auto")
-        push!(result, ("ivm.maintenance_level", _t1787,))
+        _t1884 = _make_value_string(pp, "auto")
+        push!(result, ("ivm.maintenance_level", _t1884,))
     else
         if msg.ivm_config.level == Proto.MaintenanceLevel.MAINTENANCE_LEVEL_ALL
-            _t1788 = _make_value_string(pp, "all")
-            push!(result, ("ivm.maintenance_level", _t1788,))
+            _t1885 = _make_value_string(pp, "all")
+            push!(result, ("ivm.maintenance_level", _t1885,))
         else
             if msg.ivm_config.level == Proto.MaintenanceLevel.MAINTENANCE_LEVEL_OFF
-                _t1789 = _make_value_string(pp, "off")
-                push!(result, ("ivm.maintenance_level", _t1789,))
+                _t1886 = _make_value_string(pp, "off")
+                push!(result, ("ivm.maintenance_level", _t1886,))
             end
         end
     end
-    _t1790 = _make_value_int64(pp, msg.semantics_version)
-    push!(result, ("semantics_version", _t1790,))
+    _t1887 = _make_value_int64(pp, msg.semantics_version)
+    push!(result, ("semantics_version", _t1887,))
     return sort(result)
 end
 
 function deconstruct_csv_config(pp::PrettyPrinter, msg::Proto.CSVConfig)::Vector{Tuple{String, Proto.Value}}
     result = Tuple{String, Proto.Value}[]
-    _t1791 = _make_value_int32(pp, msg.header_row)
-    push!(result, ("csv_header_row", _t1791,))
-    _t1792 = _make_value_int64(pp, msg.skip)
-    push!(result, ("csv_skip", _t1792,))
+    _t1888 = _make_value_int32(pp, msg.header_row)
+    push!(result, ("csv_header_row", _t1888,))
+    _t1889 = _make_value_int64(pp, msg.skip)
+    push!(result, ("csv_skip", _t1889,))
     if msg.new_line != ""
-        _t1793 = _make_value_string(pp, msg.new_line)
-        push!(result, ("csv_new_line", _t1793,))
-    end
-    _t1794 = _make_value_string(pp, msg.delimiter)
-    push!(result, ("csv_delimiter", _t1794,))
-    _t1795 = _make_value_string(pp, msg.quotechar)
-    push!(result, ("csv_quotechar", _t1795,))
-    _t1796 = _make_value_string(pp, msg.escapechar)
-    push!(result, ("csv_escapechar", _t1796,))
+        _t1890 = _make_value_string(pp, msg.new_line)
+        push!(result, ("csv_new_line", _t1890,))
+    end
+    _t1891 = _make_value_string(pp, msg.delimiter)
+    push!(result, ("csv_delimiter", _t1891,))
+    _t1892 = _make_value_string(pp, msg.quotechar)
+    push!(result, ("csv_quotechar", _t1892,))
+    _t1893 = _make_value_string(pp, msg.escapechar)
+    push!(result, ("csv_escapechar", _t1893,))
     if msg.comment != ""
-        _t1797 = _make_value_string(pp, msg.comment)
-        push!(result, ("csv_comment", _t1797,))
+        _t1894 = _make_value_string(pp, msg.comment)
+        push!(result, ("csv_comment", _t1894,))
     end
     for missing_string in msg.missing_strings
-        _t1798 = _make_value_string(pp, missing_string)
-        push!(result, ("csv_missing_strings", _t1798,))
-    end
-    _t1799 = _make_value_string(pp, msg.decimal_separator)
-    push!(result, ("csv_decimal_separator", _t1799,))
-    _t1800 = _make_value_string(pp, msg.encoding)
-    push!(result, ("csv_encoding", _t1800,))
-    _t1801 = _make_value_string(pp, msg.compression)
-    push!(result, ("csv_compression", _t1801,))
+        _t1895 = _make_value_string(pp, missing_string)
+        push!(result, ("csv_missing_strings", _t1895,))
+    end
+    _t1896 = _make_value_string(pp, msg.decimal_separator)
+    push!(result, ("csv_decimal_separator", _t1896,))
+    _t1897 = _make_value_string(pp, msg.encoding)
+    push!(result, ("csv_encoding", _t1897,))
+    _t1898 = _make_value_string(pp, msg.compression)
+    push!(result, ("csv_compression", _t1898,))
     if msg.partition_size_mb != 0
-        _t1802 = _make_value_int64(pp, msg.partition_size_mb)
-        push!(result, ("csv_partition_size_mb", _t1802,))
+        _t1899 = _make_value_int64(pp, msg.partition_size_mb)
+        push!(result, ("csv_partition_size_mb", _t1899,))
     end
     return sort(result)
 end
@@ -468,91 +486,91 @@ function deconstruct_csv_storage_integration_optional(pp::PrettyPrinter, msg::Pr
     if !_has_proto_field(msg, Symbol("storage_integration"))
         return nothing
     else
-        _t1803 = nothing
+        _t1900 = nothing
     end
     si = msg.storage_integration
     result = Tuple{String, Proto.Value}[]
     if si.provider != ""
-        _t1804 = _make_value_string(pp, si.provider)
-        push!(result, ("provider", _t1804,))
+        _t1901 = _make_value_string(pp, si.provider)
+        push!(result, ("provider", _t1901,))
     end
     if si.azure_sas_token != ""
-        _t1805 = _make_value_string(pp, "***")
-        push!(result, ("azure_sas_token", _t1805,))
+        _t1902 = _make_value_string(pp, "***")
+        push!(result, ("azure_sas_token", _t1902,))
     end
     if si.s3_region != ""
-        _t1806 = _make_value_string(pp, si.s3_region)
-        push!(result, ("s3_region", _t1806,))
+        _t1903 = _make_value_string(pp, si.s3_region)
+        push!(result, ("s3_region", _t1903,))
     end
     if si.s3_access_key_id != ""
-        _t1807 = _make_value_string(pp, "***")
-        push!(result, ("s3_access_key_id", _t1807,))
+        _t1904 = _make_value_string(pp, "***")
+        push!(result, ("s3_access_key_id", _t1904,))
     end
     if si.s3_secret_access_key != ""
-        _t1808 = _make_value_string(pp, "***")
-        push!(result, ("s3_secret_access_key", _t1808,))
+        _t1905 = _make_value_string(pp, "***")
+        push!(result, ("s3_secret_access_key", _t1905,))
     end
     return sort(result)
 end
 
 function deconstruct_betree_info_config(pp::PrettyPrinter, msg::Proto.BeTreeInfo)::Vector{Tuple{String, Proto.Value}}
     result = Tuple{String, Proto.Value}[]
-    _t1809 = _make_value_float64(pp, msg.storage_config.epsilon)
-    push!(result, ("betree_config_epsilon", _t1809,))
-    _t1810 = _make_value_int64(pp, msg.storage_config.max_pivots)
-    push!(result, ("betree_config_max_pivots", _t1810,))
-    _t1811 = _make_value_int64(pp, msg.storage_config.max_deltas)
-    push!(result, ("betree_config_max_deltas", _t1811,))
-    _t1812 = _make_value_int64(pp, msg.storage_config.max_leaf)
-    push!(result, ("betree_config_max_leaf", _t1812,))
+    _t1906 = _make_value_float64(pp, msg.storage_config.epsilon)
+    push!(result, ("betree_config_epsilon", _t1906,))
+    _t1907 = _make_value_int64(pp, msg.storage_config.max_pivots)
+    push!(result, ("betree_config_max_pivots", _t1907,))
+    _t1908 = _make_value_int64(pp, msg.storage_config.max_deltas)
+    push!(result, ("betree_config_max_deltas", _t1908,))
+    _t1909 = _make_value_int64(pp, msg.storage_config.max_leaf)
+    push!(result, ("betree_config_max_leaf", _t1909,))
     if _has_proto_field(msg.relation_locator, Symbol("root_pageid"))
         if !isnothing(_get_oneof_field(msg.relation_locator, :root_pageid))
-            _t1813 = _make_value_uint128(pp, _get_oneof_field(msg.relation_locator, :root_pageid))
-            push!(result, ("betree_locator_root_pageid", _t1813,))
+            _t1910 = _make_value_uint128(pp, _get_oneof_field(msg.relation_locator, :root_pageid))
+            push!(result, ("betree_locator_root_pageid", _t1910,))
         end
     end
     if _has_proto_field(msg.relation_locator, Symbol("inline_data"))
         if !isnothing(_get_oneof_field(msg.relation_locator, :inline_data))
-            _t1814 = _make_value_string(pp, String(copy(_get_oneof_field(msg.relation_locator, :inline_data))))
-            push!(result, ("betree_locator_inline_data", _t1814,))
+            _t1911 = _make_value_string(pp, String(copy(_get_oneof_field(msg.relation_locator, :inline_data))))
+            push!(result, ("betree_locator_inline_data", _t1911,))
         end
     end
-    _t1815 = _make_value_int64(pp, msg.relation_locator.element_count)
-    push!(result, ("betree_locator_element_count", _t1815,))
-    _t1816 = _make_value_int64(pp, msg.relation_locator.tree_height)
-    push!(result, ("betree_locator_tree_height", _t1816,))
+    _t1912 = _make_value_int64(pp, msg.relation_locator.element_count)
+    push!(result, ("betree_locator_element_count", _t1912,))
+    _t1913 = _make_value_int64(pp, msg.relation_locator.tree_height)
+    push!(result, ("betree_locator_tree_height", _t1913,))
     return sort(result)
 end
 
 function deconstruct_export_csv_config(pp::PrettyPrinter, msg::Proto.ExportCSVConfig)::Vector{Tuple{String, Proto.Value}}
     result = Tuple{String, Proto.Value}[]
     if !isnothing(msg.partition_size)
-        _t1817 = _make_value_int64(pp, msg.partition_size)
-        push!(result, ("partition_size", _t1817,))
+        _t1914 = _make_value_int64(pp, msg.partition_size)
+        push!(result, ("partition_size", _t1914,))
     end
     if !isnothing(msg.compression)
-        _t1818 = _make_value_string(pp, msg.compression)
-        push!(result, ("compression", _t1818,))
+        _t1915 = _make_value_string(pp, msg.compression)
+        push!(result, ("compression", _t1915,))
     end
     if !isnothing(msg.syntax_header_row)
-        _t1819 = _make_value_boolean(pp, msg.syntax_header_row)
-        push!(result, ("syntax_header_row", _t1819,))
+        _t1916 = _make_value_boolean(pp, msg.syntax_header_row)
+        push!(result, ("syntax_header_row", _t1916,))
     end
     if !isnothing(msg.syntax_missing_string)
-        _t1820 = _make_value_string(pp, msg.syntax_missing_string)
-        push!(result, ("syntax_missing_string", _t1820,))
+        _t1917 = _make_value_string(pp, msg.syntax_missing_string)
+        push!(result, ("syntax_missing_string", _t1917,))
     end
     if !isnothing(msg.syntax_delim)
-        _t1821 = _make_value_string(pp, msg.syntax_delim)
-        push!(result, ("syntax_delim", _t1821,))
+        _t1918 = _make_value_string(pp, msg.syntax_delim)
+        push!(result, ("syntax_delim", _t1918,))
     end
     if !isnothing(msg.syntax_quotechar)
-        _t1822 = _make_value_string(pp, msg.syntax_quotechar)
-        push!(result, ("syntax_quotechar", _t1822,))
+        _t1919 = _make_value_string(pp, msg.syntax_quotechar)
+        push!(result, ("syntax_quotechar", _t1919,))
     end
     if !isnothing(msg.syntax_escapechar)
-        _t1823 = _make_value_string(pp, msg.syntax_escapechar)
-        push!(result, ("syntax_escapechar", _t1823,))
+        _t1920 = _make_value_string(pp, msg.syntax_escapechar)
+        push!(result, ("syntax_escapechar", _t1920,))
     end
     return sort(result)
 end
@@ -565,7 +583,7 @@ function deconstruct_iceberg_catalog_config_scope_optional(pp::PrettyPrinter, ms
     if msg.scope != ""
         return msg.scope
     else
-        _t1824 = nothing
+        _t1921 = nothing
     end
     return nothing
 end
@@ -574,7 +592,7 @@ function deconstruct_iceberg_data_from_snapshot_optional(pp::PrettyPrinter, msg:
     if msg.from_snapshot != ""
         return msg.from_snapshot
     else
-        _t1825 = nothing
+        _t1922 = nothing
     end
     return nothing
 end
@@ -583,7 +601,7 @@ function deconstruct_iceberg_data_to_snapshot_optional(pp::PrettyPrinter, msg::P
     if msg.to_snapshot != ""
         return msg.to_snapshot
     else
-        _t1826 = nothing
+        _t1923 = nothing
     end
     return nothing
 end
@@ -591,21 +609,21 @@ end
 function deconstruct_export_iceberg_config_optional(pp::PrettyPrinter, msg::Proto.ExportIcebergConfig)::Union{Nothing, Vector{Tuple{String, Proto.Value}}}
     result = Tuple{String, Proto.Value}[]
     if msg.prefix != ""
-        _t1827 = _make_value_string(pp, msg.prefix)
-        push!(result, ("prefix", _t1827,))
+        _t1924 = _make_value_string(pp, msg.prefix)
+        push!(result, ("prefix", _t1924,))
     end
     if msg.target_file_size_bytes != 0
-        _t1828 = _make_value_int64(pp, msg.target_file_size_bytes)
-        push!(result, ("target_file_size_bytes", _t1828,))
+        _t1925 = _make_value_int64(pp, msg.target_file_size_bytes)
+        push!(result, ("target_file_size_bytes", _t1925,))
     end
     if msg.compression != ""
-        _t1829 = _make_value_string(pp, msg.compression)
-        push!(result, ("compression", _t1829,))
+        _t1926 = _make_value_string(pp, msg.compression)
+        push!(result, ("compression", _t1926,))
     end
     if length(result) == 0
         return nothing
     else
-        _t1830 = nothing
+        _t1927 = nothing
     end
     return sort(result)
 end
@@ -620,7 +638,7 @@ function deconstruct_relation_id_uint128(pp::PrettyPrinter, msg::Proto.RelationI
     if isnothing(name)
         return relation_id_to_uint128(pp, msg)
     else
-        _t1831 = nothing
+        _t1928 = nothing
     end
     return nothing
 end
@@ -639,47 +657,47 @@ end
 # --- Pretty-print functions ---
 
 function pretty_transaction(pp::PrettyPrinter, msg::Proto.Transaction)
-    flat808 = try_flat(pp, msg, pretty_transaction)
-    if !isnothing(flat808)
-        write(pp, flat808)
+    flat851 = try_flat(pp, msg, pretty_transaction)
+    if !isnothing(flat851)
+        write(pp, flat851)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("configure"))
-            _t1598 = _dollar_dollar.configure
+            _t1684 = _dollar_dollar.configure
         else
-            _t1598 = nothing
+            _t1684 = nothing
         end
         if _has_proto_field(_dollar_dollar, Symbol("sync"))
-            _t1599 = _dollar_dollar.sync
+            _t1685 = _dollar_dollar.sync
         else
-            _t1599 = nothing
+            _t1685 = nothing
         end
-        fields799 = (_t1598, _t1599, _dollar_dollar.epochs,)
-        unwrapped_fields800 = fields799
+        fields842 = (_t1684, _t1685, _dollar_dollar.epochs,)
+        unwrapped_fields843 = fields842
         write(pp, "(transaction")
         indent_sexp!(pp)
-        field801 = unwrapped_fields800[1]
-        if !isnothing(field801)
+        field844 = unwrapped_fields843[1]
+        if !isnothing(field844)
             newline(pp)
-            opt_val802 = field801
-            pretty_configure(pp, opt_val802)
+            opt_val845 = field844
+            pretty_configure(pp, opt_val845)
         end
-        field803 = unwrapped_fields800[2]
-        if !isnothing(field803)
+        field846 = unwrapped_fields843[2]
+        if !isnothing(field846)
             newline(pp)
-            opt_val804 = field803
-            pretty_sync(pp, opt_val804)
+            opt_val847 = field846
+            pretty_sync(pp, opt_val847)
         end
-        field805 = unwrapped_fields800[3]
-        if !isempty(field805)
+        field848 = unwrapped_fields843[3]
+        if !isempty(field848)
             newline(pp)
-            for (i1600, elem806) in enumerate(field805)
-                i807 = i1600 - 1
-                if (i807 > 0)
+            for (i1686, elem849) in enumerate(field848)
+                i850 = i1686 - 1
+                if (i850 > 0)
                     newline(pp)
                 end
-                pretty_epoch(pp, elem806)
+                pretty_epoch(pp, elem849)
             end
         end
         dedent!(pp)
@@ -689,19 +707,19 @@ function pretty_transaction(pp::PrettyPrinter, msg::Proto.Transaction)
 end
 
 function pretty_configure(pp::PrettyPrinter, msg::Proto.Configure)
-    flat811 = try_flat(pp, msg, pretty_configure)
-    if !isnothing(flat811)
-        write(pp, flat811)
+    flat854 = try_flat(pp, msg, pretty_configure)
+    if !isnothing(flat854)
+        write(pp, flat854)
         return nothing
     else
         _dollar_dollar = msg
-        _t1601 = deconstruct_configure(pp, _dollar_dollar)
-        fields809 = _t1601
-        unwrapped_fields810 = fields809
+        _t1687 = deconstruct_configure(pp, _dollar_dollar)
+        fields852 = _t1687
+        unwrapped_fields853 = fields852
         write(pp, "(configure")
         indent_sexp!(pp)
         newline(pp)
-        pretty_config_dict(pp, unwrapped_fields810)
+        pretty_config_dict(pp, unwrapped_fields853)
         dedent!(pp)
         write(pp, ")")
     end
@@ -709,22 +727,22 @@ function pretty_configure(pp::PrettyPrinter, msg::Proto.Configure)
 end
 
 function pretty_config_dict(pp::PrettyPrinter, msg::Vector{Tuple{String, Proto.Value}})
-    flat815 = try_flat(pp, msg, pretty_config_dict)
-    if !isnothing(flat815)
-        write(pp, flat815)
+    flat858 = try_flat(pp, msg, pretty_config_dict)
+    if !isnothing(flat858)
+        write(pp, flat858)
         return nothing
     else
-        fields812 = msg
+        fields855 = msg
         write(pp, "{")
         indent!(pp)
-        if !isempty(fields812)
+        if !isempty(fields855)
             newline(pp)
-            for (i1602, elem813) in enumerate(fields812)
-                i814 = i1602 - 1
-                if (i814 > 0)
+            for (i1688, elem856) in enumerate(fields855)
+                i857 = i1688 - 1
+                if (i857 > 0)
                     newline(pp)
                 end
-                pretty_config_key_value(pp, elem813)
+                pretty_config_key_value(pp, elem856)
             end
         end
         dedent!(pp)
@@ -734,163 +752,163 @@ function pretty_config_dict(pp::PrettyPrinter, msg::Vector{Tuple{String, Proto.V
 end
 
 function pretty_config_key_value(pp::PrettyPrinter, msg::Tuple{String, Proto.Value})
-    flat820 = try_flat(pp, msg, pretty_config_key_value)
-    if !isnothing(flat820)
-        write(pp, flat820)
+    flat863 = try_flat(pp, msg, pretty_config_key_value)
+    if !isnothing(flat863)
+        write(pp, flat863)
         return nothing
     else
         _dollar_dollar = msg
-        fields816 = (_dollar_dollar[1], _dollar_dollar[2],)
-        unwrapped_fields817 = fields816
+        fields859 = (_dollar_dollar[1], _dollar_dollar[2],)
+        unwrapped_fields860 = fields859
         write(pp, ":")
-        field818 = unwrapped_fields817[1]
-        write(pp, field818)
+        field861 = unwrapped_fields860[1]
+        write(pp, field861)
         write(pp, " ")
-        field819 = unwrapped_fields817[2]
-        pretty_raw_value(pp, field819)
+        field862 = unwrapped_fields860[2]
+        pretty_raw_value(pp, field862)
     end
     return nothing
 end
 
 function pretty_raw_value(pp::PrettyPrinter, msg::Proto.Value)
-    flat846 = try_flat(pp, msg, pretty_raw_value)
-    if !isnothing(flat846)
-        write(pp, flat846)
+    flat889 = try_flat(pp, msg, pretty_raw_value)
+    if !isnothing(flat889)
+        write(pp, flat889)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("date_value"))
-            _t1603 = _get_oneof_field(_dollar_dollar, :date_value)
+            _t1689 = _get_oneof_field(_dollar_dollar, :date_value)
         else
-            _t1603 = nothing
+            _t1689 = nothing
         end
-        deconstruct_result844 = _t1603
-        if !isnothing(deconstruct_result844)
-            unwrapped845 = deconstruct_result844
-            pretty_raw_date(pp, unwrapped845)
+        deconstruct_result887 = _t1689
+        if !isnothing(deconstruct_result887)
+            unwrapped888 = deconstruct_result887
+            pretty_raw_date(pp, unwrapped888)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("datetime_value"))
-                _t1604 = _get_oneof_field(_dollar_dollar, :datetime_value)
+                _t1690 = _get_oneof_field(_dollar_dollar, :datetime_value)
             else
-                _t1604 = nothing
+                _t1690 = nothing
             end
-            deconstruct_result842 = _t1604
-            if !isnothing(deconstruct_result842)
-                unwrapped843 = deconstruct_result842
-                pretty_raw_datetime(pp, unwrapped843)
+            deconstruct_result885 = _t1690
+            if !isnothing(deconstruct_result885)
+                unwrapped886 = deconstruct_result885
+                pretty_raw_datetime(pp, unwrapped886)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("string_value"))
-                    _t1605 = _get_oneof_field(_dollar_dollar, :string_value)
+                    _t1691 = _get_oneof_field(_dollar_dollar, :string_value)
                 else
-                    _t1605 = nothing
+                    _t1691 = nothing
                 end
-                deconstruct_result840 = _t1605
-                if !isnothing(deconstruct_result840)
-                    unwrapped841 = deconstruct_result840
-                    write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped841))
+                deconstruct_result883 = _t1691
+                if !isnothing(deconstruct_result883)
+                    unwrapped884 = deconstruct_result883
+                    write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped884))
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("int32_value"))
-                        _t1606 = _get_oneof_field(_dollar_dollar, :int32_value)
+                        _t1692 = _get_oneof_field(_dollar_dollar, :int32_value)
                     else
-                        _t1606 = nothing
+                        _t1692 = nothing
                     end
-                    deconstruct_result838 = _t1606
-                    if !isnothing(deconstruct_result838)
-                        unwrapped839 = deconstruct_result838
-                        write(pp, (string(Int64(unwrapped839)) * "i32"))
+                    deconstruct_result881 = _t1692
+                    if !isnothing(deconstruct_result881)
+                        unwrapped882 = deconstruct_result881
+                        write(pp, (string(Int64(unwrapped882)) * "i32"))
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("int_value"))
-                            _t1607 = _get_oneof_field(_dollar_dollar, :int_value)
+                            _t1693 = _get_oneof_field(_dollar_dollar, :int_value)
                         else
-                            _t1607 = nothing
+                            _t1693 = nothing
                         end
-                        deconstruct_result836 = _t1607
-                        if !isnothing(deconstruct_result836)
-                            unwrapped837 = deconstruct_result836
-                            write(pp, string(unwrapped837))
+                        deconstruct_result879 = _t1693
+                        if !isnothing(deconstruct_result879)
+                            unwrapped880 = deconstruct_result879
+                            write(pp, string(unwrapped880))
                         else
                             _dollar_dollar = msg
                             if _has_proto_field(_dollar_dollar, Symbol("float32_value"))
-                                _t1608 = _get_oneof_field(_dollar_dollar, :float32_value)
+                                _t1694 = _get_oneof_field(_dollar_dollar, :float32_value)
                             else
-                                _t1608 = nothing
+                                _t1694 = nothing
                             end
-                            deconstruct_result834 = _t1608
-                            if !isnothing(deconstruct_result834)
-                                unwrapped835 = deconstruct_result834
-                                write(pp, format_float32_literal(unwrapped835))
+                            deconstruct_result877 = _t1694
+                            if !isnothing(deconstruct_result877)
+                                unwrapped878 = deconstruct_result877
+                                write(pp, format_float32_literal(unwrapped878))
                             else
                                 _dollar_dollar = msg
                                 if _has_proto_field(_dollar_dollar, Symbol("float_value"))
-                                    _t1609 = _get_oneof_field(_dollar_dollar, :float_value)
+                                    _t1695 = _get_oneof_field(_dollar_dollar, :float_value)
                                 else
-                                    _t1609 = nothing
+                                    _t1695 = nothing
                                 end
-                                deconstruct_result832 = _t1609
-                                if !isnothing(deconstruct_result832)
-                                    unwrapped833 = deconstruct_result832
-                                    write(pp, lowercase(string(unwrapped833)))
+                                deconstruct_result875 = _t1695
+                                if !isnothing(deconstruct_result875)
+                                    unwrapped876 = deconstruct_result875
+                                    write(pp, lowercase(string(unwrapped876)))
                                 else
                                     _dollar_dollar = msg
                                     if _has_proto_field(_dollar_dollar, Symbol("uint32_value"))
-                                        _t1610 = _get_oneof_field(_dollar_dollar, :uint32_value)
+                                        _t1696 = _get_oneof_field(_dollar_dollar, :uint32_value)
                                     else
-                                        _t1610 = nothing
+                                        _t1696 = nothing
                                     end
-                                    deconstruct_result830 = _t1610
-                                    if !isnothing(deconstruct_result830)
-                                        unwrapped831 = deconstruct_result830
-                                        write(pp, (string(Int64(unwrapped831)) * "u32"))
+                                    deconstruct_result873 = _t1696
+                                    if !isnothing(deconstruct_result873)
+                                        unwrapped874 = deconstruct_result873
+                                        write(pp, (string(Int64(unwrapped874)) * "u32"))
                                     else
                                         _dollar_dollar = msg
                                         if _has_proto_field(_dollar_dollar, Symbol("uint128_value"))
-                                            _t1611 = _get_oneof_field(_dollar_dollar, :uint128_value)
+                                            _t1697 = _get_oneof_field(_dollar_dollar, :uint128_value)
                                         else
-                                            _t1611 = nothing
+                                            _t1697 = nothing
                                         end
-                                        deconstruct_result828 = _t1611
-                                        if !isnothing(deconstruct_result828)
-                                            unwrapped829 = deconstruct_result828
-                                            write(pp, format_uint128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped829))
+                                        deconstruct_result871 = _t1697
+                                        if !isnothing(deconstruct_result871)
+                                            unwrapped872 = deconstruct_result871
+                                            write(pp, format_uint128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped872))
                                         else
                                             _dollar_dollar = msg
                                             if _has_proto_field(_dollar_dollar, Symbol("int128_value"))
-                                                _t1612 = _get_oneof_field(_dollar_dollar, :int128_value)
+                                                _t1698 = _get_oneof_field(_dollar_dollar, :int128_value)
                                             else
-                                                _t1612 = nothing
+                                                _t1698 = nothing
                                             end
-                                            deconstruct_result826 = _t1612
-                                            if !isnothing(deconstruct_result826)
-                                                unwrapped827 = deconstruct_result826
-                                                write(pp, format_int128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped827))
+                                            deconstruct_result869 = _t1698
+                                            if !isnothing(deconstruct_result869)
+                                                unwrapped870 = deconstruct_result869
+                                                write(pp, format_int128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped870))
                                             else
                                                 _dollar_dollar = msg
                                                 if _has_proto_field(_dollar_dollar, Symbol("decimal_value"))
-                                                    _t1613 = _get_oneof_field(_dollar_dollar, :decimal_value)
+                                                    _t1699 = _get_oneof_field(_dollar_dollar, :decimal_value)
                                                 else
-                                                    _t1613 = nothing
+                                                    _t1699 = nothing
                                                 end
-                                                deconstruct_result824 = _t1613
-                                                if !isnothing(deconstruct_result824)
-                                                    unwrapped825 = deconstruct_result824
-                                                    write(pp, format_decimal(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped825))
+                                                deconstruct_result867 = _t1699
+                                                if !isnothing(deconstruct_result867)
+                                                    unwrapped868 = deconstruct_result867
+                                                    write(pp, format_decimal(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped868))
                                                 else
                                                     _dollar_dollar = msg
                                                     if _has_proto_field(_dollar_dollar, Symbol("boolean_value"))
-                                                        _t1614 = _get_oneof_field(_dollar_dollar, :boolean_value)
+                                                        _t1700 = _get_oneof_field(_dollar_dollar, :boolean_value)
                                                     else
-                                                        _t1614 = nothing
+                                                        _t1700 = nothing
                                                     end
-                                                    deconstruct_result822 = _t1614
-                                                    if !isnothing(deconstruct_result822)
-                                                        unwrapped823 = deconstruct_result822
-                                                        pretty_boolean_value(pp, unwrapped823)
+                                                    deconstruct_result865 = _t1700
+                                                    if !isnothing(deconstruct_result865)
+                                                        unwrapped866 = deconstruct_result865
+                                                        pretty_boolean_value(pp, unwrapped866)
                                                     else
-                                                        fields821 = msg
+                                                        fields864 = msg
                                                         write(pp, "missing")
                                                     end
                                                 end
@@ -909,25 +927,25 @@ function pretty_raw_value(pp::PrettyPrinter, msg::Proto.Value)
 end
 
 function pretty_raw_date(pp::PrettyPrinter, msg::Proto.DateValue)
-    flat852 = try_flat(pp, msg, pretty_raw_date)
-    if !isnothing(flat852)
-        write(pp, flat852)
+    flat895 = try_flat(pp, msg, pretty_raw_date)
+    if !isnothing(flat895)
+        write(pp, flat895)
         return nothing
     else
         _dollar_dollar = msg
-        fields847 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day),)
-        unwrapped_fields848 = fields847
+        fields890 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day),)
+        unwrapped_fields891 = fields890
         write(pp, "(date")
         indent_sexp!(pp)
         newline(pp)
-        field849 = unwrapped_fields848[1]
-        write(pp, string(field849))
+        field892 = unwrapped_fields891[1]
+        write(pp, string(field892))
         newline(pp)
-        field850 = unwrapped_fields848[2]
-        write(pp, string(field850))
+        field893 = unwrapped_fields891[2]
+        write(pp, string(field893))
         newline(pp)
-        field851 = unwrapped_fields848[3]
-        write(pp, string(field851))
+        field894 = unwrapped_fields891[3]
+        write(pp, string(field894))
         dedent!(pp)
         write(pp, ")")
     end
@@ -935,39 +953,39 @@ function pretty_raw_date(pp::PrettyPrinter, msg::Proto.DateValue)
 end
 
 function pretty_raw_datetime(pp::PrettyPrinter, msg::Proto.DateTimeValue)
-    flat863 = try_flat(pp, msg, pretty_raw_datetime)
-    if !isnothing(flat863)
-        write(pp, flat863)
+    flat906 = try_flat(pp, msg, pretty_raw_datetime)
+    if !isnothing(flat906)
+        write(pp, flat906)
         return nothing
     else
         _dollar_dollar = msg
-        fields853 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day), Int64(_dollar_dollar.hour), Int64(_dollar_dollar.minute), Int64(_dollar_dollar.second), Int64(_dollar_dollar.microsecond),)
-        unwrapped_fields854 = fields853
+        fields896 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day), Int64(_dollar_dollar.hour), Int64(_dollar_dollar.minute), Int64(_dollar_dollar.second), Int64(_dollar_dollar.microsecond),)
+        unwrapped_fields897 = fields896
         write(pp, "(datetime")
         indent_sexp!(pp)
         newline(pp)
-        field855 = unwrapped_fields854[1]
-        write(pp, string(field855))
+        field898 = unwrapped_fields897[1]
+        write(pp, string(field898))
         newline(pp)
-        field856 = unwrapped_fields854[2]
-        write(pp, string(field856))
+        field899 = unwrapped_fields897[2]
+        write(pp, string(field899))
         newline(pp)
-        field857 = unwrapped_fields854[3]
-        write(pp, string(field857))
+        field900 = unwrapped_fields897[3]
+        write(pp, string(field900))
         newline(pp)
-        field858 = unwrapped_fields854[4]
-        write(pp, string(field858))
+        field901 = unwrapped_fields897[4]
+        write(pp, string(field901))
         newline(pp)
-        field859 = unwrapped_fields854[5]
-        write(pp, string(field859))
+        field902 = unwrapped_fields897[5]
+        write(pp, string(field902))
         newline(pp)
-        field860 = unwrapped_fields854[6]
-        write(pp, string(field860))
-        field861 = unwrapped_fields854[7]
-        if !isnothing(field861)
+        field903 = unwrapped_fields897[6]
+        write(pp, string(field903))
+        field904 = unwrapped_fields897[7]
+        if !isnothing(field904)
             newline(pp)
-            opt_val862 = field861
-            write(pp, string(opt_val862))
+            opt_val905 = field904
+            write(pp, string(opt_val905))
         end
         dedent!(pp)
         write(pp, ")")
@@ -978,24 +996,24 @@ end
 function pretty_boolean_value(pp::PrettyPrinter, msg::Bool)
     _dollar_dollar = msg
     if _dollar_dollar
-        _t1615 = ()
+        _t1701 = ()
     else
-        _t1615 = nothing
+        _t1701 = nothing
     end
-    deconstruct_result866 = _t1615
-    if !isnothing(deconstruct_result866)
-        unwrapped867 = deconstruct_result866
+    deconstruct_result909 = _t1701
+    if !isnothing(deconstruct_result909)
+        unwrapped910 = deconstruct_result909
         write(pp, "true")
     else
         _dollar_dollar = msg
         if !_dollar_dollar
-            _t1616 = ()
+            _t1702 = ()
         else
-            _t1616 = nothing
+            _t1702 = nothing
         end
-        deconstruct_result864 = _t1616
-        if !isnothing(deconstruct_result864)
-            unwrapped865 = deconstruct_result864
+        deconstruct_result907 = _t1702
+        if !isnothing(deconstruct_result907)
+            unwrapped908 = deconstruct_result907
             write(pp, "false")
         else
             throw(ParseError("No matching rule for boolean_value"))
@@ -1005,24 +1023,24 @@ function pretty_boolean_value(pp::PrettyPrinter, msg::Bool)
 end
 
 function pretty_sync(pp::PrettyPrinter, msg::Proto.Sync)
-    flat872 = try_flat(pp, msg, pretty_sync)
-    if !isnothing(flat872)
-        write(pp, flat872)
+    flat915 = try_flat(pp, msg, pretty_sync)
+    if !isnothing(flat915)
+        write(pp, flat915)
         return nothing
     else
         _dollar_dollar = msg
-        fields868 = _dollar_dollar.fragments
-        unwrapped_fields869 = fields868
+        fields911 = _dollar_dollar.fragments
+        unwrapped_fields912 = fields911
         write(pp, "(sync")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields869)
+        if !isempty(unwrapped_fields912)
             newline(pp)
-            for (i1617, elem870) in enumerate(unwrapped_fields869)
-                i871 = i1617 - 1
-                if (i871 > 0)
+            for (i1703, elem913) in enumerate(unwrapped_fields912)
+                i914 = i1703 - 1
+                if (i914 > 0)
                     newline(pp)
                 end
-                pretty_fragment_id(pp, elem870)
+                pretty_fragment_id(pp, elem913)
             end
         end
         dedent!(pp)
@@ -1032,52 +1050,52 @@ function pretty_sync(pp::PrettyPrinter, msg::Proto.Sync)
 end
 
 function pretty_fragment_id(pp::PrettyPrinter, msg::Proto.FragmentId)
-    flat875 = try_flat(pp, msg, pretty_fragment_id)
-    if !isnothing(flat875)
-        write(pp, flat875)
+    flat918 = try_flat(pp, msg, pretty_fragment_id)
+    if !isnothing(flat918)
+        write(pp, flat918)
         return nothing
     else
         _dollar_dollar = msg
-        fields873 = fragment_id_to_string(pp, _dollar_dollar)
-        unwrapped_fields874 = fields873
+        fields916 = fragment_id_to_string(pp, _dollar_dollar)
+        unwrapped_fields917 = fields916
         write(pp, ":")
-        write(pp, unwrapped_fields874)
+        write(pp, unwrapped_fields917)
     end
     return nothing
 end
 
 function pretty_epoch(pp::PrettyPrinter, msg::Proto.Epoch)
-    flat882 = try_flat(pp, msg, pretty_epoch)
-    if !isnothing(flat882)
-        write(pp, flat882)
+    flat925 = try_flat(pp, msg, pretty_epoch)
+    if !isnothing(flat925)
+        write(pp, flat925)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.writes)
-            _t1618 = _dollar_dollar.writes
+            _t1704 = _dollar_dollar.writes
         else
-            _t1618 = nothing
+            _t1704 = nothing
         end
         if !isempty(_dollar_dollar.reads)
-            _t1619 = _dollar_dollar.reads
+            _t1705 = _dollar_dollar.reads
         else
-            _t1619 = nothing
+            _t1705 = nothing
         end
-        fields876 = (_t1618, _t1619,)
-        unwrapped_fields877 = fields876
+        fields919 = (_t1704, _t1705,)
+        unwrapped_fields920 = fields919
         write(pp, "(epoch")
         indent_sexp!(pp)
-        field878 = unwrapped_fields877[1]
-        if !isnothing(field878)
+        field921 = unwrapped_fields920[1]
+        if !isnothing(field921)
             newline(pp)
-            opt_val879 = field878
-            pretty_epoch_writes(pp, opt_val879)
+            opt_val922 = field921
+            pretty_epoch_writes(pp, opt_val922)
         end
-        field880 = unwrapped_fields877[2]
-        if !isnothing(field880)
+        field923 = unwrapped_fields920[2]
+        if !isnothing(field923)
             newline(pp)
-            opt_val881 = field880
-            pretty_epoch_reads(pp, opt_val881)
+            opt_val924 = field923
+            pretty_epoch_reads(pp, opt_val924)
         end
         dedent!(pp)
         write(pp, ")")
@@ -1086,22 +1104,22 @@ function pretty_epoch(pp::PrettyPrinter, msg::Proto.Epoch)
 end
 
 function pretty_epoch_writes(pp::PrettyPrinter, msg::Vector{Proto.Write})
-    flat886 = try_flat(pp, msg, pretty_epoch_writes)
-    if !isnothing(flat886)
-        write(pp, flat886)
+    flat929 = try_flat(pp, msg, pretty_epoch_writes)
+    if !isnothing(flat929)
+        write(pp, flat929)
         return nothing
     else
-        fields883 = msg
+        fields926 = msg
         write(pp, "(writes")
         indent_sexp!(pp)
-        if !isempty(fields883)
+        if !isempty(fields926)
             newline(pp)
-            for (i1620, elem884) in enumerate(fields883)
-                i885 = i1620 - 1
-                if (i885 > 0)
+            for (i1706, elem927) in enumerate(fields926)
+                i928 = i1706 - 1
+                if (i928 > 0)
                     newline(pp)
                 end
-                pretty_write(pp, elem884)
+                pretty_write(pp, elem927)
             end
         end
         dedent!(pp)
@@ -1111,54 +1129,54 @@ function pretty_epoch_writes(pp::PrettyPrinter, msg::Vector{Proto.Write})
 end
 
 function pretty_write(pp::PrettyPrinter, msg::Proto.Write)
-    flat895 = try_flat(pp, msg, pretty_write)
-    if !isnothing(flat895)
-        write(pp, flat895)
+    flat938 = try_flat(pp, msg, pretty_write)
+    if !isnothing(flat938)
+        write(pp, flat938)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("define"))
-            _t1621 = _get_oneof_field(_dollar_dollar, :define)
+            _t1707 = _get_oneof_field(_dollar_dollar, :define)
         else
-            _t1621 = nothing
+            _t1707 = nothing
         end
-        deconstruct_result893 = _t1621
-        if !isnothing(deconstruct_result893)
-            unwrapped894 = deconstruct_result893
-            pretty_define(pp, unwrapped894)
+        deconstruct_result936 = _t1707
+        if !isnothing(deconstruct_result936)
+            unwrapped937 = deconstruct_result936
+            pretty_define(pp, unwrapped937)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("undefine"))
-                _t1622 = _get_oneof_field(_dollar_dollar, :undefine)
+                _t1708 = _get_oneof_field(_dollar_dollar, :undefine)
             else
-                _t1622 = nothing
+                _t1708 = nothing
             end
-            deconstruct_result891 = _t1622
-            if !isnothing(deconstruct_result891)
-                unwrapped892 = deconstruct_result891
-                pretty_undefine(pp, unwrapped892)
+            deconstruct_result934 = _t1708
+            if !isnothing(deconstruct_result934)
+                unwrapped935 = deconstruct_result934
+                pretty_undefine(pp, unwrapped935)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("context"))
-                    _t1623 = _get_oneof_field(_dollar_dollar, :context)
+                    _t1709 = _get_oneof_field(_dollar_dollar, :context)
                 else
-                    _t1623 = nothing
+                    _t1709 = nothing
                 end
-                deconstruct_result889 = _t1623
-                if !isnothing(deconstruct_result889)
-                    unwrapped890 = deconstruct_result889
-                    pretty_context(pp, unwrapped890)
+                deconstruct_result932 = _t1709
+                if !isnothing(deconstruct_result932)
+                    unwrapped933 = deconstruct_result932
+                    pretty_context(pp, unwrapped933)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("snapshot"))
-                        _t1624 = _get_oneof_field(_dollar_dollar, :snapshot)
+                        _t1710 = _get_oneof_field(_dollar_dollar, :snapshot)
                     else
-                        _t1624 = nothing
+                        _t1710 = nothing
                     end
-                    deconstruct_result887 = _t1624
-                    if !isnothing(deconstruct_result887)
-                        unwrapped888 = deconstruct_result887
-                        pretty_snapshot(pp, unwrapped888)
+                    deconstruct_result930 = _t1710
+                    if !isnothing(deconstruct_result930)
+                        unwrapped931 = deconstruct_result930
+                        pretty_snapshot(pp, unwrapped931)
                     else
                         throw(ParseError("No matching rule for write"))
                     end
@@ -1170,18 +1188,18 @@ function pretty_write(pp::PrettyPrinter, msg::Proto.Write)
 end
 
 function pretty_define(pp::PrettyPrinter, msg::Proto.Define)
-    flat898 = try_flat(pp, msg, pretty_define)
-    if !isnothing(flat898)
-        write(pp, flat898)
+    flat941 = try_flat(pp, msg, pretty_define)
+    if !isnothing(flat941)
+        write(pp, flat941)
         return nothing
     else
         _dollar_dollar = msg
-        fields896 = _dollar_dollar.fragment
-        unwrapped_fields897 = fields896
+        fields939 = _dollar_dollar.fragment
+        unwrapped_fields940 = fields939
         write(pp, "(define")
         indent_sexp!(pp)
         newline(pp)
-        pretty_fragment(pp, unwrapped_fields897)
+        pretty_fragment(pp, unwrapped_fields940)
         dedent!(pp)
         write(pp, ")")
     end
@@ -1189,29 +1207,29 @@ function pretty_define(pp::PrettyPrinter, msg::Proto.Define)
 end
 
 function pretty_fragment(pp::PrettyPrinter, msg::Proto.Fragment)
-    flat905 = try_flat(pp, msg, pretty_fragment)
-    if !isnothing(flat905)
-        write(pp, flat905)
+    flat948 = try_flat(pp, msg, pretty_fragment)
+    if !isnothing(flat948)
+        write(pp, flat948)
         return nothing
     else
         _dollar_dollar = msg
         start_pretty_fragment(pp, _dollar_dollar)
-        fields899 = (_dollar_dollar.id, _dollar_dollar.declarations,)
-        unwrapped_fields900 = fields899
+        fields942 = (_dollar_dollar.id, _dollar_dollar.declarations,)
+        unwrapped_fields943 = fields942
         write(pp, "(fragment")
         indent_sexp!(pp)
         newline(pp)
-        field901 = unwrapped_fields900[1]
-        pretty_new_fragment_id(pp, field901)
-        field902 = unwrapped_fields900[2]
-        if !isempty(field902)
+        field944 = unwrapped_fields943[1]
+        pretty_new_fragment_id(pp, field944)
+        field945 = unwrapped_fields943[2]
+        if !isempty(field945)
             newline(pp)
-            for (i1625, elem903) in enumerate(field902)
-                i904 = i1625 - 1
-                if (i904 > 0)
+            for (i1711, elem946) in enumerate(field945)
+                i947 = i1711 - 1
+                if (i947 > 0)
                     newline(pp)
                 end
-                pretty_declaration(pp, elem903)
+                pretty_declaration(pp, elem946)
             end
         end
         dedent!(pp)
@@ -1221,66 +1239,66 @@ function pretty_fragment(pp::PrettyPrinter, msg::Proto.Fragment)
 end
 
 function pretty_new_fragment_id(pp::PrettyPrinter, msg::Proto.FragmentId)
-    flat907 = try_flat(pp, msg, pretty_new_fragment_id)
-    if !isnothing(flat907)
-        write(pp, flat907)
+    flat950 = try_flat(pp, msg, pretty_new_fragment_id)
+    if !isnothing(flat950)
+        write(pp, flat950)
         return nothing
     else
-        fields906 = msg
-        pretty_fragment_id(pp, fields906)
+        fields949 = msg
+        pretty_fragment_id(pp, fields949)
     end
     return nothing
 end
 
 function pretty_declaration(pp::PrettyPrinter, msg::Proto.Declaration)
-    flat916 = try_flat(pp, msg, pretty_declaration)
-    if !isnothing(flat916)
-        write(pp, flat916)
+    flat959 = try_flat(pp, msg, pretty_declaration)
+    if !isnothing(flat959)
+        write(pp, flat959)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("def"))
-            _t1626 = _get_oneof_field(_dollar_dollar, :def)
+            _t1712 = _get_oneof_field(_dollar_dollar, :def)
         else
-            _t1626 = nothing
+            _t1712 = nothing
         end
-        deconstruct_result914 = _t1626
-        if !isnothing(deconstruct_result914)
-            unwrapped915 = deconstruct_result914
-            pretty_def(pp, unwrapped915)
+        deconstruct_result957 = _t1712
+        if !isnothing(deconstruct_result957)
+            unwrapped958 = deconstruct_result957
+            pretty_def(pp, unwrapped958)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("algorithm"))
-                _t1627 = _get_oneof_field(_dollar_dollar, :algorithm)
+                _t1713 = _get_oneof_field(_dollar_dollar, :algorithm)
             else
-                _t1627 = nothing
+                _t1713 = nothing
             end
-            deconstruct_result912 = _t1627
-            if !isnothing(deconstruct_result912)
-                unwrapped913 = deconstruct_result912
-                pretty_algorithm(pp, unwrapped913)
+            deconstruct_result955 = _t1713
+            if !isnothing(deconstruct_result955)
+                unwrapped956 = deconstruct_result955
+                pretty_algorithm(pp, unwrapped956)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("constraint"))
-                    _t1628 = _get_oneof_field(_dollar_dollar, :constraint)
+                    _t1714 = _get_oneof_field(_dollar_dollar, :constraint)
                 else
-                    _t1628 = nothing
+                    _t1714 = nothing
                 end
-                deconstruct_result910 = _t1628
-                if !isnothing(deconstruct_result910)
-                    unwrapped911 = deconstruct_result910
-                    pretty_constraint(pp, unwrapped911)
+                deconstruct_result953 = _t1714
+                if !isnothing(deconstruct_result953)
+                    unwrapped954 = deconstruct_result953
+                    pretty_constraint(pp, unwrapped954)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("data"))
-                        _t1629 = _get_oneof_field(_dollar_dollar, :data)
+                        _t1715 = _get_oneof_field(_dollar_dollar, :data)
                     else
-                        _t1629 = nothing
+                        _t1715 = nothing
                     end
-                    deconstruct_result908 = _t1629
-                    if !isnothing(deconstruct_result908)
-                        unwrapped909 = deconstruct_result908
-                        pretty_data(pp, unwrapped909)
+                    deconstruct_result951 = _t1715
+                    if !isnothing(deconstruct_result951)
+                        unwrapped952 = deconstruct_result951
+                        pretty_data(pp, unwrapped952)
                     else
                         throw(ParseError("No matching rule for declaration"))
                     end
@@ -1292,32 +1310,32 @@ function pretty_declaration(pp::PrettyPrinter, msg::Proto.Declaration)
 end
 
 function pretty_def(pp::PrettyPrinter, msg::Proto.Def)
-    flat923 = try_flat(pp, msg, pretty_def)
-    if !isnothing(flat923)
-        write(pp, flat923)
+    flat966 = try_flat(pp, msg, pretty_def)
+    if !isnothing(flat966)
+        write(pp, flat966)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1630 = _dollar_dollar.attrs
+            _t1716 = _dollar_dollar.attrs
         else
-            _t1630 = nothing
+            _t1716 = nothing
         end
-        fields917 = (_dollar_dollar.name, _dollar_dollar.body, _t1630,)
-        unwrapped_fields918 = fields917
+        fields960 = (_dollar_dollar.name, _dollar_dollar.body, _t1716,)
+        unwrapped_fields961 = fields960
         write(pp, "(def")
         indent_sexp!(pp)
         newline(pp)
-        field919 = unwrapped_fields918[1]
-        pretty_relation_id(pp, field919)
+        field962 = unwrapped_fields961[1]
+        pretty_relation_id(pp, field962)
         newline(pp)
-        field920 = unwrapped_fields918[2]
-        pretty_abstraction(pp, field920)
-        field921 = unwrapped_fields918[3]
-        if !isnothing(field921)
+        field963 = unwrapped_fields961[2]
+        pretty_abstraction(pp, field963)
+        field964 = unwrapped_fields961[3]
+        if !isnothing(field964)
             newline(pp)
-            opt_val922 = field921
-            pretty_attrs(pp, opt_val922)
+            opt_val965 = field964
+            pretty_attrs(pp, opt_val965)
         end
         dedent!(pp)
         write(pp, ")")
@@ -1326,30 +1344,30 @@ function pretty_def(pp::PrettyPrinter, msg::Proto.Def)
 end
 
 function pretty_relation_id(pp::PrettyPrinter, msg::Proto.RelationId)
-    flat928 = try_flat(pp, msg, pretty_relation_id)
-    if !isnothing(flat928)
-        write(pp, flat928)
+    flat971 = try_flat(pp, msg, pretty_relation_id)
+    if !isnothing(flat971)
+        write(pp, flat971)
         return nothing
     else
         _dollar_dollar = msg
         if !isnothing(relation_id_to_string(pp, _dollar_dollar))
-            _t1632 = deconstruct_relation_id_string(pp, _dollar_dollar)
-            _t1631 = _t1632
+            _t1718 = deconstruct_relation_id_string(pp, _dollar_dollar)
+            _t1717 = _t1718
         else
-            _t1631 = nothing
+            _t1717 = nothing
         end
-        deconstruct_result926 = _t1631
-        if !isnothing(deconstruct_result926)
-            unwrapped927 = deconstruct_result926
+        deconstruct_result969 = _t1717
+        if !isnothing(deconstruct_result969)
+            unwrapped970 = deconstruct_result969
             write(pp, ":")
-            write(pp, unwrapped927)
+            write(pp, unwrapped970)
         else
             _dollar_dollar = msg
-            _t1633 = deconstruct_relation_id_uint128(pp, _dollar_dollar)
-            deconstruct_result924 = _t1633
-            if !isnothing(deconstruct_result924)
-                unwrapped925 = deconstruct_result924
-                write(pp, format_uint128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped925))
+            _t1719 = deconstruct_relation_id_uint128(pp, _dollar_dollar)
+            deconstruct_result967 = _t1719
+            if !isnothing(deconstruct_result967)
+                unwrapped968 = deconstruct_result967
+                write(pp, format_uint128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped968))
             else
                 throw(ParseError("No matching rule for relation_id"))
             end
@@ -1359,22 +1377,22 @@ function pretty_relation_id(pp::PrettyPrinter, msg::Proto.RelationId)
 end
 
 function pretty_abstraction(pp::PrettyPrinter, msg::Proto.Abstraction)
-    flat933 = try_flat(pp, msg, pretty_abstraction)
-    if !isnothing(flat933)
-        write(pp, flat933)
+    flat976 = try_flat(pp, msg, pretty_abstraction)
+    if !isnothing(flat976)
+        write(pp, flat976)
         return nothing
     else
         _dollar_dollar = msg
-        _t1634 = deconstruct_bindings(pp, _dollar_dollar)
-        fields929 = (_t1634, _dollar_dollar.value,)
-        unwrapped_fields930 = fields929
+        _t1720 = deconstruct_bindings(pp, _dollar_dollar)
+        fields972 = (_t1720, _dollar_dollar.value,)
+        unwrapped_fields973 = fields972
         write(pp, "(")
         indent!(pp)
-        field931 = unwrapped_fields930[1]
-        pretty_bindings(pp, field931)
+        field974 = unwrapped_fields973[1]
+        pretty_bindings(pp, field974)
         newline(pp)
-        field932 = unwrapped_fields930[2]
-        pretty_formula(pp, field932)
+        field975 = unwrapped_fields973[2]
+        pretty_formula(pp, field975)
         dedent!(pp)
         write(pp, ")")
     end
@@ -1382,34 +1400,34 @@ function pretty_abstraction(pp::PrettyPrinter, msg::Proto.Abstraction)
 end
 
 function pretty_bindings(pp::PrettyPrinter, msg::Tuple{Vector{Proto.Binding}, Vector{Proto.Binding}})
-    flat941 = try_flat(pp, msg, pretty_bindings)
-    if !isnothing(flat941)
-        write(pp, flat941)
+    flat984 = try_flat(pp, msg, pretty_bindings)
+    if !isnothing(flat984)
+        write(pp, flat984)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar[2])
-            _t1635 = _dollar_dollar[2]
+            _t1721 = _dollar_dollar[2]
         else
-            _t1635 = nothing
+            _t1721 = nothing
         end
-        fields934 = (_dollar_dollar[1], _t1635,)
-        unwrapped_fields935 = fields934
+        fields977 = (_dollar_dollar[1], _t1721,)
+        unwrapped_fields978 = fields977
         write(pp, "[")
         indent!(pp)
-        field936 = unwrapped_fields935[1]
-        for (i1636, elem937) in enumerate(field936)
-            i938 = i1636 - 1
-            if (i938 > 0)
+        field979 = unwrapped_fields978[1]
+        for (i1722, elem980) in enumerate(field979)
+            i981 = i1722 - 1
+            if (i981 > 0)
                 newline(pp)
             end
-            pretty_binding(pp, elem937)
+            pretty_binding(pp, elem980)
         end
-        field939 = unwrapped_fields935[2]
-        if !isnothing(field939)
+        field982 = unwrapped_fields978[2]
+        if !isnothing(field982)
             newline(pp)
-            opt_val940 = field939
-            pretty_value_bindings(pp, opt_val940)
+            opt_val983 = field982
+            pretty_value_bindings(pp, opt_val983)
         end
         dedent!(pp)
         write(pp, "]")
@@ -1418,182 +1436,182 @@ function pretty_bindings(pp::PrettyPrinter, msg::Tuple{Vector{Proto.Binding}, Ve
 end
 
 function pretty_binding(pp::PrettyPrinter, msg::Proto.Binding)
-    flat946 = try_flat(pp, msg, pretty_binding)
-    if !isnothing(flat946)
-        write(pp, flat946)
+    flat989 = try_flat(pp, msg, pretty_binding)
+    if !isnothing(flat989)
+        write(pp, flat989)
         return nothing
     else
         _dollar_dollar = msg
-        fields942 = (_dollar_dollar.var.name, _dollar_dollar.var"#type",)
-        unwrapped_fields943 = fields942
-        field944 = unwrapped_fields943[1]
-        write(pp, field944)
+        fields985 = (_dollar_dollar.var.name, _dollar_dollar.var"#type",)
+        unwrapped_fields986 = fields985
+        field987 = unwrapped_fields986[1]
+        write(pp, field987)
         write(pp, "::")
-        field945 = unwrapped_fields943[2]
-        pretty_type(pp, field945)
+        field988 = unwrapped_fields986[2]
+        pretty_type(pp, field988)
     end
     return nothing
 end
 
 function pretty_type(pp::PrettyPrinter, msg::Proto.var"#Type")
-    flat975 = try_flat(pp, msg, pretty_type)
-    if !isnothing(flat975)
-        write(pp, flat975)
+    flat1018 = try_flat(pp, msg, pretty_type)
+    if !isnothing(flat1018)
+        write(pp, flat1018)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("unspecified_type"))
-            _t1637 = _get_oneof_field(_dollar_dollar, :unspecified_type)
+            _t1723 = _get_oneof_field(_dollar_dollar, :unspecified_type)
         else
-            _t1637 = nothing
+            _t1723 = nothing
         end
-        deconstruct_result973 = _t1637
-        if !isnothing(deconstruct_result973)
-            unwrapped974 = deconstruct_result973
-            pretty_unspecified_type(pp, unwrapped974)
+        deconstruct_result1016 = _t1723
+        if !isnothing(deconstruct_result1016)
+            unwrapped1017 = deconstruct_result1016
+            pretty_unspecified_type(pp, unwrapped1017)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("string_type"))
-                _t1638 = _get_oneof_field(_dollar_dollar, :string_type)
+                _t1724 = _get_oneof_field(_dollar_dollar, :string_type)
             else
-                _t1638 = nothing
+                _t1724 = nothing
             end
-            deconstruct_result971 = _t1638
-            if !isnothing(deconstruct_result971)
-                unwrapped972 = deconstruct_result971
-                pretty_string_type(pp, unwrapped972)
+            deconstruct_result1014 = _t1724
+            if !isnothing(deconstruct_result1014)
+                unwrapped1015 = deconstruct_result1014
+                pretty_string_type(pp, unwrapped1015)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("int_type"))
-                    _t1639 = _get_oneof_field(_dollar_dollar, :int_type)
+                    _t1725 = _get_oneof_field(_dollar_dollar, :int_type)
                 else
-                    _t1639 = nothing
+                    _t1725 = nothing
                 end
-                deconstruct_result969 = _t1639
-                if !isnothing(deconstruct_result969)
-                    unwrapped970 = deconstruct_result969
-                    pretty_int_type(pp, unwrapped970)
+                deconstruct_result1012 = _t1725
+                if !isnothing(deconstruct_result1012)
+                    unwrapped1013 = deconstruct_result1012
+                    pretty_int_type(pp, unwrapped1013)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("float_type"))
-                        _t1640 = _get_oneof_field(_dollar_dollar, :float_type)
+                        _t1726 = _get_oneof_field(_dollar_dollar, :float_type)
                     else
-                        _t1640 = nothing
+                        _t1726 = nothing
                     end
-                    deconstruct_result967 = _t1640
-                    if !isnothing(deconstruct_result967)
-                        unwrapped968 = deconstruct_result967
-                        pretty_float_type(pp, unwrapped968)
+                    deconstruct_result1010 = _t1726
+                    if !isnothing(deconstruct_result1010)
+                        unwrapped1011 = deconstruct_result1010
+                        pretty_float_type(pp, unwrapped1011)
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("uint128_type"))
-                            _t1641 = _get_oneof_field(_dollar_dollar, :uint128_type)
+                            _t1727 = _get_oneof_field(_dollar_dollar, :uint128_type)
                         else
-                            _t1641 = nothing
+                            _t1727 = nothing
                         end
-                        deconstruct_result965 = _t1641
-                        if !isnothing(deconstruct_result965)
-                            unwrapped966 = deconstruct_result965
-                            pretty_uint128_type(pp, unwrapped966)
+                        deconstruct_result1008 = _t1727
+                        if !isnothing(deconstruct_result1008)
+                            unwrapped1009 = deconstruct_result1008
+                            pretty_uint128_type(pp, unwrapped1009)
                         else
                             _dollar_dollar = msg
                             if _has_proto_field(_dollar_dollar, Symbol("int128_type"))
-                                _t1642 = _get_oneof_field(_dollar_dollar, :int128_type)
+                                _t1728 = _get_oneof_field(_dollar_dollar, :int128_type)
                             else
-                                _t1642 = nothing
+                                _t1728 = nothing
                             end
-                            deconstruct_result963 = _t1642
-                            if !isnothing(deconstruct_result963)
-                                unwrapped964 = deconstruct_result963
-                                pretty_int128_type(pp, unwrapped964)
+                            deconstruct_result1006 = _t1728
+                            if !isnothing(deconstruct_result1006)
+                                unwrapped1007 = deconstruct_result1006
+                                pretty_int128_type(pp, unwrapped1007)
                             else
                                 _dollar_dollar = msg
                                 if _has_proto_field(_dollar_dollar, Symbol("date_type"))
-                                    _t1643 = _get_oneof_field(_dollar_dollar, :date_type)
+                                    _t1729 = _get_oneof_field(_dollar_dollar, :date_type)
                                 else
-                                    _t1643 = nothing
+                                    _t1729 = nothing
                                 end
-                                deconstruct_result961 = _t1643
-                                if !isnothing(deconstruct_result961)
-                                    unwrapped962 = deconstruct_result961
-                                    pretty_date_type(pp, unwrapped962)
+                                deconstruct_result1004 = _t1729
+                                if !isnothing(deconstruct_result1004)
+                                    unwrapped1005 = deconstruct_result1004
+                                    pretty_date_type(pp, unwrapped1005)
                                 else
                                     _dollar_dollar = msg
                                     if _has_proto_field(_dollar_dollar, Symbol("datetime_type"))
-                                        _t1644 = _get_oneof_field(_dollar_dollar, :datetime_type)
+                                        _t1730 = _get_oneof_field(_dollar_dollar, :datetime_type)
                                     else
-                                        _t1644 = nothing
+                                        _t1730 = nothing
                                     end
-                                    deconstruct_result959 = _t1644
-                                    if !isnothing(deconstruct_result959)
-                                        unwrapped960 = deconstruct_result959
-                                        pretty_datetime_type(pp, unwrapped960)
+                                    deconstruct_result1002 = _t1730
+                                    if !isnothing(deconstruct_result1002)
+                                        unwrapped1003 = deconstruct_result1002
+                                        pretty_datetime_type(pp, unwrapped1003)
                                     else
                                         _dollar_dollar = msg
                                         if _has_proto_field(_dollar_dollar, Symbol("missing_type"))
-                                            _t1645 = _get_oneof_field(_dollar_dollar, :missing_type)
+                                            _t1731 = _get_oneof_field(_dollar_dollar, :missing_type)
                                         else
-                                            _t1645 = nothing
+                                            _t1731 = nothing
                                         end
-                                        deconstruct_result957 = _t1645
-                                        if !isnothing(deconstruct_result957)
-                                            unwrapped958 = deconstruct_result957
-                                            pretty_missing_type(pp, unwrapped958)
+                                        deconstruct_result1000 = _t1731
+                                        if !isnothing(deconstruct_result1000)
+                                            unwrapped1001 = deconstruct_result1000
+                                            pretty_missing_type(pp, unwrapped1001)
                                         else
                                             _dollar_dollar = msg
                                             if _has_proto_field(_dollar_dollar, Symbol("decimal_type"))
-                                                _t1646 = _get_oneof_field(_dollar_dollar, :decimal_type)
+                                                _t1732 = _get_oneof_field(_dollar_dollar, :decimal_type)
                                             else
-                                                _t1646 = nothing
+                                                _t1732 = nothing
                                             end
-                                            deconstruct_result955 = _t1646
-                                            if !isnothing(deconstruct_result955)
-                                                unwrapped956 = deconstruct_result955
-                                                pretty_decimal_type(pp, unwrapped956)
+                                            deconstruct_result998 = _t1732
+                                            if !isnothing(deconstruct_result998)
+                                                unwrapped999 = deconstruct_result998
+                                                pretty_decimal_type(pp, unwrapped999)
                                             else
                                                 _dollar_dollar = msg
                                                 if _has_proto_field(_dollar_dollar, Symbol("boolean_type"))
-                                                    _t1647 = _get_oneof_field(_dollar_dollar, :boolean_type)
+                                                    _t1733 = _get_oneof_field(_dollar_dollar, :boolean_type)
                                                 else
-                                                    _t1647 = nothing
+                                                    _t1733 = nothing
                                                 end
-                                                deconstruct_result953 = _t1647
-                                                if !isnothing(deconstruct_result953)
-                                                    unwrapped954 = deconstruct_result953
-                                                    pretty_boolean_type(pp, unwrapped954)
+                                                deconstruct_result996 = _t1733
+                                                if !isnothing(deconstruct_result996)
+                                                    unwrapped997 = deconstruct_result996
+                                                    pretty_boolean_type(pp, unwrapped997)
                                                 else
                                                     _dollar_dollar = msg
                                                     if _has_proto_field(_dollar_dollar, Symbol("int32_type"))
-                                                        _t1648 = _get_oneof_field(_dollar_dollar, :int32_type)
+                                                        _t1734 = _get_oneof_field(_dollar_dollar, :int32_type)
                                                     else
-                                                        _t1648 = nothing
+                                                        _t1734 = nothing
                                                     end
-                                                    deconstruct_result951 = _t1648
-                                                    if !isnothing(deconstruct_result951)
-                                                        unwrapped952 = deconstruct_result951
-                                                        pretty_int32_type(pp, unwrapped952)
+                                                    deconstruct_result994 = _t1734
+                                                    if !isnothing(deconstruct_result994)
+                                                        unwrapped995 = deconstruct_result994
+                                                        pretty_int32_type(pp, unwrapped995)
                                                     else
                                                         _dollar_dollar = msg
                                                         if _has_proto_field(_dollar_dollar, Symbol("float32_type"))
-                                                            _t1649 = _get_oneof_field(_dollar_dollar, :float32_type)
+                                                            _t1735 = _get_oneof_field(_dollar_dollar, :float32_type)
                                                         else
-                                                            _t1649 = nothing
+                                                            _t1735 = nothing
                                                         end
-                                                        deconstruct_result949 = _t1649
-                                                        if !isnothing(deconstruct_result949)
-                                                            unwrapped950 = deconstruct_result949
-                                                            pretty_float32_type(pp, unwrapped950)
+                                                        deconstruct_result992 = _t1735
+                                                        if !isnothing(deconstruct_result992)
+                                                            unwrapped993 = deconstruct_result992
+                                                            pretty_float32_type(pp, unwrapped993)
                                                         else
                                                             _dollar_dollar = msg
                                                             if _has_proto_field(_dollar_dollar, Symbol("uint32_type"))
-                                                                _t1650 = _get_oneof_field(_dollar_dollar, :uint32_type)
+                                                                _t1736 = _get_oneof_field(_dollar_dollar, :uint32_type)
                                                             else
-                                                                _t1650 = nothing
+                                                                _t1736 = nothing
                                                             end
-                                                            deconstruct_result947 = _t1650
-                                                            if !isnothing(deconstruct_result947)
-                                                                unwrapped948 = deconstruct_result947
-                                                                pretty_uint32_type(pp, unwrapped948)
+                                                            deconstruct_result990 = _t1736
+                                                            if !isnothing(deconstruct_result990)
+                                                                unwrapped991 = deconstruct_result990
+                                                                pretty_uint32_type(pp, unwrapped991)
                                                             else
                                                                 throw(ParseError("No matching rule for type"))
                                                             end
@@ -1615,76 +1633,76 @@ function pretty_type(pp::PrettyPrinter, msg::Proto.var"#Type")
 end
 
 function pretty_unspecified_type(pp::PrettyPrinter, msg::Proto.UnspecifiedType)
-    fields976 = msg
+    fields1019 = msg
     write(pp, "UNKNOWN")
     return nothing
 end
 
 function pretty_string_type(pp::PrettyPrinter, msg::Proto.StringType)
-    fields977 = msg
+    fields1020 = msg
     write(pp, "STRING")
     return nothing
 end
 
 function pretty_int_type(pp::PrettyPrinter, msg::Proto.IntType)
-    fields978 = msg
+    fields1021 = msg
     write(pp, "INT")
     return nothing
 end
 
 function pretty_float_type(pp::PrettyPrinter, msg::Proto.FloatType)
-    fields979 = msg
+    fields1022 = msg
     write(pp, "FLOAT")
     return nothing
 end
 
 function pretty_uint128_type(pp::PrettyPrinter, msg::Proto.UInt128Type)
-    fields980 = msg
+    fields1023 = msg
     write(pp, "UINT128")
     return nothing
 end
 
 function pretty_int128_type(pp::PrettyPrinter, msg::Proto.Int128Type)
-    fields981 = msg
+    fields1024 = msg
     write(pp, "INT128")
     return nothing
 end
 
 function pretty_date_type(pp::PrettyPrinter, msg::Proto.DateType)
-    fields982 = msg
+    fields1025 = msg
     write(pp, "DATE")
     return nothing
 end
 
 function pretty_datetime_type(pp::PrettyPrinter, msg::Proto.DateTimeType)
-    fields983 = msg
+    fields1026 = msg
     write(pp, "DATETIME")
     return nothing
 end
 
 function pretty_missing_type(pp::PrettyPrinter, msg::Proto.MissingType)
-    fields984 = msg
+    fields1027 = msg
     write(pp, "MISSING")
     return nothing
 end
 
 function pretty_decimal_type(pp::PrettyPrinter, msg::Proto.DecimalType)
-    flat989 = try_flat(pp, msg, pretty_decimal_type)
-    if !isnothing(flat989)
-        write(pp, flat989)
+    flat1032 = try_flat(pp, msg, pretty_decimal_type)
+    if !isnothing(flat1032)
+        write(pp, flat1032)
         return nothing
     else
         _dollar_dollar = msg
-        fields985 = (Int64(_dollar_dollar.precision), Int64(_dollar_dollar.scale),)
-        unwrapped_fields986 = fields985
+        fields1028 = (Int64(_dollar_dollar.precision), Int64(_dollar_dollar.scale),)
+        unwrapped_fields1029 = fields1028
         write(pp, "(DECIMAL")
         indent_sexp!(pp)
         newline(pp)
-        field987 = unwrapped_fields986[1]
-        write(pp, string(field987))
+        field1030 = unwrapped_fields1029[1]
+        write(pp, string(field1030))
         newline(pp)
-        field988 = unwrapped_fields986[2]
-        write(pp, string(field988))
+        field1031 = unwrapped_fields1029[2]
+        write(pp, string(field1031))
         dedent!(pp)
         write(pp, ")")
     end
@@ -1692,45 +1710,45 @@ function pretty_decimal_type(pp::PrettyPrinter, msg::Proto.DecimalType)
 end
 
 function pretty_boolean_type(pp::PrettyPrinter, msg::Proto.BooleanType)
-    fields990 = msg
+    fields1033 = msg
     write(pp, "BOOLEAN")
     return nothing
 end
 
 function pretty_int32_type(pp::PrettyPrinter, msg::Proto.Int32Type)
-    fields991 = msg
+    fields1034 = msg
     write(pp, "INT32")
     return nothing
 end
 
 function pretty_float32_type(pp::PrettyPrinter, msg::Proto.Float32Type)
-    fields992 = msg
+    fields1035 = msg
     write(pp, "FLOAT32")
     return nothing
 end
 
 function pretty_uint32_type(pp::PrettyPrinter, msg::Proto.UInt32Type)
-    fields993 = msg
+    fields1036 = msg
     write(pp, "UINT32")
     return nothing
 end
 
 function pretty_value_bindings(pp::PrettyPrinter, msg::Vector{Proto.Binding})
-    flat997 = try_flat(pp, msg, pretty_value_bindings)
-    if !isnothing(flat997)
-        write(pp, flat997)
+    flat1040 = try_flat(pp, msg, pretty_value_bindings)
+    if !isnothing(flat1040)
+        write(pp, flat1040)
         return nothing
     else
-        fields994 = msg
+        fields1037 = msg
         write(pp, "|")
-        if !isempty(fields994)
+        if !isempty(fields1037)
             write(pp, " ")
-            for (i1651, elem995) in enumerate(fields994)
-                i996 = i1651 - 1
-                if (i996 > 0)
+            for (i1737, elem1038) in enumerate(fields1037)
+                i1039 = i1737 - 1
+                if (i1039 > 0)
                     newline(pp)
                 end
-                pretty_binding(pp, elem995)
+                pretty_binding(pp, elem1038)
             end
         end
     end
@@ -1738,153 +1756,153 @@ function pretty_value_bindings(pp::PrettyPrinter, msg::Vector{Proto.Binding})
 end
 
 function pretty_formula(pp::PrettyPrinter, msg::Proto.Formula)
-    flat1024 = try_flat(pp, msg, pretty_formula)
-    if !isnothing(flat1024)
-        write(pp, flat1024)
+    flat1067 = try_flat(pp, msg, pretty_formula)
+    if !isnothing(flat1067)
+        write(pp, flat1067)
         return nothing
     else
         _dollar_dollar = msg
         if (_has_proto_field(_dollar_dollar, Symbol("conjunction")) && isempty(_get_oneof_field(_dollar_dollar, :conjunction).args))
-            _t1652 = _get_oneof_field(_dollar_dollar, :conjunction)
+            _t1738 = _get_oneof_field(_dollar_dollar, :conjunction)
         else
-            _t1652 = nothing
+            _t1738 = nothing
         end
-        deconstruct_result1022 = _t1652
-        if !isnothing(deconstruct_result1022)
-            unwrapped1023 = deconstruct_result1022
-            pretty_true(pp, unwrapped1023)
+        deconstruct_result1065 = _t1738
+        if !isnothing(deconstruct_result1065)
+            unwrapped1066 = deconstruct_result1065
+            pretty_true(pp, unwrapped1066)
         else
             _dollar_dollar = msg
             if (_has_proto_field(_dollar_dollar, Symbol("disjunction")) && isempty(_get_oneof_field(_dollar_dollar, :disjunction).args))
-                _t1653 = _get_oneof_field(_dollar_dollar, :disjunction)
+                _t1739 = _get_oneof_field(_dollar_dollar, :disjunction)
             else
-                _t1653 = nothing
+                _t1739 = nothing
             end
-            deconstruct_result1020 = _t1653
-            if !isnothing(deconstruct_result1020)
-                unwrapped1021 = deconstruct_result1020
-                pretty_false(pp, unwrapped1021)
+            deconstruct_result1063 = _t1739
+            if !isnothing(deconstruct_result1063)
+                unwrapped1064 = deconstruct_result1063
+                pretty_false(pp, unwrapped1064)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("exists"))
-                    _t1654 = _get_oneof_field(_dollar_dollar, :exists)
+                    _t1740 = _get_oneof_field(_dollar_dollar, :exists)
                 else
-                    _t1654 = nothing
+                    _t1740 = nothing
                 end
-                deconstruct_result1018 = _t1654
-                if !isnothing(deconstruct_result1018)
-                    unwrapped1019 = deconstruct_result1018
-                    pretty_exists(pp, unwrapped1019)
+                deconstruct_result1061 = _t1740
+                if !isnothing(deconstruct_result1061)
+                    unwrapped1062 = deconstruct_result1061
+                    pretty_exists(pp, unwrapped1062)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("reduce"))
-                        _t1655 = _get_oneof_field(_dollar_dollar, :reduce)
+                        _t1741 = _get_oneof_field(_dollar_dollar, :reduce)
                     else
-                        _t1655 = nothing
+                        _t1741 = nothing
                     end
-                    deconstruct_result1016 = _t1655
-                    if !isnothing(deconstruct_result1016)
-                        unwrapped1017 = deconstruct_result1016
-                        pretty_reduce(pp, unwrapped1017)
+                    deconstruct_result1059 = _t1741
+                    if !isnothing(deconstruct_result1059)
+                        unwrapped1060 = deconstruct_result1059
+                        pretty_reduce(pp, unwrapped1060)
                     else
                         _dollar_dollar = msg
                         if (_has_proto_field(_dollar_dollar, Symbol("conjunction")) && !isempty(_get_oneof_field(_dollar_dollar, :conjunction).args))
-                            _t1656 = _get_oneof_field(_dollar_dollar, :conjunction)
+                            _t1742 = _get_oneof_field(_dollar_dollar, :conjunction)
                         else
-                            _t1656 = nothing
+                            _t1742 = nothing
                         end
-                        deconstruct_result1014 = _t1656
-                        if !isnothing(deconstruct_result1014)
-                            unwrapped1015 = deconstruct_result1014
-                            pretty_conjunction(pp, unwrapped1015)
+                        deconstruct_result1057 = _t1742
+                        if !isnothing(deconstruct_result1057)
+                            unwrapped1058 = deconstruct_result1057
+                            pretty_conjunction(pp, unwrapped1058)
                         else
                             _dollar_dollar = msg
                             if (_has_proto_field(_dollar_dollar, Symbol("disjunction")) && !isempty(_get_oneof_field(_dollar_dollar, :disjunction).args))
-                                _t1657 = _get_oneof_field(_dollar_dollar, :disjunction)
+                                _t1743 = _get_oneof_field(_dollar_dollar, :disjunction)
                             else
-                                _t1657 = nothing
+                                _t1743 = nothing
                             end
-                            deconstruct_result1012 = _t1657
-                            if !isnothing(deconstruct_result1012)
-                                unwrapped1013 = deconstruct_result1012
-                                pretty_disjunction(pp, unwrapped1013)
+                            deconstruct_result1055 = _t1743
+                            if !isnothing(deconstruct_result1055)
+                                unwrapped1056 = deconstruct_result1055
+                                pretty_disjunction(pp, unwrapped1056)
                             else
                                 _dollar_dollar = msg
                                 if _has_proto_field(_dollar_dollar, Symbol("not"))
-                                    _t1658 = _get_oneof_field(_dollar_dollar, :not)
+                                    _t1744 = _get_oneof_field(_dollar_dollar, :not)
                                 else
-                                    _t1658 = nothing
+                                    _t1744 = nothing
                                 end
-                                deconstruct_result1010 = _t1658
-                                if !isnothing(deconstruct_result1010)
-                                    unwrapped1011 = deconstruct_result1010
-                                    pretty_not(pp, unwrapped1011)
+                                deconstruct_result1053 = _t1744
+                                if !isnothing(deconstruct_result1053)
+                                    unwrapped1054 = deconstruct_result1053
+                                    pretty_not(pp, unwrapped1054)
                                 else
                                     _dollar_dollar = msg
                                     if _has_proto_field(_dollar_dollar, Symbol("ffi"))
-                                        _t1659 = _get_oneof_field(_dollar_dollar, :ffi)
+                                        _t1745 = _get_oneof_field(_dollar_dollar, :ffi)
                                     else
-                                        _t1659 = nothing
+                                        _t1745 = nothing
                                     end
-                                    deconstruct_result1008 = _t1659
-                                    if !isnothing(deconstruct_result1008)
-                                        unwrapped1009 = deconstruct_result1008
-                                        pretty_ffi(pp, unwrapped1009)
+                                    deconstruct_result1051 = _t1745
+                                    if !isnothing(deconstruct_result1051)
+                                        unwrapped1052 = deconstruct_result1051
+                                        pretty_ffi(pp, unwrapped1052)
                                     else
                                         _dollar_dollar = msg
                                         if _has_proto_field(_dollar_dollar, Symbol("atom"))
-                                            _t1660 = _get_oneof_field(_dollar_dollar, :atom)
+                                            _t1746 = _get_oneof_field(_dollar_dollar, :atom)
                                         else
-                                            _t1660 = nothing
+                                            _t1746 = nothing
                                         end
-                                        deconstruct_result1006 = _t1660
-                                        if !isnothing(deconstruct_result1006)
-                                            unwrapped1007 = deconstruct_result1006
-                                            pretty_atom(pp, unwrapped1007)
+                                        deconstruct_result1049 = _t1746
+                                        if !isnothing(deconstruct_result1049)
+                                            unwrapped1050 = deconstruct_result1049
+                                            pretty_atom(pp, unwrapped1050)
                                         else
                                             _dollar_dollar = msg
                                             if _has_proto_field(_dollar_dollar, Symbol("pragma"))
-                                                _t1661 = _get_oneof_field(_dollar_dollar, :pragma)
+                                                _t1747 = _get_oneof_field(_dollar_dollar, :pragma)
                                             else
-                                                _t1661 = nothing
+                                                _t1747 = nothing
                                             end
-                                            deconstruct_result1004 = _t1661
-                                            if !isnothing(deconstruct_result1004)
-                                                unwrapped1005 = deconstruct_result1004
-                                                pretty_pragma(pp, unwrapped1005)
+                                            deconstruct_result1047 = _t1747
+                                            if !isnothing(deconstruct_result1047)
+                                                unwrapped1048 = deconstruct_result1047
+                                                pretty_pragma(pp, unwrapped1048)
                                             else
                                                 _dollar_dollar = msg
                                                 if _has_proto_field(_dollar_dollar, Symbol("primitive"))
-                                                    _t1662 = _get_oneof_field(_dollar_dollar, :primitive)
+                                                    _t1748 = _get_oneof_field(_dollar_dollar, :primitive)
                                                 else
-                                                    _t1662 = nothing
+                                                    _t1748 = nothing
                                                 end
-                                                deconstruct_result1002 = _t1662
-                                                if !isnothing(deconstruct_result1002)
-                                                    unwrapped1003 = deconstruct_result1002
-                                                    pretty_primitive(pp, unwrapped1003)
+                                                deconstruct_result1045 = _t1748
+                                                if !isnothing(deconstruct_result1045)
+                                                    unwrapped1046 = deconstruct_result1045
+                                                    pretty_primitive(pp, unwrapped1046)
                                                 else
                                                     _dollar_dollar = msg
                                                     if _has_proto_field(_dollar_dollar, Symbol("rel_atom"))
-                                                        _t1663 = _get_oneof_field(_dollar_dollar, :rel_atom)
+                                                        _t1749 = _get_oneof_field(_dollar_dollar, :rel_atom)
                                                     else
-                                                        _t1663 = nothing
+                                                        _t1749 = nothing
                                                     end
-                                                    deconstruct_result1000 = _t1663
-                                                    if !isnothing(deconstruct_result1000)
-                                                        unwrapped1001 = deconstruct_result1000
-                                                        pretty_rel_atom(pp, unwrapped1001)
+                                                    deconstruct_result1043 = _t1749
+                                                    if !isnothing(deconstruct_result1043)
+                                                        unwrapped1044 = deconstruct_result1043
+                                                        pretty_rel_atom(pp, unwrapped1044)
                                                     else
                                                         _dollar_dollar = msg
                                                         if _has_proto_field(_dollar_dollar, Symbol("cast"))
-                                                            _t1664 = _get_oneof_field(_dollar_dollar, :cast)
+                                                            _t1750 = _get_oneof_field(_dollar_dollar, :cast)
                                                         else
-                                                            _t1664 = nothing
+                                                            _t1750 = nothing
                                                         end
-                                                        deconstruct_result998 = _t1664
-                                                        if !isnothing(deconstruct_result998)
-                                                            unwrapped999 = deconstruct_result998
-                                                            pretty_cast(pp, unwrapped999)
+                                                        deconstruct_result1041 = _t1750
+                                                        if !isnothing(deconstruct_result1041)
+                                                            unwrapped1042 = deconstruct_result1041
+                                                            pretty_cast(pp, unwrapped1042)
                                                         else
                                                             throw(ParseError("No matching rule for formula"))
                                                         end
@@ -1905,35 +1923,35 @@ function pretty_formula(pp::PrettyPrinter, msg::Proto.Formula)
 end
 
 function pretty_true(pp::PrettyPrinter, msg::Proto.Conjunction)
-    fields1025 = msg
+    fields1068 = msg
     write(pp, "(true)")
     return nothing
 end
 
 function pretty_false(pp::PrettyPrinter, msg::Proto.Disjunction)
-    fields1026 = msg
+    fields1069 = msg
     write(pp, "(false)")
     return nothing
 end
 
 function pretty_exists(pp::PrettyPrinter, msg::Proto.Exists)
-    flat1031 = try_flat(pp, msg, pretty_exists)
-    if !isnothing(flat1031)
-        write(pp, flat1031)
+    flat1074 = try_flat(pp, msg, pretty_exists)
+    if !isnothing(flat1074)
+        write(pp, flat1074)
         return nothing
     else
         _dollar_dollar = msg
-        _t1665 = deconstruct_bindings(pp, _dollar_dollar.body)
-        fields1027 = (_t1665, _dollar_dollar.body.value,)
-        unwrapped_fields1028 = fields1027
+        _t1751 = deconstruct_bindings(pp, _dollar_dollar.body)
+        fields1070 = (_t1751, _dollar_dollar.body.value,)
+        unwrapped_fields1071 = fields1070
         write(pp, "(exists")
         indent_sexp!(pp)
         newline(pp)
-        field1029 = unwrapped_fields1028[1]
-        pretty_bindings(pp, field1029)
+        field1072 = unwrapped_fields1071[1]
+        pretty_bindings(pp, field1072)
         newline(pp)
-        field1030 = unwrapped_fields1028[2]
-        pretty_formula(pp, field1030)
+        field1073 = unwrapped_fields1071[2]
+        pretty_formula(pp, field1073)
         dedent!(pp)
         write(pp, ")")
     end
@@ -1941,25 +1959,25 @@ function pretty_exists(pp::PrettyPrinter, msg::Proto.Exists)
 end
 
 function pretty_reduce(pp::PrettyPrinter, msg::Proto.Reduce)
-    flat1037 = try_flat(pp, msg, pretty_reduce)
-    if !isnothing(flat1037)
-        write(pp, flat1037)
+    flat1080 = try_flat(pp, msg, pretty_reduce)
+    if !isnothing(flat1080)
+        write(pp, flat1080)
         return nothing
     else
         _dollar_dollar = msg
-        fields1032 = (_dollar_dollar.op, _dollar_dollar.body, _dollar_dollar.terms,)
-        unwrapped_fields1033 = fields1032
+        fields1075 = (_dollar_dollar.op, _dollar_dollar.body, _dollar_dollar.terms,)
+        unwrapped_fields1076 = fields1075
         write(pp, "(reduce")
         indent_sexp!(pp)
         newline(pp)
-        field1034 = unwrapped_fields1033[1]
-        pretty_abstraction(pp, field1034)
+        field1077 = unwrapped_fields1076[1]
+        pretty_abstraction(pp, field1077)
         newline(pp)
-        field1035 = unwrapped_fields1033[2]
-        pretty_abstraction(pp, field1035)
+        field1078 = unwrapped_fields1076[2]
+        pretty_abstraction(pp, field1078)
         newline(pp)
-        field1036 = unwrapped_fields1033[3]
-        pretty_terms(pp, field1036)
+        field1079 = unwrapped_fields1076[3]
+        pretty_terms(pp, field1079)
         dedent!(pp)
         write(pp, ")")
     end
@@ -1967,22 +1985,22 @@ function pretty_reduce(pp::PrettyPrinter, msg::Proto.Reduce)
 end
 
 function pretty_terms(pp::PrettyPrinter, msg::Vector{Proto.Term})
-    flat1041 = try_flat(pp, msg, pretty_terms)
-    if !isnothing(flat1041)
-        write(pp, flat1041)
+    flat1084 = try_flat(pp, msg, pretty_terms)
+    if !isnothing(flat1084)
+        write(pp, flat1084)
         return nothing
     else
-        fields1038 = msg
+        fields1081 = msg
         write(pp, "(terms")
         indent_sexp!(pp)
-        if !isempty(fields1038)
+        if !isempty(fields1081)
             newline(pp)
-            for (i1666, elem1039) in enumerate(fields1038)
-                i1040 = i1666 - 1
-                if (i1040 > 0)
+            for (i1752, elem1082) in enumerate(fields1081)
+                i1083 = i1752 - 1
+                if (i1083 > 0)
                     newline(pp)
                 end
-                pretty_term(pp, elem1039)
+                pretty_term(pp, elem1082)
             end
         end
         dedent!(pp)
@@ -1992,32 +2010,32 @@ function pretty_terms(pp::PrettyPrinter, msg::Vector{Proto.Term})
 end
 
 function pretty_term(pp::PrettyPrinter, msg::Proto.Term)
-    flat1046 = try_flat(pp, msg, pretty_term)
-    if !isnothing(flat1046)
-        write(pp, flat1046)
+    flat1089 = try_flat(pp, msg, pretty_term)
+    if !isnothing(flat1089)
+        write(pp, flat1089)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("var"))
-            _t1667 = _get_oneof_field(_dollar_dollar, :var)
+            _t1753 = _get_oneof_field(_dollar_dollar, :var)
         else
-            _t1667 = nothing
+            _t1753 = nothing
         end
-        deconstruct_result1044 = _t1667
-        if !isnothing(deconstruct_result1044)
-            unwrapped1045 = deconstruct_result1044
-            pretty_var(pp, unwrapped1045)
+        deconstruct_result1087 = _t1753
+        if !isnothing(deconstruct_result1087)
+            unwrapped1088 = deconstruct_result1087
+            pretty_var(pp, unwrapped1088)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("constant"))
-                _t1668 = _get_oneof_field(_dollar_dollar, :constant)
+                _t1754 = _get_oneof_field(_dollar_dollar, :constant)
             else
-                _t1668 = nothing
+                _t1754 = nothing
             end
-            deconstruct_result1042 = _t1668
-            if !isnothing(deconstruct_result1042)
-                unwrapped1043 = deconstruct_result1042
-                pretty_value(pp, unwrapped1043)
+            deconstruct_result1085 = _t1754
+            if !isnothing(deconstruct_result1085)
+                unwrapped1086 = deconstruct_result1085
+                pretty_value(pp, unwrapped1086)
             else
                 throw(ParseError("No matching rule for term"))
             end
@@ -2027,158 +2045,158 @@ function pretty_term(pp::PrettyPrinter, msg::Proto.Term)
 end
 
 function pretty_var(pp::PrettyPrinter, msg::Proto.Var)
-    flat1049 = try_flat(pp, msg, pretty_var)
-    if !isnothing(flat1049)
-        write(pp, flat1049)
+    flat1092 = try_flat(pp, msg, pretty_var)
+    if !isnothing(flat1092)
+        write(pp, flat1092)
         return nothing
     else
         _dollar_dollar = msg
-        fields1047 = _dollar_dollar.name
-        unwrapped_fields1048 = fields1047
-        write(pp, unwrapped_fields1048)
+        fields1090 = _dollar_dollar.name
+        unwrapped_fields1091 = fields1090
+        write(pp, unwrapped_fields1091)
     end
     return nothing
 end
 
 function pretty_value(pp::PrettyPrinter, msg::Proto.Value)
-    flat1075 = try_flat(pp, msg, pretty_value)
-    if !isnothing(flat1075)
-        write(pp, flat1075)
+    flat1118 = try_flat(pp, msg, pretty_value)
+    if !isnothing(flat1118)
+        write(pp, flat1118)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("date_value"))
-            _t1669 = _get_oneof_field(_dollar_dollar, :date_value)
+            _t1755 = _get_oneof_field(_dollar_dollar, :date_value)
         else
-            _t1669 = nothing
+            _t1755 = nothing
         end
-        deconstruct_result1073 = _t1669
-        if !isnothing(deconstruct_result1073)
-            unwrapped1074 = deconstruct_result1073
-            pretty_date(pp, unwrapped1074)
+        deconstruct_result1116 = _t1755
+        if !isnothing(deconstruct_result1116)
+            unwrapped1117 = deconstruct_result1116
+            pretty_date(pp, unwrapped1117)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("datetime_value"))
-                _t1670 = _get_oneof_field(_dollar_dollar, :datetime_value)
+                _t1756 = _get_oneof_field(_dollar_dollar, :datetime_value)
             else
-                _t1670 = nothing
+                _t1756 = nothing
             end
-            deconstruct_result1071 = _t1670
-            if !isnothing(deconstruct_result1071)
-                unwrapped1072 = deconstruct_result1071
-                pretty_datetime(pp, unwrapped1072)
+            deconstruct_result1114 = _t1756
+            if !isnothing(deconstruct_result1114)
+                unwrapped1115 = deconstruct_result1114
+                pretty_datetime(pp, unwrapped1115)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("string_value"))
-                    _t1671 = _get_oneof_field(_dollar_dollar, :string_value)
+                    _t1757 = _get_oneof_field(_dollar_dollar, :string_value)
                 else
-                    _t1671 = nothing
+                    _t1757 = nothing
                 end
-                deconstruct_result1069 = _t1671
-                if !isnothing(deconstruct_result1069)
-                    unwrapped1070 = deconstruct_result1069
-                    write(pp, format_string(pp, unwrapped1070))
+                deconstruct_result1112 = _t1757
+                if !isnothing(deconstruct_result1112)
+                    unwrapped1113 = deconstruct_result1112
+                    write(pp, format_string(pp, unwrapped1113))
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("int32_value"))
-                        _t1672 = _get_oneof_field(_dollar_dollar, :int32_value)
+                        _t1758 = _get_oneof_field(_dollar_dollar, :int32_value)
                     else
-                        _t1672 = nothing
+                        _t1758 = nothing
                     end
-                    deconstruct_result1067 = _t1672
-                    if !isnothing(deconstruct_result1067)
-                        unwrapped1068 = deconstruct_result1067
-                        write(pp, format_int32(pp, unwrapped1068))
+                    deconstruct_result1110 = _t1758
+                    if !isnothing(deconstruct_result1110)
+                        unwrapped1111 = deconstruct_result1110
+                        write(pp, format_int32(pp, unwrapped1111))
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("int_value"))
-                            _t1673 = _get_oneof_field(_dollar_dollar, :int_value)
+                            _t1759 = _get_oneof_field(_dollar_dollar, :int_value)
                         else
-                            _t1673 = nothing
+                            _t1759 = nothing
                         end
-                        deconstruct_result1065 = _t1673
-                        if !isnothing(deconstruct_result1065)
-                            unwrapped1066 = deconstruct_result1065
-                            write(pp, format_int(pp, unwrapped1066))
+                        deconstruct_result1108 = _t1759
+                        if !isnothing(deconstruct_result1108)
+                            unwrapped1109 = deconstruct_result1108
+                            write(pp, format_int(pp, unwrapped1109))
                         else
                             _dollar_dollar = msg
                             if _has_proto_field(_dollar_dollar, Symbol("float32_value"))
-                                _t1674 = _get_oneof_field(_dollar_dollar, :float32_value)
+                                _t1760 = _get_oneof_field(_dollar_dollar, :float32_value)
                             else
-                                _t1674 = nothing
+                                _t1760 = nothing
                             end
-                            deconstruct_result1063 = _t1674
-                            if !isnothing(deconstruct_result1063)
-                                unwrapped1064 = deconstruct_result1063
-                                write(pp, format_float32(pp, unwrapped1064))
+                            deconstruct_result1106 = _t1760
+                            if !isnothing(deconstruct_result1106)
+                                unwrapped1107 = deconstruct_result1106
+                                write(pp, format_float32(pp, unwrapped1107))
                             else
                                 _dollar_dollar = msg
                                 if _has_proto_field(_dollar_dollar, Symbol("float_value"))
-                                    _t1675 = _get_oneof_field(_dollar_dollar, :float_value)
+                                    _t1761 = _get_oneof_field(_dollar_dollar, :float_value)
                                 else
-                                    _t1675 = nothing
+                                    _t1761 = nothing
                                 end
-                                deconstruct_result1061 = _t1675
-                                if !isnothing(deconstruct_result1061)
-                                    unwrapped1062 = deconstruct_result1061
-                                    write(pp, format_float(pp, unwrapped1062))
+                                deconstruct_result1104 = _t1761
+                                if !isnothing(deconstruct_result1104)
+                                    unwrapped1105 = deconstruct_result1104
+                                    write(pp, format_float(pp, unwrapped1105))
                                 else
                                     _dollar_dollar = msg
                                     if _has_proto_field(_dollar_dollar, Symbol("uint32_value"))
-                                        _t1676 = _get_oneof_field(_dollar_dollar, :uint32_value)
+                                        _t1762 = _get_oneof_field(_dollar_dollar, :uint32_value)
                                     else
-                                        _t1676 = nothing
+                                        _t1762 = nothing
                                     end
-                                    deconstruct_result1059 = _t1676
-                                    if !isnothing(deconstruct_result1059)
-                                        unwrapped1060 = deconstruct_result1059
-                                        write(pp, format_uint32(pp, unwrapped1060))
+                                    deconstruct_result1102 = _t1762
+                                    if !isnothing(deconstruct_result1102)
+                                        unwrapped1103 = deconstruct_result1102
+                                        write(pp, format_uint32(pp, unwrapped1103))
                                     else
                                         _dollar_dollar = msg
                                         if _has_proto_field(_dollar_dollar, Symbol("uint128_value"))
-                                            _t1677 = _get_oneof_field(_dollar_dollar, :uint128_value)
+                                            _t1763 = _get_oneof_field(_dollar_dollar, :uint128_value)
                                         else
-                                            _t1677 = nothing
+                                            _t1763 = nothing
                                         end
-                                        deconstruct_result1057 = _t1677
-                                        if !isnothing(deconstruct_result1057)
-                                            unwrapped1058 = deconstruct_result1057
-                                            write(pp, format_uint128(pp, unwrapped1058))
+                                        deconstruct_result1100 = _t1763
+                                        if !isnothing(deconstruct_result1100)
+                                            unwrapped1101 = deconstruct_result1100
+                                            write(pp, format_uint128(pp, unwrapped1101))
                                         else
                                             _dollar_dollar = msg
                                             if _has_proto_field(_dollar_dollar, Symbol("int128_value"))
-                                                _t1678 = _get_oneof_field(_dollar_dollar, :int128_value)
+                                                _t1764 = _get_oneof_field(_dollar_dollar, :int128_value)
                                             else
-                                                _t1678 = nothing
+                                                _t1764 = nothing
                                             end
-                                            deconstruct_result1055 = _t1678
-                                            if !isnothing(deconstruct_result1055)
-                                                unwrapped1056 = deconstruct_result1055
-                                                write(pp, format_int128(pp, unwrapped1056))
+                                            deconstruct_result1098 = _t1764
+                                            if !isnothing(deconstruct_result1098)
+                                                unwrapped1099 = deconstruct_result1098
+                                                write(pp, format_int128(pp, unwrapped1099))
                                             else
                                                 _dollar_dollar = msg
                                                 if _has_proto_field(_dollar_dollar, Symbol("decimal_value"))
-                                                    _t1679 = _get_oneof_field(_dollar_dollar, :decimal_value)
+                                                    _t1765 = _get_oneof_field(_dollar_dollar, :decimal_value)
                                                 else
-                                                    _t1679 = nothing
+                                                    _t1765 = nothing
                                                 end
-                                                deconstruct_result1053 = _t1679
-                                                if !isnothing(deconstruct_result1053)
-                                                    unwrapped1054 = deconstruct_result1053
-                                                    write(pp, format_decimal(pp, unwrapped1054))
+                                                deconstruct_result1096 = _t1765
+                                                if !isnothing(deconstruct_result1096)
+                                                    unwrapped1097 = deconstruct_result1096
+                                                    write(pp, format_decimal(pp, unwrapped1097))
                                                 else
                                                     _dollar_dollar = msg
                                                     if _has_proto_field(_dollar_dollar, Symbol("boolean_value"))
-                                                        _t1680 = _get_oneof_field(_dollar_dollar, :boolean_value)
+                                                        _t1766 = _get_oneof_field(_dollar_dollar, :boolean_value)
                                                     else
-                                                        _t1680 = nothing
+                                                        _t1766 = nothing
                                                     end
-                                                    deconstruct_result1051 = _t1680
-                                                    if !isnothing(deconstruct_result1051)
-                                                        unwrapped1052 = deconstruct_result1051
-                                                        pretty_boolean_value(pp, unwrapped1052)
+                                                    deconstruct_result1094 = _t1766
+                                                    if !isnothing(deconstruct_result1094)
+                                                        unwrapped1095 = deconstruct_result1094
+                                                        pretty_boolean_value(pp, unwrapped1095)
                                                     else
-                                                        fields1050 = msg
+                                                        fields1093 = msg
                                                         write(pp, "missing")
                                                     end
                                                 end
@@ -2197,25 +2215,25 @@ function pretty_value(pp::PrettyPrinter, msg::Proto.Value)
 end
 
 function pretty_date(pp::PrettyPrinter, msg::Proto.DateValue)
-    flat1081 = try_flat(pp, msg, pretty_date)
-    if !isnothing(flat1081)
-        write(pp, flat1081)
+    flat1124 = try_flat(pp, msg, pretty_date)
+    if !isnothing(flat1124)
+        write(pp, flat1124)
         return nothing
     else
         _dollar_dollar = msg
-        fields1076 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day),)
-        unwrapped_fields1077 = fields1076
+        fields1119 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day),)
+        unwrapped_fields1120 = fields1119
         write(pp, "(date")
         indent_sexp!(pp)
         newline(pp)
-        field1078 = unwrapped_fields1077[1]
-        write(pp, format_int(pp, field1078))
+        field1121 = unwrapped_fields1120[1]
+        write(pp, format_int(pp, field1121))
         newline(pp)
-        field1079 = unwrapped_fields1077[2]
-        write(pp, format_int(pp, field1079))
+        field1122 = unwrapped_fields1120[2]
+        write(pp, format_int(pp, field1122))
         newline(pp)
-        field1080 = unwrapped_fields1077[3]
-        write(pp, format_int(pp, field1080))
+        field1123 = unwrapped_fields1120[3]
+        write(pp, format_int(pp, field1123))
         dedent!(pp)
         write(pp, ")")
     end
@@ -2223,39 +2241,39 @@ function pretty_date(pp::PrettyPrinter, msg::Proto.DateValue)
 end
 
 function pretty_datetime(pp::PrettyPrinter, msg::Proto.DateTimeValue)
-    flat1092 = try_flat(pp, msg, pretty_datetime)
-    if !isnothing(flat1092)
-        write(pp, flat1092)
+    flat1135 = try_flat(pp, msg, pretty_datetime)
+    if !isnothing(flat1135)
+        write(pp, flat1135)
         return nothing
     else
         _dollar_dollar = msg
-        fields1082 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day), Int64(_dollar_dollar.hour), Int64(_dollar_dollar.minute), Int64(_dollar_dollar.second), Int64(_dollar_dollar.microsecond),)
-        unwrapped_fields1083 = fields1082
+        fields1125 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day), Int64(_dollar_dollar.hour), Int64(_dollar_dollar.minute), Int64(_dollar_dollar.second), Int64(_dollar_dollar.microsecond),)
+        unwrapped_fields1126 = fields1125
         write(pp, "(datetime")
         indent_sexp!(pp)
         newline(pp)
-        field1084 = unwrapped_fields1083[1]
-        write(pp, format_int(pp, field1084))
+        field1127 = unwrapped_fields1126[1]
+        write(pp, format_int(pp, field1127))
         newline(pp)
-        field1085 = unwrapped_fields1083[2]
-        write(pp, format_int(pp, field1085))
+        field1128 = unwrapped_fields1126[2]
+        write(pp, format_int(pp, field1128))
         newline(pp)
-        field1086 = unwrapped_fields1083[3]
-        write(pp, format_int(pp, field1086))
+        field1129 = unwrapped_fields1126[3]
+        write(pp, format_int(pp, field1129))
         newline(pp)
-        field1087 = unwrapped_fields1083[4]
-        write(pp, format_int(pp, field1087))
+        field1130 = unwrapped_fields1126[4]
+        write(pp, format_int(pp, field1130))
         newline(pp)
-        field1088 = unwrapped_fields1083[5]
-        write(pp, format_int(pp, field1088))
+        field1131 = unwrapped_fields1126[5]
+        write(pp, format_int(pp, field1131))
         newline(pp)
-        field1089 = unwrapped_fields1083[6]
-        write(pp, format_int(pp, field1089))
-        field1090 = unwrapped_fields1083[7]
-        if !isnothing(field1090)
+        field1132 = unwrapped_fields1126[6]
+        write(pp, format_int(pp, field1132))
+        field1133 = unwrapped_fields1126[7]
+        if !isnothing(field1133)
             newline(pp)
-            opt_val1091 = field1090
-            write(pp, format_int(pp, opt_val1091))
+            opt_val1134 = field1133
+            write(pp, format_int(pp, opt_val1134))
         end
         dedent!(pp)
         write(pp, ")")
@@ -2264,24 +2282,24 @@ function pretty_datetime(pp::PrettyPrinter, msg::Proto.DateTimeValue)
 end
 
 function pretty_conjunction(pp::PrettyPrinter, msg::Proto.Conjunction)
-    flat1097 = try_flat(pp, msg, pretty_conjunction)
-    if !isnothing(flat1097)
-        write(pp, flat1097)
+    flat1140 = try_flat(pp, msg, pretty_conjunction)
+    if !isnothing(flat1140)
+        write(pp, flat1140)
         return nothing
     else
         _dollar_dollar = msg
-        fields1093 = _dollar_dollar.args
-        unwrapped_fields1094 = fields1093
+        fields1136 = _dollar_dollar.args
+        unwrapped_fields1137 = fields1136
         write(pp, "(and")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields1094)
+        if !isempty(unwrapped_fields1137)
             newline(pp)
-            for (i1681, elem1095) in enumerate(unwrapped_fields1094)
-                i1096 = i1681 - 1
-                if (i1096 > 0)
+            for (i1767, elem1138) in enumerate(unwrapped_fields1137)
+                i1139 = i1767 - 1
+                if (i1139 > 0)
                     newline(pp)
                 end
-                pretty_formula(pp, elem1095)
+                pretty_formula(pp, elem1138)
             end
         end
         dedent!(pp)
@@ -2291,24 +2309,24 @@ function pretty_conjunction(pp::PrettyPrinter, msg::Proto.Conjunction)
 end
 
 function pretty_disjunction(pp::PrettyPrinter, msg::Proto.Disjunction)
-    flat1102 = try_flat(pp, msg, pretty_disjunction)
-    if !isnothing(flat1102)
-        write(pp, flat1102)
+    flat1145 = try_flat(pp, msg, pretty_disjunction)
+    if !isnothing(flat1145)
+        write(pp, flat1145)
         return nothing
     else
         _dollar_dollar = msg
-        fields1098 = _dollar_dollar.args
-        unwrapped_fields1099 = fields1098
+        fields1141 = _dollar_dollar.args
+        unwrapped_fields1142 = fields1141
         write(pp, "(or")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields1099)
+        if !isempty(unwrapped_fields1142)
             newline(pp)
-            for (i1682, elem1100) in enumerate(unwrapped_fields1099)
-                i1101 = i1682 - 1
-                if (i1101 > 0)
+            for (i1768, elem1143) in enumerate(unwrapped_fields1142)
+                i1144 = i1768 - 1
+                if (i1144 > 0)
                     newline(pp)
                 end
-                pretty_formula(pp, elem1100)
+                pretty_formula(pp, elem1143)
             end
         end
         dedent!(pp)
@@ -2318,18 +2336,18 @@ function pretty_disjunction(pp::PrettyPrinter, msg::Proto.Disjunction)
 end
 
 function pretty_not(pp::PrettyPrinter, msg::Proto.Not)
-    flat1105 = try_flat(pp, msg, pretty_not)
-    if !isnothing(flat1105)
-        write(pp, flat1105)
+    flat1148 = try_flat(pp, msg, pretty_not)
+    if !isnothing(flat1148)
+        write(pp, flat1148)
         return nothing
     else
         _dollar_dollar = msg
-        fields1103 = _dollar_dollar.arg
-        unwrapped_fields1104 = fields1103
+        fields1146 = _dollar_dollar.arg
+        unwrapped_fields1147 = fields1146
         write(pp, "(not")
         indent_sexp!(pp)
         newline(pp)
-        pretty_formula(pp, unwrapped_fields1104)
+        pretty_formula(pp, unwrapped_fields1147)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2337,25 +2355,25 @@ function pretty_not(pp::PrettyPrinter, msg::Proto.Not)
 end
 
 function pretty_ffi(pp::PrettyPrinter, msg::Proto.FFI)
-    flat1111 = try_flat(pp, msg, pretty_ffi)
-    if !isnothing(flat1111)
-        write(pp, flat1111)
+    flat1154 = try_flat(pp, msg, pretty_ffi)
+    if !isnothing(flat1154)
+        write(pp, flat1154)
         return nothing
     else
         _dollar_dollar = msg
-        fields1106 = (_dollar_dollar.name, _dollar_dollar.args, _dollar_dollar.terms,)
-        unwrapped_fields1107 = fields1106
+        fields1149 = (_dollar_dollar.name, _dollar_dollar.args, _dollar_dollar.terms,)
+        unwrapped_fields1150 = fields1149
         write(pp, "(ffi")
         indent_sexp!(pp)
         newline(pp)
-        field1108 = unwrapped_fields1107[1]
-        pretty_name(pp, field1108)
+        field1151 = unwrapped_fields1150[1]
+        pretty_name(pp, field1151)
         newline(pp)
-        field1109 = unwrapped_fields1107[2]
-        pretty_ffi_args(pp, field1109)
+        field1152 = unwrapped_fields1150[2]
+        pretty_ffi_args(pp, field1152)
         newline(pp)
-        field1110 = unwrapped_fields1107[3]
-        pretty_terms(pp, field1110)
+        field1153 = unwrapped_fields1150[3]
+        pretty_terms(pp, field1153)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2363,35 +2381,35 @@ function pretty_ffi(pp::PrettyPrinter, msg::Proto.FFI)
 end
 
 function pretty_name(pp::PrettyPrinter, msg::String)
-    flat1113 = try_flat(pp, msg, pretty_name)
-    if !isnothing(flat1113)
-        write(pp, flat1113)
+    flat1156 = try_flat(pp, msg, pretty_name)
+    if !isnothing(flat1156)
+        write(pp, flat1156)
         return nothing
     else
-        fields1112 = msg
+        fields1155 = msg
         write(pp, ":")
-        write(pp, fields1112)
+        write(pp, fields1155)
     end
     return nothing
 end
 
 function pretty_ffi_args(pp::PrettyPrinter, msg::Vector{Proto.Abstraction})
-    flat1117 = try_flat(pp, msg, pretty_ffi_args)
-    if !isnothing(flat1117)
-        write(pp, flat1117)
+    flat1160 = try_flat(pp, msg, pretty_ffi_args)
+    if !isnothing(flat1160)
+        write(pp, flat1160)
         return nothing
     else
-        fields1114 = msg
+        fields1157 = msg
         write(pp, "(args")
         indent_sexp!(pp)
-        if !isempty(fields1114)
+        if !isempty(fields1157)
             newline(pp)
-            for (i1683, elem1115) in enumerate(fields1114)
-                i1116 = i1683 - 1
-                if (i1116 > 0)
+            for (i1769, elem1158) in enumerate(fields1157)
+                i1159 = i1769 - 1
+                if (i1159 > 0)
                     newline(pp)
                 end
-                pretty_abstraction(pp, elem1115)
+                pretty_abstraction(pp, elem1158)
             end
         end
         dedent!(pp)
@@ -2401,28 +2419,28 @@ function pretty_ffi_args(pp::PrettyPrinter, msg::Vector{Proto.Abstraction})
 end
 
 function pretty_atom(pp::PrettyPrinter, msg::Proto.Atom)
-    flat1124 = try_flat(pp, msg, pretty_atom)
-    if !isnothing(flat1124)
-        write(pp, flat1124)
+    flat1167 = try_flat(pp, msg, pretty_atom)
+    if !isnothing(flat1167)
+        write(pp, flat1167)
         return nothing
     else
         _dollar_dollar = msg
-        fields1118 = (_dollar_dollar.name, _dollar_dollar.terms,)
-        unwrapped_fields1119 = fields1118
+        fields1161 = (_dollar_dollar.name, _dollar_dollar.terms,)
+        unwrapped_fields1162 = fields1161
         write(pp, "(atom")
         indent_sexp!(pp)
         newline(pp)
-        field1120 = unwrapped_fields1119[1]
-        pretty_relation_id(pp, field1120)
-        field1121 = unwrapped_fields1119[2]
-        if !isempty(field1121)
+        field1163 = unwrapped_fields1162[1]
+        pretty_relation_id(pp, field1163)
+        field1164 = unwrapped_fields1162[2]
+        if !isempty(field1164)
             newline(pp)
-            for (i1684, elem1122) in enumerate(field1121)
-                i1123 = i1684 - 1
-                if (i1123 > 0)
+            for (i1770, elem1165) in enumerate(field1164)
+                i1166 = i1770 - 1
+                if (i1166 > 0)
                     newline(pp)
                 end
-                pretty_term(pp, elem1122)
+                pretty_term(pp, elem1165)
             end
         end
         dedent!(pp)
@@ -2432,28 +2450,28 @@ function pretty_atom(pp::PrettyPrinter, msg::Proto.Atom)
 end
 
 function pretty_pragma(pp::PrettyPrinter, msg::Proto.Pragma)
-    flat1131 = try_flat(pp, msg, pretty_pragma)
-    if !isnothing(flat1131)
-        write(pp, flat1131)
+    flat1174 = try_flat(pp, msg, pretty_pragma)
+    if !isnothing(flat1174)
+        write(pp, flat1174)
         return nothing
     else
         _dollar_dollar = msg
-        fields1125 = (_dollar_dollar.name, _dollar_dollar.terms,)
-        unwrapped_fields1126 = fields1125
+        fields1168 = (_dollar_dollar.name, _dollar_dollar.terms,)
+        unwrapped_fields1169 = fields1168
         write(pp, "(pragma")
         indent_sexp!(pp)
         newline(pp)
-        field1127 = unwrapped_fields1126[1]
-        pretty_name(pp, field1127)
-        field1128 = unwrapped_fields1126[2]
-        if !isempty(field1128)
+        field1170 = unwrapped_fields1169[1]
+        pretty_name(pp, field1170)
+        field1171 = unwrapped_fields1169[2]
+        if !isempty(field1171)
             newline(pp)
-            for (i1685, elem1129) in enumerate(field1128)
-                i1130 = i1685 - 1
-                if (i1130 > 0)
+            for (i1771, elem1172) in enumerate(field1171)
+                i1173 = i1771 - 1
+                if (i1173 > 0)
                     newline(pp)
                 end
-                pretty_term(pp, elem1129)
+                pretty_term(pp, elem1172)
             end
         end
         dedent!(pp)
@@ -2463,118 +2481,118 @@ function pretty_pragma(pp::PrettyPrinter, msg::Proto.Pragma)
 end
 
 function pretty_primitive(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1147 = try_flat(pp, msg, pretty_primitive)
-    if !isnothing(flat1147)
-        write(pp, flat1147)
+    flat1190 = try_flat(pp, msg, pretty_primitive)
+    if !isnothing(flat1190)
+        write(pp, flat1190)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_eq"
-            _t1686 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1772 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1686 = nothing
+            _t1772 = nothing
         end
-        guard_result1146 = _t1686
-        if !isnothing(guard_result1146)
+        guard_result1189 = _t1772
+        if !isnothing(guard_result1189)
             pretty_eq(pp, msg)
         else
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_lt_monotype"
-                _t1687 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+                _t1773 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
             else
-                _t1687 = nothing
+                _t1773 = nothing
             end
-            guard_result1145 = _t1687
-            if !isnothing(guard_result1145)
+            guard_result1188 = _t1773
+            if !isnothing(guard_result1188)
                 pretty_lt(pp, msg)
             else
                 _dollar_dollar = msg
                 if _dollar_dollar.name == "rel_primitive_lt_eq_monotype"
-                    _t1688 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+                    _t1774 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
                 else
-                    _t1688 = nothing
+                    _t1774 = nothing
                 end
-                guard_result1144 = _t1688
-                if !isnothing(guard_result1144)
+                guard_result1187 = _t1774
+                if !isnothing(guard_result1187)
                     pretty_lt_eq(pp, msg)
                 else
                     _dollar_dollar = msg
                     if _dollar_dollar.name == "rel_primitive_gt_monotype"
-                        _t1689 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+                        _t1775 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
                     else
-                        _t1689 = nothing
+                        _t1775 = nothing
                     end
-                    guard_result1143 = _t1689
-                    if !isnothing(guard_result1143)
+                    guard_result1186 = _t1775
+                    if !isnothing(guard_result1186)
                         pretty_gt(pp, msg)
                     else
                         _dollar_dollar = msg
                         if _dollar_dollar.name == "rel_primitive_gt_eq_monotype"
-                            _t1690 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+                            _t1776 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
                         else
-                            _t1690 = nothing
+                            _t1776 = nothing
                         end
-                        guard_result1142 = _t1690
-                        if !isnothing(guard_result1142)
+                        guard_result1185 = _t1776
+                        if !isnothing(guard_result1185)
                             pretty_gt_eq(pp, msg)
                         else
                             _dollar_dollar = msg
                             if _dollar_dollar.name == "rel_primitive_add_monotype"
-                                _t1691 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+                                _t1777 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
                             else
-                                _t1691 = nothing
+                                _t1777 = nothing
                             end
-                            guard_result1141 = _t1691
-                            if !isnothing(guard_result1141)
+                            guard_result1184 = _t1777
+                            if !isnothing(guard_result1184)
                                 pretty_add(pp, msg)
                             else
                                 _dollar_dollar = msg
                                 if _dollar_dollar.name == "rel_primitive_subtract_monotype"
-                                    _t1692 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+                                    _t1778 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
                                 else
-                                    _t1692 = nothing
+                                    _t1778 = nothing
                                 end
-                                guard_result1140 = _t1692
-                                if !isnothing(guard_result1140)
+                                guard_result1183 = _t1778
+                                if !isnothing(guard_result1183)
                                     pretty_minus(pp, msg)
                                 else
                                     _dollar_dollar = msg
                                     if _dollar_dollar.name == "rel_primitive_multiply_monotype"
-                                        _t1693 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+                                        _t1779 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
                                     else
-                                        _t1693 = nothing
+                                        _t1779 = nothing
                                     end
-                                    guard_result1139 = _t1693
-                                    if !isnothing(guard_result1139)
+                                    guard_result1182 = _t1779
+                                    if !isnothing(guard_result1182)
                                         pretty_multiply(pp, msg)
                                     else
                                         _dollar_dollar = msg
                                         if _dollar_dollar.name == "rel_primitive_divide_monotype"
-                                            _t1694 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+                                            _t1780 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
                                         else
-                                            _t1694 = nothing
+                                            _t1780 = nothing
                                         end
-                                        guard_result1138 = _t1694
-                                        if !isnothing(guard_result1138)
+                                        guard_result1181 = _t1780
+                                        if !isnothing(guard_result1181)
                                             pretty_divide(pp, msg)
                                         else
                                             _dollar_dollar = msg
-                                            fields1132 = (_dollar_dollar.name, _dollar_dollar.terms,)
-                                            unwrapped_fields1133 = fields1132
+                                            fields1175 = (_dollar_dollar.name, _dollar_dollar.terms,)
+                                            unwrapped_fields1176 = fields1175
                                             write(pp, "(primitive")
                                             indent_sexp!(pp)
                                             newline(pp)
-                                            field1134 = unwrapped_fields1133[1]
-                                            pretty_name(pp, field1134)
-                                            field1135 = unwrapped_fields1133[2]
-                                            if !isempty(field1135)
+                                            field1177 = unwrapped_fields1176[1]
+                                            pretty_name(pp, field1177)
+                                            field1178 = unwrapped_fields1176[2]
+                                            if !isempty(field1178)
                                                 newline(pp)
-                                                for (i1695, elem1136) in enumerate(field1135)
-                                                    i1137 = i1695 - 1
-                                                    if (i1137 > 0)
+                                                for (i1781, elem1179) in enumerate(field1178)
+                                                    i1180 = i1781 - 1
+                                                    if (i1180 > 0)
                                                         newline(pp)
                                                     end
-                                                    pretty_rel_term(pp, elem1136)
+                                                    pretty_rel_term(pp, elem1179)
                                                 end
                                             end
                                             dedent!(pp)
@@ -2593,27 +2611,27 @@ function pretty_primitive(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_eq(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1152 = try_flat(pp, msg, pretty_eq)
-    if !isnothing(flat1152)
-        write(pp, flat1152)
+    flat1195 = try_flat(pp, msg, pretty_eq)
+    if !isnothing(flat1195)
+        write(pp, flat1195)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_eq"
-            _t1696 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1782 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1696 = nothing
+            _t1782 = nothing
         end
-        fields1148 = _t1696
-        unwrapped_fields1149 = fields1148
+        fields1191 = _t1782
+        unwrapped_fields1192 = fields1191
         write(pp, "(=")
         indent_sexp!(pp)
         newline(pp)
-        field1150 = unwrapped_fields1149[1]
-        pretty_term(pp, field1150)
+        field1193 = unwrapped_fields1192[1]
+        pretty_term(pp, field1193)
         newline(pp)
-        field1151 = unwrapped_fields1149[2]
-        pretty_term(pp, field1151)
+        field1194 = unwrapped_fields1192[2]
+        pretty_term(pp, field1194)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2621,27 +2639,27 @@ function pretty_eq(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_lt(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1157 = try_flat(pp, msg, pretty_lt)
-    if !isnothing(flat1157)
-        write(pp, flat1157)
+    flat1200 = try_flat(pp, msg, pretty_lt)
+    if !isnothing(flat1200)
+        write(pp, flat1200)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_lt_monotype"
-            _t1697 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1783 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1697 = nothing
+            _t1783 = nothing
         end
-        fields1153 = _t1697
-        unwrapped_fields1154 = fields1153
+        fields1196 = _t1783
+        unwrapped_fields1197 = fields1196
         write(pp, "(<")
         indent_sexp!(pp)
         newline(pp)
-        field1155 = unwrapped_fields1154[1]
-        pretty_term(pp, field1155)
+        field1198 = unwrapped_fields1197[1]
+        pretty_term(pp, field1198)
         newline(pp)
-        field1156 = unwrapped_fields1154[2]
-        pretty_term(pp, field1156)
+        field1199 = unwrapped_fields1197[2]
+        pretty_term(pp, field1199)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2649,27 +2667,27 @@ function pretty_lt(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_lt_eq(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1162 = try_flat(pp, msg, pretty_lt_eq)
-    if !isnothing(flat1162)
-        write(pp, flat1162)
+    flat1205 = try_flat(pp, msg, pretty_lt_eq)
+    if !isnothing(flat1205)
+        write(pp, flat1205)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_lt_eq_monotype"
-            _t1698 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1784 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1698 = nothing
+            _t1784 = nothing
         end
-        fields1158 = _t1698
-        unwrapped_fields1159 = fields1158
+        fields1201 = _t1784
+        unwrapped_fields1202 = fields1201
         write(pp, "(<=")
         indent_sexp!(pp)
         newline(pp)
-        field1160 = unwrapped_fields1159[1]
-        pretty_term(pp, field1160)
+        field1203 = unwrapped_fields1202[1]
+        pretty_term(pp, field1203)
         newline(pp)
-        field1161 = unwrapped_fields1159[2]
-        pretty_term(pp, field1161)
+        field1204 = unwrapped_fields1202[2]
+        pretty_term(pp, field1204)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2677,27 +2695,27 @@ function pretty_lt_eq(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_gt(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1167 = try_flat(pp, msg, pretty_gt)
-    if !isnothing(flat1167)
-        write(pp, flat1167)
+    flat1210 = try_flat(pp, msg, pretty_gt)
+    if !isnothing(flat1210)
+        write(pp, flat1210)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_gt_monotype"
-            _t1699 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1785 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1699 = nothing
+            _t1785 = nothing
         end
-        fields1163 = _t1699
-        unwrapped_fields1164 = fields1163
+        fields1206 = _t1785
+        unwrapped_fields1207 = fields1206
         write(pp, "(>")
         indent_sexp!(pp)
         newline(pp)
-        field1165 = unwrapped_fields1164[1]
-        pretty_term(pp, field1165)
+        field1208 = unwrapped_fields1207[1]
+        pretty_term(pp, field1208)
         newline(pp)
-        field1166 = unwrapped_fields1164[2]
-        pretty_term(pp, field1166)
+        field1209 = unwrapped_fields1207[2]
+        pretty_term(pp, field1209)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2705,27 +2723,27 @@ function pretty_gt(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_gt_eq(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1172 = try_flat(pp, msg, pretty_gt_eq)
-    if !isnothing(flat1172)
-        write(pp, flat1172)
+    flat1215 = try_flat(pp, msg, pretty_gt_eq)
+    if !isnothing(flat1215)
+        write(pp, flat1215)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_gt_eq_monotype"
-            _t1700 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1786 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1700 = nothing
+            _t1786 = nothing
         end
-        fields1168 = _t1700
-        unwrapped_fields1169 = fields1168
+        fields1211 = _t1786
+        unwrapped_fields1212 = fields1211
         write(pp, "(>=")
         indent_sexp!(pp)
         newline(pp)
-        field1170 = unwrapped_fields1169[1]
-        pretty_term(pp, field1170)
+        field1213 = unwrapped_fields1212[1]
+        pretty_term(pp, field1213)
         newline(pp)
-        field1171 = unwrapped_fields1169[2]
-        pretty_term(pp, field1171)
+        field1214 = unwrapped_fields1212[2]
+        pretty_term(pp, field1214)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2733,30 +2751,30 @@ function pretty_gt_eq(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_add(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1178 = try_flat(pp, msg, pretty_add)
-    if !isnothing(flat1178)
-        write(pp, flat1178)
+    flat1221 = try_flat(pp, msg, pretty_add)
+    if !isnothing(flat1221)
+        write(pp, flat1221)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_add_monotype"
-            _t1701 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+            _t1787 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
         else
-            _t1701 = nothing
+            _t1787 = nothing
         end
-        fields1173 = _t1701
-        unwrapped_fields1174 = fields1173
+        fields1216 = _t1787
+        unwrapped_fields1217 = fields1216
         write(pp, "(+")
         indent_sexp!(pp)
         newline(pp)
-        field1175 = unwrapped_fields1174[1]
-        pretty_term(pp, field1175)
+        field1218 = unwrapped_fields1217[1]
+        pretty_term(pp, field1218)
         newline(pp)
-        field1176 = unwrapped_fields1174[2]
-        pretty_term(pp, field1176)
+        field1219 = unwrapped_fields1217[2]
+        pretty_term(pp, field1219)
         newline(pp)
-        field1177 = unwrapped_fields1174[3]
-        pretty_term(pp, field1177)
+        field1220 = unwrapped_fields1217[3]
+        pretty_term(pp, field1220)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2764,30 +2782,30 @@ function pretty_add(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_minus(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1184 = try_flat(pp, msg, pretty_minus)
-    if !isnothing(flat1184)
-        write(pp, flat1184)
+    flat1227 = try_flat(pp, msg, pretty_minus)
+    if !isnothing(flat1227)
+        write(pp, flat1227)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_subtract_monotype"
-            _t1702 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+            _t1788 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
         else
-            _t1702 = nothing
+            _t1788 = nothing
         end
-        fields1179 = _t1702
-        unwrapped_fields1180 = fields1179
+        fields1222 = _t1788
+        unwrapped_fields1223 = fields1222
         write(pp, "(-")
         indent_sexp!(pp)
         newline(pp)
-        field1181 = unwrapped_fields1180[1]
-        pretty_term(pp, field1181)
+        field1224 = unwrapped_fields1223[1]
+        pretty_term(pp, field1224)
         newline(pp)
-        field1182 = unwrapped_fields1180[2]
-        pretty_term(pp, field1182)
+        field1225 = unwrapped_fields1223[2]
+        pretty_term(pp, field1225)
         newline(pp)
-        field1183 = unwrapped_fields1180[3]
-        pretty_term(pp, field1183)
+        field1226 = unwrapped_fields1223[3]
+        pretty_term(pp, field1226)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2795,30 +2813,30 @@ function pretty_minus(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_multiply(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1190 = try_flat(pp, msg, pretty_multiply)
-    if !isnothing(flat1190)
-        write(pp, flat1190)
+    flat1233 = try_flat(pp, msg, pretty_multiply)
+    if !isnothing(flat1233)
+        write(pp, flat1233)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_multiply_monotype"
-            _t1703 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+            _t1789 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
         else
-            _t1703 = nothing
+            _t1789 = nothing
         end
-        fields1185 = _t1703
-        unwrapped_fields1186 = fields1185
+        fields1228 = _t1789
+        unwrapped_fields1229 = fields1228
         write(pp, "(*")
         indent_sexp!(pp)
         newline(pp)
-        field1187 = unwrapped_fields1186[1]
-        pretty_term(pp, field1187)
+        field1230 = unwrapped_fields1229[1]
+        pretty_term(pp, field1230)
         newline(pp)
-        field1188 = unwrapped_fields1186[2]
-        pretty_term(pp, field1188)
+        field1231 = unwrapped_fields1229[2]
+        pretty_term(pp, field1231)
         newline(pp)
-        field1189 = unwrapped_fields1186[3]
-        pretty_term(pp, field1189)
+        field1232 = unwrapped_fields1229[3]
+        pretty_term(pp, field1232)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2826,30 +2844,30 @@ function pretty_multiply(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_divide(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1196 = try_flat(pp, msg, pretty_divide)
-    if !isnothing(flat1196)
-        write(pp, flat1196)
+    flat1239 = try_flat(pp, msg, pretty_divide)
+    if !isnothing(flat1239)
+        write(pp, flat1239)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_divide_monotype"
-            _t1704 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+            _t1790 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
         else
-            _t1704 = nothing
+            _t1790 = nothing
         end
-        fields1191 = _t1704
-        unwrapped_fields1192 = fields1191
+        fields1234 = _t1790
+        unwrapped_fields1235 = fields1234
         write(pp, "(/")
         indent_sexp!(pp)
         newline(pp)
-        field1193 = unwrapped_fields1192[1]
-        pretty_term(pp, field1193)
+        field1236 = unwrapped_fields1235[1]
+        pretty_term(pp, field1236)
         newline(pp)
-        field1194 = unwrapped_fields1192[2]
-        pretty_term(pp, field1194)
+        field1237 = unwrapped_fields1235[2]
+        pretty_term(pp, field1237)
         newline(pp)
-        field1195 = unwrapped_fields1192[3]
-        pretty_term(pp, field1195)
+        field1238 = unwrapped_fields1235[3]
+        pretty_term(pp, field1238)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2857,32 +2875,32 @@ function pretty_divide(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_rel_term(pp::PrettyPrinter, msg::Proto.RelTerm)
-    flat1201 = try_flat(pp, msg, pretty_rel_term)
-    if !isnothing(flat1201)
-        write(pp, flat1201)
+    flat1244 = try_flat(pp, msg, pretty_rel_term)
+    if !isnothing(flat1244)
+        write(pp, flat1244)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("specialized_value"))
-            _t1705 = _get_oneof_field(_dollar_dollar, :specialized_value)
+            _t1791 = _get_oneof_field(_dollar_dollar, :specialized_value)
         else
-            _t1705 = nothing
+            _t1791 = nothing
         end
-        deconstruct_result1199 = _t1705
-        if !isnothing(deconstruct_result1199)
-            unwrapped1200 = deconstruct_result1199
-            pretty_specialized_value(pp, unwrapped1200)
+        deconstruct_result1242 = _t1791
+        if !isnothing(deconstruct_result1242)
+            unwrapped1243 = deconstruct_result1242
+            pretty_specialized_value(pp, unwrapped1243)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("term"))
-                _t1706 = _get_oneof_field(_dollar_dollar, :term)
+                _t1792 = _get_oneof_field(_dollar_dollar, :term)
             else
-                _t1706 = nothing
+                _t1792 = nothing
             end
-            deconstruct_result1197 = _t1706
-            if !isnothing(deconstruct_result1197)
-                unwrapped1198 = deconstruct_result1197
-                pretty_term(pp, unwrapped1198)
+            deconstruct_result1240 = _t1792
+            if !isnothing(deconstruct_result1240)
+                unwrapped1241 = deconstruct_result1240
+                pretty_term(pp, unwrapped1241)
             else
                 throw(ParseError("No matching rule for rel_term"))
             end
@@ -2892,41 +2910,41 @@ function pretty_rel_term(pp::PrettyPrinter, msg::Proto.RelTerm)
 end
 
 function pretty_specialized_value(pp::PrettyPrinter, msg::Proto.Value)
-    flat1203 = try_flat(pp, msg, pretty_specialized_value)
-    if !isnothing(flat1203)
-        write(pp, flat1203)
+    flat1246 = try_flat(pp, msg, pretty_specialized_value)
+    if !isnothing(flat1246)
+        write(pp, flat1246)
         return nothing
     else
-        fields1202 = msg
+        fields1245 = msg
         write(pp, "#")
-        pretty_raw_value(pp, fields1202)
+        pretty_raw_value(pp, fields1245)
     end
     return nothing
 end
 
 function pretty_rel_atom(pp::PrettyPrinter, msg::Proto.RelAtom)
-    flat1210 = try_flat(pp, msg, pretty_rel_atom)
-    if !isnothing(flat1210)
-        write(pp, flat1210)
+    flat1253 = try_flat(pp, msg, pretty_rel_atom)
+    if !isnothing(flat1253)
+        write(pp, flat1253)
         return nothing
     else
         _dollar_dollar = msg
-        fields1204 = (_dollar_dollar.name, _dollar_dollar.terms,)
-        unwrapped_fields1205 = fields1204
+        fields1247 = (_dollar_dollar.name, _dollar_dollar.terms,)
+        unwrapped_fields1248 = fields1247
         write(pp, "(relatom")
         indent_sexp!(pp)
         newline(pp)
-        field1206 = unwrapped_fields1205[1]
-        pretty_name(pp, field1206)
-        field1207 = unwrapped_fields1205[2]
-        if !isempty(field1207)
+        field1249 = unwrapped_fields1248[1]
+        pretty_name(pp, field1249)
+        field1250 = unwrapped_fields1248[2]
+        if !isempty(field1250)
             newline(pp)
-            for (i1707, elem1208) in enumerate(field1207)
-                i1209 = i1707 - 1
-                if (i1209 > 0)
+            for (i1793, elem1251) in enumerate(field1250)
+                i1252 = i1793 - 1
+                if (i1252 > 0)
                     newline(pp)
                 end
-                pretty_rel_term(pp, elem1208)
+                pretty_rel_term(pp, elem1251)
             end
         end
         dedent!(pp)
@@ -2936,22 +2954,22 @@ function pretty_rel_atom(pp::PrettyPrinter, msg::Proto.RelAtom)
 end
 
 function pretty_cast(pp::PrettyPrinter, msg::Proto.Cast)
-    flat1215 = try_flat(pp, msg, pretty_cast)
-    if !isnothing(flat1215)
-        write(pp, flat1215)
+    flat1258 = try_flat(pp, msg, pretty_cast)
+    if !isnothing(flat1258)
+        write(pp, flat1258)
         return nothing
     else
         _dollar_dollar = msg
-        fields1211 = (_dollar_dollar.input, _dollar_dollar.result,)
-        unwrapped_fields1212 = fields1211
+        fields1254 = (_dollar_dollar.input, _dollar_dollar.result,)
+        unwrapped_fields1255 = fields1254
         write(pp, "(cast")
         indent_sexp!(pp)
         newline(pp)
-        field1213 = unwrapped_fields1212[1]
-        pretty_term(pp, field1213)
+        field1256 = unwrapped_fields1255[1]
+        pretty_term(pp, field1256)
         newline(pp)
-        field1214 = unwrapped_fields1212[2]
-        pretty_term(pp, field1214)
+        field1257 = unwrapped_fields1255[2]
+        pretty_term(pp, field1257)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2959,22 +2977,22 @@ function pretty_cast(pp::PrettyPrinter, msg::Proto.Cast)
 end
 
 function pretty_attrs(pp::PrettyPrinter, msg::Vector{Proto.Attribute})
-    flat1219 = try_flat(pp, msg, pretty_attrs)
-    if !isnothing(flat1219)
-        write(pp, flat1219)
+    flat1262 = try_flat(pp, msg, pretty_attrs)
+    if !isnothing(flat1262)
+        write(pp, flat1262)
         return nothing
     else
-        fields1216 = msg
+        fields1259 = msg
         write(pp, "(attrs")
         indent_sexp!(pp)
-        if !isempty(fields1216)
+        if !isempty(fields1259)
             newline(pp)
-            for (i1708, elem1217) in enumerate(fields1216)
-                i1218 = i1708 - 1
-                if (i1218 > 0)
+            for (i1794, elem1260) in enumerate(fields1259)
+                i1261 = i1794 - 1
+                if (i1261 > 0)
                     newline(pp)
                 end
-                pretty_attribute(pp, elem1217)
+                pretty_attribute(pp, elem1260)
             end
         end
         dedent!(pp)
@@ -2984,28 +3002,28 @@ function pretty_attrs(pp::PrettyPrinter, msg::Vector{Proto.Attribute})
 end
 
 function pretty_attribute(pp::PrettyPrinter, msg::Proto.Attribute)
-    flat1226 = try_flat(pp, msg, pretty_attribute)
-    if !isnothing(flat1226)
-        write(pp, flat1226)
+    flat1269 = try_flat(pp, msg, pretty_attribute)
+    if !isnothing(flat1269)
+        write(pp, flat1269)
         return nothing
     else
         _dollar_dollar = msg
-        fields1220 = (_dollar_dollar.name, _dollar_dollar.args,)
-        unwrapped_fields1221 = fields1220
+        fields1263 = (_dollar_dollar.name, _dollar_dollar.args,)
+        unwrapped_fields1264 = fields1263
         write(pp, "(attribute")
         indent_sexp!(pp)
         newline(pp)
-        field1222 = unwrapped_fields1221[1]
-        pretty_name(pp, field1222)
-        field1223 = unwrapped_fields1221[2]
-        if !isempty(field1223)
+        field1265 = unwrapped_fields1264[1]
+        pretty_name(pp, field1265)
+        field1266 = unwrapped_fields1264[2]
+        if !isempty(field1266)
             newline(pp)
-            for (i1709, elem1224) in enumerate(field1223)
-                i1225 = i1709 - 1
-                if (i1225 > 0)
+            for (i1795, elem1267) in enumerate(field1266)
+                i1268 = i1795 - 1
+                if (i1268 > 0)
                     newline(pp)
                 end
-                pretty_raw_value(pp, elem1224)
+                pretty_raw_value(pp, elem1267)
             end
         end
         dedent!(pp)
@@ -3015,40 +3033,40 @@ function pretty_attribute(pp::PrettyPrinter, msg::Proto.Attribute)
 end
 
 function pretty_algorithm(pp::PrettyPrinter, msg::Proto.Algorithm)
-    flat1235 = try_flat(pp, msg, pretty_algorithm)
-    if !isnothing(flat1235)
-        write(pp, flat1235)
+    flat1278 = try_flat(pp, msg, pretty_algorithm)
+    if !isnothing(flat1278)
+        write(pp, flat1278)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1710 = _dollar_dollar.attrs
+            _t1796 = _dollar_dollar.attrs
         else
-            _t1710 = nothing
+            _t1796 = nothing
         end
-        fields1227 = (_dollar_dollar.var"#global", _dollar_dollar.body, _t1710,)
-        unwrapped_fields1228 = fields1227
+        fields1270 = (_dollar_dollar.var"#global", _dollar_dollar.body, _t1796,)
+        unwrapped_fields1271 = fields1270
         write(pp, "(algorithm")
         indent_sexp!(pp)
-        field1229 = unwrapped_fields1228[1]
-        if !isempty(field1229)
+        field1272 = unwrapped_fields1271[1]
+        if !isempty(field1272)
             newline(pp)
-            for (i1711, elem1230) in enumerate(field1229)
-                i1231 = i1711 - 1
-                if (i1231 > 0)
+            for (i1797, elem1273) in enumerate(field1272)
+                i1274 = i1797 - 1
+                if (i1274 > 0)
                     newline(pp)
                 end
-                pretty_relation_id(pp, elem1230)
+                pretty_relation_id(pp, elem1273)
             end
         end
         newline(pp)
-        field1232 = unwrapped_fields1228[2]
-        pretty_script(pp, field1232)
-        field1233 = unwrapped_fields1228[3]
-        if !isnothing(field1233)
+        field1275 = unwrapped_fields1271[2]
+        pretty_script(pp, field1275)
+        field1276 = unwrapped_fields1271[3]
+        if !isnothing(field1276)
             newline(pp)
-            opt_val1234 = field1233
-            pretty_attrs(pp, opt_val1234)
+            opt_val1277 = field1276
+            pretty_attrs(pp, opt_val1277)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3057,24 +3075,24 @@ function pretty_algorithm(pp::PrettyPrinter, msg::Proto.Algorithm)
 end
 
 function pretty_script(pp::PrettyPrinter, msg::Proto.Script)
-    flat1240 = try_flat(pp, msg, pretty_script)
-    if !isnothing(flat1240)
-        write(pp, flat1240)
+    flat1283 = try_flat(pp, msg, pretty_script)
+    if !isnothing(flat1283)
+        write(pp, flat1283)
         return nothing
     else
         _dollar_dollar = msg
-        fields1236 = _dollar_dollar.constructs
-        unwrapped_fields1237 = fields1236
+        fields1279 = _dollar_dollar.constructs
+        unwrapped_fields1280 = fields1279
         write(pp, "(script")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields1237)
+        if !isempty(unwrapped_fields1280)
             newline(pp)
-            for (i1712, elem1238) in enumerate(unwrapped_fields1237)
-                i1239 = i1712 - 1
-                if (i1239 > 0)
+            for (i1798, elem1281) in enumerate(unwrapped_fields1280)
+                i1282 = i1798 - 1
+                if (i1282 > 0)
                     newline(pp)
                 end
-                pretty_construct(pp, elem1238)
+                pretty_construct(pp, elem1281)
             end
         end
         dedent!(pp)
@@ -3084,32 +3102,32 @@ function pretty_script(pp::PrettyPrinter, msg::Proto.Script)
 end
 
 function pretty_construct(pp::PrettyPrinter, msg::Proto.Construct)
-    flat1245 = try_flat(pp, msg, pretty_construct)
-    if !isnothing(flat1245)
-        write(pp, flat1245)
+    flat1288 = try_flat(pp, msg, pretty_construct)
+    if !isnothing(flat1288)
+        write(pp, flat1288)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("loop"))
-            _t1713 = _get_oneof_field(_dollar_dollar, :loop)
+            _t1799 = _get_oneof_field(_dollar_dollar, :loop)
         else
-            _t1713 = nothing
+            _t1799 = nothing
         end
-        deconstruct_result1243 = _t1713
-        if !isnothing(deconstruct_result1243)
-            unwrapped1244 = deconstruct_result1243
-            pretty_loop(pp, unwrapped1244)
+        deconstruct_result1286 = _t1799
+        if !isnothing(deconstruct_result1286)
+            unwrapped1287 = deconstruct_result1286
+            pretty_loop(pp, unwrapped1287)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("instruction"))
-                _t1714 = _get_oneof_field(_dollar_dollar, :instruction)
+                _t1800 = _get_oneof_field(_dollar_dollar, :instruction)
             else
-                _t1714 = nothing
+                _t1800 = nothing
             end
-            deconstruct_result1241 = _t1714
-            if !isnothing(deconstruct_result1241)
-                unwrapped1242 = deconstruct_result1241
-                pretty_instruction(pp, unwrapped1242)
+            deconstruct_result1284 = _t1800
+            if !isnothing(deconstruct_result1284)
+                unwrapped1285 = deconstruct_result1284
+                pretty_instruction(pp, unwrapped1285)
             else
                 throw(ParseError("No matching rule for construct"))
             end
@@ -3119,32 +3137,32 @@ function pretty_construct(pp::PrettyPrinter, msg::Proto.Construct)
 end
 
 function pretty_loop(pp::PrettyPrinter, msg::Proto.Loop)
-    flat1252 = try_flat(pp, msg, pretty_loop)
-    if !isnothing(flat1252)
-        write(pp, flat1252)
+    flat1295 = try_flat(pp, msg, pretty_loop)
+    if !isnothing(flat1295)
+        write(pp, flat1295)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1715 = _dollar_dollar.attrs
+            _t1801 = _dollar_dollar.attrs
         else
-            _t1715 = nothing
+            _t1801 = nothing
         end
-        fields1246 = (_dollar_dollar.init, _dollar_dollar.body, _t1715,)
-        unwrapped_fields1247 = fields1246
+        fields1289 = (_dollar_dollar.init, _dollar_dollar.body, _t1801,)
+        unwrapped_fields1290 = fields1289
         write(pp, "(loop")
         indent_sexp!(pp)
         newline(pp)
-        field1248 = unwrapped_fields1247[1]
-        pretty_init(pp, field1248)
+        field1291 = unwrapped_fields1290[1]
+        pretty_init(pp, field1291)
         newline(pp)
-        field1249 = unwrapped_fields1247[2]
-        pretty_script(pp, field1249)
-        field1250 = unwrapped_fields1247[3]
-        if !isnothing(field1250)
+        field1292 = unwrapped_fields1290[2]
+        pretty_script(pp, field1292)
+        field1293 = unwrapped_fields1290[3]
+        if !isnothing(field1293)
             newline(pp)
-            opt_val1251 = field1250
-            pretty_attrs(pp, opt_val1251)
+            opt_val1294 = field1293
+            pretty_attrs(pp, opt_val1294)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3153,22 +3171,22 @@ function pretty_loop(pp::PrettyPrinter, msg::Proto.Loop)
 end
 
 function pretty_init(pp::PrettyPrinter, msg::Vector{Proto.Instruction})
-    flat1256 = try_flat(pp, msg, pretty_init)
-    if !isnothing(flat1256)
-        write(pp, flat1256)
+    flat1299 = try_flat(pp, msg, pretty_init)
+    if !isnothing(flat1299)
+        write(pp, flat1299)
         return nothing
     else
-        fields1253 = msg
+        fields1296 = msg
         write(pp, "(init")
         indent_sexp!(pp)
-        if !isempty(fields1253)
+        if !isempty(fields1296)
             newline(pp)
-            for (i1716, elem1254) in enumerate(fields1253)
-                i1255 = i1716 - 1
-                if (i1255 > 0)
+            for (i1802, elem1297) in enumerate(fields1296)
+                i1298 = i1802 - 1
+                if (i1298 > 0)
                     newline(pp)
                 end
-                pretty_instruction(pp, elem1254)
+                pretty_instruction(pp, elem1297)
             end
         end
         dedent!(pp)
@@ -3178,65 +3196,65 @@ function pretty_init(pp::PrettyPrinter, msg::Vector{Proto.Instruction})
 end
 
 function pretty_instruction(pp::PrettyPrinter, msg::Proto.Instruction)
-    flat1267 = try_flat(pp, msg, pretty_instruction)
-    if !isnothing(flat1267)
-        write(pp, flat1267)
+    flat1310 = try_flat(pp, msg, pretty_instruction)
+    if !isnothing(flat1310)
+        write(pp, flat1310)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("assign"))
-            _t1717 = _get_oneof_field(_dollar_dollar, :assign)
+            _t1803 = _get_oneof_field(_dollar_dollar, :assign)
         else
-            _t1717 = nothing
+            _t1803 = nothing
         end
-        deconstruct_result1265 = _t1717
-        if !isnothing(deconstruct_result1265)
-            unwrapped1266 = deconstruct_result1265
-            pretty_assign(pp, unwrapped1266)
+        deconstruct_result1308 = _t1803
+        if !isnothing(deconstruct_result1308)
+            unwrapped1309 = deconstruct_result1308
+            pretty_assign(pp, unwrapped1309)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("upsert"))
-                _t1718 = _get_oneof_field(_dollar_dollar, :upsert)
+                _t1804 = _get_oneof_field(_dollar_dollar, :upsert)
             else
-                _t1718 = nothing
+                _t1804 = nothing
             end
-            deconstruct_result1263 = _t1718
-            if !isnothing(deconstruct_result1263)
-                unwrapped1264 = deconstruct_result1263
-                pretty_upsert(pp, unwrapped1264)
+            deconstruct_result1306 = _t1804
+            if !isnothing(deconstruct_result1306)
+                unwrapped1307 = deconstruct_result1306
+                pretty_upsert(pp, unwrapped1307)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("#break"))
-                    _t1719 = _get_oneof_field(_dollar_dollar, :var"#break")
+                    _t1805 = _get_oneof_field(_dollar_dollar, :var"#break")
                 else
-                    _t1719 = nothing
+                    _t1805 = nothing
                 end
-                deconstruct_result1261 = _t1719
-                if !isnothing(deconstruct_result1261)
-                    unwrapped1262 = deconstruct_result1261
-                    pretty_break(pp, unwrapped1262)
+                deconstruct_result1304 = _t1805
+                if !isnothing(deconstruct_result1304)
+                    unwrapped1305 = deconstruct_result1304
+                    pretty_break(pp, unwrapped1305)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("monoid_def"))
-                        _t1720 = _get_oneof_field(_dollar_dollar, :monoid_def)
+                        _t1806 = _get_oneof_field(_dollar_dollar, :monoid_def)
                     else
-                        _t1720 = nothing
+                        _t1806 = nothing
                     end
-                    deconstruct_result1259 = _t1720
-                    if !isnothing(deconstruct_result1259)
-                        unwrapped1260 = deconstruct_result1259
-                        pretty_monoid_def(pp, unwrapped1260)
+                    deconstruct_result1302 = _t1806
+                    if !isnothing(deconstruct_result1302)
+                        unwrapped1303 = deconstruct_result1302
+                        pretty_monoid_def(pp, unwrapped1303)
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("monus_def"))
-                            _t1721 = _get_oneof_field(_dollar_dollar, :monus_def)
+                            _t1807 = _get_oneof_field(_dollar_dollar, :monus_def)
                         else
-                            _t1721 = nothing
+                            _t1807 = nothing
                         end
-                        deconstruct_result1257 = _t1721
-                        if !isnothing(deconstruct_result1257)
-                            unwrapped1258 = deconstruct_result1257
-                            pretty_monus_def(pp, unwrapped1258)
+                        deconstruct_result1300 = _t1807
+                        if !isnothing(deconstruct_result1300)
+                            unwrapped1301 = deconstruct_result1300
+                            pretty_monus_def(pp, unwrapped1301)
                         else
                             throw(ParseError("No matching rule for instruction"))
                         end
@@ -3249,32 +3267,32 @@ function pretty_instruction(pp::PrettyPrinter, msg::Proto.Instruction)
 end
 
 function pretty_assign(pp::PrettyPrinter, msg::Proto.Assign)
-    flat1274 = try_flat(pp, msg, pretty_assign)
-    if !isnothing(flat1274)
-        write(pp, flat1274)
+    flat1317 = try_flat(pp, msg, pretty_assign)
+    if !isnothing(flat1317)
+        write(pp, flat1317)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1722 = _dollar_dollar.attrs
+            _t1808 = _dollar_dollar.attrs
         else
-            _t1722 = nothing
+            _t1808 = nothing
         end
-        fields1268 = (_dollar_dollar.name, _dollar_dollar.body, _t1722,)
-        unwrapped_fields1269 = fields1268
+        fields1311 = (_dollar_dollar.name, _dollar_dollar.body, _t1808,)
+        unwrapped_fields1312 = fields1311
         write(pp, "(assign")
         indent_sexp!(pp)
         newline(pp)
-        field1270 = unwrapped_fields1269[1]
-        pretty_relation_id(pp, field1270)
+        field1313 = unwrapped_fields1312[1]
+        pretty_relation_id(pp, field1313)
         newline(pp)
-        field1271 = unwrapped_fields1269[2]
-        pretty_abstraction(pp, field1271)
-        field1272 = unwrapped_fields1269[3]
-        if !isnothing(field1272)
+        field1314 = unwrapped_fields1312[2]
+        pretty_abstraction(pp, field1314)
+        field1315 = unwrapped_fields1312[3]
+        if !isnothing(field1315)
             newline(pp)
-            opt_val1273 = field1272
-            pretty_attrs(pp, opt_val1273)
+            opt_val1316 = field1315
+            pretty_attrs(pp, opt_val1316)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3283,32 +3301,32 @@ function pretty_assign(pp::PrettyPrinter, msg::Proto.Assign)
 end
 
 function pretty_upsert(pp::PrettyPrinter, msg::Proto.Upsert)
-    flat1281 = try_flat(pp, msg, pretty_upsert)
-    if !isnothing(flat1281)
-        write(pp, flat1281)
+    flat1324 = try_flat(pp, msg, pretty_upsert)
+    if !isnothing(flat1324)
+        write(pp, flat1324)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1723 = _dollar_dollar.attrs
+            _t1809 = _dollar_dollar.attrs
         else
-            _t1723 = nothing
+            _t1809 = nothing
         end
-        fields1275 = (_dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1723,)
-        unwrapped_fields1276 = fields1275
+        fields1318 = (_dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1809,)
+        unwrapped_fields1319 = fields1318
         write(pp, "(upsert")
         indent_sexp!(pp)
         newline(pp)
-        field1277 = unwrapped_fields1276[1]
-        pretty_relation_id(pp, field1277)
+        field1320 = unwrapped_fields1319[1]
+        pretty_relation_id(pp, field1320)
         newline(pp)
-        field1278 = unwrapped_fields1276[2]
-        pretty_abstraction_with_arity(pp, field1278)
-        field1279 = unwrapped_fields1276[3]
-        if !isnothing(field1279)
+        field1321 = unwrapped_fields1319[2]
+        pretty_abstraction_with_arity(pp, field1321)
+        field1322 = unwrapped_fields1319[3]
+        if !isnothing(field1322)
             newline(pp)
-            opt_val1280 = field1279
-            pretty_attrs(pp, opt_val1280)
+            opt_val1323 = field1322
+            pretty_attrs(pp, opt_val1323)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3317,22 +3335,22 @@ function pretty_upsert(pp::PrettyPrinter, msg::Proto.Upsert)
 end
 
 function pretty_abstraction_with_arity(pp::PrettyPrinter, msg::Tuple{Proto.Abstraction, Int64})
-    flat1286 = try_flat(pp, msg, pretty_abstraction_with_arity)
-    if !isnothing(flat1286)
-        write(pp, flat1286)
+    flat1329 = try_flat(pp, msg, pretty_abstraction_with_arity)
+    if !isnothing(flat1329)
+        write(pp, flat1329)
         return nothing
     else
         _dollar_dollar = msg
-        _t1724 = deconstruct_bindings_with_arity(pp, _dollar_dollar[1], _dollar_dollar[2])
-        fields1282 = (_t1724, _dollar_dollar[1].value,)
-        unwrapped_fields1283 = fields1282
+        _t1810 = deconstruct_bindings_with_arity(pp, _dollar_dollar[1], _dollar_dollar[2])
+        fields1325 = (_t1810, _dollar_dollar[1].value,)
+        unwrapped_fields1326 = fields1325
         write(pp, "(")
         indent!(pp)
-        field1284 = unwrapped_fields1283[1]
-        pretty_bindings(pp, field1284)
+        field1327 = unwrapped_fields1326[1]
+        pretty_bindings(pp, field1327)
         newline(pp)
-        field1285 = unwrapped_fields1283[2]
-        pretty_formula(pp, field1285)
+        field1328 = unwrapped_fields1326[2]
+        pretty_formula(pp, field1328)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3340,32 +3358,32 @@ function pretty_abstraction_with_arity(pp::PrettyPrinter, msg::Tuple{Proto.Abstr
 end
 
 function pretty_break(pp::PrettyPrinter, msg::Proto.Break)
-    flat1293 = try_flat(pp, msg, pretty_break)
-    if !isnothing(flat1293)
-        write(pp, flat1293)
+    flat1336 = try_flat(pp, msg, pretty_break)
+    if !isnothing(flat1336)
+        write(pp, flat1336)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1725 = _dollar_dollar.attrs
+            _t1811 = _dollar_dollar.attrs
         else
-            _t1725 = nothing
+            _t1811 = nothing
         end
-        fields1287 = (_dollar_dollar.name, _dollar_dollar.body, _t1725,)
-        unwrapped_fields1288 = fields1287
+        fields1330 = (_dollar_dollar.name, _dollar_dollar.body, _t1811,)
+        unwrapped_fields1331 = fields1330
         write(pp, "(break")
         indent_sexp!(pp)
         newline(pp)
-        field1289 = unwrapped_fields1288[1]
-        pretty_relation_id(pp, field1289)
+        field1332 = unwrapped_fields1331[1]
+        pretty_relation_id(pp, field1332)
         newline(pp)
-        field1290 = unwrapped_fields1288[2]
-        pretty_abstraction(pp, field1290)
-        field1291 = unwrapped_fields1288[3]
-        if !isnothing(field1291)
+        field1333 = unwrapped_fields1331[2]
+        pretty_abstraction(pp, field1333)
+        field1334 = unwrapped_fields1331[3]
+        if !isnothing(field1334)
             newline(pp)
-            opt_val1292 = field1291
-            pretty_attrs(pp, opt_val1292)
+            opt_val1335 = field1334
+            pretty_attrs(pp, opt_val1335)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3374,35 +3392,35 @@ function pretty_break(pp::PrettyPrinter, msg::Proto.Break)
 end
 
 function pretty_monoid_def(pp::PrettyPrinter, msg::Proto.MonoidDef)
-    flat1301 = try_flat(pp, msg, pretty_monoid_def)
-    if !isnothing(flat1301)
-        write(pp, flat1301)
+    flat1344 = try_flat(pp, msg, pretty_monoid_def)
+    if !isnothing(flat1344)
+        write(pp, flat1344)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1726 = _dollar_dollar.attrs
+            _t1812 = _dollar_dollar.attrs
         else
-            _t1726 = nothing
+            _t1812 = nothing
         end
-        fields1294 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1726,)
-        unwrapped_fields1295 = fields1294
+        fields1337 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1812,)
+        unwrapped_fields1338 = fields1337
         write(pp, "(monoid")
         indent_sexp!(pp)
         newline(pp)
-        field1296 = unwrapped_fields1295[1]
-        pretty_monoid(pp, field1296)
+        field1339 = unwrapped_fields1338[1]
+        pretty_monoid(pp, field1339)
         newline(pp)
-        field1297 = unwrapped_fields1295[2]
-        pretty_relation_id(pp, field1297)
+        field1340 = unwrapped_fields1338[2]
+        pretty_relation_id(pp, field1340)
         newline(pp)
-        field1298 = unwrapped_fields1295[3]
-        pretty_abstraction_with_arity(pp, field1298)
-        field1299 = unwrapped_fields1295[4]
-        if !isnothing(field1299)
+        field1341 = unwrapped_fields1338[3]
+        pretty_abstraction_with_arity(pp, field1341)
+        field1342 = unwrapped_fields1338[4]
+        if !isnothing(field1342)
             newline(pp)
-            opt_val1300 = field1299
-            pretty_attrs(pp, opt_val1300)
+            opt_val1343 = field1342
+            pretty_attrs(pp, opt_val1343)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3411,54 +3429,54 @@ function pretty_monoid_def(pp::PrettyPrinter, msg::Proto.MonoidDef)
 end
 
 function pretty_monoid(pp::PrettyPrinter, msg::Proto.Monoid)
-    flat1310 = try_flat(pp, msg, pretty_monoid)
-    if !isnothing(flat1310)
-        write(pp, flat1310)
+    flat1353 = try_flat(pp, msg, pretty_monoid)
+    if !isnothing(flat1353)
+        write(pp, flat1353)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("or_monoid"))
-            _t1727 = _get_oneof_field(_dollar_dollar, :or_monoid)
+            _t1813 = _get_oneof_field(_dollar_dollar, :or_monoid)
         else
-            _t1727 = nothing
+            _t1813 = nothing
         end
-        deconstruct_result1308 = _t1727
-        if !isnothing(deconstruct_result1308)
-            unwrapped1309 = deconstruct_result1308
-            pretty_or_monoid(pp, unwrapped1309)
+        deconstruct_result1351 = _t1813
+        if !isnothing(deconstruct_result1351)
+            unwrapped1352 = deconstruct_result1351
+            pretty_or_monoid(pp, unwrapped1352)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("min_monoid"))
-                _t1728 = _get_oneof_field(_dollar_dollar, :min_monoid)
+                _t1814 = _get_oneof_field(_dollar_dollar, :min_monoid)
             else
-                _t1728 = nothing
+                _t1814 = nothing
             end
-            deconstruct_result1306 = _t1728
-            if !isnothing(deconstruct_result1306)
-                unwrapped1307 = deconstruct_result1306
-                pretty_min_monoid(pp, unwrapped1307)
+            deconstruct_result1349 = _t1814
+            if !isnothing(deconstruct_result1349)
+                unwrapped1350 = deconstruct_result1349
+                pretty_min_monoid(pp, unwrapped1350)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("max_monoid"))
-                    _t1729 = _get_oneof_field(_dollar_dollar, :max_monoid)
+                    _t1815 = _get_oneof_field(_dollar_dollar, :max_monoid)
                 else
-                    _t1729 = nothing
+                    _t1815 = nothing
                 end
-                deconstruct_result1304 = _t1729
-                if !isnothing(deconstruct_result1304)
-                    unwrapped1305 = deconstruct_result1304
-                    pretty_max_monoid(pp, unwrapped1305)
+                deconstruct_result1347 = _t1815
+                if !isnothing(deconstruct_result1347)
+                    unwrapped1348 = deconstruct_result1347
+                    pretty_max_monoid(pp, unwrapped1348)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("sum_monoid"))
-                        _t1730 = _get_oneof_field(_dollar_dollar, :sum_monoid)
+                        _t1816 = _get_oneof_field(_dollar_dollar, :sum_monoid)
                     else
-                        _t1730 = nothing
+                        _t1816 = nothing
                     end
-                    deconstruct_result1302 = _t1730
-                    if !isnothing(deconstruct_result1302)
-                        unwrapped1303 = deconstruct_result1302
-                        pretty_sum_monoid(pp, unwrapped1303)
+                    deconstruct_result1345 = _t1816
+                    if !isnothing(deconstruct_result1345)
+                        unwrapped1346 = deconstruct_result1345
+                        pretty_sum_monoid(pp, unwrapped1346)
                     else
                         throw(ParseError("No matching rule for monoid"))
                     end
@@ -3470,24 +3488,24 @@ function pretty_monoid(pp::PrettyPrinter, msg::Proto.Monoid)
 end
 
 function pretty_or_monoid(pp::PrettyPrinter, msg::Proto.OrMonoid)
-    fields1311 = msg
+    fields1354 = msg
     write(pp, "(or)")
     return nothing
 end
 
 function pretty_min_monoid(pp::PrettyPrinter, msg::Proto.MinMonoid)
-    flat1314 = try_flat(pp, msg, pretty_min_monoid)
-    if !isnothing(flat1314)
-        write(pp, flat1314)
+    flat1357 = try_flat(pp, msg, pretty_min_monoid)
+    if !isnothing(flat1357)
+        write(pp, flat1357)
         return nothing
     else
         _dollar_dollar = msg
-        fields1312 = _dollar_dollar.var"#type"
-        unwrapped_fields1313 = fields1312
+        fields1355 = _dollar_dollar.var"#type"
+        unwrapped_fields1356 = fields1355
         write(pp, "(min")
         indent_sexp!(pp)
         newline(pp)
-        pretty_type(pp, unwrapped_fields1313)
+        pretty_type(pp, unwrapped_fields1356)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3495,18 +3513,18 @@ function pretty_min_monoid(pp::PrettyPrinter, msg::Proto.MinMonoid)
 end
 
 function pretty_max_monoid(pp::PrettyPrinter, msg::Proto.MaxMonoid)
-    flat1317 = try_flat(pp, msg, pretty_max_monoid)
-    if !isnothing(flat1317)
-        write(pp, flat1317)
+    flat1360 = try_flat(pp, msg, pretty_max_monoid)
+    if !isnothing(flat1360)
+        write(pp, flat1360)
         return nothing
     else
         _dollar_dollar = msg
-        fields1315 = _dollar_dollar.var"#type"
-        unwrapped_fields1316 = fields1315
+        fields1358 = _dollar_dollar.var"#type"
+        unwrapped_fields1359 = fields1358
         write(pp, "(max")
         indent_sexp!(pp)
         newline(pp)
-        pretty_type(pp, unwrapped_fields1316)
+        pretty_type(pp, unwrapped_fields1359)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3514,18 +3532,18 @@ function pretty_max_monoid(pp::PrettyPrinter, msg::Proto.MaxMonoid)
 end
 
 function pretty_sum_monoid(pp::PrettyPrinter, msg::Proto.SumMonoid)
-    flat1320 = try_flat(pp, msg, pretty_sum_monoid)
-    if !isnothing(flat1320)
-        write(pp, flat1320)
+    flat1363 = try_flat(pp, msg, pretty_sum_monoid)
+    if !isnothing(flat1363)
+        write(pp, flat1363)
         return nothing
     else
         _dollar_dollar = msg
-        fields1318 = _dollar_dollar.var"#type"
-        unwrapped_fields1319 = fields1318
+        fields1361 = _dollar_dollar.var"#type"
+        unwrapped_fields1362 = fields1361
         write(pp, "(sum")
         indent_sexp!(pp)
         newline(pp)
-        pretty_type(pp, unwrapped_fields1319)
+        pretty_type(pp, unwrapped_fields1362)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3533,35 +3551,35 @@ function pretty_sum_monoid(pp::PrettyPrinter, msg::Proto.SumMonoid)
 end
 
 function pretty_monus_def(pp::PrettyPrinter, msg::Proto.MonusDef)
-    flat1328 = try_flat(pp, msg, pretty_monus_def)
-    if !isnothing(flat1328)
-        write(pp, flat1328)
+    flat1371 = try_flat(pp, msg, pretty_monus_def)
+    if !isnothing(flat1371)
+        write(pp, flat1371)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1731 = _dollar_dollar.attrs
+            _t1817 = _dollar_dollar.attrs
         else
-            _t1731 = nothing
+            _t1817 = nothing
         end
-        fields1321 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1731,)
-        unwrapped_fields1322 = fields1321
+        fields1364 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1817,)
+        unwrapped_fields1365 = fields1364
         write(pp, "(monus")
         indent_sexp!(pp)
         newline(pp)
-        field1323 = unwrapped_fields1322[1]
-        pretty_monoid(pp, field1323)
+        field1366 = unwrapped_fields1365[1]
+        pretty_monoid(pp, field1366)
         newline(pp)
-        field1324 = unwrapped_fields1322[2]
-        pretty_relation_id(pp, field1324)
+        field1367 = unwrapped_fields1365[2]
+        pretty_relation_id(pp, field1367)
         newline(pp)
-        field1325 = unwrapped_fields1322[3]
-        pretty_abstraction_with_arity(pp, field1325)
-        field1326 = unwrapped_fields1322[4]
-        if !isnothing(field1326)
+        field1368 = unwrapped_fields1365[3]
+        pretty_abstraction_with_arity(pp, field1368)
+        field1369 = unwrapped_fields1365[4]
+        if !isnothing(field1369)
             newline(pp)
-            opt_val1327 = field1326
-            pretty_attrs(pp, opt_val1327)
+            opt_val1370 = field1369
+            pretty_attrs(pp, opt_val1370)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3570,28 +3588,28 @@ function pretty_monus_def(pp::PrettyPrinter, msg::Proto.MonusDef)
 end
 
 function pretty_constraint(pp::PrettyPrinter, msg::Proto.Constraint)
-    flat1335 = try_flat(pp, msg, pretty_constraint)
-    if !isnothing(flat1335)
-        write(pp, flat1335)
+    flat1378 = try_flat(pp, msg, pretty_constraint)
+    if !isnothing(flat1378)
+        write(pp, flat1378)
         return nothing
     else
         _dollar_dollar = msg
-        fields1329 = (_dollar_dollar.name, _get_oneof_field(_dollar_dollar, :functional_dependency).guard, _get_oneof_field(_dollar_dollar, :functional_dependency).keys, _get_oneof_field(_dollar_dollar, :functional_dependency).values,)
-        unwrapped_fields1330 = fields1329
+        fields1372 = (_dollar_dollar.name, _get_oneof_field(_dollar_dollar, :functional_dependency).guard, _get_oneof_field(_dollar_dollar, :functional_dependency).keys, _get_oneof_field(_dollar_dollar, :functional_dependency).values,)
+        unwrapped_fields1373 = fields1372
         write(pp, "(functional_dependency")
         indent_sexp!(pp)
         newline(pp)
-        field1331 = unwrapped_fields1330[1]
-        pretty_relation_id(pp, field1331)
+        field1374 = unwrapped_fields1373[1]
+        pretty_relation_id(pp, field1374)
         newline(pp)
-        field1332 = unwrapped_fields1330[2]
-        pretty_abstraction(pp, field1332)
+        field1375 = unwrapped_fields1373[2]
+        pretty_abstraction(pp, field1375)
         newline(pp)
-        field1333 = unwrapped_fields1330[3]
-        pretty_functional_dependency_keys(pp, field1333)
+        field1376 = unwrapped_fields1373[3]
+        pretty_functional_dependency_keys(pp, field1376)
         newline(pp)
-        field1334 = unwrapped_fields1330[4]
-        pretty_functional_dependency_values(pp, field1334)
+        field1377 = unwrapped_fields1373[4]
+        pretty_functional_dependency_values(pp, field1377)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3599,22 +3617,22 @@ function pretty_constraint(pp::PrettyPrinter, msg::Proto.Constraint)
 end
 
 function pretty_functional_dependency_keys(pp::PrettyPrinter, msg::Vector{Proto.Var})
-    flat1339 = try_flat(pp, msg, pretty_functional_dependency_keys)
-    if !isnothing(flat1339)
-        write(pp, flat1339)
+    flat1382 = try_flat(pp, msg, pretty_functional_dependency_keys)
+    if !isnothing(flat1382)
+        write(pp, flat1382)
         return nothing
     else
-        fields1336 = msg
+        fields1379 = msg
         write(pp, "(keys")
         indent_sexp!(pp)
-        if !isempty(fields1336)
+        if !isempty(fields1379)
             newline(pp)
-            for (i1732, elem1337) in enumerate(fields1336)
-                i1338 = i1732 - 1
-                if (i1338 > 0)
+            for (i1818, elem1380) in enumerate(fields1379)
+                i1381 = i1818 - 1
+                if (i1381 > 0)
                     newline(pp)
                 end
-                pretty_var(pp, elem1337)
+                pretty_var(pp, elem1380)
             end
         end
         dedent!(pp)
@@ -3624,22 +3642,22 @@ function pretty_functional_dependency_keys(pp::PrettyPrinter, msg::Vector{Proto.
 end
 
 function pretty_functional_dependency_values(pp::PrettyPrinter, msg::Vector{Proto.Var})
-    flat1343 = try_flat(pp, msg, pretty_functional_dependency_values)
-    if !isnothing(flat1343)
-        write(pp, flat1343)
+    flat1386 = try_flat(pp, msg, pretty_functional_dependency_values)
+    if !isnothing(flat1386)
+        write(pp, flat1386)
         return nothing
     else
-        fields1340 = msg
+        fields1383 = msg
         write(pp, "(values")
         indent_sexp!(pp)
-        if !isempty(fields1340)
+        if !isempty(fields1383)
             newline(pp)
-            for (i1733, elem1341) in enumerate(fields1340)
-                i1342 = i1733 - 1
-                if (i1342 > 0)
+            for (i1819, elem1384) in enumerate(fields1383)
+                i1385 = i1819 - 1
+                if (i1385 > 0)
                     newline(pp)
                 end
-                pretty_var(pp, elem1341)
+                pretty_var(pp, elem1384)
             end
         end
         dedent!(pp)
@@ -3649,54 +3667,54 @@ function pretty_functional_dependency_values(pp::PrettyPrinter, msg::Vector{Prot
 end
 
 function pretty_data(pp::PrettyPrinter, msg::Proto.Data)
-    flat1352 = try_flat(pp, msg, pretty_data)
-    if !isnothing(flat1352)
-        write(pp, flat1352)
+    flat1395 = try_flat(pp, msg, pretty_data)
+    if !isnothing(flat1395)
+        write(pp, flat1395)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("edb"))
-            _t1734 = _get_oneof_field(_dollar_dollar, :edb)
+            _t1820 = _get_oneof_field(_dollar_dollar, :edb)
         else
-            _t1734 = nothing
+            _t1820 = nothing
         end
-        deconstruct_result1350 = _t1734
-        if !isnothing(deconstruct_result1350)
-            unwrapped1351 = deconstruct_result1350
-            pretty_edb(pp, unwrapped1351)
+        deconstruct_result1393 = _t1820
+        if !isnothing(deconstruct_result1393)
+            unwrapped1394 = deconstruct_result1393
+            pretty_edb(pp, unwrapped1394)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("betree_relation"))
-                _t1735 = _get_oneof_field(_dollar_dollar, :betree_relation)
+                _t1821 = _get_oneof_field(_dollar_dollar, :betree_relation)
             else
-                _t1735 = nothing
+                _t1821 = nothing
             end
-            deconstruct_result1348 = _t1735
-            if !isnothing(deconstruct_result1348)
-                unwrapped1349 = deconstruct_result1348
-                pretty_betree_relation(pp, unwrapped1349)
+            deconstruct_result1391 = _t1821
+            if !isnothing(deconstruct_result1391)
+                unwrapped1392 = deconstruct_result1391
+                pretty_betree_relation(pp, unwrapped1392)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("csv_data"))
-                    _t1736 = _get_oneof_field(_dollar_dollar, :csv_data)
+                    _t1822 = _get_oneof_field(_dollar_dollar, :csv_data)
                 else
-                    _t1736 = nothing
+                    _t1822 = nothing
                 end
-                deconstruct_result1346 = _t1736
-                if !isnothing(deconstruct_result1346)
-                    unwrapped1347 = deconstruct_result1346
-                    pretty_csv_data(pp, unwrapped1347)
+                deconstruct_result1389 = _t1822
+                if !isnothing(deconstruct_result1389)
+                    unwrapped1390 = deconstruct_result1389
+                    pretty_csv_data(pp, unwrapped1390)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("iceberg_data"))
-                        _t1737 = _get_oneof_field(_dollar_dollar, :iceberg_data)
+                        _t1823 = _get_oneof_field(_dollar_dollar, :iceberg_data)
                     else
-                        _t1737 = nothing
+                        _t1823 = nothing
                     end
-                    deconstruct_result1344 = _t1737
-                    if !isnothing(deconstruct_result1344)
-                        unwrapped1345 = deconstruct_result1344
-                        pretty_iceberg_data(pp, unwrapped1345)
+                    deconstruct_result1387 = _t1823
+                    if !isnothing(deconstruct_result1387)
+                        unwrapped1388 = deconstruct_result1387
+                        pretty_iceberg_data(pp, unwrapped1388)
                     else
                         throw(ParseError("No matching rule for data"))
                     end
@@ -3708,25 +3726,25 @@ function pretty_data(pp::PrettyPrinter, msg::Proto.Data)
 end
 
 function pretty_edb(pp::PrettyPrinter, msg::Proto.EDB)
-    flat1358 = try_flat(pp, msg, pretty_edb)
-    if !isnothing(flat1358)
-        write(pp, flat1358)
+    flat1401 = try_flat(pp, msg, pretty_edb)
+    if !isnothing(flat1401)
+        write(pp, flat1401)
         return nothing
     else
         _dollar_dollar = msg
-        fields1353 = (_dollar_dollar.target_id, _dollar_dollar.path, _dollar_dollar.types,)
-        unwrapped_fields1354 = fields1353
+        fields1396 = (_dollar_dollar.target_id, _dollar_dollar.path, _dollar_dollar.types,)
+        unwrapped_fields1397 = fields1396
         write(pp, "(edb")
         indent_sexp!(pp)
         newline(pp)
-        field1355 = unwrapped_fields1354[1]
-        pretty_relation_id(pp, field1355)
+        field1398 = unwrapped_fields1397[1]
+        pretty_relation_id(pp, field1398)
         newline(pp)
-        field1356 = unwrapped_fields1354[2]
-        pretty_edb_path(pp, field1356)
+        field1399 = unwrapped_fields1397[2]
+        pretty_edb_path(pp, field1399)
         newline(pp)
-        field1357 = unwrapped_fields1354[3]
-        pretty_edb_types(pp, field1357)
+        field1400 = unwrapped_fields1397[3]
+        pretty_edb_types(pp, field1400)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3734,20 +3752,20 @@ function pretty_edb(pp::PrettyPrinter, msg::Proto.EDB)
 end
 
 function pretty_edb_path(pp::PrettyPrinter, msg::Vector{String})
-    flat1362 = try_flat(pp, msg, pretty_edb_path)
-    if !isnothing(flat1362)
-        write(pp, flat1362)
+    flat1405 = try_flat(pp, msg, pretty_edb_path)
+    if !isnothing(flat1405)
+        write(pp, flat1405)
         return nothing
     else
-        fields1359 = msg
+        fields1402 = msg
         write(pp, "[")
         indent!(pp)
-        for (i1738, elem1360) in enumerate(fields1359)
-            i1361 = i1738 - 1
-            if (i1361 > 0)
+        for (i1824, elem1403) in enumerate(fields1402)
+            i1404 = i1824 - 1
+            if (i1404 > 0)
                 newline(pp)
             end
-            write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1360))
+            write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1403))
         end
         dedent!(pp)
         write(pp, "]")
@@ -3756,20 +3774,20 @@ function pretty_edb_path(pp::PrettyPrinter, msg::Vector{String})
 end
 
 function pretty_edb_types(pp::PrettyPrinter, msg::Vector{Proto.var"#Type"})
-    flat1366 = try_flat(pp, msg, pretty_edb_types)
-    if !isnothing(flat1366)
-        write(pp, flat1366)
+    flat1409 = try_flat(pp, msg, pretty_edb_types)
+    if !isnothing(flat1409)
+        write(pp, flat1409)
         return nothing
     else
-        fields1363 = msg
+        fields1406 = msg
         write(pp, "[")
         indent!(pp)
-        for (i1739, elem1364) in enumerate(fields1363)
-            i1365 = i1739 - 1
-            if (i1365 > 0)
+        for (i1825, elem1407) in enumerate(fields1406)
+            i1408 = i1825 - 1
+            if (i1408 > 0)
                 newline(pp)
             end
-            pretty_type(pp, elem1364)
+            pretty_type(pp, elem1407)
         end
         dedent!(pp)
         write(pp, "]")
@@ -3778,22 +3796,22 @@ function pretty_edb_types(pp::PrettyPrinter, msg::Vector{Proto.var"#Type"})
 end
 
 function pretty_betree_relation(pp::PrettyPrinter, msg::Proto.BeTreeRelation)
-    flat1371 = try_flat(pp, msg, pretty_betree_relation)
-    if !isnothing(flat1371)
-        write(pp, flat1371)
+    flat1414 = try_flat(pp, msg, pretty_betree_relation)
+    if !isnothing(flat1414)
+        write(pp, flat1414)
         return nothing
     else
         _dollar_dollar = msg
-        fields1367 = (_dollar_dollar.name, _dollar_dollar.relation_info,)
-        unwrapped_fields1368 = fields1367
+        fields1410 = (_dollar_dollar.name, _dollar_dollar.relation_info,)
+        unwrapped_fields1411 = fields1410
         write(pp, "(betree_relation")
         indent_sexp!(pp)
         newline(pp)
-        field1369 = unwrapped_fields1368[1]
-        pretty_relation_id(pp, field1369)
+        field1412 = unwrapped_fields1411[1]
+        pretty_relation_id(pp, field1412)
         newline(pp)
-        field1370 = unwrapped_fields1368[2]
-        pretty_betree_info(pp, field1370)
+        field1413 = unwrapped_fields1411[2]
+        pretty_betree_info(pp, field1413)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3801,26 +3819,26 @@ function pretty_betree_relation(pp::PrettyPrinter, msg::Proto.BeTreeRelation)
 end
 
 function pretty_betree_info(pp::PrettyPrinter, msg::Proto.BeTreeInfo)
-    flat1377 = try_flat(pp, msg, pretty_betree_info)
-    if !isnothing(flat1377)
-        write(pp, flat1377)
+    flat1420 = try_flat(pp, msg, pretty_betree_info)
+    if !isnothing(flat1420)
+        write(pp, flat1420)
         return nothing
     else
         _dollar_dollar = msg
-        _t1740 = deconstruct_betree_info_config(pp, _dollar_dollar)
-        fields1372 = (_dollar_dollar.key_types, _dollar_dollar.value_types, _t1740,)
-        unwrapped_fields1373 = fields1372
+        _t1826 = deconstruct_betree_info_config(pp, _dollar_dollar)
+        fields1415 = (_dollar_dollar.key_types, _dollar_dollar.value_types, _t1826,)
+        unwrapped_fields1416 = fields1415
         write(pp, "(betree_info")
         indent_sexp!(pp)
         newline(pp)
-        field1374 = unwrapped_fields1373[1]
-        pretty_betree_info_key_types(pp, field1374)
+        field1417 = unwrapped_fields1416[1]
+        pretty_betree_info_key_types(pp, field1417)
         newline(pp)
-        field1375 = unwrapped_fields1373[2]
-        pretty_betree_info_value_types(pp, field1375)
+        field1418 = unwrapped_fields1416[2]
+        pretty_betree_info_value_types(pp, field1418)
         newline(pp)
-        field1376 = unwrapped_fields1373[3]
-        pretty_config_dict(pp, field1376)
+        field1419 = unwrapped_fields1416[3]
+        pretty_config_dict(pp, field1419)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3828,22 +3846,22 @@ function pretty_betree_info(pp::PrettyPrinter, msg::Proto.BeTreeInfo)
 end
 
 function pretty_betree_info_key_types(pp::PrettyPrinter, msg::Vector{Proto.var"#Type"})
-    flat1381 = try_flat(pp, msg, pretty_betree_info_key_types)
-    if !isnothing(flat1381)
-        write(pp, flat1381)
+    flat1424 = try_flat(pp, msg, pretty_betree_info_key_types)
+    if !isnothing(flat1424)
+        write(pp, flat1424)
         return nothing
     else
-        fields1378 = msg
+        fields1421 = msg
         write(pp, "(key_types")
         indent_sexp!(pp)
-        if !isempty(fields1378)
+        if !isempty(fields1421)
             newline(pp)
-            for (i1741, elem1379) in enumerate(fields1378)
-                i1380 = i1741 - 1
-                if (i1380 > 0)
+            for (i1827, elem1422) in enumerate(fields1421)
+                i1423 = i1827 - 1
+                if (i1423 > 0)
                     newline(pp)
                 end
-                pretty_type(pp, elem1379)
+                pretty_type(pp, elem1422)
             end
         end
         dedent!(pp)
@@ -3853,22 +3871,22 @@ function pretty_betree_info_key_types(pp::PrettyPrinter, msg::Vector{Proto.var"#
 end
 
 function pretty_betree_info_value_types(pp::PrettyPrinter, msg::Vector{Proto.var"#Type"})
-    flat1385 = try_flat(pp, msg, pretty_betree_info_value_types)
-    if !isnothing(flat1385)
-        write(pp, flat1385)
+    flat1428 = try_flat(pp, msg, pretty_betree_info_value_types)
+    if !isnothing(flat1428)
+        write(pp, flat1428)
         return nothing
     else
-        fields1382 = msg
+        fields1425 = msg
         write(pp, "(value_types")
         indent_sexp!(pp)
-        if !isempty(fields1382)
+        if !isempty(fields1425)
             newline(pp)
-            for (i1742, elem1383) in enumerate(fields1382)
-                i1384 = i1742 - 1
-                if (i1384 > 0)
+            for (i1828, elem1426) in enumerate(fields1425)
+                i1427 = i1828 - 1
+                if (i1427 > 0)
                     newline(pp)
                 end
-                pretty_type(pp, elem1383)
+                pretty_type(pp, elem1426)
             end
         end
         dedent!(pp)
@@ -3878,28 +3896,39 @@ function pretty_betree_info_value_types(pp::PrettyPrinter, msg::Vector{Proto.var
 end
 
 function pretty_csv_data(pp::PrettyPrinter, msg::Proto.CSVData)
-    flat1392 = try_flat(pp, msg, pretty_csv_data)
-    if !isnothing(flat1392)
-        write(pp, flat1392)
+    flat1438 = try_flat(pp, msg, pretty_csv_data)
+    if !isnothing(flat1438)
+        write(pp, flat1438)
         return nothing
     else
         _dollar_dollar = msg
-        fields1386 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _dollar_dollar.asof,)
-        unwrapped_fields1387 = fields1386
+        _t1829 = deconstruct_csv_data_columns_optional(pp, _dollar_dollar)
+        _t1830 = deconstruct_csv_data_relations_optional(pp, _dollar_dollar)
+        fields1429 = (_dollar_dollar.locator, _dollar_dollar.config, _t1829, _t1830, _dollar_dollar.asof,)
+        unwrapped_fields1430 = fields1429
         write(pp, "(csv_data")
         indent_sexp!(pp)
         newline(pp)
-        field1388 = unwrapped_fields1387[1]
-        pretty_csvlocator(pp, field1388)
-        newline(pp)
-        field1389 = unwrapped_fields1387[2]
-        pretty_csv_config(pp, field1389)
+        field1431 = unwrapped_fields1430[1]
+        pretty_csvlocator(pp, field1431)
         newline(pp)
-        field1390 = unwrapped_fields1387[3]
-        pretty_gnf_columns(pp, field1390)
+        field1432 = unwrapped_fields1430[2]
+        pretty_csv_config(pp, field1432)
+        field1433 = unwrapped_fields1430[3]
+        if !isnothing(field1433)
+            newline(pp)
+            opt_val1434 = field1433
+            pretty_gnf_columns(pp, opt_val1434)
+        end
+        field1435 = unwrapped_fields1430[4]
+        if !isnothing(field1435)
+            newline(pp)
+            opt_val1436 = field1435
+            pretty_target_relations(pp, opt_val1436)
+        end
         newline(pp)
-        field1391 = unwrapped_fields1387[4]
-        pretty_csv_asof(pp, field1391)
+        field1437 = unwrapped_fields1430[5]
+        pretty_csv_asof(pp, field1437)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3907,37 +3936,37 @@ function pretty_csv_data(pp::PrettyPrinter, msg::Proto.CSVData)
 end
 
 function pretty_csvlocator(pp::PrettyPrinter, msg::Proto.CSVLocator)
-    flat1399 = try_flat(pp, msg, pretty_csvlocator)
-    if !isnothing(flat1399)
-        write(pp, flat1399)
+    flat1445 = try_flat(pp, msg, pretty_csvlocator)
+    if !isnothing(flat1445)
+        write(pp, flat1445)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.paths)
-            _t1743 = _dollar_dollar.paths
+            _t1831 = _dollar_dollar.paths
         else
-            _t1743 = nothing
+            _t1831 = nothing
         end
         if String(copy(_dollar_dollar.inline_data)) != ""
-            _t1744 = String(copy(_dollar_dollar.inline_data))
+            _t1832 = String(copy(_dollar_dollar.inline_data))
         else
-            _t1744 = nothing
+            _t1832 = nothing
         end
-        fields1393 = (_t1743, _t1744,)
-        unwrapped_fields1394 = fields1393
+        fields1439 = (_t1831, _t1832,)
+        unwrapped_fields1440 = fields1439
         write(pp, "(csv_locator")
         indent_sexp!(pp)
-        field1395 = unwrapped_fields1394[1]
-        if !isnothing(field1395)
+        field1441 = unwrapped_fields1440[1]
+        if !isnothing(field1441)
             newline(pp)
-            opt_val1396 = field1395
-            pretty_csv_locator_paths(pp, opt_val1396)
+            opt_val1442 = field1441
+            pretty_csv_locator_paths(pp, opt_val1442)
         end
-        field1397 = unwrapped_fields1394[2]
-        if !isnothing(field1397)
+        field1443 = unwrapped_fields1440[2]
+        if !isnothing(field1443)
             newline(pp)
-            opt_val1398 = field1397
-            pretty_csv_locator_inline_data(pp, opt_val1398)
+            opt_val1444 = field1443
+            pretty_csv_locator_inline_data(pp, opt_val1444)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3946,22 +3975,22 @@ function pretty_csvlocator(pp::PrettyPrinter, msg::Proto.CSVLocator)
 end
 
 function pretty_csv_locator_paths(pp::PrettyPrinter, msg::Vector{String})
-    flat1403 = try_flat(pp, msg, pretty_csv_locator_paths)
-    if !isnothing(flat1403)
-        write(pp, flat1403)
+    flat1449 = try_flat(pp, msg, pretty_csv_locator_paths)
+    if !isnothing(flat1449)
+        write(pp, flat1449)
         return nothing
     else
-        fields1400 = msg
+        fields1446 = msg
         write(pp, "(paths")
         indent_sexp!(pp)
-        if !isempty(fields1400)
+        if !isempty(fields1446)
             newline(pp)
-            for (i1745, elem1401) in enumerate(fields1400)
-                i1402 = i1745 - 1
-                if (i1402 > 0)
+            for (i1833, elem1447) in enumerate(fields1446)
+                i1448 = i1833 - 1
+                if (i1448 > 0)
                     newline(pp)
                 end
-                write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1401))
+                write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1447))
             end
         end
         dedent!(pp)
@@ -3971,16 +4000,16 @@ function pretty_csv_locator_paths(pp::PrettyPrinter, msg::Vector{String})
 end
 
 function pretty_csv_locator_inline_data(pp::PrettyPrinter, msg::String)
-    flat1405 = try_flat(pp, msg, pretty_csv_locator_inline_data)
-    if !isnothing(flat1405)
-        write(pp, flat1405)
+    flat1451 = try_flat(pp, msg, pretty_csv_locator_inline_data)
+    if !isnothing(flat1451)
+        write(pp, flat1451)
         return nothing
     else
-        fields1404 = msg
+        fields1450 = msg
         write(pp, "(inline_data")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(pp, fields1404))
+        write(pp, format_string(pp, fields1450))
         dedent!(pp)
         write(pp, ")")
     end
@@ -3988,26 +4017,26 @@ function pretty_csv_locator_inline_data(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_csv_config(pp::PrettyPrinter, msg::Proto.CSVConfig)
-    flat1411 = try_flat(pp, msg, pretty_csv_config)
-    if !isnothing(flat1411)
-        write(pp, flat1411)
+    flat1457 = try_flat(pp, msg, pretty_csv_config)
+    if !isnothing(flat1457)
+        write(pp, flat1457)
         return nothing
     else
         _dollar_dollar = msg
-        _t1746 = deconstruct_csv_config(pp, _dollar_dollar)
-        _t1747 = deconstruct_csv_storage_integration_optional(pp, _dollar_dollar)
-        fields1406 = (_t1746, _t1747,)
-        unwrapped_fields1407 = fields1406
+        _t1834 = deconstruct_csv_config(pp, _dollar_dollar)
+        _t1835 = deconstruct_csv_storage_integration_optional(pp, _dollar_dollar)
+        fields1452 = (_t1834, _t1835,)
+        unwrapped_fields1453 = fields1452
         write(pp, "(csv_config")
         indent_sexp!(pp)
         newline(pp)
-        field1408 = unwrapped_fields1407[1]
-        pretty_config_dict(pp, field1408)
-        field1409 = unwrapped_fields1407[2]
-        if !isnothing(field1409)
+        field1454 = unwrapped_fields1453[1]
+        pretty_config_dict(pp, field1454)
+        field1455 = unwrapped_fields1453[2]
+        if !isnothing(field1455)
             newline(pp)
-            opt_val1410 = field1409
-            pretty__storage_integration(pp, opt_val1410)
+            opt_val1456 = field1455
+            pretty__storage_integration(pp, opt_val1456)
         end
         dedent!(pp)
         write(pp, ")")
@@ -4016,16 +4045,16 @@ function pretty_csv_config(pp::PrettyPrinter, msg::Proto.CSVConfig)
 end
 
 function pretty__storage_integration(pp::PrettyPrinter, msg::Vector{Tuple{String, Proto.Value}})
-    flat1413 = try_flat(pp, msg, pretty__storage_integration)
-    if !isnothing(flat1413)
-        write(pp, flat1413)
+    flat1459 = try_flat(pp, msg, pretty__storage_integration)
+    if !isnothing(flat1459)
+        write(pp, flat1459)
         return nothing
     else
-        fields1412 = msg
+        fields1458 = msg
         write(pp, "(storage_integration")
         indent_sexp!(pp)
         newline(pp)
-        pretty_config_dict(pp, fields1412)
+        pretty_config_dict(pp, fields1458)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4033,22 +4062,22 @@ function pretty__storage_integration(pp::PrettyPrinter, msg::Vector{Tuple{String
 end
 
 function pretty_gnf_columns(pp::PrettyPrinter, msg::Vector{Proto.GNFColumn})
-    flat1417 = try_flat(pp, msg, pretty_gnf_columns)
-    if !isnothing(flat1417)
-        write(pp, flat1417)
+    flat1463 = try_flat(pp, msg, pretty_gnf_columns)
+    if !isnothing(flat1463)
+        write(pp, flat1463)
         return nothing
     else
-        fields1414 = msg
+        fields1460 = msg
         write(pp, "(columns")
         indent_sexp!(pp)
-        if !isempty(fields1414)
+        if !isempty(fields1460)
             newline(pp)
-            for (i1748, elem1415) in enumerate(fields1414)
-                i1416 = i1748 - 1
-                if (i1416 > 0)
+            for (i1836, elem1461) in enumerate(fields1460)
+                i1462 = i1836 - 1
+                if (i1462 > 0)
                     newline(pp)
                 end
-                pretty_gnf_column(pp, elem1415)
+                pretty_gnf_column(pp, elem1461)
             end
         end
         dedent!(pp)
@@ -4058,39 +4087,39 @@ function pretty_gnf_columns(pp::PrettyPrinter, msg::Vector{Proto.GNFColumn})
 end
 
 function pretty_gnf_column(pp::PrettyPrinter, msg::Proto.GNFColumn)
-    flat1426 = try_flat(pp, msg, pretty_gnf_column)
-    if !isnothing(flat1426)
-        write(pp, flat1426)
+    flat1472 = try_flat(pp, msg, pretty_gnf_column)
+    if !isnothing(flat1472)
+        write(pp, flat1472)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("target_id"))
-            _t1749 = _dollar_dollar.target_id
+            _t1837 = _dollar_dollar.target_id
         else
-            _t1749 = nothing
+            _t1837 = nothing
         end
-        fields1418 = (_dollar_dollar.column_path, _t1749, _dollar_dollar.types,)
-        unwrapped_fields1419 = fields1418
+        fields1464 = (_dollar_dollar.column_path, _t1837, _dollar_dollar.types,)
+        unwrapped_fields1465 = fields1464
         write(pp, "(column")
         indent_sexp!(pp)
         newline(pp)
-        field1420 = unwrapped_fields1419[1]
-        pretty_gnf_column_path(pp, field1420)
-        field1421 = unwrapped_fields1419[2]
-        if !isnothing(field1421)
+        field1466 = unwrapped_fields1465[1]
+        pretty_gnf_column_path(pp, field1466)
+        field1467 = unwrapped_fields1465[2]
+        if !isnothing(field1467)
             newline(pp)
-            opt_val1422 = field1421
-            pretty_relation_id(pp, opt_val1422)
+            opt_val1468 = field1467
+            pretty_relation_id(pp, opt_val1468)
         end
         newline(pp)
         write(pp, "[")
-        field1423 = unwrapped_fields1419[3]
-        for (i1750, elem1424) in enumerate(field1423)
-            i1425 = i1750 - 1
-            if (i1425 > 0)
+        field1469 = unwrapped_fields1465[3]
+        for (i1838, elem1470) in enumerate(field1469)
+            i1471 = i1838 - 1
+            if (i1471 > 0)
                 newline(pp)
             end
-            pretty_type(pp, elem1424)
+            pretty_type(pp, elem1470)
         end
         write(pp, "]")
         dedent!(pp)
@@ -4100,39 +4129,39 @@ function pretty_gnf_column(pp::PrettyPrinter, msg::Proto.GNFColumn)
 end
 
 function pretty_gnf_column_path(pp::PrettyPrinter, msg::Vector{String})
-    flat1433 = try_flat(pp, msg, pretty_gnf_column_path)
-    if !isnothing(flat1433)
-        write(pp, flat1433)
+    flat1479 = try_flat(pp, msg, pretty_gnf_column_path)
+    if !isnothing(flat1479)
+        write(pp, flat1479)
         return nothing
     else
         _dollar_dollar = msg
         if length(_dollar_dollar) == 1
-            _t1751 = _dollar_dollar[1]
+            _t1839 = _dollar_dollar[1]
         else
-            _t1751 = nothing
+            _t1839 = nothing
         end
-        deconstruct_result1431 = _t1751
-        if !isnothing(deconstruct_result1431)
-            unwrapped1432 = deconstruct_result1431
-            write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped1432))
+        deconstruct_result1477 = _t1839
+        if !isnothing(deconstruct_result1477)
+            unwrapped1478 = deconstruct_result1477
+            write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped1478))
         else
             _dollar_dollar = msg
             if length(_dollar_dollar) != 1
-                _t1752 = _dollar_dollar
+                _t1840 = _dollar_dollar
             else
-                _t1752 = nothing
+                _t1840 = nothing
             end
-            deconstruct_result1427 = _t1752
-            if !isnothing(deconstruct_result1427)
-                unwrapped1428 = deconstruct_result1427
+            deconstruct_result1473 = _t1840
+            if !isnothing(deconstruct_result1473)
+                unwrapped1474 = deconstruct_result1473
                 write(pp, "[")
                 indent!(pp)
-                for (i1753, elem1429) in enumerate(unwrapped1428)
-                    i1430 = i1753 - 1
-                    if (i1430 > 0)
+                for (i1841, elem1475) in enumerate(unwrapped1474)
+                    i1476 = i1841 - 1
+                    if (i1476 > 0)
                         newline(pp)
                     end
-                    write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1429))
+                    write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1475))
                 end
                 dedent!(pp)
                 write(pp, "]")
@@ -4144,17 +4173,226 @@ function pretty_gnf_column_path(pp::PrettyPrinter, msg::Vector{String})
     return nothing
 end
 
+function pretty_target_relations(pp::PrettyPrinter, msg::Proto.TargetRelations)
+    flat1484 = try_flat(pp, msg, pretty_target_relations)
+    if !isnothing(flat1484)
+        write(pp, flat1484)
+        return nothing
+    else
+        _dollar_dollar = msg
+        fields1480 = (_dollar_dollar.keys, _dollar_dollar,)
+        unwrapped_fields1481 = fields1480
+        write(pp, "(relations")
+        indent_sexp!(pp)
+        newline(pp)
+        field1482 = unwrapped_fields1481[1]
+        pretty_relation_keys(pp, field1482)
+        newline(pp)
+        field1483 = unwrapped_fields1481[2]
+        pretty_relation_body(pp, field1483)
+        dedent!(pp)
+        write(pp, ")")
+    end
+    return nothing
+end
+
+function pretty_relation_keys(pp::PrettyPrinter, msg::Vector{Proto.NamedColumn})
+    flat1488 = try_flat(pp, msg, pretty_relation_keys)
+    if !isnothing(flat1488)
+        write(pp, flat1488)
+        return nothing
+    else
+        fields1485 = msg
+        write(pp, "(keys")
+        indent_sexp!(pp)
+        if !isempty(fields1485)
+            newline(pp)
+            for (i1842, elem1486) in enumerate(fields1485)
+                i1487 = i1842 - 1
+                if (i1487 > 0)
+                    newline(pp)
+                end
+                pretty_named_column(pp, elem1486)
+            end
+        end
+        dedent!(pp)
+        write(pp, ")")
+    end
+    return nothing
+end
+
+function pretty_named_column(pp::PrettyPrinter, msg::Proto.NamedColumn)
+    flat1493 = try_flat(pp, msg, pretty_named_column)
+    if !isnothing(flat1493)
+        write(pp, flat1493)
+        return nothing
+    else
+        _dollar_dollar = msg
+        fields1489 = (_dollar_dollar.name, _dollar_dollar.var"#type",)
+        unwrapped_fields1490 = fields1489
+        write(pp, "(column")
+        indent_sexp!(pp)
+        newline(pp)
+        field1491 = unwrapped_fields1490[1]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1491))
+        newline(pp)
+        field1492 = unwrapped_fields1490[2]
+        pretty_type(pp, field1492)
+        dedent!(pp)
+        write(pp, ")")
+    end
+    return nothing
+end
+
+function pretty_relation_body(pp::PrettyPrinter, msg::Proto.TargetRelations)
+    flat1500 = try_flat(pp, msg, pretty_relation_body)
+    if !isnothing(flat1500)
+        write(pp, flat1500)
+        return nothing
+    else
+        _dollar_dollar = msg
+        if _has_proto_field(_dollar_dollar, Symbol("plain"))
+            _t1843 = _get_oneof_field(_dollar_dollar, :plain).targets
+        else
+            _t1843 = nothing
+        end
+        deconstruct_result1498 = _t1843
+        if !isnothing(deconstruct_result1498)
+            unwrapped1499 = deconstruct_result1498
+            pretty_non_cdc_relations(pp, unwrapped1499)
+        else
+            _dollar_dollar = msg
+            if _has_proto_field(_dollar_dollar, Symbol("cdc"))
+                _t1844 = (_get_oneof_field(_dollar_dollar, :cdc).inserts, _get_oneof_field(_dollar_dollar, :cdc).deletes,)
+            else
+                _t1844 = nothing
+            end
+            deconstruct_result1494 = _t1844
+            if !isnothing(deconstruct_result1494)
+                unwrapped1495 = deconstruct_result1494
+                field1496 = unwrapped1495[1]
+                pretty_cdc_inserts(pp, field1496)
+                write(pp, " ")
+                field1497 = unwrapped1495[2]
+                pretty_cdc_deletes(pp, field1497)
+            else
+                throw(ParseError("No matching rule for relation_body"))
+            end
+        end
+    end
+    return nothing
+end
+
+function pretty_non_cdc_relations(pp::PrettyPrinter, msg::Vector{Proto.TargetRelation})
+    flat1504 = try_flat(pp, msg, pretty_non_cdc_relations)
+    if !isnothing(flat1504)
+        write(pp, flat1504)
+        return nothing
+    else
+        fields1501 = msg
+        for (i1845, elem1502) in enumerate(fields1501)
+            i1503 = i1845 - 1
+            if (i1503 > 0)
+                newline(pp)
+            end
+            pretty_target_relation(pp, elem1502)
+        end
+    end
+    return nothing
+end
+
+function pretty_target_relation(pp::PrettyPrinter, msg::Proto.TargetRelation)
+    flat1511 = try_flat(pp, msg, pretty_target_relation)
+    if !isnothing(flat1511)
+        write(pp, flat1511)
+        return nothing
+    else
+        _dollar_dollar = msg
+        fields1505 = (_dollar_dollar.target_id, _dollar_dollar.values,)
+        unwrapped_fields1506 = fields1505
+        write(pp, "(relation")
+        indent_sexp!(pp)
+        newline(pp)
+        field1507 = unwrapped_fields1506[1]
+        pretty_relation_id(pp, field1507)
+        field1508 = unwrapped_fields1506[2]
+        if !isempty(field1508)
+            newline(pp)
+            for (i1846, elem1509) in enumerate(field1508)
+                i1510 = i1846 - 1
+                if (i1510 > 0)
+                    newline(pp)
+                end
+                pretty_named_column(pp, elem1509)
+            end
+        end
+        dedent!(pp)
+        write(pp, ")")
+    end
+    return nothing
+end
+
+function pretty_cdc_inserts(pp::PrettyPrinter, msg::Vector{Proto.TargetRelation})
+    flat1515 = try_flat(pp, msg, pretty_cdc_inserts)
+    if !isnothing(flat1515)
+        write(pp, flat1515)
+        return nothing
+    else
+        fields1512 = msg
+        write(pp, "(inserts")
+        indent_sexp!(pp)
+        if !isempty(fields1512)
+            newline(pp)
+            for (i1847, elem1513) in enumerate(fields1512)
+                i1514 = i1847 - 1
+                if (i1514 > 0)
+                    newline(pp)
+                end
+                pretty_target_relation(pp, elem1513)
+            end
+        end
+        dedent!(pp)
+        write(pp, ")")
+    end
+    return nothing
+end
+
+function pretty_cdc_deletes(pp::PrettyPrinter, msg::Vector{Proto.TargetRelation})
+    flat1519 = try_flat(pp, msg, pretty_cdc_deletes)
+    if !isnothing(flat1519)
+        write(pp, flat1519)
+        return nothing
+    else
+        fields1516 = msg
+        write(pp, "(deletes")
+        indent_sexp!(pp)
+        if !isempty(fields1516)
+            newline(pp)
+            for (i1848, elem1517) in enumerate(fields1516)
+                i1518 = i1848 - 1
+                if (i1518 > 0)
+                    newline(pp)
+                end
+                pretty_target_relation(pp, elem1517)
+            end
+        end
+        dedent!(pp)
+        write(pp, ")")
+    end
+    return nothing
+end
+
 function pretty_csv_asof(pp::PrettyPrinter, msg::String)
-    flat1435 = try_flat(pp, msg, pretty_csv_asof)
-    if !isnothing(flat1435)
-        write(pp, flat1435)
+    flat1521 = try_flat(pp, msg, pretty_csv_asof)
+    if !isnothing(flat1521)
+        write(pp, flat1521)
         return nothing
     else
-        fields1434 = msg
+        fields1520 = msg
         write(pp, "(asof")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1434))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1520))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4162,42 +4400,42 @@ function pretty_csv_asof(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_data(pp::PrettyPrinter, msg::Proto.IcebergData)
-    flat1446 = try_flat(pp, msg, pretty_iceberg_data)
-    if !isnothing(flat1446)
-        write(pp, flat1446)
+    flat1532 = try_flat(pp, msg, pretty_iceberg_data)
+    if !isnothing(flat1532)
+        write(pp, flat1532)
         return nothing
     else
         _dollar_dollar = msg
-        _t1754 = deconstruct_iceberg_data_from_snapshot_optional(pp, _dollar_dollar)
-        _t1755 = deconstruct_iceberg_data_to_snapshot_optional(pp, _dollar_dollar)
-        fields1436 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _t1754, _t1755, _dollar_dollar.returns_delta,)
-        unwrapped_fields1437 = fields1436
+        _t1849 = deconstruct_iceberg_data_from_snapshot_optional(pp, _dollar_dollar)
+        _t1850 = deconstruct_iceberg_data_to_snapshot_optional(pp, _dollar_dollar)
+        fields1522 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _t1849, _t1850, _dollar_dollar.returns_delta,)
+        unwrapped_fields1523 = fields1522
         write(pp, "(iceberg_data")
         indent_sexp!(pp)
         newline(pp)
-        field1438 = unwrapped_fields1437[1]
-        pretty_iceberg_locator(pp, field1438)
+        field1524 = unwrapped_fields1523[1]
+        pretty_iceberg_locator(pp, field1524)
         newline(pp)
-        field1439 = unwrapped_fields1437[2]
-        pretty_iceberg_catalog_config(pp, field1439)
+        field1525 = unwrapped_fields1523[2]
+        pretty_iceberg_catalog_config(pp, field1525)
         newline(pp)
-        field1440 = unwrapped_fields1437[3]
-        pretty_gnf_columns(pp, field1440)
-        field1441 = unwrapped_fields1437[4]
-        if !isnothing(field1441)
+        field1526 = unwrapped_fields1523[3]
+        pretty_gnf_columns(pp, field1526)
+        field1527 = unwrapped_fields1523[4]
+        if !isnothing(field1527)
             newline(pp)
-            opt_val1442 = field1441
-            pretty_iceberg_from_snapshot(pp, opt_val1442)
+            opt_val1528 = field1527
+            pretty_iceberg_from_snapshot(pp, opt_val1528)
         end
-        field1443 = unwrapped_fields1437[5]
-        if !isnothing(field1443)
+        field1529 = unwrapped_fields1523[5]
+        if !isnothing(field1529)
             newline(pp)
-            opt_val1444 = field1443
-            pretty_iceberg_to_snapshot(pp, opt_val1444)
+            opt_val1530 = field1529
+            pretty_iceberg_to_snapshot(pp, opt_val1530)
         end
         newline(pp)
-        field1445 = unwrapped_fields1437[6]
-        pretty_boolean_value(pp, field1445)
+        field1531 = unwrapped_fields1523[6]
+        pretty_boolean_value(pp, field1531)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4205,25 +4443,25 @@ function pretty_iceberg_data(pp::PrettyPrinter, msg::Proto.IcebergData)
 end
 
 function pretty_iceberg_locator(pp::PrettyPrinter, msg::Proto.IcebergLocator)
-    flat1452 = try_flat(pp, msg, pretty_iceberg_locator)
-    if !isnothing(flat1452)
-        write(pp, flat1452)
+    flat1538 = try_flat(pp, msg, pretty_iceberg_locator)
+    if !isnothing(flat1538)
+        write(pp, flat1538)
         return nothing
     else
         _dollar_dollar = msg
-        fields1447 = (_dollar_dollar.table_name, _dollar_dollar.namespace, _dollar_dollar.warehouse,)
-        unwrapped_fields1448 = fields1447
+        fields1533 = (_dollar_dollar.table_name, _dollar_dollar.namespace, _dollar_dollar.warehouse,)
+        unwrapped_fields1534 = fields1533
         write(pp, "(iceberg_locator")
         indent_sexp!(pp)
         newline(pp)
-        field1449 = unwrapped_fields1448[1]
-        pretty_iceberg_locator_table_name(pp, field1449)
+        field1535 = unwrapped_fields1534[1]
+        pretty_iceberg_locator_table_name(pp, field1535)
         newline(pp)
-        field1450 = unwrapped_fields1448[2]
-        pretty_iceberg_locator_namespace(pp, field1450)
+        field1536 = unwrapped_fields1534[2]
+        pretty_iceberg_locator_namespace(pp, field1536)
         newline(pp)
-        field1451 = unwrapped_fields1448[3]
-        pretty_iceberg_locator_warehouse(pp, field1451)
+        field1537 = unwrapped_fields1534[3]
+        pretty_iceberg_locator_warehouse(pp, field1537)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4231,16 +4469,16 @@ function pretty_iceberg_locator(pp::PrettyPrinter, msg::Proto.IcebergLocator)
 end
 
 function pretty_iceberg_locator_table_name(pp::PrettyPrinter, msg::String)
-    flat1454 = try_flat(pp, msg, pretty_iceberg_locator_table_name)
-    if !isnothing(flat1454)
-        write(pp, flat1454)
+    flat1540 = try_flat(pp, msg, pretty_iceberg_locator_table_name)
+    if !isnothing(flat1540)
+        write(pp, flat1540)
         return nothing
     else
-        fields1453 = msg
+        fields1539 = msg
         write(pp, "(table_name")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1453))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1539))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4248,22 +4486,22 @@ function pretty_iceberg_locator_table_name(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_locator_namespace(pp::PrettyPrinter, msg::Vector{String})
-    flat1458 = try_flat(pp, msg, pretty_iceberg_locator_namespace)
-    if !isnothing(flat1458)
-        write(pp, flat1458)
+    flat1544 = try_flat(pp, msg, pretty_iceberg_locator_namespace)
+    if !isnothing(flat1544)
+        write(pp, flat1544)
         return nothing
     else
-        fields1455 = msg
+        fields1541 = msg
         write(pp, "(namespace")
         indent_sexp!(pp)
-        if !isempty(fields1455)
+        if !isempty(fields1541)
             newline(pp)
-            for (i1756, elem1456) in enumerate(fields1455)
-                i1457 = i1756 - 1
-                if (i1457 > 0)
+            for (i1851, elem1542) in enumerate(fields1541)
+                i1543 = i1851 - 1
+                if (i1543 > 0)
                     newline(pp)
                 end
-                write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1456))
+                write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1542))
             end
         end
         dedent!(pp)
@@ -4273,16 +4511,16 @@ function pretty_iceberg_locator_namespace(pp::PrettyPrinter, msg::Vector{String}
 end
 
 function pretty_iceberg_locator_warehouse(pp::PrettyPrinter, msg::String)
-    flat1460 = try_flat(pp, msg, pretty_iceberg_locator_warehouse)
-    if !isnothing(flat1460)
-        write(pp, flat1460)
+    flat1546 = try_flat(pp, msg, pretty_iceberg_locator_warehouse)
+    if !isnothing(flat1546)
+        write(pp, flat1546)
         return nothing
     else
-        fields1459 = msg
+        fields1545 = msg
         write(pp, "(warehouse")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1459))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1545))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4290,32 +4528,32 @@ function pretty_iceberg_locator_warehouse(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_catalog_config(pp::PrettyPrinter, msg::Proto.IcebergCatalogConfig)
-    flat1468 = try_flat(pp, msg, pretty_iceberg_catalog_config)
-    if !isnothing(flat1468)
-        write(pp, flat1468)
+    flat1554 = try_flat(pp, msg, pretty_iceberg_catalog_config)
+    if !isnothing(flat1554)
+        write(pp, flat1554)
         return nothing
     else
         _dollar_dollar = msg
-        _t1757 = deconstruct_iceberg_catalog_config_scope_optional(pp, _dollar_dollar)
-        fields1461 = (_dollar_dollar.catalog_uri, _t1757, sort([(k, v) for (k, v) in _dollar_dollar.properties]), sort([(k, v) for (k, v) in _dollar_dollar.auth_properties]),)
-        unwrapped_fields1462 = fields1461
+        _t1852 = deconstruct_iceberg_catalog_config_scope_optional(pp, _dollar_dollar)
+        fields1547 = (_dollar_dollar.catalog_uri, _t1852, sort([(k, v) for (k, v) in _dollar_dollar.properties]), sort([(k, v) for (k, v) in _dollar_dollar.auth_properties]),)
+        unwrapped_fields1548 = fields1547
         write(pp, "(iceberg_catalog_config")
         indent_sexp!(pp)
         newline(pp)
-        field1463 = unwrapped_fields1462[1]
-        pretty_iceberg_catalog_uri(pp, field1463)
-        field1464 = unwrapped_fields1462[2]
-        if !isnothing(field1464)
+        field1549 = unwrapped_fields1548[1]
+        pretty_iceberg_catalog_uri(pp, field1549)
+        field1550 = unwrapped_fields1548[2]
+        if !isnothing(field1550)
             newline(pp)
-            opt_val1465 = field1464
-            pretty_iceberg_catalog_config_scope(pp, opt_val1465)
+            opt_val1551 = field1550
+            pretty_iceberg_catalog_config_scope(pp, opt_val1551)
         end
         newline(pp)
-        field1466 = unwrapped_fields1462[3]
-        pretty_iceberg_properties(pp, field1466)
+        field1552 = unwrapped_fields1548[3]
+        pretty_iceberg_properties(pp, field1552)
         newline(pp)
-        field1467 = unwrapped_fields1462[4]
-        pretty_iceberg_auth_properties(pp, field1467)
+        field1553 = unwrapped_fields1548[4]
+        pretty_iceberg_auth_properties(pp, field1553)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4323,16 +4561,16 @@ function pretty_iceberg_catalog_config(pp::PrettyPrinter, msg::Proto.IcebergCata
 end
 
 function pretty_iceberg_catalog_uri(pp::PrettyPrinter, msg::String)
-    flat1470 = try_flat(pp, msg, pretty_iceberg_catalog_uri)
-    if !isnothing(flat1470)
-        write(pp, flat1470)
+    flat1556 = try_flat(pp, msg, pretty_iceberg_catalog_uri)
+    if !isnothing(flat1556)
+        write(pp, flat1556)
         return nothing
     else
-        fields1469 = msg
+        fields1555 = msg
         write(pp, "(catalog_uri")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1469))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1555))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4340,16 +4578,16 @@ function pretty_iceberg_catalog_uri(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_catalog_config_scope(pp::PrettyPrinter, msg::String)
-    flat1472 = try_flat(pp, msg, pretty_iceberg_catalog_config_scope)
-    if !isnothing(flat1472)
-        write(pp, flat1472)
+    flat1558 = try_flat(pp, msg, pretty_iceberg_catalog_config_scope)
+    if !isnothing(flat1558)
+        write(pp, flat1558)
         return nothing
     else
-        fields1471 = msg
+        fields1557 = msg
         write(pp, "(scope")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1471))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1557))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4357,22 +4595,22 @@ function pretty_iceberg_catalog_config_scope(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_properties(pp::PrettyPrinter, msg::Vector{Tuple{String, String}})
-    flat1476 = try_flat(pp, msg, pretty_iceberg_properties)
-    if !isnothing(flat1476)
-        write(pp, flat1476)
+    flat1562 = try_flat(pp, msg, pretty_iceberg_properties)
+    if !isnothing(flat1562)
+        write(pp, flat1562)
         return nothing
     else
-        fields1473 = msg
+        fields1559 = msg
         write(pp, "(properties")
         indent_sexp!(pp)
-        if !isempty(fields1473)
+        if !isempty(fields1559)
             newline(pp)
-            for (i1758, elem1474) in enumerate(fields1473)
-                i1475 = i1758 - 1
-                if (i1475 > 0)
+            for (i1853, elem1560) in enumerate(fields1559)
+                i1561 = i1853 - 1
+                if (i1561 > 0)
                     newline(pp)
                 end
-                pretty_iceberg_property_entry(pp, elem1474)
+                pretty_iceberg_property_entry(pp, elem1560)
             end
         end
         dedent!(pp)
@@ -4382,22 +4620,22 @@ function pretty_iceberg_properties(pp::PrettyPrinter, msg::Vector{Tuple{String,
 end
 
 function pretty_iceberg_property_entry(pp::PrettyPrinter, msg::Tuple{String, String})
-    flat1481 = try_flat(pp, msg, pretty_iceberg_property_entry)
-    if !isnothing(flat1481)
-        write(pp, flat1481)
+    flat1567 = try_flat(pp, msg, pretty_iceberg_property_entry)
+    if !isnothing(flat1567)
+        write(pp, flat1567)
         return nothing
     else
         _dollar_dollar = msg
-        fields1477 = (_dollar_dollar[1], _dollar_dollar[2],)
-        unwrapped_fields1478 = fields1477
+        fields1563 = (_dollar_dollar[1], _dollar_dollar[2],)
+        unwrapped_fields1564 = fields1563
         write(pp, "(prop")
         indent_sexp!(pp)
         newline(pp)
-        field1479 = unwrapped_fields1478[1]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1479))
+        field1565 = unwrapped_fields1564[1]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1565))
         newline(pp)
-        field1480 = unwrapped_fields1478[2]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1480))
+        field1566 = unwrapped_fields1564[2]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1566))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4405,22 +4643,22 @@ function pretty_iceberg_property_entry(pp::PrettyPrinter, msg::Tuple{String, Str
 end
 
 function pretty_iceberg_auth_properties(pp::PrettyPrinter, msg::Vector{Tuple{String, String}})
-    flat1485 = try_flat(pp, msg, pretty_iceberg_auth_properties)
-    if !isnothing(flat1485)
-        write(pp, flat1485)
+    flat1571 = try_flat(pp, msg, pretty_iceberg_auth_properties)
+    if !isnothing(flat1571)
+        write(pp, flat1571)
         return nothing
     else
-        fields1482 = msg
+        fields1568 = msg
         write(pp, "(auth_properties")
         indent_sexp!(pp)
-        if !isempty(fields1482)
+        if !isempty(fields1568)
             newline(pp)
-            for (i1759, elem1483) in enumerate(fields1482)
-                i1484 = i1759 - 1
-                if (i1484 > 0)
+            for (i1854, elem1569) in enumerate(fields1568)
+                i1570 = i1854 - 1
+                if (i1570 > 0)
                     newline(pp)
                 end
-                pretty_iceberg_masked_property_entry(pp, elem1483)
+                pretty_iceberg_masked_property_entry(pp, elem1569)
             end
         end
         dedent!(pp)
@@ -4430,23 +4668,23 @@ function pretty_iceberg_auth_properties(pp::PrettyPrinter, msg::Vector{Tuple{Str
 end
 
 function pretty_iceberg_masked_property_entry(pp::PrettyPrinter, msg::Tuple{String, String})
-    flat1490 = try_flat(pp, msg, pretty_iceberg_masked_property_entry)
-    if !isnothing(flat1490)
-        write(pp, flat1490)
+    flat1576 = try_flat(pp, msg, pretty_iceberg_masked_property_entry)
+    if !isnothing(flat1576)
+        write(pp, flat1576)
         return nothing
     else
         _dollar_dollar = msg
-        _t1760 = mask_secret_value(pp, _dollar_dollar)
-        fields1486 = (_dollar_dollar[1], _t1760,)
-        unwrapped_fields1487 = fields1486
+        _t1855 = mask_secret_value(pp, _dollar_dollar)
+        fields1572 = (_dollar_dollar[1], _t1855,)
+        unwrapped_fields1573 = fields1572
         write(pp, "(prop")
         indent_sexp!(pp)
         newline(pp)
-        field1488 = unwrapped_fields1487[1]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1488))
+        field1574 = unwrapped_fields1573[1]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1574))
         newline(pp)
-        field1489 = unwrapped_fields1487[2]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1489))
+        field1575 = unwrapped_fields1573[2]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1575))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4454,16 +4692,16 @@ function pretty_iceberg_masked_property_entry(pp::PrettyPrinter, msg::Tuple{Stri
 end
 
 function pretty_iceberg_from_snapshot(pp::PrettyPrinter, msg::String)
-    flat1492 = try_flat(pp, msg, pretty_iceberg_from_snapshot)
-    if !isnothing(flat1492)
-        write(pp, flat1492)
+    flat1578 = try_flat(pp, msg, pretty_iceberg_from_snapshot)
+    if !isnothing(flat1578)
+        write(pp, flat1578)
         return nothing
     else
-        fields1491 = msg
+        fields1577 = msg
         write(pp, "(from_snapshot")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1491))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1577))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4471,16 +4709,16 @@ function pretty_iceberg_from_snapshot(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_to_snapshot(pp::PrettyPrinter, msg::String)
-    flat1494 = try_flat(pp, msg, pretty_iceberg_to_snapshot)
-    if !isnothing(flat1494)
-        write(pp, flat1494)
+    flat1580 = try_flat(pp, msg, pretty_iceberg_to_snapshot)
+    if !isnothing(flat1580)
+        write(pp, flat1580)
         return nothing
     else
-        fields1493 = msg
+        fields1579 = msg
         write(pp, "(to_snapshot")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1493))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1579))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4488,18 +4726,18 @@ function pretty_iceberg_to_snapshot(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_undefine(pp::PrettyPrinter, msg::Proto.Undefine)
-    flat1497 = try_flat(pp, msg, pretty_undefine)
-    if !isnothing(flat1497)
-        write(pp, flat1497)
+    flat1583 = try_flat(pp, msg, pretty_undefine)
+    if !isnothing(flat1583)
+        write(pp, flat1583)
         return nothing
     else
         _dollar_dollar = msg
-        fields1495 = _dollar_dollar.fragment_id
-        unwrapped_fields1496 = fields1495
+        fields1581 = _dollar_dollar.fragment_id
+        unwrapped_fields1582 = fields1581
         write(pp, "(undefine")
         indent_sexp!(pp)
         newline(pp)
-        pretty_fragment_id(pp, unwrapped_fields1496)
+        pretty_fragment_id(pp, unwrapped_fields1582)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4507,24 +4745,24 @@ function pretty_undefine(pp::PrettyPrinter, msg::Proto.Undefine)
 end
 
 function pretty_context(pp::PrettyPrinter, msg::Proto.Context)
-    flat1502 = try_flat(pp, msg, pretty_context)
-    if !isnothing(flat1502)
-        write(pp, flat1502)
+    flat1588 = try_flat(pp, msg, pretty_context)
+    if !isnothing(flat1588)
+        write(pp, flat1588)
         return nothing
     else
         _dollar_dollar = msg
-        fields1498 = _dollar_dollar.relations
-        unwrapped_fields1499 = fields1498
+        fields1584 = _dollar_dollar.relations
+        unwrapped_fields1585 = fields1584
         write(pp, "(context")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields1499)
+        if !isempty(unwrapped_fields1585)
             newline(pp)
-            for (i1761, elem1500) in enumerate(unwrapped_fields1499)
-                i1501 = i1761 - 1
-                if (i1501 > 0)
+            for (i1856, elem1586) in enumerate(unwrapped_fields1585)
+                i1587 = i1856 - 1
+                if (i1587 > 0)
                     newline(pp)
                 end
-                pretty_relation_id(pp, elem1500)
+                pretty_relation_id(pp, elem1586)
             end
         end
         dedent!(pp)
@@ -4534,28 +4772,28 @@ function pretty_context(pp::PrettyPrinter, msg::Proto.Context)
 end
 
 function pretty_snapshot(pp::PrettyPrinter, msg::Proto.Snapshot)
-    flat1509 = try_flat(pp, msg, pretty_snapshot)
-    if !isnothing(flat1509)
-        write(pp, flat1509)
+    flat1595 = try_flat(pp, msg, pretty_snapshot)
+    if !isnothing(flat1595)
+        write(pp, flat1595)
         return nothing
     else
         _dollar_dollar = msg
-        fields1503 = (_dollar_dollar.prefix, _dollar_dollar.mappings,)
-        unwrapped_fields1504 = fields1503
+        fields1589 = (_dollar_dollar.prefix, _dollar_dollar.mappings,)
+        unwrapped_fields1590 = fields1589
         write(pp, "(snapshot")
         indent_sexp!(pp)
         newline(pp)
-        field1505 = unwrapped_fields1504[1]
-        pretty_edb_path(pp, field1505)
-        field1506 = unwrapped_fields1504[2]
-        if !isempty(field1506)
+        field1591 = unwrapped_fields1590[1]
+        pretty_edb_path(pp, field1591)
+        field1592 = unwrapped_fields1590[2]
+        if !isempty(field1592)
             newline(pp)
-            for (i1762, elem1507) in enumerate(field1506)
-                i1508 = i1762 - 1
-                if (i1508 > 0)
+            for (i1857, elem1593) in enumerate(field1592)
+                i1594 = i1857 - 1
+                if (i1594 > 0)
                     newline(pp)
                 end
-                pretty_snapshot_mapping(pp, elem1507)
+                pretty_snapshot_mapping(pp, elem1593)
             end
         end
         dedent!(pp)
@@ -4565,40 +4803,40 @@ function pretty_snapshot(pp::PrettyPrinter, msg::Proto.Snapshot)
 end
 
 function pretty_snapshot_mapping(pp::PrettyPrinter, msg::Proto.SnapshotMapping)
-    flat1514 = try_flat(pp, msg, pretty_snapshot_mapping)
-    if !isnothing(flat1514)
-        write(pp, flat1514)
+    flat1600 = try_flat(pp, msg, pretty_snapshot_mapping)
+    if !isnothing(flat1600)
+        write(pp, flat1600)
         return nothing
     else
         _dollar_dollar = msg
-        fields1510 = (_dollar_dollar.destination_path, _dollar_dollar.source_relation,)
-        unwrapped_fields1511 = fields1510
-        field1512 = unwrapped_fields1511[1]
-        pretty_edb_path(pp, field1512)
+        fields1596 = (_dollar_dollar.destination_path, _dollar_dollar.source_relation,)
+        unwrapped_fields1597 = fields1596
+        field1598 = unwrapped_fields1597[1]
+        pretty_edb_path(pp, field1598)
         write(pp, " ")
-        field1513 = unwrapped_fields1511[2]
-        pretty_relation_id(pp, field1513)
+        field1599 = unwrapped_fields1597[2]
+        pretty_relation_id(pp, field1599)
     end
     return nothing
 end
 
 function pretty_epoch_reads(pp::PrettyPrinter, msg::Vector{Proto.Read})
-    flat1518 = try_flat(pp, msg, pretty_epoch_reads)
-    if !isnothing(flat1518)
-        write(pp, flat1518)
+    flat1604 = try_flat(pp, msg, pretty_epoch_reads)
+    if !isnothing(flat1604)
+        write(pp, flat1604)
         return nothing
     else
-        fields1515 = msg
+        fields1601 = msg
         write(pp, "(reads")
         indent_sexp!(pp)
-        if !isempty(fields1515)
+        if !isempty(fields1601)
             newline(pp)
-            for (i1763, elem1516) in enumerate(fields1515)
-                i1517 = i1763 - 1
-                if (i1517 > 0)
+            for (i1858, elem1602) in enumerate(fields1601)
+                i1603 = i1858 - 1
+                if (i1603 > 0)
                     newline(pp)
                 end
-                pretty_read(pp, elem1516)
+                pretty_read(pp, elem1602)
             end
         end
         dedent!(pp)
@@ -4608,65 +4846,65 @@ function pretty_epoch_reads(pp::PrettyPrinter, msg::Vector{Proto.Read})
 end
 
 function pretty_read(pp::PrettyPrinter, msg::Proto.Read)
-    flat1529 = try_flat(pp, msg, pretty_read)
-    if !isnothing(flat1529)
-        write(pp, flat1529)
+    flat1615 = try_flat(pp, msg, pretty_read)
+    if !isnothing(flat1615)
+        write(pp, flat1615)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("demand"))
-            _t1764 = _get_oneof_field(_dollar_dollar, :demand)
+            _t1859 = _get_oneof_field(_dollar_dollar, :demand)
         else
-            _t1764 = nothing
+            _t1859 = nothing
         end
-        deconstruct_result1527 = _t1764
-        if !isnothing(deconstruct_result1527)
-            unwrapped1528 = deconstruct_result1527
-            pretty_demand(pp, unwrapped1528)
+        deconstruct_result1613 = _t1859
+        if !isnothing(deconstruct_result1613)
+            unwrapped1614 = deconstruct_result1613
+            pretty_demand(pp, unwrapped1614)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("output"))
-                _t1765 = _get_oneof_field(_dollar_dollar, :output)
+                _t1860 = _get_oneof_field(_dollar_dollar, :output)
             else
-                _t1765 = nothing
+                _t1860 = nothing
             end
-            deconstruct_result1525 = _t1765
-            if !isnothing(deconstruct_result1525)
-                unwrapped1526 = deconstruct_result1525
-                pretty_output(pp, unwrapped1526)
+            deconstruct_result1611 = _t1860
+            if !isnothing(deconstruct_result1611)
+                unwrapped1612 = deconstruct_result1611
+                pretty_output(pp, unwrapped1612)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("what_if"))
-                    _t1766 = _get_oneof_field(_dollar_dollar, :what_if)
+                    _t1861 = _get_oneof_field(_dollar_dollar, :what_if)
                 else
-                    _t1766 = nothing
+                    _t1861 = nothing
                 end
-                deconstruct_result1523 = _t1766
-                if !isnothing(deconstruct_result1523)
-                    unwrapped1524 = deconstruct_result1523
-                    pretty_what_if(pp, unwrapped1524)
+                deconstruct_result1609 = _t1861
+                if !isnothing(deconstruct_result1609)
+                    unwrapped1610 = deconstruct_result1609
+                    pretty_what_if(pp, unwrapped1610)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("abort"))
-                        _t1767 = _get_oneof_field(_dollar_dollar, :abort)
+                        _t1862 = _get_oneof_field(_dollar_dollar, :abort)
                     else
-                        _t1767 = nothing
+                        _t1862 = nothing
                     end
-                    deconstruct_result1521 = _t1767
-                    if !isnothing(deconstruct_result1521)
-                        unwrapped1522 = deconstruct_result1521
-                        pretty_abort(pp, unwrapped1522)
+                    deconstruct_result1607 = _t1862
+                    if !isnothing(deconstruct_result1607)
+                        unwrapped1608 = deconstruct_result1607
+                        pretty_abort(pp, unwrapped1608)
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("#export"))
-                            _t1768 = _get_oneof_field(_dollar_dollar, :var"#export")
+                            _t1863 = _get_oneof_field(_dollar_dollar, :var"#export")
                         else
-                            _t1768 = nothing
+                            _t1863 = nothing
                         end
-                        deconstruct_result1519 = _t1768
-                        if !isnothing(deconstruct_result1519)
-                            unwrapped1520 = deconstruct_result1519
-                            pretty_export(pp, unwrapped1520)
+                        deconstruct_result1605 = _t1863
+                        if !isnothing(deconstruct_result1605)
+                            unwrapped1606 = deconstruct_result1605
+                            pretty_export(pp, unwrapped1606)
                         else
                             throw(ParseError("No matching rule for read"))
                         end
@@ -4679,18 +4917,18 @@ function pretty_read(pp::PrettyPrinter, msg::Proto.Read)
 end
 
 function pretty_demand(pp::PrettyPrinter, msg::Proto.Demand)
-    flat1532 = try_flat(pp, msg, pretty_demand)
-    if !isnothing(flat1532)
-        write(pp, flat1532)
+    flat1618 = try_flat(pp, msg, pretty_demand)
+    if !isnothing(flat1618)
+        write(pp, flat1618)
         return nothing
     else
         _dollar_dollar = msg
-        fields1530 = _dollar_dollar.relation_id
-        unwrapped_fields1531 = fields1530
+        fields1616 = _dollar_dollar.relation_id
+        unwrapped_fields1617 = fields1616
         write(pp, "(demand")
         indent_sexp!(pp)
         newline(pp)
-        pretty_relation_id(pp, unwrapped_fields1531)
+        pretty_relation_id(pp, unwrapped_fields1617)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4698,22 +4936,22 @@ function pretty_demand(pp::PrettyPrinter, msg::Proto.Demand)
 end
 
 function pretty_output(pp::PrettyPrinter, msg::Proto.Output)
-    flat1537 = try_flat(pp, msg, pretty_output)
-    if !isnothing(flat1537)
-        write(pp, flat1537)
+    flat1623 = try_flat(pp, msg, pretty_output)
+    if !isnothing(flat1623)
+        write(pp, flat1623)
         return nothing
     else
         _dollar_dollar = msg
-        fields1533 = (_dollar_dollar.name, _dollar_dollar.relation_id,)
-        unwrapped_fields1534 = fields1533
+        fields1619 = (_dollar_dollar.name, _dollar_dollar.relation_id,)
+        unwrapped_fields1620 = fields1619
         write(pp, "(output")
         indent_sexp!(pp)
         newline(pp)
-        field1535 = unwrapped_fields1534[1]
-        pretty_name(pp, field1535)
+        field1621 = unwrapped_fields1620[1]
+        pretty_name(pp, field1621)
         newline(pp)
-        field1536 = unwrapped_fields1534[2]
-        pretty_relation_id(pp, field1536)
+        field1622 = unwrapped_fields1620[2]
+        pretty_relation_id(pp, field1622)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4721,22 +4959,22 @@ function pretty_output(pp::PrettyPrinter, msg::Proto.Output)
 end
 
 function pretty_what_if(pp::PrettyPrinter, msg::Proto.WhatIf)
-    flat1542 = try_flat(pp, msg, pretty_what_if)
-    if !isnothing(flat1542)
-        write(pp, flat1542)
+    flat1628 = try_flat(pp, msg, pretty_what_if)
+    if !isnothing(flat1628)
+        write(pp, flat1628)
         return nothing
     else
         _dollar_dollar = msg
-        fields1538 = (_dollar_dollar.branch, _dollar_dollar.epoch,)
-        unwrapped_fields1539 = fields1538
+        fields1624 = (_dollar_dollar.branch, _dollar_dollar.epoch,)
+        unwrapped_fields1625 = fields1624
         write(pp, "(what_if")
         indent_sexp!(pp)
         newline(pp)
-        field1540 = unwrapped_fields1539[1]
-        pretty_name(pp, field1540)
+        field1626 = unwrapped_fields1625[1]
+        pretty_name(pp, field1626)
         newline(pp)
-        field1541 = unwrapped_fields1539[2]
-        pretty_epoch(pp, field1541)
+        field1627 = unwrapped_fields1625[2]
+        pretty_epoch(pp, field1627)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4744,30 +4982,30 @@ function pretty_what_if(pp::PrettyPrinter, msg::Proto.WhatIf)
 end
 
 function pretty_abort(pp::PrettyPrinter, msg::Proto.Abort)
-    flat1548 = try_flat(pp, msg, pretty_abort)
-    if !isnothing(flat1548)
-        write(pp, flat1548)
+    flat1634 = try_flat(pp, msg, pretty_abort)
+    if !isnothing(flat1634)
+        write(pp, flat1634)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name != "abort"
-            _t1769 = _dollar_dollar.name
+            _t1864 = _dollar_dollar.name
         else
-            _t1769 = nothing
+            _t1864 = nothing
         end
-        fields1543 = (_t1769, _dollar_dollar.relation_id,)
-        unwrapped_fields1544 = fields1543
+        fields1629 = (_t1864, _dollar_dollar.relation_id,)
+        unwrapped_fields1630 = fields1629
         write(pp, "(abort")
         indent_sexp!(pp)
-        field1545 = unwrapped_fields1544[1]
-        if !isnothing(field1545)
+        field1631 = unwrapped_fields1630[1]
+        if !isnothing(field1631)
             newline(pp)
-            opt_val1546 = field1545
-            pretty_name(pp, opt_val1546)
+            opt_val1632 = field1631
+            pretty_name(pp, opt_val1632)
         end
         newline(pp)
-        field1547 = unwrapped_fields1544[2]
-        pretty_relation_id(pp, field1547)
+        field1633 = unwrapped_fields1630[2]
+        pretty_relation_id(pp, field1633)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4775,40 +5013,40 @@ function pretty_abort(pp::PrettyPrinter, msg::Proto.Abort)
 end
 
 function pretty_export(pp::PrettyPrinter, msg::Proto.Export)
-    flat1553 = try_flat(pp, msg, pretty_export)
-    if !isnothing(flat1553)
-        write(pp, flat1553)
+    flat1639 = try_flat(pp, msg, pretty_export)
+    if !isnothing(flat1639)
+        write(pp, flat1639)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("csv_config"))
-            _t1770 = _get_oneof_field(_dollar_dollar, :csv_config)
+            _t1865 = _get_oneof_field(_dollar_dollar, :csv_config)
         else
-            _t1770 = nothing
+            _t1865 = nothing
         end
-        deconstruct_result1551 = _t1770
-        if !isnothing(deconstruct_result1551)
-            unwrapped1552 = deconstruct_result1551
+        deconstruct_result1637 = _t1865
+        if !isnothing(deconstruct_result1637)
+            unwrapped1638 = deconstruct_result1637
             write(pp, "(export")
             indent_sexp!(pp)
             newline(pp)
-            pretty_export_csv_config(pp, unwrapped1552)
+            pretty_export_csv_config(pp, unwrapped1638)
             dedent!(pp)
             write(pp, ")")
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("iceberg_config"))
-                _t1771 = _get_oneof_field(_dollar_dollar, :iceberg_config)
+                _t1866 = _get_oneof_field(_dollar_dollar, :iceberg_config)
             else
-                _t1771 = nothing
+                _t1866 = nothing
             end
-            deconstruct_result1549 = _t1771
-            if !isnothing(deconstruct_result1549)
-                unwrapped1550 = deconstruct_result1549
+            deconstruct_result1635 = _t1866
+            if !isnothing(deconstruct_result1635)
+                unwrapped1636 = deconstruct_result1635
                 write(pp, "(export_iceberg")
                 indent_sexp!(pp)
                 newline(pp)
-                pretty_export_iceberg_config(pp, unwrapped1550)
+                pretty_export_iceberg_config(pp, unwrapped1636)
                 dedent!(pp)
                 write(pp, ")")
             else
@@ -4820,55 +5058,55 @@ function pretty_export(pp::PrettyPrinter, msg::Proto.Export)
 end
 
 function pretty_export_csv_config(pp::PrettyPrinter, msg::Proto.ExportCSVConfig)
-    flat1564 = try_flat(pp, msg, pretty_export_csv_config)
-    if !isnothing(flat1564)
-        write(pp, flat1564)
+    flat1650 = try_flat(pp, msg, pretty_export_csv_config)
+    if !isnothing(flat1650)
+        write(pp, flat1650)
         return nothing
     else
         _dollar_dollar = msg
         if length(_dollar_dollar.data_columns) == 0
-            _t1772 = (_dollar_dollar.path, _dollar_dollar.csv_source, _dollar_dollar.csv_config,)
+            _t1867 = (_dollar_dollar.path, _dollar_dollar.csv_source, _dollar_dollar.csv_config,)
         else
-            _t1772 = nothing
+            _t1867 = nothing
         end
-        deconstruct_result1559 = _t1772
-        if !isnothing(deconstruct_result1559)
-            unwrapped1560 = deconstruct_result1559
+        deconstruct_result1645 = _t1867
+        if !isnothing(deconstruct_result1645)
+            unwrapped1646 = deconstruct_result1645
             write(pp, "(export_csv_config_v2")
             indent_sexp!(pp)
             newline(pp)
-            field1561 = unwrapped1560[1]
-            pretty_export_csv_path(pp, field1561)
+            field1647 = unwrapped1646[1]
+            pretty_export_csv_path(pp, field1647)
             newline(pp)
-            field1562 = unwrapped1560[2]
-            pretty_export_csv_source(pp, field1562)
+            field1648 = unwrapped1646[2]
+            pretty_export_csv_source(pp, field1648)
             newline(pp)
-            field1563 = unwrapped1560[3]
-            pretty_csv_config(pp, field1563)
+            field1649 = unwrapped1646[3]
+            pretty_csv_config(pp, field1649)
             dedent!(pp)
             write(pp, ")")
         else
             _dollar_dollar = msg
             if length(_dollar_dollar.data_columns) != 0
-                _t1774 = deconstruct_export_csv_config(pp, _dollar_dollar)
-                _t1773 = (_dollar_dollar.path, _dollar_dollar.data_columns, _t1774,)
+                _t1869 = deconstruct_export_csv_config(pp, _dollar_dollar)
+                _t1868 = (_dollar_dollar.path, _dollar_dollar.data_columns, _t1869,)
             else
-                _t1773 = nothing
+                _t1868 = nothing
             end
-            deconstruct_result1554 = _t1773
-            if !isnothing(deconstruct_result1554)
-                unwrapped1555 = deconstruct_result1554
+            deconstruct_result1640 = _t1868
+            if !isnothing(deconstruct_result1640)
+                unwrapped1641 = deconstruct_result1640
                 write(pp, "(export_csv_config")
                 indent_sexp!(pp)
                 newline(pp)
-                field1556 = unwrapped1555[1]
-                pretty_export_csv_path(pp, field1556)
+                field1642 = unwrapped1641[1]
+                pretty_export_csv_path(pp, field1642)
                 newline(pp)
-                field1557 = unwrapped1555[2]
-                pretty_export_csv_columns_list(pp, field1557)
+                field1643 = unwrapped1641[2]
+                pretty_export_csv_columns_list(pp, field1643)
                 newline(pp)
-                field1558 = unwrapped1555[3]
-                pretty_config_dict(pp, field1558)
+                field1644 = unwrapped1641[3]
+                pretty_config_dict(pp, field1644)
                 dedent!(pp)
                 write(pp, ")")
             else
@@ -4880,16 +5118,16 @@ function pretty_export_csv_config(pp::PrettyPrinter, msg::Proto.ExportCSVConfig)
 end
 
 function pretty_export_csv_path(pp::PrettyPrinter, msg::String)
-    flat1566 = try_flat(pp, msg, pretty_export_csv_path)
-    if !isnothing(flat1566)
-        write(pp, flat1566)
+    flat1652 = try_flat(pp, msg, pretty_export_csv_path)
+    if !isnothing(flat1652)
+        write(pp, flat1652)
         return nothing
     else
-        fields1565 = msg
+        fields1651 = msg
         write(pp, "(path")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1565))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1651))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4897,30 +5135,30 @@ function pretty_export_csv_path(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_export_csv_source(pp::PrettyPrinter, msg::Proto.ExportCSVSource)
-    flat1573 = try_flat(pp, msg, pretty_export_csv_source)
-    if !isnothing(flat1573)
-        write(pp, flat1573)
+    flat1659 = try_flat(pp, msg, pretty_export_csv_source)
+    if !isnothing(flat1659)
+        write(pp, flat1659)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("gnf_columns"))
-            _t1775 = _get_oneof_field(_dollar_dollar, :gnf_columns).columns
+            _t1870 = _get_oneof_field(_dollar_dollar, :gnf_columns).columns
         else
-            _t1775 = nothing
+            _t1870 = nothing
         end
-        deconstruct_result1569 = _t1775
-        if !isnothing(deconstruct_result1569)
-            unwrapped1570 = deconstruct_result1569
+        deconstruct_result1655 = _t1870
+        if !isnothing(deconstruct_result1655)
+            unwrapped1656 = deconstruct_result1655
             write(pp, "(gnf_columns")
             indent_sexp!(pp)
-            if !isempty(unwrapped1570)
+            if !isempty(unwrapped1656)
                 newline(pp)
-                for (i1776, elem1571) in enumerate(unwrapped1570)
-                    i1572 = i1776 - 1
-                    if (i1572 > 0)
+                for (i1871, elem1657) in enumerate(unwrapped1656)
+                    i1658 = i1871 - 1
+                    if (i1658 > 0)
                         newline(pp)
                     end
-                    pretty_export_csv_column(pp, elem1571)
+                    pretty_export_csv_column(pp, elem1657)
                 end
             end
             dedent!(pp)
@@ -4928,17 +5166,17 @@ function pretty_export_csv_source(pp::PrettyPrinter, msg::Proto.ExportCSVSource)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("table_def"))
-                _t1777 = _get_oneof_field(_dollar_dollar, :table_def)
+                _t1872 = _get_oneof_field(_dollar_dollar, :table_def)
             else
-                _t1777 = nothing
+                _t1872 = nothing
             end
-            deconstruct_result1567 = _t1777
-            if !isnothing(deconstruct_result1567)
-                unwrapped1568 = deconstruct_result1567
+            deconstruct_result1653 = _t1872
+            if !isnothing(deconstruct_result1653)
+                unwrapped1654 = deconstruct_result1653
                 write(pp, "(table_def")
                 indent_sexp!(pp)
                 newline(pp)
-                pretty_relation_id(pp, unwrapped1568)
+                pretty_relation_id(pp, unwrapped1654)
                 dedent!(pp)
                 write(pp, ")")
             else
@@ -4950,22 +5188,22 @@ function pretty_export_csv_source(pp::PrettyPrinter, msg::Proto.ExportCSVSource)
 end
 
 function pretty_export_csv_column(pp::PrettyPrinter, msg::Proto.ExportCSVColumn)
-    flat1578 = try_flat(pp, msg, pretty_export_csv_column)
-    if !isnothing(flat1578)
-        write(pp, flat1578)
+    flat1664 = try_flat(pp, msg, pretty_export_csv_column)
+    if !isnothing(flat1664)
+        write(pp, flat1664)
         return nothing
     else
         _dollar_dollar = msg
-        fields1574 = (_dollar_dollar.column_name, _dollar_dollar.column_data,)
-        unwrapped_fields1575 = fields1574
+        fields1660 = (_dollar_dollar.column_name, _dollar_dollar.column_data,)
+        unwrapped_fields1661 = fields1660
         write(pp, "(column")
         indent_sexp!(pp)
         newline(pp)
-        field1576 = unwrapped_fields1575[1]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1576))
+        field1662 = unwrapped_fields1661[1]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1662))
         newline(pp)
-        field1577 = unwrapped_fields1575[2]
-        pretty_relation_id(pp, field1577)
+        field1663 = unwrapped_fields1661[2]
+        pretty_relation_id(pp, field1663)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4973,22 +5211,22 @@ function pretty_export_csv_column(pp::PrettyPrinter, msg::Proto.ExportCSVColumn)
 end
 
 function pretty_export_csv_columns_list(pp::PrettyPrinter, msg::Vector{Proto.ExportCSVColumn})
-    flat1582 = try_flat(pp, msg, pretty_export_csv_columns_list)
-    if !isnothing(flat1582)
-        write(pp, flat1582)
+    flat1668 = try_flat(pp, msg, pretty_export_csv_columns_list)
+    if !isnothing(flat1668)
+        write(pp, flat1668)
         return nothing
     else
-        fields1579 = msg
+        fields1665 = msg
         write(pp, "(columns")
         indent_sexp!(pp)
-        if !isempty(fields1579)
+        if !isempty(fields1665)
             newline(pp)
-            for (i1778, elem1580) in enumerate(fields1579)
-                i1581 = i1778 - 1
-                if (i1581 > 0)
+            for (i1873, elem1666) in enumerate(fields1665)
+                i1667 = i1873 - 1
+                if (i1667 > 0)
                     newline(pp)
                 end
-                pretty_export_csv_column(pp, elem1580)
+                pretty_export_csv_column(pp, elem1666)
             end
         end
         dedent!(pp)
@@ -4998,34 +5236,34 @@ function pretty_export_csv_columns_list(pp::PrettyPrinter, msg::Vector{Proto.Exp
 end
 
 function pretty_export_iceberg_config(pp::PrettyPrinter, msg::Proto.ExportIcebergConfig)
-    flat1591 = try_flat(pp, msg, pretty_export_iceberg_config)
-    if !isnothing(flat1591)
-        write(pp, flat1591)
+    flat1677 = try_flat(pp, msg, pretty_export_iceberg_config)
+    if !isnothing(flat1677)
+        write(pp, flat1677)
         return nothing
     else
         _dollar_dollar = msg
-        _t1779 = deconstruct_export_iceberg_config_optional(pp, _dollar_dollar)
-        fields1583 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.table_def, sort([(k, v) for (k, v) in _dollar_dollar.table_properties]), _t1779,)
-        unwrapped_fields1584 = fields1583
+        _t1874 = deconstruct_export_iceberg_config_optional(pp, _dollar_dollar)
+        fields1669 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.table_def, sort([(k, v) for (k, v) in _dollar_dollar.table_properties]), _t1874,)
+        unwrapped_fields1670 = fields1669
         write(pp, "(export_iceberg_config")
         indent_sexp!(pp)
         newline(pp)
-        field1585 = unwrapped_fields1584[1]
-        pretty_iceberg_locator(pp, field1585)
+        field1671 = unwrapped_fields1670[1]
+        pretty_iceberg_locator(pp, field1671)
         newline(pp)
-        field1586 = unwrapped_fields1584[2]
-        pretty_iceberg_catalog_config(pp, field1586)
+        field1672 = unwrapped_fields1670[2]
+        pretty_iceberg_catalog_config(pp, field1672)
         newline(pp)
-        field1587 = unwrapped_fields1584[3]
-        pretty_export_iceberg_table_def(pp, field1587)
+        field1673 = unwrapped_fields1670[3]
+        pretty_export_iceberg_table_def(pp, field1673)
         newline(pp)
-        field1588 = unwrapped_fields1584[4]
-        pretty_iceberg_table_properties(pp, field1588)
-        field1589 = unwrapped_fields1584[5]
-        if !isnothing(field1589)
+        field1674 = unwrapped_fields1670[4]
+        pretty_iceberg_table_properties(pp, field1674)
+        field1675 = unwrapped_fields1670[5]
+        if !isnothing(field1675)
             newline(pp)
-            opt_val1590 = field1589
-            pretty_config_dict(pp, opt_val1590)
+            opt_val1676 = field1675
+            pretty_config_dict(pp, opt_val1676)
         end
         dedent!(pp)
         write(pp, ")")
@@ -5034,16 +5272,16 @@ function pretty_export_iceberg_config(pp::PrettyPrinter, msg::Proto.ExportIceber
 end
 
 function pretty_export_iceberg_table_def(pp::PrettyPrinter, msg::Proto.RelationId)
-    flat1593 = try_flat(pp, msg, pretty_export_iceberg_table_def)
-    if !isnothing(flat1593)
-        write(pp, flat1593)
+    flat1679 = try_flat(pp, msg, pretty_export_iceberg_table_def)
+    if !isnothing(flat1679)
+        write(pp, flat1679)
         return nothing
     else
-        fields1592 = msg
+        fields1678 = msg
         write(pp, "(table_def")
         indent_sexp!(pp)
         newline(pp)
-        pretty_relation_id(pp, fields1592)
+        pretty_relation_id(pp, fields1678)
         dedent!(pp)
         write(pp, ")")
     end
@@ -5051,22 +5289,22 @@ function pretty_export_iceberg_table_def(pp::PrettyPrinter, msg::Proto.RelationI
 end
 
 function pretty_iceberg_table_properties(pp::PrettyPrinter, msg::Vector{Tuple{String, String}})
-    flat1597 = try_flat(pp, msg, pretty_iceberg_table_properties)
-    if !isnothing(flat1597)
-        write(pp, flat1597)
+    flat1683 = try_flat(pp, msg, pretty_iceberg_table_properties)
+    if !isnothing(flat1683)
+        write(pp, flat1683)
         return nothing
     else
-        fields1594 = msg
+        fields1680 = msg
         write(pp, "(table_properties")
         indent_sexp!(pp)
-        if !isempty(fields1594)
+        if !isempty(fields1680)
             newline(pp)
-            for (i1780, elem1595) in enumerate(fields1594)
-                i1596 = i1780 - 1
-                if (i1596 > 0)
+            for (i1875, elem1681) in enumerate(fields1680)
+                i1682 = i1875 - 1
+                if (i1682 > 0)
                     newline(pp)
                 end
-                pretty_iceberg_property_entry(pp, elem1595)
+                pretty_iceberg_property_entry(pp, elem1681)
             end
         end
         dedent!(pp)
@@ -5081,12 +5319,12 @@ end
 function pretty_debug_info(pp::PrettyPrinter, msg::Proto.DebugInfo)
     write(pp, "(debug_info")
     indent_sexp!(pp)
-    for (i1832, _rid) in enumerate(msg.ids)
-        _idx = i1832 - 1
+    for (i1929, _rid) in enumerate(msg.ids)
+        _idx = i1929 - 1
         newline(pp)
         write(pp, "(")
-        _t1833 = Proto.UInt128Value(low=_rid.id_low, high=_rid.id_high)
-        _pprint_dispatch(pp, _t1833)
+        _t1930 = Proto.UInt128Value(low=_rid.id_low, high=_rid.id_high)
+        _pprint_dispatch(pp, _t1930)
         write(pp, " ")
         write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, msg.orig_names[_idx + 1]))
         write(pp, ")")
@@ -5145,6 +5383,33 @@ function pretty_be_tree_locator(pp::PrettyPrinter, msg::Proto.BeTreeLocator)
     return nothing
 end
 
+function pretty_cdc_targets(pp::PrettyPrinter, msg::Proto.CdcTargets)
+    write(pp, "(cdc_targets")
+    indent_sexp!(pp)
+    newline(pp)
+    write(pp, ":inserts (")
+    for (i1931, _elem) in enumerate(msg.inserts)
+        _idx = i1931 - 1
+        if (_idx > 0)
+            write(pp, " ")
+        end
+        _pprint_dispatch(pp, _elem)
+    end
+    write(pp, ")")
+    newline(pp)
+    write(pp, ":deletes (")
+    for (i1932, _elem) in enumerate(msg.deletes)
+        _idx = i1932 - 1
+        if (_idx > 0)
+            write(pp, " ")
+        end
+        _pprint_dispatch(pp, _elem)
+    end
+    write(pp, "))")
+    dedent!(pp)
+    return nothing
+end
+
 function pretty_decimal_value(pp::PrettyPrinter, msg::Proto.DecimalValue)
     write(pp, format_decimal(pp, msg))
     return nothing
@@ -5158,8 +5423,8 @@ function pretty_functional_dependency(pp::PrettyPrinter, msg::Proto.FunctionalDe
     _pprint_dispatch(pp, msg.guard)
     newline(pp)
     write(pp, ":keys (")
-    for (i1834, _elem) in enumerate(msg.keys)
-        _idx = i1834 - 1
+    for (i1933, _elem) in enumerate(msg.keys)
+        _idx = i1933 - 1
         if (_idx > 0)
             write(pp, " ")
         end
@@ -5168,8 +5433,8 @@ function pretty_functional_dependency(pp::PrettyPrinter, msg::Proto.FunctionalDe
     write(pp, ")")
     newline(pp)
     write(pp, ":values (")
-    for (i1835, _elem) in enumerate(msg.values)
-        _idx = i1835 - 1
+    for (i1934, _elem) in enumerate(msg.values)
+        _idx = i1934 - 1
         if (_idx > 0)
             write(pp, " ")
         end
@@ -5190,6 +5455,23 @@ function pretty_missing_value(pp::PrettyPrinter, msg::Proto.MissingValue)
     return nothing
 end
 
+function pretty_plain_targets(pp::PrettyPrinter, msg::Proto.PlainTargets)
+    write(pp, "(plain_targets")
+    indent_sexp!(pp)
+    newline(pp)
+    write(pp, ":targets (")
+    for (i1935, _elem) in enumerate(msg.targets)
+        _idx = i1935 - 1
+        if (_idx > 0)
+            write(pp, " ")
+        end
+        _pprint_dispatch(pp, _elem)
+    end
+    write(pp, "))")
+    dedent!(pp)
+    return nothing
+end
+
 function pretty_storage_integration(pp::PrettyPrinter, msg::Proto.StorageIntegration)
     write(pp, "(storage_integration")
     indent_sexp!(pp)
@@ -5223,8 +5505,8 @@ function pretty_export_csv_columns(pp::PrettyPrinter, msg::Proto.ExportCSVColumn
     indent_sexp!(pp)
     newline(pp)
     write(pp, ":columns (")
-    for (i1836, _elem) in enumerate(msg.columns)
-        _idx = i1836 - 1
+    for (i1936, _elem) in enumerate(msg.columns)
+        _idx = i1936 - 1
         if (_idx > 0)
             write(pp, " ")
         end
@@ -5353,6 +5635,11 @@ _pprint_dispatch(pp::PrettyPrinter, x::Proto.CSVLocator) = pretty_csvlocator(pp,
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.CSVConfig) = pretty_csv_config(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Vector{Proto.GNFColumn}) = pretty_gnf_columns(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.GNFColumn) = pretty_gnf_column(pp, x)
+_pprint_dispatch(pp::PrettyPrinter, x::Proto.TargetRelations) = pretty_target_relations(pp, x)
+_pprint_dispatch(pp::PrettyPrinter, x::Vector{Proto.NamedColumn}) = pretty_relation_keys(pp, x)
+_pprint_dispatch(pp::PrettyPrinter, x::Proto.NamedColumn) = pretty_named_column(pp, x)
+_pprint_dispatch(pp::PrettyPrinter, x::Vector{Proto.TargetRelation}) = pretty_non_cdc_relations(pp, x)
+_pprint_dispatch(pp::PrettyPrinter, x::Proto.TargetRelation) = pretty_target_relation(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.IcebergData) = pretty_iceberg_data(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.IcebergLocator) = pretty_iceberg_locator(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.IcebergCatalogConfig) = pretty_iceberg_catalog_config(pp, x)
@@ -5377,10 +5664,12 @@ _pprint_dispatch(pp::PrettyPrinter, x::Proto.ExportIcebergConfig) = pretty_expor
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.DebugInfo) = pretty_debug_info(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.BeTreeConfig) = pretty_be_tree_config(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.BeTreeLocator) = pretty_be_tree_locator(pp, x)
+_pprint_dispatch(pp::PrettyPrinter, x::Proto.CdcTargets) = pretty_cdc_targets(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.DecimalValue) = pretty_decimal_value(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.FunctionalDependency) = pretty_functional_dependency(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.Int128Value) = pretty_int128_value(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.MissingValue) = pretty_missing_value(pp, x)
+_pprint_dispatch(pp::PrettyPrinter, x::Proto.PlainTargets) = pretty_plain_targets(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.StorageIntegration) = pretty_storage_integration(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.UInt128Value) = pretty_u_int128_value(pp, x)
 _pprint_dispatch(pp::PrettyPrinter, x::Proto.ExportCSVColumns) = pretty_export_csv_columns(pp, x)
diff --git a/sdks/julia/LogicalQueryProtocol.jl/src/properties.jl b/sdks/julia/LogicalQueryProtocol.jl/src/properties.jl
index 1ad25287..6efa28c3 100644
--- a/sdks/julia/LogicalQueryProtocol.jl/src/properties.jl
+++ b/sdks/julia/LogicalQueryProtocol.jl/src/properties.jl
@@ -224,6 +224,25 @@ function global_ids(data::Data)
     elseif dt.name == :csv_data
         csv_data = dt[]::CSVData
         ids = LQPRelationId[]
+        if !isnothing(csv_data.relations)
+            # Generalized form: collect target relations from whichever body group is set — the
+            # plain group's `targets`, or the CDC `inserts`/`deletes` groups (which may share a
+            # target, so deduplicate).
+            body = csv_data.relations.body
+            if !isnothing(body)
+                payload = body[]
+                # `isa` (not `body.name`) so the branch narrows the concrete type for inference.
+                groups = payload isa PlainTargets ? (payload.targets,) : (payload.inserts, payload.deletes)
+                for group in groups
+                    for outrel in group
+                        if !isnothing(outrel.target_id)
+                            push!(ids, persistent_id(outrel.target_id))
+                        end
+                    end
+                end
+            end
+            return unique(ids)
+        end
         for column in csv_data.columns
             if !isnothing(column.target_id)
                 push!(ids, persistent_id(column.target_id))
diff --git a/sdks/julia/LogicalQueryProtocol.jl/test/equality_tests.jl b/sdks/julia/LogicalQueryProtocol.jl/test/equality_tests.jl
index 4b5cde4b..4aa4be7a 100644
--- a/sdks/julia/LogicalQueryProtocol.jl/test/equality_tests.jl
+++ b/sdks/julia/LogicalQueryProtocol.jl/test/equality_tests.jl
@@ -2128,6 +2128,208 @@ end
     @test b1 == b2 && b2 == b5 && b1 == b5
 end
 
+@testitem "Equality for NamedColumn" tags=[:ring1, :unit] begin
+    using LogicalQueryProtocol: NamedColumn, var"#Type", IntType, StringType
+    using ProtoBuf: OneOf
+
+    tint = var"#Type"(var"#type"=OneOf(:int_type, IntType()))
+    tstr = var"#Type"(var"#type"=OneOf(:string_type, StringType()))
+
+    c1 = NamedColumn(name="src", var"#type"=tint)
+    c2 = NamedColumn(name="src", var"#type"=tint)
+    c3 = NamedColumn(name="dst", var"#type"=tint)   # different name
+    c4 = NamedColumn(name="src", var"#type"=tstr)   # different type
+    c5 = NamedColumn(name="src", var"#type"=tint)
+
+    # Equality and inequality
+    @test c1 == c2
+    @test c1 != c3
+    @test c1 != c4
+    @test isequal(c1, c2)
+
+    # Hash consistency
+    @test hash(c1) == hash(c2)
+
+    # Reflexivity
+    @test c1 == c1
+    @test isequal(c1, c1)
+
+    # Symmetry
+    @test c1 == c2 && c2 == c1
+
+    # Transitivity
+    @test c1 == c2 && c2 == c5 && c1 == c5
+
+    # Works in collections
+    @test length(Set([c1, c2, c3])) == 2
+end
+
+@testitem "Equality for TargetRelation" tags=[:ring1, :unit] begin
+    using LogicalQueryProtocol: TargetRelation, NamedColumn, RelationId, var"#Type", FloatType
+    using ProtoBuf: OneOf
+
+    t1 = var"#Type"(var"#type"=OneOf(:float_type, FloatType()))
+    v1 = NamedColumn(name="weight", var"#type"=t1)
+    v2 = NamedColumn(name="label", var"#type"=t1)
+    r1 = RelationId(id_low=1, id_high=0)
+    r2 = RelationId(id_low=2, id_high=0)
+
+    tr1 = TargetRelation(target_id=r1, values=[v1])
+    tr2 = TargetRelation(target_id=r1, values=[v1])
+    tr3 = TargetRelation(target_id=r2, values=[v1])   # different target
+    tr4 = TargetRelation(target_id=r1, values=[v2])   # different values
+    tr5 = TargetRelation(target_id=r1, values=[])     # no value columns (e.g. keys-only delete)
+    tr6 = TargetRelation(target_id=r1, values=[v1])
+
+    # Equality and inequality
+    @test tr1 == tr2
+    @test tr1 != tr3
+    @test tr1 != tr4
+    @test tr1 != tr5
+    @test isequal(tr1, tr2)
+
+    # Hash consistency
+    @test hash(tr1) == hash(tr2)
+
+    # Reflexivity
+    @test tr1 == tr1
+    @test isequal(tr1, tr1)
+
+    # Symmetry
+    @test tr1 == tr2 && tr2 == tr1
+
+    # Transitivity
+    @test tr1 == tr2 && tr2 == tr6 && tr1 == tr6
+end
+
+@testitem "Equality for PlainTargets" tags=[:ring1, :unit] begin
+    using LogicalQueryProtocol: PlainTargets, TargetRelation, NamedColumn, RelationId, var"#Type", FloatType
+    using ProtoBuf: OneOf
+
+    t1 = var"#Type"(var"#type"=OneOf(:float_type, FloatType()))
+    val = NamedColumn(name="weight", var"#type"=t1)
+    rel1 = TargetRelation(target_id=RelationId(id_low=1, id_high=0), values=[val])
+    rel2 = TargetRelation(target_id=RelationId(id_low=2, id_high=0), values=[val])
+
+    p1 = PlainTargets(targets=[rel1])
+    p2 = PlainTargets(targets=[rel1])
+    p3 = PlainTargets(targets=[rel2])   # different targets
+    p4 = PlainTargets(targets=[])       # empty
+    p5 = PlainTargets(targets=[rel1])
+
+    # Equality and inequality
+    @test p1 == p2
+    @test p1 != p3
+    @test p1 != p4
+    @test isequal(p1, p2)
+
+    # Hash consistency
+    @test hash(p1) == hash(p2)
+
+    # Reflexivity
+    @test p1 == p1
+    @test isequal(p1, p1)
+
+    # Symmetry
+    @test p1 == p2 && p2 == p1
+
+    # Transitivity
+    @test p1 == p2 && p2 == p5 && p1 == p5
+end
+
+@testitem "Equality for CdcTargets" tags=[:ring1, :unit] begin
+    using LogicalQueryProtocol: CdcTargets, TargetRelation, NamedColumn, RelationId, var"#Type", FloatType
+    using ProtoBuf: OneOf
+
+    t1 = var"#Type"(var"#type"=OneOf(:float_type, FloatType()))
+    val = NamedColumn(name="weight", var"#type"=t1)
+    rel1 = TargetRelation(target_id=RelationId(id_low=1, id_high=0), values=[val])
+    rel2 = TargetRelation(target_id=RelationId(id_low=2, id_high=0), values=[val])
+
+    c1 = CdcTargets(inserts=[rel1], deletes=[rel2])
+    c2 = CdcTargets(inserts=[rel1], deletes=[rel2])
+    c3 = CdcTargets(inserts=[rel2], deletes=[rel2])   # different inserts
+    c4 = CdcTargets(inserts=[rel1], deletes=[rel1])   # different deletes
+    c5 = CdcTargets(inserts=[rel1], deletes=[rel2])
+
+    # Equality and inequality
+    @test c1 == c2
+    @test c1 != c3
+    @test c1 != c4
+    @test isequal(c1, c2)
+
+    # Hash consistency
+    @test hash(c1) == hash(c2)
+
+    # Reflexivity
+    @test c1 == c1
+    @test isequal(c1, c1)
+
+    # Symmetry
+    @test c1 == c2 && c2 == c1
+
+    # Transitivity
+    @test c1 == c2 && c2 == c5 && c1 == c5
+end
+
+@testitem "Equality for TargetRelations" tags=[:ring1, :unit] begin
+    using LogicalQueryProtocol: TargetRelations, PlainTargets, CdcTargets, TargetRelation, NamedColumn, RelationId, var"#Type", IntType, FloatType
+    using ProtoBuf: OneOf
+
+    tint = var"#Type"(var"#type"=OneOf(:int_type, IntType()))
+    tflt = var"#Type"(var"#type"=OneOf(:float_type, FloatType()))
+    key = NamedColumn(name="id", var"#type"=tint)
+    val = NamedColumn(name="weight", var"#type"=tflt)
+    r1 = RelationId(id_low=1, id_high=0)
+    r2 = RelationId(id_low=2, id_high=0)
+    rel1 = TargetRelation(target_id=r1, values=[val])
+    rel2 = TargetRelation(target_id=r2, values=[val])
+
+    plain(rs) = OneOf(:plain, PlainTargets(targets=rs))
+    cdc(ins, dels) = OneOf(:cdc, CdcTargets(inserts=ins, deletes=dels))
+
+    # Plain (non-CDC) body.
+    g1 = TargetRelations(keys=[key], body=plain([rel1]))
+    g2 = TargetRelations(keys=[key], body=plain([rel1]))
+    g3 = TargetRelations(keys=[], body=plain([rel1]))       # different keys
+    g4 = TargetRelations(keys=[key], body=plain([rel2]))    # different body
+    g5 = TargetRelations(keys=[key], body=plain([rel1]))
+
+    # Equality and inequality
+    @test g1 == g2
+    @test g1 != g3
+    @test g1 != g4
+    @test isequal(g1, g2)
+
+    # Hash consistency
+    @test hash(g1) == hash(g2)
+
+    # Reflexivity
+    @test g1 == g1
+    @test isequal(g1, g1)
+
+    # Symmetry
+    @test g1 == g2 && g2 == g1
+
+    # Transitivity
+    @test g1 == g2 && g2 == g5 && g1 == g5
+
+    # CDC body.
+    cdc1 = TargetRelations(keys=[key], body=cdc([rel1], [rel1]))
+    cdc2 = TargetRelations(keys=[key], body=cdc([rel1], [rel1]))
+    cdc3 = TargetRelations(keys=[key], body=cdc([rel2], [rel1]))  # different inserts
+    cdc4 = TargetRelations(keys=[key], body=cdc([rel1], [rel2]))  # different deletes
+
+    @test cdc1 == cdc2
+    @test cdc1 != cdc3
+    @test cdc1 != cdc4
+    @test hash(cdc1) == hash(cdc2)
+    @test isequal(cdc1, cdc2)
+
+    # Different oneof arms are unequal even when they share a relation.
+    @test g1 != cdc1
+end
+
 @testitem "Equality for CSVData" tags=[:ring1, :unit] begin
     using LogicalQueryProtocol: CSVData, CSVLocator, CSVConfig, GNFColumn, RelationId, var"#Type", IntType
     using ProtoBuf: OneOf
diff --git a/sdks/python/src/lqp/gen/parser.py b/sdks/python/src/lqp/gen/parser.py
index 3aa748e1..60b4511a 100644
--- a/sdks/python/src/lqp/gen/parser.py
+++ b/sdks/python/src/lqp/gen/parser.py
@@ -424,196 +424,219 @@ def relation_id_to_uint128(self, msg):
     def _extract_value_int32(self, value: logic_pb2.Value | None, default: int) -> int:
         if value is not None:
             assert value is not None
-            _t2088 = value.HasField("int32_value")
+            _t2187 = value.HasField("int32_value")
         else:
-            _t2088 = False
-        if _t2088:
+            _t2187 = False
+        if _t2187:
             assert value is not None
             return value.int32_value
         else:
-            _t2089 = None
+            _t2188 = None
         return int(default)
 
     def _extract_value_int64(self, value: logic_pb2.Value | None, default: int) -> int:
         if value is not None:
             assert value is not None
-            _t2090 = value.HasField("int_value")
+            _t2189 = value.HasField("int_value")
         else:
-            _t2090 = False
-        if _t2090:
+            _t2189 = False
+        if _t2189:
             assert value is not None
             return value.int_value
         else:
-            _t2091 = None
+            _t2190 = None
         return default
 
     def _extract_value_string(self, value: logic_pb2.Value | None, default: str) -> str:
         if value is not None:
             assert value is not None
-            _t2092 = value.HasField("string_value")
+            _t2191 = value.HasField("string_value")
         else:
-            _t2092 = False
-        if _t2092:
+            _t2191 = False
+        if _t2191:
             assert value is not None
             return value.string_value
         else:
-            _t2093 = None
+            _t2192 = None
         return default
 
     def _extract_value_boolean(self, value: logic_pb2.Value | None, default: bool) -> bool:
         if value is not None:
             assert value is not None
-            _t2094 = value.HasField("boolean_value")
+            _t2193 = value.HasField("boolean_value")
         else:
-            _t2094 = False
-        if _t2094:
+            _t2193 = False
+        if _t2193:
             assert value is not None
             return value.boolean_value
         else:
-            _t2095 = None
+            _t2194 = None
         return default
 
     def _extract_value_string_list(self, value: logic_pb2.Value | None, default: Sequence[str]) -> Sequence[str]:
         if value is not None:
             assert value is not None
-            _t2096 = value.HasField("string_value")
+            _t2195 = value.HasField("string_value")
         else:
-            _t2096 = False
-        if _t2096:
+            _t2195 = False
+        if _t2195:
             assert value is not None
             return [value.string_value]
         else:
-            _t2097 = None
+            _t2196 = None
         return default
 
     def _try_extract_value_int64(self, value: logic_pb2.Value | None) -> int | None:
         if value is not None:
             assert value is not None
-            _t2098 = value.HasField("int_value")
+            _t2197 = value.HasField("int_value")
         else:
-            _t2098 = False
-        if _t2098:
+            _t2197 = False
+        if _t2197:
             assert value is not None
             return value.int_value
         else:
-            _t2099 = None
+            _t2198 = None
         return None
 
     def _try_extract_value_float64(self, value: logic_pb2.Value | None) -> float | None:
         if value is not None:
             assert value is not None
-            _t2100 = value.HasField("float_value")
+            _t2199 = value.HasField("float_value")
         else:
-            _t2100 = False
-        if _t2100:
+            _t2199 = False
+        if _t2199:
             assert value is not None
             return value.float_value
         else:
-            _t2101 = None
+            _t2200 = None
         return None
 
     def _try_extract_value_bytes(self, value: logic_pb2.Value | None) -> bytes | None:
         if value is not None:
             assert value is not None
-            _t2102 = value.HasField("string_value")
+            _t2201 = value.HasField("string_value")
         else:
-            _t2102 = False
-        if _t2102:
+            _t2201 = False
+        if _t2201:
             assert value is not None
             return value.string_value.encode()
         else:
-            _t2103 = None
+            _t2202 = None
         return None
 
     def _try_extract_value_uint128(self, value: logic_pb2.Value | None) -> logic_pb2.UInt128Value | None:
         if value is not None:
             assert value is not None
-            _t2104 = value.HasField("uint128_value")
+            _t2203 = value.HasField("uint128_value")
         else:
-            _t2104 = False
-        if _t2104:
+            _t2203 = False
+        if _t2203:
             assert value is not None
             return value.uint128_value
         else:
-            _t2105 = None
+            _t2204 = None
         return None
 
+    def construct_non_cdc_relations(self, targets: Sequence[logic_pb2.TargetRelation]) -> logic_pb2.TargetRelations:
+        _t2205 = logic_pb2.PlainTargets(targets=targets)
+        _t2206 = logic_pb2.TargetRelations(keys=[], plain=_t2205)
+        return _t2206
+
+    def construct_cdc_relations(self, inserts: Sequence[logic_pb2.TargetRelation], deletes: Sequence[logic_pb2.TargetRelation]) -> logic_pb2.TargetRelations:
+        _t2207 = logic_pb2.CdcTargets(inserts=inserts, deletes=deletes)
+        _t2208 = logic_pb2.TargetRelations(keys=[], cdc=_t2207)
+        return _t2208
+
+    def construct_relations(self, keys: Sequence[logic_pb2.NamedColumn], body: logic_pb2.TargetRelations) -> logic_pb2.TargetRelations:
+        if body.HasField("plain"):
+            _t2210 = logic_pb2.TargetRelations(keys=keys, plain=body.plain)
+            return _t2210
+        else:
+            _t2209 = None
+        _t2211 = logic_pb2.TargetRelations(keys=keys, cdc=body.cdc)
+        return _t2211
+
+    def construct_csv_data(self, locator: logic_pb2.CSVLocator, config: logic_pb2.CSVConfig, columns_opt: Sequence[logic_pb2.GNFColumn] | None, relations_opt: logic_pb2.TargetRelations | None, asof: str) -> logic_pb2.CSVData:
+        _t2212 = logic_pb2.CSVData(locator=locator, config=config, columns=(columns_opt if columns_opt is not None else []), asof=asof, relations=relations_opt)
+        return _t2212
+
     def construct_csv_config(self, config_dict: Sequence[tuple[str, logic_pb2.Value]], storage_integration_opt: Sequence[tuple[str, logic_pb2.Value]] | None) -> logic_pb2.CSVConfig:
         config = dict(config_dict)
-        _t2106 = self._extract_value_int32(config.get("csv_header_row"), 1)
-        header_row = _t2106
-        _t2107 = self._extract_value_int64(config.get("csv_skip"), 0)
-        skip = _t2107
-        _t2108 = self._extract_value_string(config.get("csv_new_line"), "")
-        new_line = _t2108
-        _t2109 = self._extract_value_string(config.get("csv_delimiter"), ",")
-        delimiter = _t2109
-        _t2110 = self._extract_value_string(config.get("csv_quotechar"), '"')
-        quotechar = _t2110
-        _t2111 = self._extract_value_string(config.get("csv_escapechar"), '"')
-        escapechar = _t2111
-        _t2112 = self._extract_value_string(config.get("csv_comment"), "")
-        comment = _t2112
-        _t2113 = self._extract_value_string_list(config.get("csv_missing_strings"), [])
-        missing_strings = _t2113
-        _t2114 = self._extract_value_string(config.get("csv_decimal_separator"), ".")
-        decimal_separator = _t2114
-        _t2115 = self._extract_value_string(config.get("csv_encoding"), "utf-8")
-        encoding = _t2115
-        _t2116 = self._extract_value_string(config.get("csv_compression"), "")
-        compression = _t2116
-        _t2117 = self._extract_value_int64(config.get("csv_partition_size_mb"), 0)
-        partition_size_mb = _t2117
-        _t2118 = self.construct_csv_storage_integration(storage_integration_opt)
-        storage_integration = _t2118
-        _t2119 = logic_pb2.CSVConfig(header_row=header_row, skip=skip, new_line=new_line, delimiter=delimiter, quotechar=quotechar, escapechar=escapechar, comment=comment, missing_strings=missing_strings, decimal_separator=decimal_separator, encoding=encoding, compression=compression, partition_size_mb=partition_size_mb, storage_integration=storage_integration)
-        return _t2119
+        _t2213 = self._extract_value_int32(config.get("csv_header_row"), 1)
+        header_row = _t2213
+        _t2214 = self._extract_value_int64(config.get("csv_skip"), 0)
+        skip = _t2214
+        _t2215 = self._extract_value_string(config.get("csv_new_line"), "")
+        new_line = _t2215
+        _t2216 = self._extract_value_string(config.get("csv_delimiter"), ",")
+        delimiter = _t2216
+        _t2217 = self._extract_value_string(config.get("csv_quotechar"), '"')
+        quotechar = _t2217
+        _t2218 = self._extract_value_string(config.get("csv_escapechar"), '"')
+        escapechar = _t2218
+        _t2219 = self._extract_value_string(config.get("csv_comment"), "")
+        comment = _t2219
+        _t2220 = self._extract_value_string_list(config.get("csv_missing_strings"), [])
+        missing_strings = _t2220
+        _t2221 = self._extract_value_string(config.get("csv_decimal_separator"), ".")
+        decimal_separator = _t2221
+        _t2222 = self._extract_value_string(config.get("csv_encoding"), "utf-8")
+        encoding = _t2222
+        _t2223 = self._extract_value_string(config.get("csv_compression"), "")
+        compression = _t2223
+        _t2224 = self._extract_value_int64(config.get("csv_partition_size_mb"), 0)
+        partition_size_mb = _t2224
+        _t2225 = self.construct_csv_storage_integration(storage_integration_opt)
+        storage_integration = _t2225
+        _t2226 = logic_pb2.CSVConfig(header_row=header_row, skip=skip, new_line=new_line, delimiter=delimiter, quotechar=quotechar, escapechar=escapechar, comment=comment, missing_strings=missing_strings, decimal_separator=decimal_separator, encoding=encoding, compression=compression, partition_size_mb=partition_size_mb, storage_integration=storage_integration)
+        return _t2226
 
     def construct_csv_storage_integration(self, storage_integration_opt: Sequence[tuple[str, logic_pb2.Value]] | None) -> logic_pb2.StorageIntegration | None:
         if storage_integration_opt is None:
             return None
         else:
-            _t2120 = None
+            _t2227 = None
         assert storage_integration_opt is not None
         config = dict(storage_integration_opt)
-        _t2121 = self._extract_value_string(config.get("provider"), "")
-        _t2122 = self._extract_value_string(config.get("azure_sas_token"), "")
-        _t2123 = self._extract_value_string(config.get("s3_region"), "")
-        _t2124 = self._extract_value_string(config.get("s3_access_key_id"), "")
-        _t2125 = self._extract_value_string(config.get("s3_secret_access_key"), "")
-        _t2126 = logic_pb2.StorageIntegration(provider=_t2121, azure_sas_token=_t2122, s3_region=_t2123, s3_access_key_id=_t2124, s3_secret_access_key=_t2125)
-        return _t2126
+        _t2228 = self._extract_value_string(config.get("provider"), "")
+        _t2229 = self._extract_value_string(config.get("azure_sas_token"), "")
+        _t2230 = self._extract_value_string(config.get("s3_region"), "")
+        _t2231 = self._extract_value_string(config.get("s3_access_key_id"), "")
+        _t2232 = self._extract_value_string(config.get("s3_secret_access_key"), "")
+        _t2233 = logic_pb2.StorageIntegration(provider=_t2228, azure_sas_token=_t2229, s3_region=_t2230, s3_access_key_id=_t2231, s3_secret_access_key=_t2232)
+        return _t2233
 
     def construct_betree_info(self, key_types: Sequence[logic_pb2.Type], value_types: Sequence[logic_pb2.Type], config_dict: Sequence[tuple[str, logic_pb2.Value]]) -> logic_pb2.BeTreeInfo:
         config = dict(config_dict)
-        _t2127 = self._try_extract_value_float64(config.get("betree_config_epsilon"))
-        epsilon = _t2127
-        _t2128 = self._try_extract_value_int64(config.get("betree_config_max_pivots"))
-        max_pivots = _t2128
-        _t2129 = self._try_extract_value_int64(config.get("betree_config_max_deltas"))
-        max_deltas = _t2129
-        _t2130 = self._try_extract_value_int64(config.get("betree_config_max_leaf"))
-        max_leaf = _t2130
-        _t2131 = logic_pb2.BeTreeConfig(epsilon=epsilon, max_pivots=max_pivots, max_deltas=max_deltas, max_leaf=max_leaf)
-        storage_config = _t2131
-        _t2132 = self._try_extract_value_uint128(config.get("betree_locator_root_pageid"))
-        root_pageid = _t2132
-        _t2133 = self._try_extract_value_bytes(config.get("betree_locator_inline_data"))
-        inline_data = _t2133
-        _t2134 = self._try_extract_value_int64(config.get("betree_locator_element_count"))
-        element_count = _t2134
-        _t2135 = self._try_extract_value_int64(config.get("betree_locator_tree_height"))
-        tree_height = _t2135
-        _t2136 = logic_pb2.BeTreeLocator(root_pageid=root_pageid, inline_data=inline_data, element_count=element_count, tree_height=tree_height)
-        relation_locator = _t2136
-        _t2137 = logic_pb2.BeTreeInfo(key_types=key_types, value_types=value_types, storage_config=storage_config, relation_locator=relation_locator)
-        return _t2137
+        _t2234 = self._try_extract_value_float64(config.get("betree_config_epsilon"))
+        epsilon = _t2234
+        _t2235 = self._try_extract_value_int64(config.get("betree_config_max_pivots"))
+        max_pivots = _t2235
+        _t2236 = self._try_extract_value_int64(config.get("betree_config_max_deltas"))
+        max_deltas = _t2236
+        _t2237 = self._try_extract_value_int64(config.get("betree_config_max_leaf"))
+        max_leaf = _t2237
+        _t2238 = logic_pb2.BeTreeConfig(epsilon=epsilon, max_pivots=max_pivots, max_deltas=max_deltas, max_leaf=max_leaf)
+        storage_config = _t2238
+        _t2239 = self._try_extract_value_uint128(config.get("betree_locator_root_pageid"))
+        root_pageid = _t2239
+        _t2240 = self._try_extract_value_bytes(config.get("betree_locator_inline_data"))
+        inline_data = _t2240
+        _t2241 = self._try_extract_value_int64(config.get("betree_locator_element_count"))
+        element_count = _t2241
+        _t2242 = self._try_extract_value_int64(config.get("betree_locator_tree_height"))
+        tree_height = _t2242
+        _t2243 = logic_pb2.BeTreeLocator(root_pageid=root_pageid, inline_data=inline_data, element_count=element_count, tree_height=tree_height)
+        relation_locator = _t2243
+        _t2244 = logic_pb2.BeTreeInfo(key_types=key_types, value_types=value_types, storage_config=storage_config, relation_locator=relation_locator)
+        return _t2244
 
     def default_configure(self) -> transactions_pb2.Configure:
-        _t2138 = transactions_pb2.IVMConfig(level=transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_OFF)
-        ivm_config = _t2138
-        _t2139 = transactions_pb2.Configure(semantics_version=0, ivm_config=ivm_config)
-        return _t2139
+        _t2245 = transactions_pb2.IVMConfig(level=transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_OFF)
+        ivm_config = _t2245
+        _t2246 = transactions_pb2.Configure(semantics_version=0, ivm_config=ivm_config)
+        return _t2246
 
     def construct_configure(self, config_dict: Sequence[tuple[str, logic_pb2.Value]]) -> transactions_pb2.Configure:
         config = dict(config_dict)
@@ -630,3376 +653,3520 @@ def construct_configure(self, config_dict: Sequence[tuple[str, logic_pb2.Value]]
                         maintenance_level = transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_ALL
                     else:
                         maintenance_level = transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_OFF
-        _t2140 = transactions_pb2.IVMConfig(level=maintenance_level)
-        ivm_config = _t2140
-        _t2141 = self._extract_value_int64(config.get("semantics_version"), 0)
-        semantics_version = _t2141
-        _t2142 = transactions_pb2.Configure(semantics_version=semantics_version, ivm_config=ivm_config)
-        return _t2142
+        _t2247 = transactions_pb2.IVMConfig(level=maintenance_level)
+        ivm_config = _t2247
+        _t2248 = self._extract_value_int64(config.get("semantics_version"), 0)
+        semantics_version = _t2248
+        _t2249 = transactions_pb2.Configure(semantics_version=semantics_version, ivm_config=ivm_config)
+        return _t2249
 
     def construct_export_csv_config(self, path: str, columns: Sequence[transactions_pb2.ExportCSVColumn], config_dict: Sequence[tuple[str, logic_pb2.Value]]) -> transactions_pb2.ExportCSVConfig:
         config = dict(config_dict)
-        _t2143 = self._extract_value_int64(config.get("partition_size"), 0)
-        partition_size = _t2143
-        _t2144 = self._extract_value_string(config.get("compression"), "")
-        compression = _t2144
-        _t2145 = self._extract_value_boolean(config.get("syntax_header_row"), True)
-        syntax_header_row = _t2145
-        _t2146 = self._extract_value_string(config.get("syntax_missing_string"), "")
-        syntax_missing_string = _t2146
-        _t2147 = self._extract_value_string(config.get("syntax_delim"), ",")
-        syntax_delim = _t2147
-        _t2148 = self._extract_value_string(config.get("syntax_quotechar"), '"')
-        syntax_quotechar = _t2148
-        _t2149 = self._extract_value_string(config.get("syntax_escapechar"), "\\")
-        syntax_escapechar = _t2149
-        _t2150 = transactions_pb2.ExportCSVConfig(path=path, data_columns=columns, partition_size=partition_size, compression=compression, syntax_header_row=syntax_header_row, syntax_missing_string=syntax_missing_string, syntax_delim=syntax_delim, syntax_quotechar=syntax_quotechar, syntax_escapechar=syntax_escapechar)
-        return _t2150
+        _t2250 = self._extract_value_int64(config.get("partition_size"), 0)
+        partition_size = _t2250
+        _t2251 = self._extract_value_string(config.get("compression"), "")
+        compression = _t2251
+        _t2252 = self._extract_value_boolean(config.get("syntax_header_row"), True)
+        syntax_header_row = _t2252
+        _t2253 = self._extract_value_string(config.get("syntax_missing_string"), "")
+        syntax_missing_string = _t2253
+        _t2254 = self._extract_value_string(config.get("syntax_delim"), ",")
+        syntax_delim = _t2254
+        _t2255 = self._extract_value_string(config.get("syntax_quotechar"), '"')
+        syntax_quotechar = _t2255
+        _t2256 = self._extract_value_string(config.get("syntax_escapechar"), "\\")
+        syntax_escapechar = _t2256
+        _t2257 = transactions_pb2.ExportCSVConfig(path=path, data_columns=columns, partition_size=partition_size, compression=compression, syntax_header_row=syntax_header_row, syntax_missing_string=syntax_missing_string, syntax_delim=syntax_delim, syntax_quotechar=syntax_quotechar, syntax_escapechar=syntax_escapechar)
+        return _t2257
 
     def construct_export_csv_config_with_source(self, path: str, csv_source: transactions_pb2.ExportCSVSource, csv_config: logic_pb2.CSVConfig) -> transactions_pb2.ExportCSVConfig:
-        _t2151 = transactions_pb2.ExportCSVConfig(path=path, csv_source=csv_source, csv_config=csv_config)
-        return _t2151
+        _t2258 = transactions_pb2.ExportCSVConfig(path=path, csv_source=csv_source, csv_config=csv_config)
+        return _t2258
 
     def construct_iceberg_catalog_config(self, catalog_uri: str, scope_opt: str | None, property_pairs: Sequence[tuple[str, str]], auth_property_pairs: Sequence[tuple[str, str]]) -> logic_pb2.IcebergCatalogConfig:
         props = dict(property_pairs)
         auth_props = dict(auth_property_pairs)
-        _t2152 = logic_pb2.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(scope_opt if scope_opt is not None else ""), properties=props, auth_properties=auth_props)
-        return _t2152
+        _t2259 = logic_pb2.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(scope_opt if scope_opt is not None else ""), properties=props, auth_properties=auth_props)
+        return _t2259
 
     def construct_iceberg_data(self, locator: logic_pb2.IcebergLocator, config: logic_pb2.IcebergCatalogConfig, columns: Sequence[logic_pb2.GNFColumn], from_snapshot_opt: str | None, to_snapshot_opt: str | None, returns_delta: bool) -> logic_pb2.IcebergData:
-        _t2153 = logic_pb2.IcebergData(locator=locator, config=config, columns=columns, from_snapshot=(from_snapshot_opt if from_snapshot_opt is not None else ""), to_snapshot=(to_snapshot_opt if to_snapshot_opt is not None else ""), returns_delta=returns_delta)
-        return _t2153
+        _t2260 = logic_pb2.IcebergData(locator=locator, config=config, columns=columns, from_snapshot=(from_snapshot_opt if from_snapshot_opt is not None else ""), to_snapshot=(to_snapshot_opt if to_snapshot_opt is not None else ""), returns_delta=returns_delta)
+        return _t2260
 
     def construct_export_iceberg_config_full(self, locator: logic_pb2.IcebergLocator, config: logic_pb2.IcebergCatalogConfig, table_def: logic_pb2.RelationId, table_property_pairs: Sequence[tuple[str, str]], config_dict: Sequence[tuple[str, logic_pb2.Value]] | None) -> transactions_pb2.ExportIcebergConfig:
         cfg = dict((config_dict if config_dict is not None else []))
-        _t2154 = self._extract_value_string(cfg.get("prefix"), "")
-        prefix = _t2154
-        _t2155 = self._extract_value_int64(cfg.get("target_file_size_bytes"), 0)
-        target_file_size_bytes = _t2155
-        _t2156 = self._extract_value_string(cfg.get("compression"), "")
-        compression = _t2156
+        _t2261 = self._extract_value_string(cfg.get("prefix"), "")
+        prefix = _t2261
+        _t2262 = self._extract_value_int64(cfg.get("target_file_size_bytes"), 0)
+        target_file_size_bytes = _t2262
+        _t2263 = self._extract_value_string(cfg.get("compression"), "")
+        compression = _t2263
         table_props = dict(table_property_pairs)
-        _t2157 = transactions_pb2.ExportIcebergConfig(locator=locator, config=config, table_def=table_def, prefix=prefix, target_file_size_bytes=target_file_size_bytes, compression=compression, table_properties=table_props)
-        return _t2157
+        _t2264 = transactions_pb2.ExportIcebergConfig(locator=locator, config=config, table_def=table_def, prefix=prefix, target_file_size_bytes=target_file_size_bytes, compression=compression, table_properties=table_props)
+        return _t2264
 
     # --- Parse methods ---
 
     def parse_transaction(self) -> transactions_pb2.Transaction:
-        span_start673 = self.span_start()
+        span_start710 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("transaction")
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("configure", 1)):
-            _t1335 = self.parse_configure()
-            _t1334 = _t1335
+            _t1409 = self.parse_configure()
+            _t1408 = _t1409
         else:
-            _t1334 = None
-        configure667 = _t1334
+            _t1408 = None
+        configure704 = _t1408
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("sync", 1)):
-            _t1337 = self.parse_sync()
-            _t1336 = _t1337
-        else:
-            _t1336 = None
-        sync668 = _t1336
-        xs669 = []
-        cond670 = self.match_lookahead_literal("(", 0)
-        while cond670:
-            _t1338 = self.parse_epoch()
-            item671 = _t1338
-            xs669.append(item671)
-            cond670 = self.match_lookahead_literal("(", 0)
-        epochs672 = xs669
-        self.consume_literal(")")
-        _t1339 = self.default_configure()
-        _t1340 = transactions_pb2.Transaction(epochs=epochs672, configure=(configure667 if configure667 is not None else _t1339), sync=sync668)
-        result674 = _t1340
-        self.record_span(span_start673, "Transaction")
-        return result674
+            _t1411 = self.parse_sync()
+            _t1410 = _t1411
+        else:
+            _t1410 = None
+        sync705 = _t1410
+        xs706 = []
+        cond707 = self.match_lookahead_literal("(", 0)
+        while cond707:
+            _t1412 = self.parse_epoch()
+            item708 = _t1412
+            xs706.append(item708)
+            cond707 = self.match_lookahead_literal("(", 0)
+        epochs709 = xs706
+        self.consume_literal(")")
+        _t1413 = self.default_configure()
+        _t1414 = transactions_pb2.Transaction(epochs=epochs709, configure=(configure704 if configure704 is not None else _t1413), sync=sync705)
+        result711 = _t1414
+        self.record_span(span_start710, "Transaction")
+        return result711
 
     def parse_configure(self) -> transactions_pb2.Configure:
-        span_start676 = self.span_start()
+        span_start713 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("configure")
-        _t1341 = self.parse_config_dict()
-        config_dict675 = _t1341
+        _t1415 = self.parse_config_dict()
+        config_dict712 = _t1415
         self.consume_literal(")")
-        _t1342 = self.construct_configure(config_dict675)
-        result677 = _t1342
-        self.record_span(span_start676, "Configure")
-        return result677
+        _t1416 = self.construct_configure(config_dict712)
+        result714 = _t1416
+        self.record_span(span_start713, "Configure")
+        return result714
 
     def parse_config_dict(self) -> Sequence[tuple[str, logic_pb2.Value]]:
         self.consume_literal("{")
-        xs678 = []
-        cond679 = self.match_lookahead_literal(":", 0)
-        while cond679:
-            _t1343 = self.parse_config_key_value()
-            item680 = _t1343
-            xs678.append(item680)
-            cond679 = self.match_lookahead_literal(":", 0)
-        config_key_values681 = xs678
+        xs715 = []
+        cond716 = self.match_lookahead_literal(":", 0)
+        while cond716:
+            _t1417 = self.parse_config_key_value()
+            item717 = _t1417
+            xs715.append(item717)
+            cond716 = self.match_lookahead_literal(":", 0)
+        config_key_values718 = xs715
         self.consume_literal("}")
-        return config_key_values681
+        return config_key_values718
 
     def parse_config_key_value(self) -> tuple[str, logic_pb2.Value]:
         self.consume_literal(":")
-        symbol682 = self.consume_terminal("SYMBOL")
-        _t1344 = self.parse_raw_value()
-        raw_value683 = _t1344
-        return (symbol682, raw_value683,)
+        symbol719 = self.consume_terminal("SYMBOL")
+        _t1418 = self.parse_raw_value()
+        raw_value720 = _t1418
+        return (symbol719, raw_value720,)
 
     def parse_raw_value(self) -> logic_pb2.Value:
-        span_start697 = self.span_start()
+        span_start734 = self.span_start()
         if self.match_lookahead_literal("true", 0):
-            _t1345 = 12
+            _t1419 = 12
         else:
             if self.match_lookahead_literal("missing", 0):
-                _t1346 = 11
+                _t1420 = 11
             else:
                 if self.match_lookahead_literal("false", 0):
-                    _t1347 = 12
+                    _t1421 = 12
                 else:
                     if self.match_lookahead_literal("(", 0):
                         if self.match_lookahead_literal("datetime", 1):
-                            _t1349 = 1
+                            _t1423 = 1
                         else:
                             if self.match_lookahead_literal("date", 1):
-                                _t1350 = 0
+                                _t1424 = 0
                             else:
-                                _t1350 = -1
-                            _t1349 = _t1350
-                        _t1348 = _t1349
+                                _t1424 = -1
+                            _t1423 = _t1424
+                        _t1422 = _t1423
                     else:
                         if self.match_lookahead_terminal("UINT32", 0):
-                            _t1351 = 7
+                            _t1425 = 7
                         else:
                             if self.match_lookahead_terminal("UINT128", 0):
-                                _t1352 = 8
+                                _t1426 = 8
                             else:
                                 if self.match_lookahead_terminal("STRING", 0):
-                                    _t1353 = 2
+                                    _t1427 = 2
                                 else:
                                     if self.match_lookahead_terminal("INT32", 0):
-                                        _t1354 = 3
+                                        _t1428 = 3
                                     else:
                                         if self.match_lookahead_terminal("INT128", 0):
-                                            _t1355 = 9
+                                            _t1429 = 9
                                         else:
                                             if self.match_lookahead_terminal("INT", 0):
-                                                _t1356 = 4
+                                                _t1430 = 4
                                             else:
                                                 if self.match_lookahead_terminal("FLOAT32", 0):
-                                                    _t1357 = 5
+                                                    _t1431 = 5
                                                 else:
                                                     if self.match_lookahead_terminal("FLOAT", 0):
-                                                        _t1358 = 6
+                                                        _t1432 = 6
                                                     else:
                                                         if self.match_lookahead_terminal("DECIMAL", 0):
-                                                            _t1359 = 10
+                                                            _t1433 = 10
                                                         else:
-                                                            _t1359 = -1
-                                                        _t1358 = _t1359
-                                                    _t1357 = _t1358
-                                                _t1356 = _t1357
-                                            _t1355 = _t1356
-                                        _t1354 = _t1355
-                                    _t1353 = _t1354
-                                _t1352 = _t1353
-                            _t1351 = _t1352
-                        _t1348 = _t1351
-                    _t1347 = _t1348
-                _t1346 = _t1347
-            _t1345 = _t1346
-        prediction684 = _t1345
-        if prediction684 == 12:
-            _t1361 = self.parse_boolean_value()
-            boolean_value696 = _t1361
-            _t1362 = logic_pb2.Value(boolean_value=boolean_value696)
-            _t1360 = _t1362
-        else:
-            if prediction684 == 11:
+                                                            _t1433 = -1
+                                                        _t1432 = _t1433
+                                                    _t1431 = _t1432
+                                                _t1430 = _t1431
+                                            _t1429 = _t1430
+                                        _t1428 = _t1429
+                                    _t1427 = _t1428
+                                _t1426 = _t1427
+                            _t1425 = _t1426
+                        _t1422 = _t1425
+                    _t1421 = _t1422
+                _t1420 = _t1421
+            _t1419 = _t1420
+        prediction721 = _t1419
+        if prediction721 == 12:
+            _t1435 = self.parse_boolean_value()
+            boolean_value733 = _t1435
+            _t1436 = logic_pb2.Value(boolean_value=boolean_value733)
+            _t1434 = _t1436
+        else:
+            if prediction721 == 11:
                 self.consume_literal("missing")
-                _t1364 = logic_pb2.MissingValue()
-                _t1365 = logic_pb2.Value(missing_value=_t1364)
-                _t1363 = _t1365
+                _t1438 = logic_pb2.MissingValue()
+                _t1439 = logic_pb2.Value(missing_value=_t1438)
+                _t1437 = _t1439
             else:
-                if prediction684 == 10:
-                    decimal695 = self.consume_terminal("DECIMAL")
-                    _t1367 = logic_pb2.Value(decimal_value=decimal695)
-                    _t1366 = _t1367
+                if prediction721 == 10:
+                    decimal732 = self.consume_terminal("DECIMAL")
+                    _t1441 = logic_pb2.Value(decimal_value=decimal732)
+                    _t1440 = _t1441
                 else:
-                    if prediction684 == 9:
-                        int128694 = self.consume_terminal("INT128")
-                        _t1369 = logic_pb2.Value(int128_value=int128694)
-                        _t1368 = _t1369
+                    if prediction721 == 9:
+                        int128731 = self.consume_terminal("INT128")
+                        _t1443 = logic_pb2.Value(int128_value=int128731)
+                        _t1442 = _t1443
                     else:
-                        if prediction684 == 8:
-                            uint128693 = self.consume_terminal("UINT128")
-                            _t1371 = logic_pb2.Value(uint128_value=uint128693)
-                            _t1370 = _t1371
+                        if prediction721 == 8:
+                            uint128730 = self.consume_terminal("UINT128")
+                            _t1445 = logic_pb2.Value(uint128_value=uint128730)
+                            _t1444 = _t1445
                         else:
-                            if prediction684 == 7:
-                                uint32692 = self.consume_terminal("UINT32")
-                                _t1373 = logic_pb2.Value(uint32_value=uint32692)
-                                _t1372 = _t1373
+                            if prediction721 == 7:
+                                uint32729 = self.consume_terminal("UINT32")
+                                _t1447 = logic_pb2.Value(uint32_value=uint32729)
+                                _t1446 = _t1447
                             else:
-                                if prediction684 == 6:
-                                    float691 = self.consume_terminal("FLOAT")
-                                    _t1375 = logic_pb2.Value(float_value=float691)
-                                    _t1374 = _t1375
+                                if prediction721 == 6:
+                                    float728 = self.consume_terminal("FLOAT")
+                                    _t1449 = logic_pb2.Value(float_value=float728)
+                                    _t1448 = _t1449
                                 else:
-                                    if prediction684 == 5:
-                                        float32690 = self.consume_terminal("FLOAT32")
-                                        _t1377 = logic_pb2.Value(float32_value=float32690)
-                                        _t1376 = _t1377
+                                    if prediction721 == 5:
+                                        float32727 = self.consume_terminal("FLOAT32")
+                                        _t1451 = logic_pb2.Value(float32_value=float32727)
+                                        _t1450 = _t1451
                                     else:
-                                        if prediction684 == 4:
-                                            int689 = self.consume_terminal("INT")
-                                            _t1379 = logic_pb2.Value(int_value=int689)
-                                            _t1378 = _t1379
+                                        if prediction721 == 4:
+                                            int726 = self.consume_terminal("INT")
+                                            _t1453 = logic_pb2.Value(int_value=int726)
+                                            _t1452 = _t1453
                                         else:
-                                            if prediction684 == 3:
-                                                int32688 = self.consume_terminal("INT32")
-                                                _t1381 = logic_pb2.Value(int32_value=int32688)
-                                                _t1380 = _t1381
+                                            if prediction721 == 3:
+                                                int32725 = self.consume_terminal("INT32")
+                                                _t1455 = logic_pb2.Value(int32_value=int32725)
+                                                _t1454 = _t1455
                                             else:
-                                                if prediction684 == 2:
-                                                    string687 = self.consume_terminal("STRING")
-                                                    _t1383 = logic_pb2.Value(string_value=string687)
-                                                    _t1382 = _t1383
+                                                if prediction721 == 2:
+                                                    string724 = self.consume_terminal("STRING")
+                                                    _t1457 = logic_pb2.Value(string_value=string724)
+                                                    _t1456 = _t1457
                                                 else:
-                                                    if prediction684 == 1:
-                                                        _t1385 = self.parse_raw_datetime()
-                                                        raw_datetime686 = _t1385
-                                                        _t1386 = logic_pb2.Value(datetime_value=raw_datetime686)
-                                                        _t1384 = _t1386
+                                                    if prediction721 == 1:
+                                                        _t1459 = self.parse_raw_datetime()
+                                                        raw_datetime723 = _t1459
+                                                        _t1460 = logic_pb2.Value(datetime_value=raw_datetime723)
+                                                        _t1458 = _t1460
                                                     else:
-                                                        if prediction684 == 0:
-                                                            _t1388 = self.parse_raw_date()
-                                                            raw_date685 = _t1388
-                                                            _t1389 = logic_pb2.Value(date_value=raw_date685)
-                                                            _t1387 = _t1389
+                                                        if prediction721 == 0:
+                                                            _t1462 = self.parse_raw_date()
+                                                            raw_date722 = _t1462
+                                                            _t1463 = logic_pb2.Value(date_value=raw_date722)
+                                                            _t1461 = _t1463
                                                         else:
                                                             raise ParseError("Unexpected token in raw_value" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                                        _t1384 = _t1387
-                                                    _t1382 = _t1384
-                                                _t1380 = _t1382
-                                            _t1378 = _t1380
-                                        _t1376 = _t1378
-                                    _t1374 = _t1376
-                                _t1372 = _t1374
-                            _t1370 = _t1372
-                        _t1368 = _t1370
-                    _t1366 = _t1368
-                _t1363 = _t1366
-            _t1360 = _t1363
-        result698 = _t1360
-        self.record_span(span_start697, "Value")
-        return result698
+                                                        _t1458 = _t1461
+                                                    _t1456 = _t1458
+                                                _t1454 = _t1456
+                                            _t1452 = _t1454
+                                        _t1450 = _t1452
+                                    _t1448 = _t1450
+                                _t1446 = _t1448
+                            _t1444 = _t1446
+                        _t1442 = _t1444
+                    _t1440 = _t1442
+                _t1437 = _t1440
+            _t1434 = _t1437
+        result735 = _t1434
+        self.record_span(span_start734, "Value")
+        return result735
 
     def parse_raw_date(self) -> logic_pb2.DateValue:
-        span_start702 = self.span_start()
+        span_start739 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("date")
-        int699 = self.consume_terminal("INT")
-        int_3700 = self.consume_terminal("INT")
-        int_4701 = self.consume_terminal("INT")
+        int736 = self.consume_terminal("INT")
+        int_3737 = self.consume_terminal("INT")
+        int_4738 = self.consume_terminal("INT")
         self.consume_literal(")")
-        _t1390 = logic_pb2.DateValue(year=int(int699), month=int(int_3700), day=int(int_4701))
-        result703 = _t1390
-        self.record_span(span_start702, "DateValue")
-        return result703
+        _t1464 = logic_pb2.DateValue(year=int(int736), month=int(int_3737), day=int(int_4738))
+        result740 = _t1464
+        self.record_span(span_start739, "DateValue")
+        return result740
 
     def parse_raw_datetime(self) -> logic_pb2.DateTimeValue:
-        span_start711 = self.span_start()
+        span_start748 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("datetime")
-        int704 = self.consume_terminal("INT")
-        int_3705 = self.consume_terminal("INT")
-        int_4706 = self.consume_terminal("INT")
-        int_5707 = self.consume_terminal("INT")
-        int_6708 = self.consume_terminal("INT")
-        int_7709 = self.consume_terminal("INT")
+        int741 = self.consume_terminal("INT")
+        int_3742 = self.consume_terminal("INT")
+        int_4743 = self.consume_terminal("INT")
+        int_5744 = self.consume_terminal("INT")
+        int_6745 = self.consume_terminal("INT")
+        int_7746 = self.consume_terminal("INT")
         if self.match_lookahead_terminal("INT", 0):
-            _t1391 = self.consume_terminal("INT")
+            _t1465 = self.consume_terminal("INT")
         else:
-            _t1391 = None
-        int_8710 = _t1391
+            _t1465 = None
+        int_8747 = _t1465
         self.consume_literal(")")
-        _t1392 = logic_pb2.DateTimeValue(year=int(int704), month=int(int_3705), day=int(int_4706), hour=int(int_5707), minute=int(int_6708), second=int(int_7709), microsecond=int((int_8710 if int_8710 is not None else 0)))
-        result712 = _t1392
-        self.record_span(span_start711, "DateTimeValue")
-        return result712
+        _t1466 = logic_pb2.DateTimeValue(year=int(int741), month=int(int_3742), day=int(int_4743), hour=int(int_5744), minute=int(int_6745), second=int(int_7746), microsecond=int((int_8747 if int_8747 is not None else 0)))
+        result749 = _t1466
+        self.record_span(span_start748, "DateTimeValue")
+        return result749
 
     def parse_boolean_value(self) -> bool:
         if self.match_lookahead_literal("true", 0):
-            _t1393 = 0
+            _t1467 = 0
         else:
             if self.match_lookahead_literal("false", 0):
-                _t1394 = 1
+                _t1468 = 1
             else:
-                _t1394 = -1
-            _t1393 = _t1394
-        prediction713 = _t1393
-        if prediction713 == 1:
+                _t1468 = -1
+            _t1467 = _t1468
+        prediction750 = _t1467
+        if prediction750 == 1:
             self.consume_literal("false")
-            _t1395 = False
+            _t1469 = False
         else:
-            if prediction713 == 0:
+            if prediction750 == 0:
                 self.consume_literal("true")
-                _t1396 = True
+                _t1470 = True
             else:
                 raise ParseError("Unexpected token in boolean_value" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1395 = _t1396
-        return _t1395
+            _t1469 = _t1470
+        return _t1469
 
     def parse_sync(self) -> transactions_pb2.Sync:
-        span_start718 = self.span_start()
+        span_start755 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("sync")
-        xs714 = []
-        cond715 = self.match_lookahead_literal(":", 0)
-        while cond715:
-            _t1397 = self.parse_fragment_id()
-            item716 = _t1397
-            xs714.append(item716)
-            cond715 = self.match_lookahead_literal(":", 0)
-        fragment_ids717 = xs714
-        self.consume_literal(")")
-        _t1398 = transactions_pb2.Sync(fragments=fragment_ids717)
-        result719 = _t1398
-        self.record_span(span_start718, "Sync")
-        return result719
+        xs751 = []
+        cond752 = self.match_lookahead_literal(":", 0)
+        while cond752:
+            _t1471 = self.parse_fragment_id()
+            item753 = _t1471
+            xs751.append(item753)
+            cond752 = self.match_lookahead_literal(":", 0)
+        fragment_ids754 = xs751
+        self.consume_literal(")")
+        _t1472 = transactions_pb2.Sync(fragments=fragment_ids754)
+        result756 = _t1472
+        self.record_span(span_start755, "Sync")
+        return result756
 
     def parse_fragment_id(self) -> fragments_pb2.FragmentId:
-        span_start721 = self.span_start()
+        span_start758 = self.span_start()
         self.consume_literal(":")
-        symbol720 = self.consume_terminal("SYMBOL")
-        result722 = fragments_pb2.FragmentId(id=symbol720.encode())
-        self.record_span(span_start721, "FragmentId")
-        return result722
+        symbol757 = self.consume_terminal("SYMBOL")
+        result759 = fragments_pb2.FragmentId(id=symbol757.encode())
+        self.record_span(span_start758, "FragmentId")
+        return result759
 
     def parse_epoch(self) -> transactions_pb2.Epoch:
-        span_start725 = self.span_start()
+        span_start762 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("epoch")
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("writes", 1)):
-            _t1400 = self.parse_epoch_writes()
-            _t1399 = _t1400
+            _t1474 = self.parse_epoch_writes()
+            _t1473 = _t1474
         else:
-            _t1399 = None
-        epoch_writes723 = _t1399
+            _t1473 = None
+        epoch_writes760 = _t1473
         if self.match_lookahead_literal("(", 0):
-            _t1402 = self.parse_epoch_reads()
-            _t1401 = _t1402
+            _t1476 = self.parse_epoch_reads()
+            _t1475 = _t1476
         else:
-            _t1401 = None
-        epoch_reads724 = _t1401
+            _t1475 = None
+        epoch_reads761 = _t1475
         self.consume_literal(")")
-        _t1403 = transactions_pb2.Epoch(writes=(epoch_writes723 if epoch_writes723 is not None else []), reads=(epoch_reads724 if epoch_reads724 is not None else []))
-        result726 = _t1403
-        self.record_span(span_start725, "Epoch")
-        return result726
+        _t1477 = transactions_pb2.Epoch(writes=(epoch_writes760 if epoch_writes760 is not None else []), reads=(epoch_reads761 if epoch_reads761 is not None else []))
+        result763 = _t1477
+        self.record_span(span_start762, "Epoch")
+        return result763
 
     def parse_epoch_writes(self) -> Sequence[transactions_pb2.Write]:
         self.consume_literal("(")
         self.consume_literal("writes")
-        xs727 = []
-        cond728 = self.match_lookahead_literal("(", 0)
-        while cond728:
-            _t1404 = self.parse_write()
-            item729 = _t1404
-            xs727.append(item729)
-            cond728 = self.match_lookahead_literal("(", 0)
-        writes730 = xs727
+        xs764 = []
+        cond765 = self.match_lookahead_literal("(", 0)
+        while cond765:
+            _t1478 = self.parse_write()
+            item766 = _t1478
+            xs764.append(item766)
+            cond765 = self.match_lookahead_literal("(", 0)
+        writes767 = xs764
         self.consume_literal(")")
-        return writes730
+        return writes767
 
     def parse_write(self) -> transactions_pb2.Write:
-        span_start736 = self.span_start()
+        span_start773 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("undefine", 1):
-                _t1406 = 1
+                _t1480 = 1
             else:
                 if self.match_lookahead_literal("snapshot", 1):
-                    _t1407 = 3
+                    _t1481 = 3
                 else:
                     if self.match_lookahead_literal("define", 1):
-                        _t1408 = 0
+                        _t1482 = 0
                     else:
                         if self.match_lookahead_literal("context", 1):
-                            _t1409 = 2
+                            _t1483 = 2
                         else:
-                            _t1409 = -1
-                        _t1408 = _t1409
-                    _t1407 = _t1408
-                _t1406 = _t1407
-            _t1405 = _t1406
-        else:
-            _t1405 = -1
-        prediction731 = _t1405
-        if prediction731 == 3:
-            _t1411 = self.parse_snapshot()
-            snapshot735 = _t1411
-            _t1412 = transactions_pb2.Write(snapshot=snapshot735)
-            _t1410 = _t1412
-        else:
-            if prediction731 == 2:
-                _t1414 = self.parse_context()
-                context734 = _t1414
-                _t1415 = transactions_pb2.Write(context=context734)
-                _t1413 = _t1415
+                            _t1483 = -1
+                        _t1482 = _t1483
+                    _t1481 = _t1482
+                _t1480 = _t1481
+            _t1479 = _t1480
+        else:
+            _t1479 = -1
+        prediction768 = _t1479
+        if prediction768 == 3:
+            _t1485 = self.parse_snapshot()
+            snapshot772 = _t1485
+            _t1486 = transactions_pb2.Write(snapshot=snapshot772)
+            _t1484 = _t1486
+        else:
+            if prediction768 == 2:
+                _t1488 = self.parse_context()
+                context771 = _t1488
+                _t1489 = transactions_pb2.Write(context=context771)
+                _t1487 = _t1489
             else:
-                if prediction731 == 1:
-                    _t1417 = self.parse_undefine()
-                    undefine733 = _t1417
-                    _t1418 = transactions_pb2.Write(undefine=undefine733)
-                    _t1416 = _t1418
+                if prediction768 == 1:
+                    _t1491 = self.parse_undefine()
+                    undefine770 = _t1491
+                    _t1492 = transactions_pb2.Write(undefine=undefine770)
+                    _t1490 = _t1492
                 else:
-                    if prediction731 == 0:
-                        _t1420 = self.parse_define()
-                        define732 = _t1420
-                        _t1421 = transactions_pb2.Write(define=define732)
-                        _t1419 = _t1421
+                    if prediction768 == 0:
+                        _t1494 = self.parse_define()
+                        define769 = _t1494
+                        _t1495 = transactions_pb2.Write(define=define769)
+                        _t1493 = _t1495
                     else:
                         raise ParseError("Unexpected token in write" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                    _t1416 = _t1419
-                _t1413 = _t1416
-            _t1410 = _t1413
-        result737 = _t1410
-        self.record_span(span_start736, "Write")
-        return result737
+                    _t1490 = _t1493
+                _t1487 = _t1490
+            _t1484 = _t1487
+        result774 = _t1484
+        self.record_span(span_start773, "Write")
+        return result774
 
     def parse_define(self) -> transactions_pb2.Define:
-        span_start739 = self.span_start()
+        span_start776 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("define")
-        _t1422 = self.parse_fragment()
-        fragment738 = _t1422
+        _t1496 = self.parse_fragment()
+        fragment775 = _t1496
         self.consume_literal(")")
-        _t1423 = transactions_pb2.Define(fragment=fragment738)
-        result740 = _t1423
-        self.record_span(span_start739, "Define")
-        return result740
+        _t1497 = transactions_pb2.Define(fragment=fragment775)
+        result777 = _t1497
+        self.record_span(span_start776, "Define")
+        return result777
 
     def parse_fragment(self) -> fragments_pb2.Fragment:
-        span_start746 = self.span_start()
+        span_start783 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("fragment")
-        _t1424 = self.parse_new_fragment_id()
-        new_fragment_id741 = _t1424
-        xs742 = []
-        cond743 = self.match_lookahead_literal("(", 0)
-        while cond743:
-            _t1425 = self.parse_declaration()
-            item744 = _t1425
-            xs742.append(item744)
-            cond743 = self.match_lookahead_literal("(", 0)
-        declarations745 = xs742
-        self.consume_literal(")")
-        result747 = self.construct_fragment(new_fragment_id741, declarations745)
-        self.record_span(span_start746, "Fragment")
-        return result747
+        _t1498 = self.parse_new_fragment_id()
+        new_fragment_id778 = _t1498
+        xs779 = []
+        cond780 = self.match_lookahead_literal("(", 0)
+        while cond780:
+            _t1499 = self.parse_declaration()
+            item781 = _t1499
+            xs779.append(item781)
+            cond780 = self.match_lookahead_literal("(", 0)
+        declarations782 = xs779
+        self.consume_literal(")")
+        result784 = self.construct_fragment(new_fragment_id778, declarations782)
+        self.record_span(span_start783, "Fragment")
+        return result784
 
     def parse_new_fragment_id(self) -> fragments_pb2.FragmentId:
-        span_start749 = self.span_start()
-        _t1426 = self.parse_fragment_id()
-        fragment_id748 = _t1426
-        self.start_fragment(fragment_id748)
-        result750 = fragment_id748
-        self.record_span(span_start749, "FragmentId")
-        return result750
+        span_start786 = self.span_start()
+        _t1500 = self.parse_fragment_id()
+        fragment_id785 = _t1500
+        self.start_fragment(fragment_id785)
+        result787 = fragment_id785
+        self.record_span(span_start786, "FragmentId")
+        return result787
 
     def parse_declaration(self) -> logic_pb2.Declaration:
-        span_start756 = self.span_start()
+        span_start793 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("iceberg_data", 1):
-                _t1428 = 3
+                _t1502 = 3
             else:
                 if self.match_lookahead_literal("functional_dependency", 1):
-                    _t1429 = 2
+                    _t1503 = 2
                 else:
                     if self.match_lookahead_literal("edb", 1):
-                        _t1430 = 3
+                        _t1504 = 3
                     else:
                         if self.match_lookahead_literal("def", 1):
-                            _t1431 = 0
+                            _t1505 = 0
                         else:
                             if self.match_lookahead_literal("csv_data", 1):
-                                _t1432 = 3
+                                _t1506 = 3
                             else:
                                 if self.match_lookahead_literal("betree_relation", 1):
-                                    _t1433 = 3
+                                    _t1507 = 3
                                 else:
                                     if self.match_lookahead_literal("algorithm", 1):
-                                        _t1434 = 1
+                                        _t1508 = 1
                                     else:
-                                        _t1434 = -1
-                                    _t1433 = _t1434
-                                _t1432 = _t1433
-                            _t1431 = _t1432
-                        _t1430 = _t1431
-                    _t1429 = _t1430
-                _t1428 = _t1429
-            _t1427 = _t1428
-        else:
-            _t1427 = -1
-        prediction751 = _t1427
-        if prediction751 == 3:
-            _t1436 = self.parse_data()
-            data755 = _t1436
-            _t1437 = logic_pb2.Declaration(data=data755)
-            _t1435 = _t1437
-        else:
-            if prediction751 == 2:
-                _t1439 = self.parse_constraint()
-                constraint754 = _t1439
-                _t1440 = logic_pb2.Declaration(constraint=constraint754)
-                _t1438 = _t1440
+                                        _t1508 = -1
+                                    _t1507 = _t1508
+                                _t1506 = _t1507
+                            _t1505 = _t1506
+                        _t1504 = _t1505
+                    _t1503 = _t1504
+                _t1502 = _t1503
+            _t1501 = _t1502
+        else:
+            _t1501 = -1
+        prediction788 = _t1501
+        if prediction788 == 3:
+            _t1510 = self.parse_data()
+            data792 = _t1510
+            _t1511 = logic_pb2.Declaration(data=data792)
+            _t1509 = _t1511
+        else:
+            if prediction788 == 2:
+                _t1513 = self.parse_constraint()
+                constraint791 = _t1513
+                _t1514 = logic_pb2.Declaration(constraint=constraint791)
+                _t1512 = _t1514
             else:
-                if prediction751 == 1:
-                    _t1442 = self.parse_algorithm()
-                    algorithm753 = _t1442
-                    _t1443 = logic_pb2.Declaration(algorithm=algorithm753)
-                    _t1441 = _t1443
+                if prediction788 == 1:
+                    _t1516 = self.parse_algorithm()
+                    algorithm790 = _t1516
+                    _t1517 = logic_pb2.Declaration(algorithm=algorithm790)
+                    _t1515 = _t1517
                 else:
-                    if prediction751 == 0:
-                        _t1445 = self.parse_def()
-                        def752 = _t1445
-                        _t1446 = logic_pb2.Declaration()
-                        getattr(_t1446, 'def').CopyFrom(def752)
-                        _t1444 = _t1446
+                    if prediction788 == 0:
+                        _t1519 = self.parse_def()
+                        def789 = _t1519
+                        _t1520 = logic_pb2.Declaration()
+                        getattr(_t1520, 'def').CopyFrom(def789)
+                        _t1518 = _t1520
                     else:
                         raise ParseError("Unexpected token in declaration" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                    _t1441 = _t1444
-                _t1438 = _t1441
-            _t1435 = _t1438
-        result757 = _t1435
-        self.record_span(span_start756, "Declaration")
-        return result757
+                    _t1515 = _t1518
+                _t1512 = _t1515
+            _t1509 = _t1512
+        result794 = _t1509
+        self.record_span(span_start793, "Declaration")
+        return result794
 
     def parse_def(self) -> logic_pb2.Def:
-        span_start761 = self.span_start()
+        span_start798 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("def")
-        _t1447 = self.parse_relation_id()
-        relation_id758 = _t1447
-        _t1448 = self.parse_abstraction()
-        abstraction759 = _t1448
+        _t1521 = self.parse_relation_id()
+        relation_id795 = _t1521
+        _t1522 = self.parse_abstraction()
+        abstraction796 = _t1522
         if self.match_lookahead_literal("(", 0):
-            _t1450 = self.parse_attrs()
-            _t1449 = _t1450
+            _t1524 = self.parse_attrs()
+            _t1523 = _t1524
         else:
-            _t1449 = None
-        attrs760 = _t1449
+            _t1523 = None
+        attrs797 = _t1523
         self.consume_literal(")")
-        _t1451 = logic_pb2.Def(name=relation_id758, body=abstraction759, attrs=(attrs760 if attrs760 is not None else []))
-        result762 = _t1451
-        self.record_span(span_start761, "Def")
-        return result762
+        _t1525 = logic_pb2.Def(name=relation_id795, body=abstraction796, attrs=(attrs797 if attrs797 is not None else []))
+        result799 = _t1525
+        self.record_span(span_start798, "Def")
+        return result799
 
     def parse_relation_id(self) -> logic_pb2.RelationId:
-        span_start766 = self.span_start()
+        span_start803 = self.span_start()
         if self.match_lookahead_literal(":", 0):
-            _t1452 = 0
+            _t1526 = 0
         else:
             if self.match_lookahead_terminal("UINT128", 0):
-                _t1453 = 1
+                _t1527 = 1
             else:
-                _t1453 = -1
-            _t1452 = _t1453
-        prediction763 = _t1452
-        if prediction763 == 1:
-            uint128765 = self.consume_terminal("UINT128")
-            _t1454 = logic_pb2.RelationId(id_low=uint128765.low, id_high=uint128765.high)
-        else:
-            if prediction763 == 0:
+                _t1527 = -1
+            _t1526 = _t1527
+        prediction800 = _t1526
+        if prediction800 == 1:
+            uint128802 = self.consume_terminal("UINT128")
+            _t1528 = logic_pb2.RelationId(id_low=uint128802.low, id_high=uint128802.high)
+        else:
+            if prediction800 == 0:
                 self.consume_literal(":")
-                symbol764 = self.consume_terminal("SYMBOL")
-                _t1455 = self.relation_id_from_string(symbol764)
+                symbol801 = self.consume_terminal("SYMBOL")
+                _t1529 = self.relation_id_from_string(symbol801)
             else:
                 raise ParseError("Unexpected token in relation_id" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1454 = _t1455
-        result767 = _t1454
-        self.record_span(span_start766, "RelationId")
-        return result767
+            _t1528 = _t1529
+        result804 = _t1528
+        self.record_span(span_start803, "RelationId")
+        return result804
 
     def parse_abstraction(self) -> logic_pb2.Abstraction:
-        span_start770 = self.span_start()
+        span_start807 = self.span_start()
         self.consume_literal("(")
-        _t1456 = self.parse_bindings()
-        bindings768 = _t1456
-        _t1457 = self.parse_formula()
-        formula769 = _t1457
+        _t1530 = self.parse_bindings()
+        bindings805 = _t1530
+        _t1531 = self.parse_formula()
+        formula806 = _t1531
         self.consume_literal(")")
-        _t1458 = logic_pb2.Abstraction(vars=(list(bindings768[0]) + list(bindings768[1] if bindings768[1] is not None else [])), value=formula769)
-        result771 = _t1458
-        self.record_span(span_start770, "Abstraction")
-        return result771
+        _t1532 = logic_pb2.Abstraction(vars=(list(bindings805[0]) + list(bindings805[1] if bindings805[1] is not None else [])), value=formula806)
+        result808 = _t1532
+        self.record_span(span_start807, "Abstraction")
+        return result808
 
     def parse_bindings(self) -> tuple[Sequence[logic_pb2.Binding], Sequence[logic_pb2.Binding]]:
         self.consume_literal("[")
-        xs772 = []
-        cond773 = self.match_lookahead_terminal("SYMBOL", 0)
-        while cond773:
-            _t1459 = self.parse_binding()
-            item774 = _t1459
-            xs772.append(item774)
-            cond773 = self.match_lookahead_terminal("SYMBOL", 0)
-        bindings775 = xs772
+        xs809 = []
+        cond810 = self.match_lookahead_terminal("SYMBOL", 0)
+        while cond810:
+            _t1533 = self.parse_binding()
+            item811 = _t1533
+            xs809.append(item811)
+            cond810 = self.match_lookahead_terminal("SYMBOL", 0)
+        bindings812 = xs809
         if self.match_lookahead_literal("|", 0):
-            _t1461 = self.parse_value_bindings()
-            _t1460 = _t1461
+            _t1535 = self.parse_value_bindings()
+            _t1534 = _t1535
         else:
-            _t1460 = None
-        value_bindings776 = _t1460
+            _t1534 = None
+        value_bindings813 = _t1534
         self.consume_literal("]")
-        return (bindings775, (value_bindings776 if value_bindings776 is not None else []),)
+        return (bindings812, (value_bindings813 if value_bindings813 is not None else []),)
 
     def parse_binding(self) -> logic_pb2.Binding:
-        span_start779 = self.span_start()
-        symbol777 = self.consume_terminal("SYMBOL")
+        span_start816 = self.span_start()
+        symbol814 = self.consume_terminal("SYMBOL")
         self.consume_literal("::")
-        _t1462 = self.parse_type()
-        type778 = _t1462
-        _t1463 = logic_pb2.Var(name=symbol777)
-        _t1464 = logic_pb2.Binding(var=_t1463, type=type778)
-        result780 = _t1464
-        self.record_span(span_start779, "Binding")
-        return result780
+        _t1536 = self.parse_type()
+        type815 = _t1536
+        _t1537 = logic_pb2.Var(name=symbol814)
+        _t1538 = logic_pb2.Binding(var=_t1537, type=type815)
+        result817 = _t1538
+        self.record_span(span_start816, "Binding")
+        return result817
 
     def parse_type(self) -> logic_pb2.Type:
-        span_start796 = self.span_start()
+        span_start833 = self.span_start()
         if self.match_lookahead_literal("UNKNOWN", 0):
-            _t1465 = 0
+            _t1539 = 0
         else:
             if self.match_lookahead_literal("UINT32", 0):
-                _t1466 = 13
+                _t1540 = 13
             else:
                 if self.match_lookahead_literal("UINT128", 0):
-                    _t1467 = 4
+                    _t1541 = 4
                 else:
                     if self.match_lookahead_literal("STRING", 0):
-                        _t1468 = 1
+                        _t1542 = 1
                     else:
                         if self.match_lookahead_literal("MISSING", 0):
-                            _t1469 = 8
+                            _t1543 = 8
                         else:
                             if self.match_lookahead_literal("INT32", 0):
-                                _t1470 = 11
+                                _t1544 = 11
                             else:
                                 if self.match_lookahead_literal("INT128", 0):
-                                    _t1471 = 5
+                                    _t1545 = 5
                                 else:
                                     if self.match_lookahead_literal("INT", 0):
-                                        _t1472 = 2
+                                        _t1546 = 2
                                     else:
                                         if self.match_lookahead_literal("FLOAT32", 0):
-                                            _t1473 = 12
+                                            _t1547 = 12
                                         else:
                                             if self.match_lookahead_literal("FLOAT", 0):
-                                                _t1474 = 3
+                                                _t1548 = 3
                                             else:
                                                 if self.match_lookahead_literal("DATETIME", 0):
-                                                    _t1475 = 7
+                                                    _t1549 = 7
                                                 else:
                                                     if self.match_lookahead_literal("DATE", 0):
-                                                        _t1476 = 6
+                                                        _t1550 = 6
                                                     else:
                                                         if self.match_lookahead_literal("BOOLEAN", 0):
-                                                            _t1477 = 10
+                                                            _t1551 = 10
                                                         else:
                                                             if self.match_lookahead_literal("(", 0):
-                                                                _t1478 = 9
+                                                                _t1552 = 9
                                                             else:
-                                                                _t1478 = -1
-                                                            _t1477 = _t1478
-                                                        _t1476 = _t1477
-                                                    _t1475 = _t1476
-                                                _t1474 = _t1475
-                                            _t1473 = _t1474
-                                        _t1472 = _t1473
-                                    _t1471 = _t1472
-                                _t1470 = _t1471
-                            _t1469 = _t1470
-                        _t1468 = _t1469
-                    _t1467 = _t1468
-                _t1466 = _t1467
-            _t1465 = _t1466
-        prediction781 = _t1465
-        if prediction781 == 13:
-            _t1480 = self.parse_uint32_type()
-            uint32_type795 = _t1480
-            _t1481 = logic_pb2.Type(uint32_type=uint32_type795)
-            _t1479 = _t1481
-        else:
-            if prediction781 == 12:
-                _t1483 = self.parse_float32_type()
-                float32_type794 = _t1483
-                _t1484 = logic_pb2.Type(float32_type=float32_type794)
-                _t1482 = _t1484
+                                                                _t1552 = -1
+                                                            _t1551 = _t1552
+                                                        _t1550 = _t1551
+                                                    _t1549 = _t1550
+                                                _t1548 = _t1549
+                                            _t1547 = _t1548
+                                        _t1546 = _t1547
+                                    _t1545 = _t1546
+                                _t1544 = _t1545
+                            _t1543 = _t1544
+                        _t1542 = _t1543
+                    _t1541 = _t1542
+                _t1540 = _t1541
+            _t1539 = _t1540
+        prediction818 = _t1539
+        if prediction818 == 13:
+            _t1554 = self.parse_uint32_type()
+            uint32_type832 = _t1554
+            _t1555 = logic_pb2.Type(uint32_type=uint32_type832)
+            _t1553 = _t1555
+        else:
+            if prediction818 == 12:
+                _t1557 = self.parse_float32_type()
+                float32_type831 = _t1557
+                _t1558 = logic_pb2.Type(float32_type=float32_type831)
+                _t1556 = _t1558
             else:
-                if prediction781 == 11:
-                    _t1486 = self.parse_int32_type()
-                    int32_type793 = _t1486
-                    _t1487 = logic_pb2.Type(int32_type=int32_type793)
-                    _t1485 = _t1487
+                if prediction818 == 11:
+                    _t1560 = self.parse_int32_type()
+                    int32_type830 = _t1560
+                    _t1561 = logic_pb2.Type(int32_type=int32_type830)
+                    _t1559 = _t1561
                 else:
-                    if prediction781 == 10:
-                        _t1489 = self.parse_boolean_type()
-                        boolean_type792 = _t1489
-                        _t1490 = logic_pb2.Type(boolean_type=boolean_type792)
-                        _t1488 = _t1490
+                    if prediction818 == 10:
+                        _t1563 = self.parse_boolean_type()
+                        boolean_type829 = _t1563
+                        _t1564 = logic_pb2.Type(boolean_type=boolean_type829)
+                        _t1562 = _t1564
                     else:
-                        if prediction781 == 9:
-                            _t1492 = self.parse_decimal_type()
-                            decimal_type791 = _t1492
-                            _t1493 = logic_pb2.Type(decimal_type=decimal_type791)
-                            _t1491 = _t1493
+                        if prediction818 == 9:
+                            _t1566 = self.parse_decimal_type()
+                            decimal_type828 = _t1566
+                            _t1567 = logic_pb2.Type(decimal_type=decimal_type828)
+                            _t1565 = _t1567
                         else:
-                            if prediction781 == 8:
-                                _t1495 = self.parse_missing_type()
-                                missing_type790 = _t1495
-                                _t1496 = logic_pb2.Type(missing_type=missing_type790)
-                                _t1494 = _t1496
+                            if prediction818 == 8:
+                                _t1569 = self.parse_missing_type()
+                                missing_type827 = _t1569
+                                _t1570 = logic_pb2.Type(missing_type=missing_type827)
+                                _t1568 = _t1570
                             else:
-                                if prediction781 == 7:
-                                    _t1498 = self.parse_datetime_type()
-                                    datetime_type789 = _t1498
-                                    _t1499 = logic_pb2.Type(datetime_type=datetime_type789)
-                                    _t1497 = _t1499
+                                if prediction818 == 7:
+                                    _t1572 = self.parse_datetime_type()
+                                    datetime_type826 = _t1572
+                                    _t1573 = logic_pb2.Type(datetime_type=datetime_type826)
+                                    _t1571 = _t1573
                                 else:
-                                    if prediction781 == 6:
-                                        _t1501 = self.parse_date_type()
-                                        date_type788 = _t1501
-                                        _t1502 = logic_pb2.Type(date_type=date_type788)
-                                        _t1500 = _t1502
+                                    if prediction818 == 6:
+                                        _t1575 = self.parse_date_type()
+                                        date_type825 = _t1575
+                                        _t1576 = logic_pb2.Type(date_type=date_type825)
+                                        _t1574 = _t1576
                                     else:
-                                        if prediction781 == 5:
-                                            _t1504 = self.parse_int128_type()
-                                            int128_type787 = _t1504
-                                            _t1505 = logic_pb2.Type(int128_type=int128_type787)
-                                            _t1503 = _t1505
+                                        if prediction818 == 5:
+                                            _t1578 = self.parse_int128_type()
+                                            int128_type824 = _t1578
+                                            _t1579 = logic_pb2.Type(int128_type=int128_type824)
+                                            _t1577 = _t1579
                                         else:
-                                            if prediction781 == 4:
-                                                _t1507 = self.parse_uint128_type()
-                                                uint128_type786 = _t1507
-                                                _t1508 = logic_pb2.Type(uint128_type=uint128_type786)
-                                                _t1506 = _t1508
+                                            if prediction818 == 4:
+                                                _t1581 = self.parse_uint128_type()
+                                                uint128_type823 = _t1581
+                                                _t1582 = logic_pb2.Type(uint128_type=uint128_type823)
+                                                _t1580 = _t1582
                                             else:
-                                                if prediction781 == 3:
-                                                    _t1510 = self.parse_float_type()
-                                                    float_type785 = _t1510
-                                                    _t1511 = logic_pb2.Type(float_type=float_type785)
-                                                    _t1509 = _t1511
+                                                if prediction818 == 3:
+                                                    _t1584 = self.parse_float_type()
+                                                    float_type822 = _t1584
+                                                    _t1585 = logic_pb2.Type(float_type=float_type822)
+                                                    _t1583 = _t1585
                                                 else:
-                                                    if prediction781 == 2:
-                                                        _t1513 = self.parse_int_type()
-                                                        int_type784 = _t1513
-                                                        _t1514 = logic_pb2.Type(int_type=int_type784)
-                                                        _t1512 = _t1514
+                                                    if prediction818 == 2:
+                                                        _t1587 = self.parse_int_type()
+                                                        int_type821 = _t1587
+                                                        _t1588 = logic_pb2.Type(int_type=int_type821)
+                                                        _t1586 = _t1588
                                                     else:
-                                                        if prediction781 == 1:
-                                                            _t1516 = self.parse_string_type()
-                                                            string_type783 = _t1516
-                                                            _t1517 = logic_pb2.Type(string_type=string_type783)
-                                                            _t1515 = _t1517
+                                                        if prediction818 == 1:
+                                                            _t1590 = self.parse_string_type()
+                                                            string_type820 = _t1590
+                                                            _t1591 = logic_pb2.Type(string_type=string_type820)
+                                                            _t1589 = _t1591
                                                         else:
-                                                            if prediction781 == 0:
-                                                                _t1519 = self.parse_unspecified_type()
-                                                                unspecified_type782 = _t1519
-                                                                _t1520 = logic_pb2.Type(unspecified_type=unspecified_type782)
-                                                                _t1518 = _t1520
+                                                            if prediction818 == 0:
+                                                                _t1593 = self.parse_unspecified_type()
+                                                                unspecified_type819 = _t1593
+                                                                _t1594 = logic_pb2.Type(unspecified_type=unspecified_type819)
+                                                                _t1592 = _t1594
                                                             else:
                                                                 raise ParseError("Unexpected token in type" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                                            _t1515 = _t1518
-                                                        _t1512 = _t1515
-                                                    _t1509 = _t1512
-                                                _t1506 = _t1509
-                                            _t1503 = _t1506
-                                        _t1500 = _t1503
-                                    _t1497 = _t1500
-                                _t1494 = _t1497
-                            _t1491 = _t1494
-                        _t1488 = _t1491
-                    _t1485 = _t1488
-                _t1482 = _t1485
-            _t1479 = _t1482
-        result797 = _t1479
-        self.record_span(span_start796, "Type")
-        return result797
+                                                            _t1589 = _t1592
+                                                        _t1586 = _t1589
+                                                    _t1583 = _t1586
+                                                _t1580 = _t1583
+                                            _t1577 = _t1580
+                                        _t1574 = _t1577
+                                    _t1571 = _t1574
+                                _t1568 = _t1571
+                            _t1565 = _t1568
+                        _t1562 = _t1565
+                    _t1559 = _t1562
+                _t1556 = _t1559
+            _t1553 = _t1556
+        result834 = _t1553
+        self.record_span(span_start833, "Type")
+        return result834
 
     def parse_unspecified_type(self) -> logic_pb2.UnspecifiedType:
-        span_start798 = self.span_start()
+        span_start835 = self.span_start()
         self.consume_literal("UNKNOWN")
-        _t1521 = logic_pb2.UnspecifiedType()
-        result799 = _t1521
-        self.record_span(span_start798, "UnspecifiedType")
-        return result799
+        _t1595 = logic_pb2.UnspecifiedType()
+        result836 = _t1595
+        self.record_span(span_start835, "UnspecifiedType")
+        return result836
 
     def parse_string_type(self) -> logic_pb2.StringType:
-        span_start800 = self.span_start()
+        span_start837 = self.span_start()
         self.consume_literal("STRING")
-        _t1522 = logic_pb2.StringType()
-        result801 = _t1522
-        self.record_span(span_start800, "StringType")
-        return result801
+        _t1596 = logic_pb2.StringType()
+        result838 = _t1596
+        self.record_span(span_start837, "StringType")
+        return result838
 
     def parse_int_type(self) -> logic_pb2.IntType:
-        span_start802 = self.span_start()
+        span_start839 = self.span_start()
         self.consume_literal("INT")
-        _t1523 = logic_pb2.IntType()
-        result803 = _t1523
-        self.record_span(span_start802, "IntType")
-        return result803
+        _t1597 = logic_pb2.IntType()
+        result840 = _t1597
+        self.record_span(span_start839, "IntType")
+        return result840
 
     def parse_float_type(self) -> logic_pb2.FloatType:
-        span_start804 = self.span_start()
+        span_start841 = self.span_start()
         self.consume_literal("FLOAT")
-        _t1524 = logic_pb2.FloatType()
-        result805 = _t1524
-        self.record_span(span_start804, "FloatType")
-        return result805
+        _t1598 = logic_pb2.FloatType()
+        result842 = _t1598
+        self.record_span(span_start841, "FloatType")
+        return result842
 
     def parse_uint128_type(self) -> logic_pb2.UInt128Type:
-        span_start806 = self.span_start()
+        span_start843 = self.span_start()
         self.consume_literal("UINT128")
-        _t1525 = logic_pb2.UInt128Type()
-        result807 = _t1525
-        self.record_span(span_start806, "UInt128Type")
-        return result807
+        _t1599 = logic_pb2.UInt128Type()
+        result844 = _t1599
+        self.record_span(span_start843, "UInt128Type")
+        return result844
 
     def parse_int128_type(self) -> logic_pb2.Int128Type:
-        span_start808 = self.span_start()
+        span_start845 = self.span_start()
         self.consume_literal("INT128")
-        _t1526 = logic_pb2.Int128Type()
-        result809 = _t1526
-        self.record_span(span_start808, "Int128Type")
-        return result809
+        _t1600 = logic_pb2.Int128Type()
+        result846 = _t1600
+        self.record_span(span_start845, "Int128Type")
+        return result846
 
     def parse_date_type(self) -> logic_pb2.DateType:
-        span_start810 = self.span_start()
+        span_start847 = self.span_start()
         self.consume_literal("DATE")
-        _t1527 = logic_pb2.DateType()
-        result811 = _t1527
-        self.record_span(span_start810, "DateType")
-        return result811
+        _t1601 = logic_pb2.DateType()
+        result848 = _t1601
+        self.record_span(span_start847, "DateType")
+        return result848
 
     def parse_datetime_type(self) -> logic_pb2.DateTimeType:
-        span_start812 = self.span_start()
+        span_start849 = self.span_start()
         self.consume_literal("DATETIME")
-        _t1528 = logic_pb2.DateTimeType()
-        result813 = _t1528
-        self.record_span(span_start812, "DateTimeType")
-        return result813
+        _t1602 = logic_pb2.DateTimeType()
+        result850 = _t1602
+        self.record_span(span_start849, "DateTimeType")
+        return result850
 
     def parse_missing_type(self) -> logic_pb2.MissingType:
-        span_start814 = self.span_start()
+        span_start851 = self.span_start()
         self.consume_literal("MISSING")
-        _t1529 = logic_pb2.MissingType()
-        result815 = _t1529
-        self.record_span(span_start814, "MissingType")
-        return result815
+        _t1603 = logic_pb2.MissingType()
+        result852 = _t1603
+        self.record_span(span_start851, "MissingType")
+        return result852
 
     def parse_decimal_type(self) -> logic_pb2.DecimalType:
-        span_start818 = self.span_start()
+        span_start855 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("DECIMAL")
-        int816 = self.consume_terminal("INT")
-        int_3817 = self.consume_terminal("INT")
+        int853 = self.consume_terminal("INT")
+        int_3854 = self.consume_terminal("INT")
         self.consume_literal(")")
-        _t1530 = logic_pb2.DecimalType(precision=int(int816), scale=int(int_3817))
-        result819 = _t1530
-        self.record_span(span_start818, "DecimalType")
-        return result819
+        _t1604 = logic_pb2.DecimalType(precision=int(int853), scale=int(int_3854))
+        result856 = _t1604
+        self.record_span(span_start855, "DecimalType")
+        return result856
 
     def parse_boolean_type(self) -> logic_pb2.BooleanType:
-        span_start820 = self.span_start()
+        span_start857 = self.span_start()
         self.consume_literal("BOOLEAN")
-        _t1531 = logic_pb2.BooleanType()
-        result821 = _t1531
-        self.record_span(span_start820, "BooleanType")
-        return result821
+        _t1605 = logic_pb2.BooleanType()
+        result858 = _t1605
+        self.record_span(span_start857, "BooleanType")
+        return result858
 
     def parse_int32_type(self) -> logic_pb2.Int32Type:
-        span_start822 = self.span_start()
+        span_start859 = self.span_start()
         self.consume_literal("INT32")
-        _t1532 = logic_pb2.Int32Type()
-        result823 = _t1532
-        self.record_span(span_start822, "Int32Type")
-        return result823
+        _t1606 = logic_pb2.Int32Type()
+        result860 = _t1606
+        self.record_span(span_start859, "Int32Type")
+        return result860
 
     def parse_float32_type(self) -> logic_pb2.Float32Type:
-        span_start824 = self.span_start()
+        span_start861 = self.span_start()
         self.consume_literal("FLOAT32")
-        _t1533 = logic_pb2.Float32Type()
-        result825 = _t1533
-        self.record_span(span_start824, "Float32Type")
-        return result825
+        _t1607 = logic_pb2.Float32Type()
+        result862 = _t1607
+        self.record_span(span_start861, "Float32Type")
+        return result862
 
     def parse_uint32_type(self) -> logic_pb2.UInt32Type:
-        span_start826 = self.span_start()
+        span_start863 = self.span_start()
         self.consume_literal("UINT32")
-        _t1534 = logic_pb2.UInt32Type()
-        result827 = _t1534
-        self.record_span(span_start826, "UInt32Type")
-        return result827
+        _t1608 = logic_pb2.UInt32Type()
+        result864 = _t1608
+        self.record_span(span_start863, "UInt32Type")
+        return result864
 
     def parse_value_bindings(self) -> Sequence[logic_pb2.Binding]:
         self.consume_literal("|")
-        xs828 = []
-        cond829 = self.match_lookahead_terminal("SYMBOL", 0)
-        while cond829:
-            _t1535 = self.parse_binding()
-            item830 = _t1535
-            xs828.append(item830)
-            cond829 = self.match_lookahead_terminal("SYMBOL", 0)
-        bindings831 = xs828
-        return bindings831
+        xs865 = []
+        cond866 = self.match_lookahead_terminal("SYMBOL", 0)
+        while cond866:
+            _t1609 = self.parse_binding()
+            item867 = _t1609
+            xs865.append(item867)
+            cond866 = self.match_lookahead_terminal("SYMBOL", 0)
+        bindings868 = xs865
+        return bindings868
 
     def parse_formula(self) -> logic_pb2.Formula:
-        span_start846 = self.span_start()
+        span_start883 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("true", 1):
-                _t1537 = 0
+                _t1611 = 0
             else:
                 if self.match_lookahead_literal("relatom", 1):
-                    _t1538 = 11
+                    _t1612 = 11
                 else:
                     if self.match_lookahead_literal("reduce", 1):
-                        _t1539 = 3
+                        _t1613 = 3
                     else:
                         if self.match_lookahead_literal("primitive", 1):
-                            _t1540 = 10
+                            _t1614 = 10
                         else:
                             if self.match_lookahead_literal("pragma", 1):
-                                _t1541 = 9
+                                _t1615 = 9
                             else:
                                 if self.match_lookahead_literal("or", 1):
-                                    _t1542 = 5
+                                    _t1616 = 5
                                 else:
                                     if self.match_lookahead_literal("not", 1):
-                                        _t1543 = 6
+                                        _t1617 = 6
                                     else:
                                         if self.match_lookahead_literal("ffi", 1):
-                                            _t1544 = 7
+                                            _t1618 = 7
                                         else:
                                             if self.match_lookahead_literal("false", 1):
-                                                _t1545 = 1
+                                                _t1619 = 1
                                             else:
                                                 if self.match_lookahead_literal("exists", 1):
-                                                    _t1546 = 2
+                                                    _t1620 = 2
                                                 else:
                                                     if self.match_lookahead_literal("cast", 1):
-                                                        _t1547 = 12
+                                                        _t1621 = 12
                                                     else:
                                                         if self.match_lookahead_literal("atom", 1):
-                                                            _t1548 = 8
+                                                            _t1622 = 8
                                                         else:
                                                             if self.match_lookahead_literal("and", 1):
-                                                                _t1549 = 4
+                                                                _t1623 = 4
                                                             else:
                                                                 if self.match_lookahead_literal(">=", 1):
-                                                                    _t1550 = 10
+                                                                    _t1624 = 10
                                                                 else:
                                                                     if self.match_lookahead_literal(">", 1):
-                                                                        _t1551 = 10
+                                                                        _t1625 = 10
                                                                     else:
                                                                         if self.match_lookahead_literal("=", 1):
-                                                                            _t1552 = 10
+                                                                            _t1626 = 10
                                                                         else:
                                                                             if self.match_lookahead_literal("<=", 1):
-                                                                                _t1553 = 10
+                                                                                _t1627 = 10
                                                                             else:
                                                                                 if self.match_lookahead_literal("<", 1):
-                                                                                    _t1554 = 10
+                                                                                    _t1628 = 10
                                                                                 else:
                                                                                     if self.match_lookahead_literal("/", 1):
-                                                                                        _t1555 = 10
+                                                                                        _t1629 = 10
                                                                                     else:
                                                                                         if self.match_lookahead_literal("-", 1):
-                                                                                            _t1556 = 10
+                                                                                            _t1630 = 10
                                                                                         else:
                                                                                             if self.match_lookahead_literal("+", 1):
-                                                                                                _t1557 = 10
+                                                                                                _t1631 = 10
                                                                                             else:
                                                                                                 if self.match_lookahead_literal("*", 1):
-                                                                                                    _t1558 = 10
+                                                                                                    _t1632 = 10
                                                                                                 else:
-                                                                                                    _t1558 = -1
-                                                                                                _t1557 = _t1558
-                                                                                            _t1556 = _t1557
-                                                                                        _t1555 = _t1556
-                                                                                    _t1554 = _t1555
-                                                                                _t1553 = _t1554
-                                                                            _t1552 = _t1553
-                                                                        _t1551 = _t1552
-                                                                    _t1550 = _t1551
-                                                                _t1549 = _t1550
-                                                            _t1548 = _t1549
-                                                        _t1547 = _t1548
-                                                    _t1546 = _t1547
-                                                _t1545 = _t1546
-                                            _t1544 = _t1545
-                                        _t1543 = _t1544
-                                    _t1542 = _t1543
-                                _t1541 = _t1542
-                            _t1540 = _t1541
-                        _t1539 = _t1540
-                    _t1538 = _t1539
-                _t1537 = _t1538
-            _t1536 = _t1537
-        else:
-            _t1536 = -1
-        prediction832 = _t1536
-        if prediction832 == 12:
-            _t1560 = self.parse_cast()
-            cast845 = _t1560
-            _t1561 = logic_pb2.Formula(cast=cast845)
-            _t1559 = _t1561
-        else:
-            if prediction832 == 11:
-                _t1563 = self.parse_rel_atom()
-                rel_atom844 = _t1563
-                _t1564 = logic_pb2.Formula(rel_atom=rel_atom844)
-                _t1562 = _t1564
+                                                                                                    _t1632 = -1
+                                                                                                _t1631 = _t1632
+                                                                                            _t1630 = _t1631
+                                                                                        _t1629 = _t1630
+                                                                                    _t1628 = _t1629
+                                                                                _t1627 = _t1628
+                                                                            _t1626 = _t1627
+                                                                        _t1625 = _t1626
+                                                                    _t1624 = _t1625
+                                                                _t1623 = _t1624
+                                                            _t1622 = _t1623
+                                                        _t1621 = _t1622
+                                                    _t1620 = _t1621
+                                                _t1619 = _t1620
+                                            _t1618 = _t1619
+                                        _t1617 = _t1618
+                                    _t1616 = _t1617
+                                _t1615 = _t1616
+                            _t1614 = _t1615
+                        _t1613 = _t1614
+                    _t1612 = _t1613
+                _t1611 = _t1612
+            _t1610 = _t1611
+        else:
+            _t1610 = -1
+        prediction869 = _t1610
+        if prediction869 == 12:
+            _t1634 = self.parse_cast()
+            cast882 = _t1634
+            _t1635 = logic_pb2.Formula(cast=cast882)
+            _t1633 = _t1635
+        else:
+            if prediction869 == 11:
+                _t1637 = self.parse_rel_atom()
+                rel_atom881 = _t1637
+                _t1638 = logic_pb2.Formula(rel_atom=rel_atom881)
+                _t1636 = _t1638
             else:
-                if prediction832 == 10:
-                    _t1566 = self.parse_primitive()
-                    primitive843 = _t1566
-                    _t1567 = logic_pb2.Formula(primitive=primitive843)
-                    _t1565 = _t1567
+                if prediction869 == 10:
+                    _t1640 = self.parse_primitive()
+                    primitive880 = _t1640
+                    _t1641 = logic_pb2.Formula(primitive=primitive880)
+                    _t1639 = _t1641
                 else:
-                    if prediction832 == 9:
-                        _t1569 = self.parse_pragma()
-                        pragma842 = _t1569
-                        _t1570 = logic_pb2.Formula(pragma=pragma842)
-                        _t1568 = _t1570
+                    if prediction869 == 9:
+                        _t1643 = self.parse_pragma()
+                        pragma879 = _t1643
+                        _t1644 = logic_pb2.Formula(pragma=pragma879)
+                        _t1642 = _t1644
                     else:
-                        if prediction832 == 8:
-                            _t1572 = self.parse_atom()
-                            atom841 = _t1572
-                            _t1573 = logic_pb2.Formula(atom=atom841)
-                            _t1571 = _t1573
+                        if prediction869 == 8:
+                            _t1646 = self.parse_atom()
+                            atom878 = _t1646
+                            _t1647 = logic_pb2.Formula(atom=atom878)
+                            _t1645 = _t1647
                         else:
-                            if prediction832 == 7:
-                                _t1575 = self.parse_ffi()
-                                ffi840 = _t1575
-                                _t1576 = logic_pb2.Formula(ffi=ffi840)
-                                _t1574 = _t1576
+                            if prediction869 == 7:
+                                _t1649 = self.parse_ffi()
+                                ffi877 = _t1649
+                                _t1650 = logic_pb2.Formula(ffi=ffi877)
+                                _t1648 = _t1650
                             else:
-                                if prediction832 == 6:
-                                    _t1578 = self.parse_not()
-                                    not839 = _t1578
-                                    _t1579 = logic_pb2.Formula()
-                                    getattr(_t1579, 'not').CopyFrom(not839)
-                                    _t1577 = _t1579
+                                if prediction869 == 6:
+                                    _t1652 = self.parse_not()
+                                    not876 = _t1652
+                                    _t1653 = logic_pb2.Formula()
+                                    getattr(_t1653, 'not').CopyFrom(not876)
+                                    _t1651 = _t1653
                                 else:
-                                    if prediction832 == 5:
-                                        _t1581 = self.parse_disjunction()
-                                        disjunction838 = _t1581
-                                        _t1582 = logic_pb2.Formula(disjunction=disjunction838)
-                                        _t1580 = _t1582
+                                    if prediction869 == 5:
+                                        _t1655 = self.parse_disjunction()
+                                        disjunction875 = _t1655
+                                        _t1656 = logic_pb2.Formula(disjunction=disjunction875)
+                                        _t1654 = _t1656
                                     else:
-                                        if prediction832 == 4:
-                                            _t1584 = self.parse_conjunction()
-                                            conjunction837 = _t1584
-                                            _t1585 = logic_pb2.Formula(conjunction=conjunction837)
-                                            _t1583 = _t1585
+                                        if prediction869 == 4:
+                                            _t1658 = self.parse_conjunction()
+                                            conjunction874 = _t1658
+                                            _t1659 = logic_pb2.Formula(conjunction=conjunction874)
+                                            _t1657 = _t1659
                                         else:
-                                            if prediction832 == 3:
-                                                _t1587 = self.parse_reduce()
-                                                reduce836 = _t1587
-                                                _t1588 = logic_pb2.Formula(reduce=reduce836)
-                                                _t1586 = _t1588
+                                            if prediction869 == 3:
+                                                _t1661 = self.parse_reduce()
+                                                reduce873 = _t1661
+                                                _t1662 = logic_pb2.Formula(reduce=reduce873)
+                                                _t1660 = _t1662
                                             else:
-                                                if prediction832 == 2:
-                                                    _t1590 = self.parse_exists()
-                                                    exists835 = _t1590
-                                                    _t1591 = logic_pb2.Formula(exists=exists835)
-                                                    _t1589 = _t1591
+                                                if prediction869 == 2:
+                                                    _t1664 = self.parse_exists()
+                                                    exists872 = _t1664
+                                                    _t1665 = logic_pb2.Formula(exists=exists872)
+                                                    _t1663 = _t1665
                                                 else:
-                                                    if prediction832 == 1:
-                                                        _t1593 = self.parse_false()
-                                                        false834 = _t1593
-                                                        _t1594 = logic_pb2.Formula(disjunction=false834)
-                                                        _t1592 = _t1594
+                                                    if prediction869 == 1:
+                                                        _t1667 = self.parse_false()
+                                                        false871 = _t1667
+                                                        _t1668 = logic_pb2.Formula(disjunction=false871)
+                                                        _t1666 = _t1668
                                                     else:
-                                                        if prediction832 == 0:
-                                                            _t1596 = self.parse_true()
-                                                            true833 = _t1596
-                                                            _t1597 = logic_pb2.Formula(conjunction=true833)
-                                                            _t1595 = _t1597
+                                                        if prediction869 == 0:
+                                                            _t1670 = self.parse_true()
+                                                            true870 = _t1670
+                                                            _t1671 = logic_pb2.Formula(conjunction=true870)
+                                                            _t1669 = _t1671
                                                         else:
                                                             raise ParseError("Unexpected token in formula" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                                        _t1592 = _t1595
-                                                    _t1589 = _t1592
-                                                _t1586 = _t1589
-                                            _t1583 = _t1586
-                                        _t1580 = _t1583
-                                    _t1577 = _t1580
-                                _t1574 = _t1577
-                            _t1571 = _t1574
-                        _t1568 = _t1571
-                    _t1565 = _t1568
-                _t1562 = _t1565
-            _t1559 = _t1562
-        result847 = _t1559
-        self.record_span(span_start846, "Formula")
-        return result847
+                                                        _t1666 = _t1669
+                                                    _t1663 = _t1666
+                                                _t1660 = _t1663
+                                            _t1657 = _t1660
+                                        _t1654 = _t1657
+                                    _t1651 = _t1654
+                                _t1648 = _t1651
+                            _t1645 = _t1648
+                        _t1642 = _t1645
+                    _t1639 = _t1642
+                _t1636 = _t1639
+            _t1633 = _t1636
+        result884 = _t1633
+        self.record_span(span_start883, "Formula")
+        return result884
 
     def parse_true(self) -> logic_pb2.Conjunction:
-        span_start848 = self.span_start()
+        span_start885 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("true")
         self.consume_literal(")")
-        _t1598 = logic_pb2.Conjunction(args=[])
-        result849 = _t1598
-        self.record_span(span_start848, "Conjunction")
-        return result849
+        _t1672 = logic_pb2.Conjunction(args=[])
+        result886 = _t1672
+        self.record_span(span_start885, "Conjunction")
+        return result886
 
     def parse_false(self) -> logic_pb2.Disjunction:
-        span_start850 = self.span_start()
+        span_start887 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("false")
         self.consume_literal(")")
-        _t1599 = logic_pb2.Disjunction(args=[])
-        result851 = _t1599
-        self.record_span(span_start850, "Disjunction")
-        return result851
+        _t1673 = logic_pb2.Disjunction(args=[])
+        result888 = _t1673
+        self.record_span(span_start887, "Disjunction")
+        return result888
 
     def parse_exists(self) -> logic_pb2.Exists:
-        span_start854 = self.span_start()
+        span_start891 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("exists")
-        _t1600 = self.parse_bindings()
-        bindings852 = _t1600
-        _t1601 = self.parse_formula()
-        formula853 = _t1601
+        _t1674 = self.parse_bindings()
+        bindings889 = _t1674
+        _t1675 = self.parse_formula()
+        formula890 = _t1675
         self.consume_literal(")")
-        _t1602 = logic_pb2.Abstraction(vars=(list(bindings852[0]) + list(bindings852[1] if bindings852[1] is not None else [])), value=formula853)
-        _t1603 = logic_pb2.Exists(body=_t1602)
-        result855 = _t1603
-        self.record_span(span_start854, "Exists")
-        return result855
+        _t1676 = logic_pb2.Abstraction(vars=(list(bindings889[0]) + list(bindings889[1] if bindings889[1] is not None else [])), value=formula890)
+        _t1677 = logic_pb2.Exists(body=_t1676)
+        result892 = _t1677
+        self.record_span(span_start891, "Exists")
+        return result892
 
     def parse_reduce(self) -> logic_pb2.Reduce:
-        span_start859 = self.span_start()
+        span_start896 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("reduce")
-        _t1604 = self.parse_abstraction()
-        abstraction856 = _t1604
-        _t1605 = self.parse_abstraction()
-        abstraction_3857 = _t1605
-        _t1606 = self.parse_terms()
-        terms858 = _t1606
-        self.consume_literal(")")
-        _t1607 = logic_pb2.Reduce(op=abstraction856, body=abstraction_3857, terms=terms858)
-        result860 = _t1607
-        self.record_span(span_start859, "Reduce")
-        return result860
+        _t1678 = self.parse_abstraction()
+        abstraction893 = _t1678
+        _t1679 = self.parse_abstraction()
+        abstraction_3894 = _t1679
+        _t1680 = self.parse_terms()
+        terms895 = _t1680
+        self.consume_literal(")")
+        _t1681 = logic_pb2.Reduce(op=abstraction893, body=abstraction_3894, terms=terms895)
+        result897 = _t1681
+        self.record_span(span_start896, "Reduce")
+        return result897
 
     def parse_terms(self) -> Sequence[logic_pb2.Term]:
         self.consume_literal("(")
         self.consume_literal("terms")
-        xs861 = []
-        cond862 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-        while cond862:
-            _t1608 = self.parse_term()
-            item863 = _t1608
-            xs861.append(item863)
-            cond862 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-        terms864 = xs861
+        xs898 = []
+        cond899 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+        while cond899:
+            _t1682 = self.parse_term()
+            item900 = _t1682
+            xs898.append(item900)
+            cond899 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+        terms901 = xs898
         self.consume_literal(")")
-        return terms864
+        return terms901
 
     def parse_term(self) -> logic_pb2.Term:
-        span_start868 = self.span_start()
+        span_start905 = self.span_start()
         if self.match_lookahead_literal("true", 0):
-            _t1609 = 1
+            _t1683 = 1
         else:
             if self.match_lookahead_literal("missing", 0):
-                _t1610 = 1
+                _t1684 = 1
             else:
                 if self.match_lookahead_literal("false", 0):
-                    _t1611 = 1
+                    _t1685 = 1
                 else:
                     if self.match_lookahead_literal("(", 0):
-                        _t1612 = 1
+                        _t1686 = 1
                     else:
                         if self.match_lookahead_terminal("SYMBOL", 0):
-                            _t1613 = 0
+                            _t1687 = 0
                         else:
                             if self.match_lookahead_terminal("UINT32", 0):
-                                _t1614 = 1
+                                _t1688 = 1
                             else:
                                 if self.match_lookahead_terminal("UINT128", 0):
-                                    _t1615 = 1
+                                    _t1689 = 1
                                 else:
                                     if self.match_lookahead_terminal("STRING", 0):
-                                        _t1616 = 1
+                                        _t1690 = 1
                                     else:
                                         if self.match_lookahead_terminal("INT32", 0):
-                                            _t1617 = 1
+                                            _t1691 = 1
                                         else:
                                             if self.match_lookahead_terminal("INT128", 0):
-                                                _t1618 = 1
+                                                _t1692 = 1
                                             else:
                                                 if self.match_lookahead_terminal("INT", 0):
-                                                    _t1619 = 1
+                                                    _t1693 = 1
                                                 else:
                                                     if self.match_lookahead_terminal("FLOAT32", 0):
-                                                        _t1620 = 1
+                                                        _t1694 = 1
                                                     else:
                                                         if self.match_lookahead_terminal("FLOAT", 0):
-                                                            _t1621 = 1
+                                                            _t1695 = 1
                                                         else:
                                                             if self.match_lookahead_terminal("DECIMAL", 0):
-                                                                _t1622 = 1
+                                                                _t1696 = 1
                                                             else:
-                                                                _t1622 = -1
-                                                            _t1621 = _t1622
-                                                        _t1620 = _t1621
-                                                    _t1619 = _t1620
-                                                _t1618 = _t1619
-                                            _t1617 = _t1618
-                                        _t1616 = _t1617
-                                    _t1615 = _t1616
-                                _t1614 = _t1615
-                            _t1613 = _t1614
-                        _t1612 = _t1613
-                    _t1611 = _t1612
-                _t1610 = _t1611
-            _t1609 = _t1610
-        prediction865 = _t1609
-        if prediction865 == 1:
-            _t1624 = self.parse_value()
-            value867 = _t1624
-            _t1625 = logic_pb2.Term(constant=value867)
-            _t1623 = _t1625
-        else:
-            if prediction865 == 0:
-                _t1627 = self.parse_var()
-                var866 = _t1627
-                _t1628 = logic_pb2.Term(var=var866)
-                _t1626 = _t1628
+                                                                _t1696 = -1
+                                                            _t1695 = _t1696
+                                                        _t1694 = _t1695
+                                                    _t1693 = _t1694
+                                                _t1692 = _t1693
+                                            _t1691 = _t1692
+                                        _t1690 = _t1691
+                                    _t1689 = _t1690
+                                _t1688 = _t1689
+                            _t1687 = _t1688
+                        _t1686 = _t1687
+                    _t1685 = _t1686
+                _t1684 = _t1685
+            _t1683 = _t1684
+        prediction902 = _t1683
+        if prediction902 == 1:
+            _t1698 = self.parse_value()
+            value904 = _t1698
+            _t1699 = logic_pb2.Term(constant=value904)
+            _t1697 = _t1699
+        else:
+            if prediction902 == 0:
+                _t1701 = self.parse_var()
+                var903 = _t1701
+                _t1702 = logic_pb2.Term(var=var903)
+                _t1700 = _t1702
             else:
                 raise ParseError("Unexpected token in term" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1623 = _t1626
-        result869 = _t1623
-        self.record_span(span_start868, "Term")
-        return result869
+            _t1697 = _t1700
+        result906 = _t1697
+        self.record_span(span_start905, "Term")
+        return result906
 
     def parse_var(self) -> logic_pb2.Var:
-        span_start871 = self.span_start()
-        symbol870 = self.consume_terminal("SYMBOL")
-        _t1629 = logic_pb2.Var(name=symbol870)
-        result872 = _t1629
-        self.record_span(span_start871, "Var")
-        return result872
+        span_start908 = self.span_start()
+        symbol907 = self.consume_terminal("SYMBOL")
+        _t1703 = logic_pb2.Var(name=symbol907)
+        result909 = _t1703
+        self.record_span(span_start908, "Var")
+        return result909
 
     def parse_value(self) -> logic_pb2.Value:
-        span_start886 = self.span_start()
+        span_start923 = self.span_start()
         if self.match_lookahead_literal("true", 0):
-            _t1630 = 12
+            _t1704 = 12
         else:
             if self.match_lookahead_literal("missing", 0):
-                _t1631 = 11
+                _t1705 = 11
             else:
                 if self.match_lookahead_literal("false", 0):
-                    _t1632 = 12
+                    _t1706 = 12
                 else:
                     if self.match_lookahead_literal("(", 0):
                         if self.match_lookahead_literal("datetime", 1):
-                            _t1634 = 1
+                            _t1708 = 1
                         else:
                             if self.match_lookahead_literal("date", 1):
-                                _t1635 = 0
+                                _t1709 = 0
                             else:
-                                _t1635 = -1
-                            _t1634 = _t1635
-                        _t1633 = _t1634
+                                _t1709 = -1
+                            _t1708 = _t1709
+                        _t1707 = _t1708
                     else:
                         if self.match_lookahead_terminal("UINT32", 0):
-                            _t1636 = 7
+                            _t1710 = 7
                         else:
                             if self.match_lookahead_terminal("UINT128", 0):
-                                _t1637 = 8
+                                _t1711 = 8
                             else:
                                 if self.match_lookahead_terminal("STRING", 0):
-                                    _t1638 = 2
+                                    _t1712 = 2
                                 else:
                                     if self.match_lookahead_terminal("INT32", 0):
-                                        _t1639 = 3
+                                        _t1713 = 3
                                     else:
                                         if self.match_lookahead_terminal("INT128", 0):
-                                            _t1640 = 9
+                                            _t1714 = 9
                                         else:
                                             if self.match_lookahead_terminal("INT", 0):
-                                                _t1641 = 4
+                                                _t1715 = 4
                                             else:
                                                 if self.match_lookahead_terminal("FLOAT32", 0):
-                                                    _t1642 = 5
+                                                    _t1716 = 5
                                                 else:
                                                     if self.match_lookahead_terminal("FLOAT", 0):
-                                                        _t1643 = 6
+                                                        _t1717 = 6
                                                     else:
                                                         if self.match_lookahead_terminal("DECIMAL", 0):
-                                                            _t1644 = 10
+                                                            _t1718 = 10
                                                         else:
-                                                            _t1644 = -1
-                                                        _t1643 = _t1644
-                                                    _t1642 = _t1643
-                                                _t1641 = _t1642
-                                            _t1640 = _t1641
-                                        _t1639 = _t1640
-                                    _t1638 = _t1639
-                                _t1637 = _t1638
-                            _t1636 = _t1637
-                        _t1633 = _t1636
-                    _t1632 = _t1633
-                _t1631 = _t1632
-            _t1630 = _t1631
-        prediction873 = _t1630
-        if prediction873 == 12:
-            _t1646 = self.parse_boolean_value()
-            boolean_value885 = _t1646
-            _t1647 = logic_pb2.Value(boolean_value=boolean_value885)
-            _t1645 = _t1647
-        else:
-            if prediction873 == 11:
+                                                            _t1718 = -1
+                                                        _t1717 = _t1718
+                                                    _t1716 = _t1717
+                                                _t1715 = _t1716
+                                            _t1714 = _t1715
+                                        _t1713 = _t1714
+                                    _t1712 = _t1713
+                                _t1711 = _t1712
+                            _t1710 = _t1711
+                        _t1707 = _t1710
+                    _t1706 = _t1707
+                _t1705 = _t1706
+            _t1704 = _t1705
+        prediction910 = _t1704
+        if prediction910 == 12:
+            _t1720 = self.parse_boolean_value()
+            boolean_value922 = _t1720
+            _t1721 = logic_pb2.Value(boolean_value=boolean_value922)
+            _t1719 = _t1721
+        else:
+            if prediction910 == 11:
                 self.consume_literal("missing")
-                _t1649 = logic_pb2.MissingValue()
-                _t1650 = logic_pb2.Value(missing_value=_t1649)
-                _t1648 = _t1650
+                _t1723 = logic_pb2.MissingValue()
+                _t1724 = logic_pb2.Value(missing_value=_t1723)
+                _t1722 = _t1724
             else:
-                if prediction873 == 10:
-                    formatted_decimal884 = self.consume_terminal("DECIMAL")
-                    _t1652 = logic_pb2.Value(decimal_value=formatted_decimal884)
-                    _t1651 = _t1652
+                if prediction910 == 10:
+                    formatted_decimal921 = self.consume_terminal("DECIMAL")
+                    _t1726 = logic_pb2.Value(decimal_value=formatted_decimal921)
+                    _t1725 = _t1726
                 else:
-                    if prediction873 == 9:
-                        formatted_int128883 = self.consume_terminal("INT128")
-                        _t1654 = logic_pb2.Value(int128_value=formatted_int128883)
-                        _t1653 = _t1654
+                    if prediction910 == 9:
+                        formatted_int128920 = self.consume_terminal("INT128")
+                        _t1728 = logic_pb2.Value(int128_value=formatted_int128920)
+                        _t1727 = _t1728
                     else:
-                        if prediction873 == 8:
-                            formatted_uint128882 = self.consume_terminal("UINT128")
-                            _t1656 = logic_pb2.Value(uint128_value=formatted_uint128882)
-                            _t1655 = _t1656
+                        if prediction910 == 8:
+                            formatted_uint128919 = self.consume_terminal("UINT128")
+                            _t1730 = logic_pb2.Value(uint128_value=formatted_uint128919)
+                            _t1729 = _t1730
                         else:
-                            if prediction873 == 7:
-                                formatted_uint32881 = self.consume_terminal("UINT32")
-                                _t1658 = logic_pb2.Value(uint32_value=formatted_uint32881)
-                                _t1657 = _t1658
+                            if prediction910 == 7:
+                                formatted_uint32918 = self.consume_terminal("UINT32")
+                                _t1732 = logic_pb2.Value(uint32_value=formatted_uint32918)
+                                _t1731 = _t1732
                             else:
-                                if prediction873 == 6:
-                                    formatted_float880 = self.consume_terminal("FLOAT")
-                                    _t1660 = logic_pb2.Value(float_value=formatted_float880)
-                                    _t1659 = _t1660
+                                if prediction910 == 6:
+                                    formatted_float917 = self.consume_terminal("FLOAT")
+                                    _t1734 = logic_pb2.Value(float_value=formatted_float917)
+                                    _t1733 = _t1734
                                 else:
-                                    if prediction873 == 5:
-                                        formatted_float32879 = self.consume_terminal("FLOAT32")
-                                        _t1662 = logic_pb2.Value(float32_value=formatted_float32879)
-                                        _t1661 = _t1662
+                                    if prediction910 == 5:
+                                        formatted_float32916 = self.consume_terminal("FLOAT32")
+                                        _t1736 = logic_pb2.Value(float32_value=formatted_float32916)
+                                        _t1735 = _t1736
                                     else:
-                                        if prediction873 == 4:
-                                            formatted_int878 = self.consume_terminal("INT")
-                                            _t1664 = logic_pb2.Value(int_value=formatted_int878)
-                                            _t1663 = _t1664
+                                        if prediction910 == 4:
+                                            formatted_int915 = self.consume_terminal("INT")
+                                            _t1738 = logic_pb2.Value(int_value=formatted_int915)
+                                            _t1737 = _t1738
                                         else:
-                                            if prediction873 == 3:
-                                                formatted_int32877 = self.consume_terminal("INT32")
-                                                _t1666 = logic_pb2.Value(int32_value=formatted_int32877)
-                                                _t1665 = _t1666
+                                            if prediction910 == 3:
+                                                formatted_int32914 = self.consume_terminal("INT32")
+                                                _t1740 = logic_pb2.Value(int32_value=formatted_int32914)
+                                                _t1739 = _t1740
                                             else:
-                                                if prediction873 == 2:
-                                                    formatted_string876 = self.consume_terminal("STRING")
-                                                    _t1668 = logic_pb2.Value(string_value=formatted_string876)
-                                                    _t1667 = _t1668
+                                                if prediction910 == 2:
+                                                    formatted_string913 = self.consume_terminal("STRING")
+                                                    _t1742 = logic_pb2.Value(string_value=formatted_string913)
+                                                    _t1741 = _t1742
                                                 else:
-                                                    if prediction873 == 1:
-                                                        _t1670 = self.parse_datetime()
-                                                        datetime875 = _t1670
-                                                        _t1671 = logic_pb2.Value(datetime_value=datetime875)
-                                                        _t1669 = _t1671
+                                                    if prediction910 == 1:
+                                                        _t1744 = self.parse_datetime()
+                                                        datetime912 = _t1744
+                                                        _t1745 = logic_pb2.Value(datetime_value=datetime912)
+                                                        _t1743 = _t1745
                                                     else:
-                                                        if prediction873 == 0:
-                                                            _t1673 = self.parse_date()
-                                                            date874 = _t1673
-                                                            _t1674 = logic_pb2.Value(date_value=date874)
-                                                            _t1672 = _t1674
+                                                        if prediction910 == 0:
+                                                            _t1747 = self.parse_date()
+                                                            date911 = _t1747
+                                                            _t1748 = logic_pb2.Value(date_value=date911)
+                                                            _t1746 = _t1748
                                                         else:
                                                             raise ParseError("Unexpected token in value" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                                        _t1669 = _t1672
-                                                    _t1667 = _t1669
-                                                _t1665 = _t1667
-                                            _t1663 = _t1665
-                                        _t1661 = _t1663
-                                    _t1659 = _t1661
-                                _t1657 = _t1659
-                            _t1655 = _t1657
-                        _t1653 = _t1655
-                    _t1651 = _t1653
-                _t1648 = _t1651
-            _t1645 = _t1648
-        result887 = _t1645
-        self.record_span(span_start886, "Value")
-        return result887
+                                                        _t1743 = _t1746
+                                                    _t1741 = _t1743
+                                                _t1739 = _t1741
+                                            _t1737 = _t1739
+                                        _t1735 = _t1737
+                                    _t1733 = _t1735
+                                _t1731 = _t1733
+                            _t1729 = _t1731
+                        _t1727 = _t1729
+                    _t1725 = _t1727
+                _t1722 = _t1725
+            _t1719 = _t1722
+        result924 = _t1719
+        self.record_span(span_start923, "Value")
+        return result924
 
     def parse_date(self) -> logic_pb2.DateValue:
-        span_start891 = self.span_start()
+        span_start928 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("date")
-        formatted_int888 = self.consume_terminal("INT")
-        formatted_int_3889 = self.consume_terminal("INT")
-        formatted_int_4890 = self.consume_terminal("INT")
+        formatted_int925 = self.consume_terminal("INT")
+        formatted_int_3926 = self.consume_terminal("INT")
+        formatted_int_4927 = self.consume_terminal("INT")
         self.consume_literal(")")
-        _t1675 = logic_pb2.DateValue(year=int(formatted_int888), month=int(formatted_int_3889), day=int(formatted_int_4890))
-        result892 = _t1675
-        self.record_span(span_start891, "DateValue")
-        return result892
+        _t1749 = logic_pb2.DateValue(year=int(formatted_int925), month=int(formatted_int_3926), day=int(formatted_int_4927))
+        result929 = _t1749
+        self.record_span(span_start928, "DateValue")
+        return result929
 
     def parse_datetime(self) -> logic_pb2.DateTimeValue:
-        span_start900 = self.span_start()
+        span_start937 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("datetime")
-        formatted_int893 = self.consume_terminal("INT")
-        formatted_int_3894 = self.consume_terminal("INT")
-        formatted_int_4895 = self.consume_terminal("INT")
-        formatted_int_5896 = self.consume_terminal("INT")
-        formatted_int_6897 = self.consume_terminal("INT")
-        formatted_int_7898 = self.consume_terminal("INT")
+        formatted_int930 = self.consume_terminal("INT")
+        formatted_int_3931 = self.consume_terminal("INT")
+        formatted_int_4932 = self.consume_terminal("INT")
+        formatted_int_5933 = self.consume_terminal("INT")
+        formatted_int_6934 = self.consume_terminal("INT")
+        formatted_int_7935 = self.consume_terminal("INT")
         if self.match_lookahead_terminal("INT", 0):
-            _t1676 = self.consume_terminal("INT")
+            _t1750 = self.consume_terminal("INT")
         else:
-            _t1676 = None
-        formatted_int_8899 = _t1676
+            _t1750 = None
+        formatted_int_8936 = _t1750
         self.consume_literal(")")
-        _t1677 = logic_pb2.DateTimeValue(year=int(formatted_int893), month=int(formatted_int_3894), day=int(formatted_int_4895), hour=int(formatted_int_5896), minute=int(formatted_int_6897), second=int(formatted_int_7898), microsecond=int((formatted_int_8899 if formatted_int_8899 is not None else 0)))
-        result901 = _t1677
-        self.record_span(span_start900, "DateTimeValue")
-        return result901
+        _t1751 = logic_pb2.DateTimeValue(year=int(formatted_int930), month=int(formatted_int_3931), day=int(formatted_int_4932), hour=int(formatted_int_5933), minute=int(formatted_int_6934), second=int(formatted_int_7935), microsecond=int((formatted_int_8936 if formatted_int_8936 is not None else 0)))
+        result938 = _t1751
+        self.record_span(span_start937, "DateTimeValue")
+        return result938
 
     def parse_conjunction(self) -> logic_pb2.Conjunction:
-        span_start906 = self.span_start()
+        span_start943 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("and")
-        xs902 = []
-        cond903 = self.match_lookahead_literal("(", 0)
-        while cond903:
-            _t1678 = self.parse_formula()
-            item904 = _t1678
-            xs902.append(item904)
-            cond903 = self.match_lookahead_literal("(", 0)
-        formulas905 = xs902
-        self.consume_literal(")")
-        _t1679 = logic_pb2.Conjunction(args=formulas905)
-        result907 = _t1679
-        self.record_span(span_start906, "Conjunction")
-        return result907
+        xs939 = []
+        cond940 = self.match_lookahead_literal("(", 0)
+        while cond940:
+            _t1752 = self.parse_formula()
+            item941 = _t1752
+            xs939.append(item941)
+            cond940 = self.match_lookahead_literal("(", 0)
+        formulas942 = xs939
+        self.consume_literal(")")
+        _t1753 = logic_pb2.Conjunction(args=formulas942)
+        result944 = _t1753
+        self.record_span(span_start943, "Conjunction")
+        return result944
 
     def parse_disjunction(self) -> logic_pb2.Disjunction:
-        span_start912 = self.span_start()
+        span_start949 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("or")
-        xs908 = []
-        cond909 = self.match_lookahead_literal("(", 0)
-        while cond909:
-            _t1680 = self.parse_formula()
-            item910 = _t1680
-            xs908.append(item910)
-            cond909 = self.match_lookahead_literal("(", 0)
-        formulas911 = xs908
-        self.consume_literal(")")
-        _t1681 = logic_pb2.Disjunction(args=formulas911)
-        result913 = _t1681
-        self.record_span(span_start912, "Disjunction")
-        return result913
+        xs945 = []
+        cond946 = self.match_lookahead_literal("(", 0)
+        while cond946:
+            _t1754 = self.parse_formula()
+            item947 = _t1754
+            xs945.append(item947)
+            cond946 = self.match_lookahead_literal("(", 0)
+        formulas948 = xs945
+        self.consume_literal(")")
+        _t1755 = logic_pb2.Disjunction(args=formulas948)
+        result950 = _t1755
+        self.record_span(span_start949, "Disjunction")
+        return result950
 
     def parse_not(self) -> logic_pb2.Not:
-        span_start915 = self.span_start()
+        span_start952 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("not")
-        _t1682 = self.parse_formula()
-        formula914 = _t1682
+        _t1756 = self.parse_formula()
+        formula951 = _t1756
         self.consume_literal(")")
-        _t1683 = logic_pb2.Not(arg=formula914)
-        result916 = _t1683
-        self.record_span(span_start915, "Not")
-        return result916
+        _t1757 = logic_pb2.Not(arg=formula951)
+        result953 = _t1757
+        self.record_span(span_start952, "Not")
+        return result953
 
     def parse_ffi(self) -> logic_pb2.FFI:
-        span_start920 = self.span_start()
+        span_start957 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("ffi")
-        _t1684 = self.parse_name()
-        name917 = _t1684
-        _t1685 = self.parse_ffi_args()
-        ffi_args918 = _t1685
-        _t1686 = self.parse_terms()
-        terms919 = _t1686
-        self.consume_literal(")")
-        _t1687 = logic_pb2.FFI(name=name917, args=ffi_args918, terms=terms919)
-        result921 = _t1687
-        self.record_span(span_start920, "FFI")
-        return result921
+        _t1758 = self.parse_name()
+        name954 = _t1758
+        _t1759 = self.parse_ffi_args()
+        ffi_args955 = _t1759
+        _t1760 = self.parse_terms()
+        terms956 = _t1760
+        self.consume_literal(")")
+        _t1761 = logic_pb2.FFI(name=name954, args=ffi_args955, terms=terms956)
+        result958 = _t1761
+        self.record_span(span_start957, "FFI")
+        return result958
 
     def parse_name(self) -> str:
         self.consume_literal(":")
-        symbol922 = self.consume_terminal("SYMBOL")
-        return symbol922
+        symbol959 = self.consume_terminal("SYMBOL")
+        return symbol959
 
     def parse_ffi_args(self) -> Sequence[logic_pb2.Abstraction]:
         self.consume_literal("(")
         self.consume_literal("args")
-        xs923 = []
-        cond924 = self.match_lookahead_literal("(", 0)
-        while cond924:
-            _t1688 = self.parse_abstraction()
-            item925 = _t1688
-            xs923.append(item925)
-            cond924 = self.match_lookahead_literal("(", 0)
-        abstractions926 = xs923
+        xs960 = []
+        cond961 = self.match_lookahead_literal("(", 0)
+        while cond961:
+            _t1762 = self.parse_abstraction()
+            item962 = _t1762
+            xs960.append(item962)
+            cond961 = self.match_lookahead_literal("(", 0)
+        abstractions963 = xs960
         self.consume_literal(")")
-        return abstractions926
+        return abstractions963
 
     def parse_atom(self) -> logic_pb2.Atom:
-        span_start932 = self.span_start()
+        span_start969 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("atom")
-        _t1689 = self.parse_relation_id()
-        relation_id927 = _t1689
-        xs928 = []
-        cond929 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-        while cond929:
-            _t1690 = self.parse_term()
-            item930 = _t1690
-            xs928.append(item930)
-            cond929 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-        terms931 = xs928
-        self.consume_literal(")")
-        _t1691 = logic_pb2.Atom(name=relation_id927, terms=terms931)
-        result933 = _t1691
-        self.record_span(span_start932, "Atom")
-        return result933
+        _t1763 = self.parse_relation_id()
+        relation_id964 = _t1763
+        xs965 = []
+        cond966 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+        while cond966:
+            _t1764 = self.parse_term()
+            item967 = _t1764
+            xs965.append(item967)
+            cond966 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+        terms968 = xs965
+        self.consume_literal(")")
+        _t1765 = logic_pb2.Atom(name=relation_id964, terms=terms968)
+        result970 = _t1765
+        self.record_span(span_start969, "Atom")
+        return result970
 
     def parse_pragma(self) -> logic_pb2.Pragma:
-        span_start939 = self.span_start()
+        span_start976 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("pragma")
-        _t1692 = self.parse_name()
-        name934 = _t1692
-        xs935 = []
-        cond936 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-        while cond936:
-            _t1693 = self.parse_term()
-            item937 = _t1693
-            xs935.append(item937)
-            cond936 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-        terms938 = xs935
-        self.consume_literal(")")
-        _t1694 = logic_pb2.Pragma(name=name934, terms=terms938)
-        result940 = _t1694
-        self.record_span(span_start939, "Pragma")
-        return result940
+        _t1766 = self.parse_name()
+        name971 = _t1766
+        xs972 = []
+        cond973 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+        while cond973:
+            _t1767 = self.parse_term()
+            item974 = _t1767
+            xs972.append(item974)
+            cond973 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+        terms975 = xs972
+        self.consume_literal(")")
+        _t1768 = logic_pb2.Pragma(name=name971, terms=terms975)
+        result977 = _t1768
+        self.record_span(span_start976, "Pragma")
+        return result977
 
     def parse_primitive(self) -> logic_pb2.Primitive:
-        span_start956 = self.span_start()
+        span_start993 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("primitive", 1):
-                _t1696 = 9
+                _t1770 = 9
             else:
                 if self.match_lookahead_literal(">=", 1):
-                    _t1697 = 4
+                    _t1771 = 4
                 else:
                     if self.match_lookahead_literal(">", 1):
-                        _t1698 = 3
+                        _t1772 = 3
                     else:
                         if self.match_lookahead_literal("=", 1):
-                            _t1699 = 0
+                            _t1773 = 0
                         else:
                             if self.match_lookahead_literal("<=", 1):
-                                _t1700 = 2
+                                _t1774 = 2
                             else:
                                 if self.match_lookahead_literal("<", 1):
-                                    _t1701 = 1
+                                    _t1775 = 1
                                 else:
                                     if self.match_lookahead_literal("/", 1):
-                                        _t1702 = 8
+                                        _t1776 = 8
                                     else:
                                         if self.match_lookahead_literal("-", 1):
-                                            _t1703 = 6
+                                            _t1777 = 6
                                         else:
                                             if self.match_lookahead_literal("+", 1):
-                                                _t1704 = 5
+                                                _t1778 = 5
                                             else:
                                                 if self.match_lookahead_literal("*", 1):
-                                                    _t1705 = 7
+                                                    _t1779 = 7
                                                 else:
-                                                    _t1705 = -1
-                                                _t1704 = _t1705
-                                            _t1703 = _t1704
-                                        _t1702 = _t1703
-                                    _t1701 = _t1702
-                                _t1700 = _t1701
-                            _t1699 = _t1700
-                        _t1698 = _t1699
-                    _t1697 = _t1698
-                _t1696 = _t1697
-            _t1695 = _t1696
-        else:
-            _t1695 = -1
-        prediction941 = _t1695
-        if prediction941 == 9:
+                                                    _t1779 = -1
+                                                _t1778 = _t1779
+                                            _t1777 = _t1778
+                                        _t1776 = _t1777
+                                    _t1775 = _t1776
+                                _t1774 = _t1775
+                            _t1773 = _t1774
+                        _t1772 = _t1773
+                    _t1771 = _t1772
+                _t1770 = _t1771
+            _t1769 = _t1770
+        else:
+            _t1769 = -1
+        prediction978 = _t1769
+        if prediction978 == 9:
             self.consume_literal("(")
             self.consume_literal("primitive")
-            _t1707 = self.parse_name()
-            name951 = _t1707
-            xs952 = []
-            cond953 = ((((((((((((((self.match_lookahead_literal("#", 0) or self.match_lookahead_literal("(", 0)) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-            while cond953:
-                _t1708 = self.parse_rel_term()
-                item954 = _t1708
-                xs952.append(item954)
-                cond953 = ((((((((((((((self.match_lookahead_literal("#", 0) or self.match_lookahead_literal("(", 0)) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-            rel_terms955 = xs952
+            _t1781 = self.parse_name()
+            name988 = _t1781
+            xs989 = []
+            cond990 = ((((((((((((((self.match_lookahead_literal("#", 0) or self.match_lookahead_literal("(", 0)) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+            while cond990:
+                _t1782 = self.parse_rel_term()
+                item991 = _t1782
+                xs989.append(item991)
+                cond990 = ((((((((((((((self.match_lookahead_literal("#", 0) or self.match_lookahead_literal("(", 0)) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+            rel_terms992 = xs989
             self.consume_literal(")")
-            _t1709 = logic_pb2.Primitive(name=name951, terms=rel_terms955)
-            _t1706 = _t1709
+            _t1783 = logic_pb2.Primitive(name=name988, terms=rel_terms992)
+            _t1780 = _t1783
         else:
-            if prediction941 == 8:
-                _t1711 = self.parse_divide()
-                divide950 = _t1711
-                _t1710 = divide950
+            if prediction978 == 8:
+                _t1785 = self.parse_divide()
+                divide987 = _t1785
+                _t1784 = divide987
             else:
-                if prediction941 == 7:
-                    _t1713 = self.parse_multiply()
-                    multiply949 = _t1713
-                    _t1712 = multiply949
+                if prediction978 == 7:
+                    _t1787 = self.parse_multiply()
+                    multiply986 = _t1787
+                    _t1786 = multiply986
                 else:
-                    if prediction941 == 6:
-                        _t1715 = self.parse_minus()
-                        minus948 = _t1715
-                        _t1714 = minus948
+                    if prediction978 == 6:
+                        _t1789 = self.parse_minus()
+                        minus985 = _t1789
+                        _t1788 = minus985
                     else:
-                        if prediction941 == 5:
-                            _t1717 = self.parse_add()
-                            add947 = _t1717
-                            _t1716 = add947
+                        if prediction978 == 5:
+                            _t1791 = self.parse_add()
+                            add984 = _t1791
+                            _t1790 = add984
                         else:
-                            if prediction941 == 4:
-                                _t1719 = self.parse_gt_eq()
-                                gt_eq946 = _t1719
-                                _t1718 = gt_eq946
+                            if prediction978 == 4:
+                                _t1793 = self.parse_gt_eq()
+                                gt_eq983 = _t1793
+                                _t1792 = gt_eq983
                             else:
-                                if prediction941 == 3:
-                                    _t1721 = self.parse_gt()
-                                    gt945 = _t1721
-                                    _t1720 = gt945
+                                if prediction978 == 3:
+                                    _t1795 = self.parse_gt()
+                                    gt982 = _t1795
+                                    _t1794 = gt982
                                 else:
-                                    if prediction941 == 2:
-                                        _t1723 = self.parse_lt_eq()
-                                        lt_eq944 = _t1723
-                                        _t1722 = lt_eq944
+                                    if prediction978 == 2:
+                                        _t1797 = self.parse_lt_eq()
+                                        lt_eq981 = _t1797
+                                        _t1796 = lt_eq981
                                     else:
-                                        if prediction941 == 1:
-                                            _t1725 = self.parse_lt()
-                                            lt943 = _t1725
-                                            _t1724 = lt943
+                                        if prediction978 == 1:
+                                            _t1799 = self.parse_lt()
+                                            lt980 = _t1799
+                                            _t1798 = lt980
                                         else:
-                                            if prediction941 == 0:
-                                                _t1727 = self.parse_eq()
-                                                eq942 = _t1727
-                                                _t1726 = eq942
+                                            if prediction978 == 0:
+                                                _t1801 = self.parse_eq()
+                                                eq979 = _t1801
+                                                _t1800 = eq979
                                             else:
                                                 raise ParseError("Unexpected token in primitive" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                            _t1724 = _t1726
-                                        _t1722 = _t1724
-                                    _t1720 = _t1722
-                                _t1718 = _t1720
-                            _t1716 = _t1718
-                        _t1714 = _t1716
-                    _t1712 = _t1714
-                _t1710 = _t1712
-            _t1706 = _t1710
-        result957 = _t1706
-        self.record_span(span_start956, "Primitive")
-        return result957
+                                            _t1798 = _t1800
+                                        _t1796 = _t1798
+                                    _t1794 = _t1796
+                                _t1792 = _t1794
+                            _t1790 = _t1792
+                        _t1788 = _t1790
+                    _t1786 = _t1788
+                _t1784 = _t1786
+            _t1780 = _t1784
+        result994 = _t1780
+        self.record_span(span_start993, "Primitive")
+        return result994
 
     def parse_eq(self) -> logic_pb2.Primitive:
-        span_start960 = self.span_start()
+        span_start997 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("=")
-        _t1728 = self.parse_term()
-        term958 = _t1728
-        _t1729 = self.parse_term()
-        term_3959 = _t1729
-        self.consume_literal(")")
-        _t1730 = logic_pb2.RelTerm(term=term958)
-        _t1731 = logic_pb2.RelTerm(term=term_3959)
-        _t1732 = logic_pb2.Primitive(name="rel_primitive_eq", terms=[_t1730, _t1731])
-        result961 = _t1732
-        self.record_span(span_start960, "Primitive")
-        return result961
+        _t1802 = self.parse_term()
+        term995 = _t1802
+        _t1803 = self.parse_term()
+        term_3996 = _t1803
+        self.consume_literal(")")
+        _t1804 = logic_pb2.RelTerm(term=term995)
+        _t1805 = logic_pb2.RelTerm(term=term_3996)
+        _t1806 = logic_pb2.Primitive(name="rel_primitive_eq", terms=[_t1804, _t1805])
+        result998 = _t1806
+        self.record_span(span_start997, "Primitive")
+        return result998
 
     def parse_lt(self) -> logic_pb2.Primitive:
-        span_start964 = self.span_start()
+        span_start1001 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("<")
-        _t1733 = self.parse_term()
-        term962 = _t1733
-        _t1734 = self.parse_term()
-        term_3963 = _t1734
-        self.consume_literal(")")
-        _t1735 = logic_pb2.RelTerm(term=term962)
-        _t1736 = logic_pb2.RelTerm(term=term_3963)
-        _t1737 = logic_pb2.Primitive(name="rel_primitive_lt_monotype", terms=[_t1735, _t1736])
-        result965 = _t1737
-        self.record_span(span_start964, "Primitive")
-        return result965
+        _t1807 = self.parse_term()
+        term999 = _t1807
+        _t1808 = self.parse_term()
+        term_31000 = _t1808
+        self.consume_literal(")")
+        _t1809 = logic_pb2.RelTerm(term=term999)
+        _t1810 = logic_pb2.RelTerm(term=term_31000)
+        _t1811 = logic_pb2.Primitive(name="rel_primitive_lt_monotype", terms=[_t1809, _t1810])
+        result1002 = _t1811
+        self.record_span(span_start1001, "Primitive")
+        return result1002
 
     def parse_lt_eq(self) -> logic_pb2.Primitive:
-        span_start968 = self.span_start()
+        span_start1005 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("<=")
-        _t1738 = self.parse_term()
-        term966 = _t1738
-        _t1739 = self.parse_term()
-        term_3967 = _t1739
-        self.consume_literal(")")
-        _t1740 = logic_pb2.RelTerm(term=term966)
-        _t1741 = logic_pb2.RelTerm(term=term_3967)
-        _t1742 = logic_pb2.Primitive(name="rel_primitive_lt_eq_monotype", terms=[_t1740, _t1741])
-        result969 = _t1742
-        self.record_span(span_start968, "Primitive")
-        return result969
+        _t1812 = self.parse_term()
+        term1003 = _t1812
+        _t1813 = self.parse_term()
+        term_31004 = _t1813
+        self.consume_literal(")")
+        _t1814 = logic_pb2.RelTerm(term=term1003)
+        _t1815 = logic_pb2.RelTerm(term=term_31004)
+        _t1816 = logic_pb2.Primitive(name="rel_primitive_lt_eq_monotype", terms=[_t1814, _t1815])
+        result1006 = _t1816
+        self.record_span(span_start1005, "Primitive")
+        return result1006
 
     def parse_gt(self) -> logic_pb2.Primitive:
-        span_start972 = self.span_start()
+        span_start1009 = self.span_start()
         self.consume_literal("(")
         self.consume_literal(">")
-        _t1743 = self.parse_term()
-        term970 = _t1743
-        _t1744 = self.parse_term()
-        term_3971 = _t1744
-        self.consume_literal(")")
-        _t1745 = logic_pb2.RelTerm(term=term970)
-        _t1746 = logic_pb2.RelTerm(term=term_3971)
-        _t1747 = logic_pb2.Primitive(name="rel_primitive_gt_monotype", terms=[_t1745, _t1746])
-        result973 = _t1747
-        self.record_span(span_start972, "Primitive")
-        return result973
+        _t1817 = self.parse_term()
+        term1007 = _t1817
+        _t1818 = self.parse_term()
+        term_31008 = _t1818
+        self.consume_literal(")")
+        _t1819 = logic_pb2.RelTerm(term=term1007)
+        _t1820 = logic_pb2.RelTerm(term=term_31008)
+        _t1821 = logic_pb2.Primitive(name="rel_primitive_gt_monotype", terms=[_t1819, _t1820])
+        result1010 = _t1821
+        self.record_span(span_start1009, "Primitive")
+        return result1010
 
     def parse_gt_eq(self) -> logic_pb2.Primitive:
-        span_start976 = self.span_start()
+        span_start1013 = self.span_start()
         self.consume_literal("(")
         self.consume_literal(">=")
-        _t1748 = self.parse_term()
-        term974 = _t1748
-        _t1749 = self.parse_term()
-        term_3975 = _t1749
-        self.consume_literal(")")
-        _t1750 = logic_pb2.RelTerm(term=term974)
-        _t1751 = logic_pb2.RelTerm(term=term_3975)
-        _t1752 = logic_pb2.Primitive(name="rel_primitive_gt_eq_monotype", terms=[_t1750, _t1751])
-        result977 = _t1752
-        self.record_span(span_start976, "Primitive")
-        return result977
+        _t1822 = self.parse_term()
+        term1011 = _t1822
+        _t1823 = self.parse_term()
+        term_31012 = _t1823
+        self.consume_literal(")")
+        _t1824 = logic_pb2.RelTerm(term=term1011)
+        _t1825 = logic_pb2.RelTerm(term=term_31012)
+        _t1826 = logic_pb2.Primitive(name="rel_primitive_gt_eq_monotype", terms=[_t1824, _t1825])
+        result1014 = _t1826
+        self.record_span(span_start1013, "Primitive")
+        return result1014
 
     def parse_add(self) -> logic_pb2.Primitive:
-        span_start981 = self.span_start()
+        span_start1018 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("+")
-        _t1753 = self.parse_term()
-        term978 = _t1753
-        _t1754 = self.parse_term()
-        term_3979 = _t1754
-        _t1755 = self.parse_term()
-        term_4980 = _t1755
-        self.consume_literal(")")
-        _t1756 = logic_pb2.RelTerm(term=term978)
-        _t1757 = logic_pb2.RelTerm(term=term_3979)
-        _t1758 = logic_pb2.RelTerm(term=term_4980)
-        _t1759 = logic_pb2.Primitive(name="rel_primitive_add_monotype", terms=[_t1756, _t1757, _t1758])
-        result982 = _t1759
-        self.record_span(span_start981, "Primitive")
-        return result982
+        _t1827 = self.parse_term()
+        term1015 = _t1827
+        _t1828 = self.parse_term()
+        term_31016 = _t1828
+        _t1829 = self.parse_term()
+        term_41017 = _t1829
+        self.consume_literal(")")
+        _t1830 = logic_pb2.RelTerm(term=term1015)
+        _t1831 = logic_pb2.RelTerm(term=term_31016)
+        _t1832 = logic_pb2.RelTerm(term=term_41017)
+        _t1833 = logic_pb2.Primitive(name="rel_primitive_add_monotype", terms=[_t1830, _t1831, _t1832])
+        result1019 = _t1833
+        self.record_span(span_start1018, "Primitive")
+        return result1019
 
     def parse_minus(self) -> logic_pb2.Primitive:
-        span_start986 = self.span_start()
+        span_start1023 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("-")
-        _t1760 = self.parse_term()
-        term983 = _t1760
-        _t1761 = self.parse_term()
-        term_3984 = _t1761
-        _t1762 = self.parse_term()
-        term_4985 = _t1762
-        self.consume_literal(")")
-        _t1763 = logic_pb2.RelTerm(term=term983)
-        _t1764 = logic_pb2.RelTerm(term=term_3984)
-        _t1765 = logic_pb2.RelTerm(term=term_4985)
-        _t1766 = logic_pb2.Primitive(name="rel_primitive_subtract_monotype", terms=[_t1763, _t1764, _t1765])
-        result987 = _t1766
-        self.record_span(span_start986, "Primitive")
-        return result987
+        _t1834 = self.parse_term()
+        term1020 = _t1834
+        _t1835 = self.parse_term()
+        term_31021 = _t1835
+        _t1836 = self.parse_term()
+        term_41022 = _t1836
+        self.consume_literal(")")
+        _t1837 = logic_pb2.RelTerm(term=term1020)
+        _t1838 = logic_pb2.RelTerm(term=term_31021)
+        _t1839 = logic_pb2.RelTerm(term=term_41022)
+        _t1840 = logic_pb2.Primitive(name="rel_primitive_subtract_monotype", terms=[_t1837, _t1838, _t1839])
+        result1024 = _t1840
+        self.record_span(span_start1023, "Primitive")
+        return result1024
 
     def parse_multiply(self) -> logic_pb2.Primitive:
-        span_start991 = self.span_start()
+        span_start1028 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("*")
-        _t1767 = self.parse_term()
-        term988 = _t1767
-        _t1768 = self.parse_term()
-        term_3989 = _t1768
-        _t1769 = self.parse_term()
-        term_4990 = _t1769
-        self.consume_literal(")")
-        _t1770 = logic_pb2.RelTerm(term=term988)
-        _t1771 = logic_pb2.RelTerm(term=term_3989)
-        _t1772 = logic_pb2.RelTerm(term=term_4990)
-        _t1773 = logic_pb2.Primitive(name="rel_primitive_multiply_monotype", terms=[_t1770, _t1771, _t1772])
-        result992 = _t1773
-        self.record_span(span_start991, "Primitive")
-        return result992
+        _t1841 = self.parse_term()
+        term1025 = _t1841
+        _t1842 = self.parse_term()
+        term_31026 = _t1842
+        _t1843 = self.parse_term()
+        term_41027 = _t1843
+        self.consume_literal(")")
+        _t1844 = logic_pb2.RelTerm(term=term1025)
+        _t1845 = logic_pb2.RelTerm(term=term_31026)
+        _t1846 = logic_pb2.RelTerm(term=term_41027)
+        _t1847 = logic_pb2.Primitive(name="rel_primitive_multiply_monotype", terms=[_t1844, _t1845, _t1846])
+        result1029 = _t1847
+        self.record_span(span_start1028, "Primitive")
+        return result1029
 
     def parse_divide(self) -> logic_pb2.Primitive:
-        span_start996 = self.span_start()
+        span_start1033 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("/")
-        _t1774 = self.parse_term()
-        term993 = _t1774
-        _t1775 = self.parse_term()
-        term_3994 = _t1775
-        _t1776 = self.parse_term()
-        term_4995 = _t1776
-        self.consume_literal(")")
-        _t1777 = logic_pb2.RelTerm(term=term993)
-        _t1778 = logic_pb2.RelTerm(term=term_3994)
-        _t1779 = logic_pb2.RelTerm(term=term_4995)
-        _t1780 = logic_pb2.Primitive(name="rel_primitive_divide_monotype", terms=[_t1777, _t1778, _t1779])
-        result997 = _t1780
-        self.record_span(span_start996, "Primitive")
-        return result997
+        _t1848 = self.parse_term()
+        term1030 = _t1848
+        _t1849 = self.parse_term()
+        term_31031 = _t1849
+        _t1850 = self.parse_term()
+        term_41032 = _t1850
+        self.consume_literal(")")
+        _t1851 = logic_pb2.RelTerm(term=term1030)
+        _t1852 = logic_pb2.RelTerm(term=term_31031)
+        _t1853 = logic_pb2.RelTerm(term=term_41032)
+        _t1854 = logic_pb2.Primitive(name="rel_primitive_divide_monotype", terms=[_t1851, _t1852, _t1853])
+        result1034 = _t1854
+        self.record_span(span_start1033, "Primitive")
+        return result1034
 
     def parse_rel_term(self) -> logic_pb2.RelTerm:
-        span_start1001 = self.span_start()
+        span_start1038 = self.span_start()
         if self.match_lookahead_literal("true", 0):
-            _t1781 = 1
+            _t1855 = 1
         else:
             if self.match_lookahead_literal("missing", 0):
-                _t1782 = 1
+                _t1856 = 1
             else:
                 if self.match_lookahead_literal("false", 0):
-                    _t1783 = 1
+                    _t1857 = 1
                 else:
                     if self.match_lookahead_literal("(", 0):
-                        _t1784 = 1
+                        _t1858 = 1
                     else:
                         if self.match_lookahead_literal("#", 0):
-                            _t1785 = 0
+                            _t1859 = 0
                         else:
                             if self.match_lookahead_terminal("SYMBOL", 0):
-                                _t1786 = 1
+                                _t1860 = 1
                             else:
                                 if self.match_lookahead_terminal("UINT32", 0):
-                                    _t1787 = 1
+                                    _t1861 = 1
                                 else:
                                     if self.match_lookahead_terminal("UINT128", 0):
-                                        _t1788 = 1
+                                        _t1862 = 1
                                     else:
                                         if self.match_lookahead_terminal("STRING", 0):
-                                            _t1789 = 1
+                                            _t1863 = 1
                                         else:
                                             if self.match_lookahead_terminal("INT32", 0):
-                                                _t1790 = 1
+                                                _t1864 = 1
                                             else:
                                                 if self.match_lookahead_terminal("INT128", 0):
-                                                    _t1791 = 1
+                                                    _t1865 = 1
                                                 else:
                                                     if self.match_lookahead_terminal("INT", 0):
-                                                        _t1792 = 1
+                                                        _t1866 = 1
                                                     else:
                                                         if self.match_lookahead_terminal("FLOAT32", 0):
-                                                            _t1793 = 1
+                                                            _t1867 = 1
                                                         else:
                                                             if self.match_lookahead_terminal("FLOAT", 0):
-                                                                _t1794 = 1
+                                                                _t1868 = 1
                                                             else:
                                                                 if self.match_lookahead_terminal("DECIMAL", 0):
-                                                                    _t1795 = 1
+                                                                    _t1869 = 1
                                                                 else:
-                                                                    _t1795 = -1
-                                                                _t1794 = _t1795
-                                                            _t1793 = _t1794
-                                                        _t1792 = _t1793
-                                                    _t1791 = _t1792
-                                                _t1790 = _t1791
-                                            _t1789 = _t1790
-                                        _t1788 = _t1789
-                                    _t1787 = _t1788
-                                _t1786 = _t1787
-                            _t1785 = _t1786
-                        _t1784 = _t1785
-                    _t1783 = _t1784
-                _t1782 = _t1783
-            _t1781 = _t1782
-        prediction998 = _t1781
-        if prediction998 == 1:
-            _t1797 = self.parse_term()
-            term1000 = _t1797
-            _t1798 = logic_pb2.RelTerm(term=term1000)
-            _t1796 = _t1798
-        else:
-            if prediction998 == 0:
-                _t1800 = self.parse_specialized_value()
-                specialized_value999 = _t1800
-                _t1801 = logic_pb2.RelTerm(specialized_value=specialized_value999)
-                _t1799 = _t1801
+                                                                    _t1869 = -1
+                                                                _t1868 = _t1869
+                                                            _t1867 = _t1868
+                                                        _t1866 = _t1867
+                                                    _t1865 = _t1866
+                                                _t1864 = _t1865
+                                            _t1863 = _t1864
+                                        _t1862 = _t1863
+                                    _t1861 = _t1862
+                                _t1860 = _t1861
+                            _t1859 = _t1860
+                        _t1858 = _t1859
+                    _t1857 = _t1858
+                _t1856 = _t1857
+            _t1855 = _t1856
+        prediction1035 = _t1855
+        if prediction1035 == 1:
+            _t1871 = self.parse_term()
+            term1037 = _t1871
+            _t1872 = logic_pb2.RelTerm(term=term1037)
+            _t1870 = _t1872
+        else:
+            if prediction1035 == 0:
+                _t1874 = self.parse_specialized_value()
+                specialized_value1036 = _t1874
+                _t1875 = logic_pb2.RelTerm(specialized_value=specialized_value1036)
+                _t1873 = _t1875
             else:
                 raise ParseError("Unexpected token in rel_term" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1796 = _t1799
-        result1002 = _t1796
-        self.record_span(span_start1001, "RelTerm")
-        return result1002
+            _t1870 = _t1873
+        result1039 = _t1870
+        self.record_span(span_start1038, "RelTerm")
+        return result1039
 
     def parse_specialized_value(self) -> logic_pb2.Value:
-        span_start1004 = self.span_start()
+        span_start1041 = self.span_start()
         self.consume_literal("#")
-        _t1802 = self.parse_raw_value()
-        raw_value1003 = _t1802
-        result1005 = raw_value1003
-        self.record_span(span_start1004, "Value")
-        return result1005
+        _t1876 = self.parse_raw_value()
+        raw_value1040 = _t1876
+        result1042 = raw_value1040
+        self.record_span(span_start1041, "Value")
+        return result1042
 
     def parse_rel_atom(self) -> logic_pb2.RelAtom:
-        span_start1011 = self.span_start()
+        span_start1048 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("relatom")
-        _t1803 = self.parse_name()
-        name1006 = _t1803
-        xs1007 = []
-        cond1008 = ((((((((((((((self.match_lookahead_literal("#", 0) or self.match_lookahead_literal("(", 0)) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-        while cond1008:
-            _t1804 = self.parse_rel_term()
-            item1009 = _t1804
-            xs1007.append(item1009)
-            cond1008 = ((((((((((((((self.match_lookahead_literal("#", 0) or self.match_lookahead_literal("(", 0)) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
-        rel_terms1010 = xs1007
-        self.consume_literal(")")
-        _t1805 = logic_pb2.RelAtom(name=name1006, terms=rel_terms1010)
-        result1012 = _t1805
-        self.record_span(span_start1011, "RelAtom")
-        return result1012
+        _t1877 = self.parse_name()
+        name1043 = _t1877
+        xs1044 = []
+        cond1045 = ((((((((((((((self.match_lookahead_literal("#", 0) or self.match_lookahead_literal("(", 0)) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+        while cond1045:
+            _t1878 = self.parse_rel_term()
+            item1046 = _t1878
+            xs1044.append(item1046)
+            cond1045 = ((((((((((((((self.match_lookahead_literal("#", 0) or self.match_lookahead_literal("(", 0)) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0)) or self.match_lookahead_terminal("SYMBOL", 0))
+        rel_terms1047 = xs1044
+        self.consume_literal(")")
+        _t1879 = logic_pb2.RelAtom(name=name1043, terms=rel_terms1047)
+        result1049 = _t1879
+        self.record_span(span_start1048, "RelAtom")
+        return result1049
 
     def parse_cast(self) -> logic_pb2.Cast:
-        span_start1015 = self.span_start()
+        span_start1052 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("cast")
-        _t1806 = self.parse_term()
-        term1013 = _t1806
-        _t1807 = self.parse_term()
-        term_31014 = _t1807
+        _t1880 = self.parse_term()
+        term1050 = _t1880
+        _t1881 = self.parse_term()
+        term_31051 = _t1881
         self.consume_literal(")")
-        _t1808 = logic_pb2.Cast(input=term1013, result=term_31014)
-        result1016 = _t1808
-        self.record_span(span_start1015, "Cast")
-        return result1016
+        _t1882 = logic_pb2.Cast(input=term1050, result=term_31051)
+        result1053 = _t1882
+        self.record_span(span_start1052, "Cast")
+        return result1053
 
     def parse_attrs(self) -> Sequence[logic_pb2.Attribute]:
         self.consume_literal("(")
         self.consume_literal("attrs")
-        xs1017 = []
-        cond1018 = self.match_lookahead_literal("(", 0)
-        while cond1018:
-            _t1809 = self.parse_attribute()
-            item1019 = _t1809
-            xs1017.append(item1019)
-            cond1018 = self.match_lookahead_literal("(", 0)
-        attributes1020 = xs1017
+        xs1054 = []
+        cond1055 = self.match_lookahead_literal("(", 0)
+        while cond1055:
+            _t1883 = self.parse_attribute()
+            item1056 = _t1883
+            xs1054.append(item1056)
+            cond1055 = self.match_lookahead_literal("(", 0)
+        attributes1057 = xs1054
         self.consume_literal(")")
-        return attributes1020
+        return attributes1057
 
     def parse_attribute(self) -> logic_pb2.Attribute:
-        span_start1026 = self.span_start()
+        span_start1063 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("attribute")
-        _t1810 = self.parse_name()
-        name1021 = _t1810
-        xs1022 = []
-        cond1023 = ((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0))
-        while cond1023:
-            _t1811 = self.parse_raw_value()
-            item1024 = _t1811
-            xs1022.append(item1024)
-            cond1023 = ((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0))
-        raw_values1025 = xs1022
-        self.consume_literal(")")
-        _t1812 = logic_pb2.Attribute(name=name1021, args=raw_values1025)
-        result1027 = _t1812
-        self.record_span(span_start1026, "Attribute")
-        return result1027
+        _t1884 = self.parse_name()
+        name1058 = _t1884
+        xs1059 = []
+        cond1060 = ((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0))
+        while cond1060:
+            _t1885 = self.parse_raw_value()
+            item1061 = _t1885
+            xs1059.append(item1061)
+            cond1060 = ((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("false", 0)) or self.match_lookahead_literal("missing", 0)) or self.match_lookahead_literal("true", 0)) or self.match_lookahead_terminal("DECIMAL", 0)) or self.match_lookahead_terminal("FLOAT", 0)) or self.match_lookahead_terminal("FLOAT32", 0)) or self.match_lookahead_terminal("INT", 0)) or self.match_lookahead_terminal("INT128", 0)) or self.match_lookahead_terminal("INT32", 0)) or self.match_lookahead_terminal("STRING", 0)) or self.match_lookahead_terminal("UINT128", 0)) or self.match_lookahead_terminal("UINT32", 0))
+        raw_values1062 = xs1059
+        self.consume_literal(")")
+        _t1886 = logic_pb2.Attribute(name=name1058, args=raw_values1062)
+        result1064 = _t1886
+        self.record_span(span_start1063, "Attribute")
+        return result1064
 
     def parse_algorithm(self) -> logic_pb2.Algorithm:
-        span_start1034 = self.span_start()
+        span_start1071 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("algorithm")
-        xs1028 = []
-        cond1029 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
-        while cond1029:
-            _t1813 = self.parse_relation_id()
-            item1030 = _t1813
-            xs1028.append(item1030)
-            cond1029 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
-        relation_ids1031 = xs1028
-        _t1814 = self.parse_script()
-        script1032 = _t1814
+        xs1065 = []
+        cond1066 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
+        while cond1066:
+            _t1887 = self.parse_relation_id()
+            item1067 = _t1887
+            xs1065.append(item1067)
+            cond1066 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
+        relation_ids1068 = xs1065
+        _t1888 = self.parse_script()
+        script1069 = _t1888
         if self.match_lookahead_literal("(", 0):
-            _t1816 = self.parse_attrs()
-            _t1815 = _t1816
+            _t1890 = self.parse_attrs()
+            _t1889 = _t1890
         else:
-            _t1815 = None
-        attrs1033 = _t1815
+            _t1889 = None
+        attrs1070 = _t1889
         self.consume_literal(")")
-        _t1817 = logic_pb2.Algorithm(body=script1032, attrs=(attrs1033 if attrs1033 is not None else []))
-        getattr(_t1817, 'global').extend(relation_ids1031)
-        result1035 = _t1817
-        self.record_span(span_start1034, "Algorithm")
-        return result1035
+        _t1891 = logic_pb2.Algorithm(body=script1069, attrs=(attrs1070 if attrs1070 is not None else []))
+        getattr(_t1891, 'global').extend(relation_ids1068)
+        result1072 = _t1891
+        self.record_span(span_start1071, "Algorithm")
+        return result1072
 
     def parse_script(self) -> logic_pb2.Script:
-        span_start1040 = self.span_start()
+        span_start1077 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("script")
-        xs1036 = []
-        cond1037 = self.match_lookahead_literal("(", 0)
-        while cond1037:
-            _t1818 = self.parse_construct()
-            item1038 = _t1818
-            xs1036.append(item1038)
-            cond1037 = self.match_lookahead_literal("(", 0)
-        constructs1039 = xs1036
-        self.consume_literal(")")
-        _t1819 = logic_pb2.Script(constructs=constructs1039)
-        result1041 = _t1819
-        self.record_span(span_start1040, "Script")
-        return result1041
+        xs1073 = []
+        cond1074 = self.match_lookahead_literal("(", 0)
+        while cond1074:
+            _t1892 = self.parse_construct()
+            item1075 = _t1892
+            xs1073.append(item1075)
+            cond1074 = self.match_lookahead_literal("(", 0)
+        constructs1076 = xs1073
+        self.consume_literal(")")
+        _t1893 = logic_pb2.Script(constructs=constructs1076)
+        result1078 = _t1893
+        self.record_span(span_start1077, "Script")
+        return result1078
 
     def parse_construct(self) -> logic_pb2.Construct:
-        span_start1045 = self.span_start()
+        span_start1082 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("upsert", 1):
-                _t1821 = 1
+                _t1895 = 1
             else:
                 if self.match_lookahead_literal("monus", 1):
-                    _t1822 = 1
+                    _t1896 = 1
                 else:
                     if self.match_lookahead_literal("monoid", 1):
-                        _t1823 = 1
+                        _t1897 = 1
                     else:
                         if self.match_lookahead_literal("loop", 1):
-                            _t1824 = 0
+                            _t1898 = 0
                         else:
                             if self.match_lookahead_literal("break", 1):
-                                _t1825 = 1
+                                _t1899 = 1
                             else:
                                 if self.match_lookahead_literal("assign", 1):
-                                    _t1826 = 1
+                                    _t1900 = 1
                                 else:
-                                    _t1826 = -1
-                                _t1825 = _t1826
-                            _t1824 = _t1825
-                        _t1823 = _t1824
-                    _t1822 = _t1823
-                _t1821 = _t1822
-            _t1820 = _t1821
-        else:
-            _t1820 = -1
-        prediction1042 = _t1820
-        if prediction1042 == 1:
-            _t1828 = self.parse_instruction()
-            instruction1044 = _t1828
-            _t1829 = logic_pb2.Construct(instruction=instruction1044)
-            _t1827 = _t1829
-        else:
-            if prediction1042 == 0:
-                _t1831 = self.parse_loop()
-                loop1043 = _t1831
-                _t1832 = logic_pb2.Construct(loop=loop1043)
-                _t1830 = _t1832
+                                    _t1900 = -1
+                                _t1899 = _t1900
+                            _t1898 = _t1899
+                        _t1897 = _t1898
+                    _t1896 = _t1897
+                _t1895 = _t1896
+            _t1894 = _t1895
+        else:
+            _t1894 = -1
+        prediction1079 = _t1894
+        if prediction1079 == 1:
+            _t1902 = self.parse_instruction()
+            instruction1081 = _t1902
+            _t1903 = logic_pb2.Construct(instruction=instruction1081)
+            _t1901 = _t1903
+        else:
+            if prediction1079 == 0:
+                _t1905 = self.parse_loop()
+                loop1080 = _t1905
+                _t1906 = logic_pb2.Construct(loop=loop1080)
+                _t1904 = _t1906
             else:
                 raise ParseError("Unexpected token in construct" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1827 = _t1830
-        result1046 = _t1827
-        self.record_span(span_start1045, "Construct")
-        return result1046
+            _t1901 = _t1904
+        result1083 = _t1901
+        self.record_span(span_start1082, "Construct")
+        return result1083
 
     def parse_loop(self) -> logic_pb2.Loop:
-        span_start1050 = self.span_start()
+        span_start1087 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("loop")
-        _t1833 = self.parse_init()
-        init1047 = _t1833
-        _t1834 = self.parse_script()
-        script1048 = _t1834
+        _t1907 = self.parse_init()
+        init1084 = _t1907
+        _t1908 = self.parse_script()
+        script1085 = _t1908
         if self.match_lookahead_literal("(", 0):
-            _t1836 = self.parse_attrs()
-            _t1835 = _t1836
+            _t1910 = self.parse_attrs()
+            _t1909 = _t1910
         else:
-            _t1835 = None
-        attrs1049 = _t1835
+            _t1909 = None
+        attrs1086 = _t1909
         self.consume_literal(")")
-        _t1837 = logic_pb2.Loop(init=init1047, body=script1048, attrs=(attrs1049 if attrs1049 is not None else []))
-        result1051 = _t1837
-        self.record_span(span_start1050, "Loop")
-        return result1051
+        _t1911 = logic_pb2.Loop(init=init1084, body=script1085, attrs=(attrs1086 if attrs1086 is not None else []))
+        result1088 = _t1911
+        self.record_span(span_start1087, "Loop")
+        return result1088
 
     def parse_init(self) -> Sequence[logic_pb2.Instruction]:
         self.consume_literal("(")
         self.consume_literal("init")
-        xs1052 = []
-        cond1053 = self.match_lookahead_literal("(", 0)
-        while cond1053:
-            _t1838 = self.parse_instruction()
-            item1054 = _t1838
-            xs1052.append(item1054)
-            cond1053 = self.match_lookahead_literal("(", 0)
-        instructions1055 = xs1052
+        xs1089 = []
+        cond1090 = self.match_lookahead_literal("(", 0)
+        while cond1090:
+            _t1912 = self.parse_instruction()
+            item1091 = _t1912
+            xs1089.append(item1091)
+            cond1090 = self.match_lookahead_literal("(", 0)
+        instructions1092 = xs1089
         self.consume_literal(")")
-        return instructions1055
+        return instructions1092
 
     def parse_instruction(self) -> logic_pb2.Instruction:
-        span_start1062 = self.span_start()
+        span_start1099 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("upsert", 1):
-                _t1840 = 1
+                _t1914 = 1
             else:
                 if self.match_lookahead_literal("monus", 1):
-                    _t1841 = 4
+                    _t1915 = 4
                 else:
                     if self.match_lookahead_literal("monoid", 1):
-                        _t1842 = 3
+                        _t1916 = 3
                     else:
                         if self.match_lookahead_literal("break", 1):
-                            _t1843 = 2
+                            _t1917 = 2
                         else:
                             if self.match_lookahead_literal("assign", 1):
-                                _t1844 = 0
+                                _t1918 = 0
                             else:
-                                _t1844 = -1
-                            _t1843 = _t1844
-                        _t1842 = _t1843
-                    _t1841 = _t1842
-                _t1840 = _t1841
-            _t1839 = _t1840
-        else:
-            _t1839 = -1
-        prediction1056 = _t1839
-        if prediction1056 == 4:
-            _t1846 = self.parse_monus_def()
-            monus_def1061 = _t1846
-            _t1847 = logic_pb2.Instruction(monus_def=monus_def1061)
-            _t1845 = _t1847
-        else:
-            if prediction1056 == 3:
-                _t1849 = self.parse_monoid_def()
-                monoid_def1060 = _t1849
-                _t1850 = logic_pb2.Instruction(monoid_def=monoid_def1060)
-                _t1848 = _t1850
+                                _t1918 = -1
+                            _t1917 = _t1918
+                        _t1916 = _t1917
+                    _t1915 = _t1916
+                _t1914 = _t1915
+            _t1913 = _t1914
+        else:
+            _t1913 = -1
+        prediction1093 = _t1913
+        if prediction1093 == 4:
+            _t1920 = self.parse_monus_def()
+            monus_def1098 = _t1920
+            _t1921 = logic_pb2.Instruction(monus_def=monus_def1098)
+            _t1919 = _t1921
+        else:
+            if prediction1093 == 3:
+                _t1923 = self.parse_monoid_def()
+                monoid_def1097 = _t1923
+                _t1924 = logic_pb2.Instruction(monoid_def=monoid_def1097)
+                _t1922 = _t1924
             else:
-                if prediction1056 == 2:
-                    _t1852 = self.parse_break()
-                    break1059 = _t1852
-                    _t1853 = logic_pb2.Instruction()
-                    getattr(_t1853, 'break').CopyFrom(break1059)
-                    _t1851 = _t1853
+                if prediction1093 == 2:
+                    _t1926 = self.parse_break()
+                    break1096 = _t1926
+                    _t1927 = logic_pb2.Instruction()
+                    getattr(_t1927, 'break').CopyFrom(break1096)
+                    _t1925 = _t1927
                 else:
-                    if prediction1056 == 1:
-                        _t1855 = self.parse_upsert()
-                        upsert1058 = _t1855
-                        _t1856 = logic_pb2.Instruction(upsert=upsert1058)
-                        _t1854 = _t1856
+                    if prediction1093 == 1:
+                        _t1929 = self.parse_upsert()
+                        upsert1095 = _t1929
+                        _t1930 = logic_pb2.Instruction(upsert=upsert1095)
+                        _t1928 = _t1930
                     else:
-                        if prediction1056 == 0:
-                            _t1858 = self.parse_assign()
-                            assign1057 = _t1858
-                            _t1859 = logic_pb2.Instruction(assign=assign1057)
-                            _t1857 = _t1859
+                        if prediction1093 == 0:
+                            _t1932 = self.parse_assign()
+                            assign1094 = _t1932
+                            _t1933 = logic_pb2.Instruction(assign=assign1094)
+                            _t1931 = _t1933
                         else:
                             raise ParseError("Unexpected token in instruction" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                        _t1854 = _t1857
-                    _t1851 = _t1854
-                _t1848 = _t1851
-            _t1845 = _t1848
-        result1063 = _t1845
-        self.record_span(span_start1062, "Instruction")
-        return result1063
+                        _t1928 = _t1931
+                    _t1925 = _t1928
+                _t1922 = _t1925
+            _t1919 = _t1922
+        result1100 = _t1919
+        self.record_span(span_start1099, "Instruction")
+        return result1100
 
     def parse_assign(self) -> logic_pb2.Assign:
-        span_start1067 = self.span_start()
+        span_start1104 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("assign")
-        _t1860 = self.parse_relation_id()
-        relation_id1064 = _t1860
-        _t1861 = self.parse_abstraction()
-        abstraction1065 = _t1861
+        _t1934 = self.parse_relation_id()
+        relation_id1101 = _t1934
+        _t1935 = self.parse_abstraction()
+        abstraction1102 = _t1935
         if self.match_lookahead_literal("(", 0):
-            _t1863 = self.parse_attrs()
-            _t1862 = _t1863
+            _t1937 = self.parse_attrs()
+            _t1936 = _t1937
         else:
-            _t1862 = None
-        attrs1066 = _t1862
+            _t1936 = None
+        attrs1103 = _t1936
         self.consume_literal(")")
-        _t1864 = logic_pb2.Assign(name=relation_id1064, body=abstraction1065, attrs=(attrs1066 if attrs1066 is not None else []))
-        result1068 = _t1864
-        self.record_span(span_start1067, "Assign")
-        return result1068
+        _t1938 = logic_pb2.Assign(name=relation_id1101, body=abstraction1102, attrs=(attrs1103 if attrs1103 is not None else []))
+        result1105 = _t1938
+        self.record_span(span_start1104, "Assign")
+        return result1105
 
     def parse_upsert(self) -> logic_pb2.Upsert:
-        span_start1072 = self.span_start()
+        span_start1109 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("upsert")
-        _t1865 = self.parse_relation_id()
-        relation_id1069 = _t1865
-        _t1866 = self.parse_abstraction_with_arity()
-        abstraction_with_arity1070 = _t1866
+        _t1939 = self.parse_relation_id()
+        relation_id1106 = _t1939
+        _t1940 = self.parse_abstraction_with_arity()
+        abstraction_with_arity1107 = _t1940
         if self.match_lookahead_literal("(", 0):
-            _t1868 = self.parse_attrs()
-            _t1867 = _t1868
+            _t1942 = self.parse_attrs()
+            _t1941 = _t1942
         else:
-            _t1867 = None
-        attrs1071 = _t1867
+            _t1941 = None
+        attrs1108 = _t1941
         self.consume_literal(")")
-        _t1869 = logic_pb2.Upsert(name=relation_id1069, body=abstraction_with_arity1070[0], attrs=(attrs1071 if attrs1071 is not None else []), value_arity=abstraction_with_arity1070[1])
-        result1073 = _t1869
-        self.record_span(span_start1072, "Upsert")
-        return result1073
+        _t1943 = logic_pb2.Upsert(name=relation_id1106, body=abstraction_with_arity1107[0], attrs=(attrs1108 if attrs1108 is not None else []), value_arity=abstraction_with_arity1107[1])
+        result1110 = _t1943
+        self.record_span(span_start1109, "Upsert")
+        return result1110
 
     def parse_abstraction_with_arity(self) -> tuple[logic_pb2.Abstraction, int]:
         self.consume_literal("(")
-        _t1870 = self.parse_bindings()
-        bindings1074 = _t1870
-        _t1871 = self.parse_formula()
-        formula1075 = _t1871
+        _t1944 = self.parse_bindings()
+        bindings1111 = _t1944
+        _t1945 = self.parse_formula()
+        formula1112 = _t1945
         self.consume_literal(")")
-        _t1872 = logic_pb2.Abstraction(vars=(list(bindings1074[0]) + list(bindings1074[1] if bindings1074[1] is not None else [])), value=formula1075)
-        return (_t1872, len(bindings1074[1]),)
+        _t1946 = logic_pb2.Abstraction(vars=(list(bindings1111[0]) + list(bindings1111[1] if bindings1111[1] is not None else [])), value=formula1112)
+        return (_t1946, len(bindings1111[1]),)
 
     def parse_break(self) -> logic_pb2.Break:
-        span_start1079 = self.span_start()
+        span_start1116 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("break")
-        _t1873 = self.parse_relation_id()
-        relation_id1076 = _t1873
-        _t1874 = self.parse_abstraction()
-        abstraction1077 = _t1874
+        _t1947 = self.parse_relation_id()
+        relation_id1113 = _t1947
+        _t1948 = self.parse_abstraction()
+        abstraction1114 = _t1948
         if self.match_lookahead_literal("(", 0):
-            _t1876 = self.parse_attrs()
-            _t1875 = _t1876
+            _t1950 = self.parse_attrs()
+            _t1949 = _t1950
         else:
-            _t1875 = None
-        attrs1078 = _t1875
+            _t1949 = None
+        attrs1115 = _t1949
         self.consume_literal(")")
-        _t1877 = logic_pb2.Break(name=relation_id1076, body=abstraction1077, attrs=(attrs1078 if attrs1078 is not None else []))
-        result1080 = _t1877
-        self.record_span(span_start1079, "Break")
-        return result1080
+        _t1951 = logic_pb2.Break(name=relation_id1113, body=abstraction1114, attrs=(attrs1115 if attrs1115 is not None else []))
+        result1117 = _t1951
+        self.record_span(span_start1116, "Break")
+        return result1117
 
     def parse_monoid_def(self) -> logic_pb2.MonoidDef:
-        span_start1085 = self.span_start()
+        span_start1122 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("monoid")
-        _t1878 = self.parse_monoid()
-        monoid1081 = _t1878
-        _t1879 = self.parse_relation_id()
-        relation_id1082 = _t1879
-        _t1880 = self.parse_abstraction_with_arity()
-        abstraction_with_arity1083 = _t1880
+        _t1952 = self.parse_monoid()
+        monoid1118 = _t1952
+        _t1953 = self.parse_relation_id()
+        relation_id1119 = _t1953
+        _t1954 = self.parse_abstraction_with_arity()
+        abstraction_with_arity1120 = _t1954
         if self.match_lookahead_literal("(", 0):
-            _t1882 = self.parse_attrs()
-            _t1881 = _t1882
+            _t1956 = self.parse_attrs()
+            _t1955 = _t1956
         else:
-            _t1881 = None
-        attrs1084 = _t1881
+            _t1955 = None
+        attrs1121 = _t1955
         self.consume_literal(")")
-        _t1883 = logic_pb2.MonoidDef(monoid=monoid1081, name=relation_id1082, body=abstraction_with_arity1083[0], attrs=(attrs1084 if attrs1084 is not None else []), value_arity=abstraction_with_arity1083[1])
-        result1086 = _t1883
-        self.record_span(span_start1085, "MonoidDef")
-        return result1086
+        _t1957 = logic_pb2.MonoidDef(monoid=monoid1118, name=relation_id1119, body=abstraction_with_arity1120[0], attrs=(attrs1121 if attrs1121 is not None else []), value_arity=abstraction_with_arity1120[1])
+        result1123 = _t1957
+        self.record_span(span_start1122, "MonoidDef")
+        return result1123
 
     def parse_monoid(self) -> logic_pb2.Monoid:
-        span_start1092 = self.span_start()
+        span_start1129 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("sum", 1):
-                _t1885 = 3
+                _t1959 = 3
             else:
                 if self.match_lookahead_literal("or", 1):
-                    _t1886 = 0
+                    _t1960 = 0
                 else:
                     if self.match_lookahead_literal("min", 1):
-                        _t1887 = 1
+                        _t1961 = 1
                     else:
                         if self.match_lookahead_literal("max", 1):
-                            _t1888 = 2
+                            _t1962 = 2
                         else:
-                            _t1888 = -1
-                        _t1887 = _t1888
-                    _t1886 = _t1887
-                _t1885 = _t1886
-            _t1884 = _t1885
-        else:
-            _t1884 = -1
-        prediction1087 = _t1884
-        if prediction1087 == 3:
-            _t1890 = self.parse_sum_monoid()
-            sum_monoid1091 = _t1890
-            _t1891 = logic_pb2.Monoid(sum_monoid=sum_monoid1091)
-            _t1889 = _t1891
-        else:
-            if prediction1087 == 2:
-                _t1893 = self.parse_max_monoid()
-                max_monoid1090 = _t1893
-                _t1894 = logic_pb2.Monoid(max_monoid=max_monoid1090)
-                _t1892 = _t1894
+                            _t1962 = -1
+                        _t1961 = _t1962
+                    _t1960 = _t1961
+                _t1959 = _t1960
+            _t1958 = _t1959
+        else:
+            _t1958 = -1
+        prediction1124 = _t1958
+        if prediction1124 == 3:
+            _t1964 = self.parse_sum_monoid()
+            sum_monoid1128 = _t1964
+            _t1965 = logic_pb2.Monoid(sum_monoid=sum_monoid1128)
+            _t1963 = _t1965
+        else:
+            if prediction1124 == 2:
+                _t1967 = self.parse_max_monoid()
+                max_monoid1127 = _t1967
+                _t1968 = logic_pb2.Monoid(max_monoid=max_monoid1127)
+                _t1966 = _t1968
             else:
-                if prediction1087 == 1:
-                    _t1896 = self.parse_min_monoid()
-                    min_monoid1089 = _t1896
-                    _t1897 = logic_pb2.Monoid(min_monoid=min_monoid1089)
-                    _t1895 = _t1897
+                if prediction1124 == 1:
+                    _t1970 = self.parse_min_monoid()
+                    min_monoid1126 = _t1970
+                    _t1971 = logic_pb2.Monoid(min_monoid=min_monoid1126)
+                    _t1969 = _t1971
                 else:
-                    if prediction1087 == 0:
-                        _t1899 = self.parse_or_monoid()
-                        or_monoid1088 = _t1899
-                        _t1900 = logic_pb2.Monoid(or_monoid=or_monoid1088)
-                        _t1898 = _t1900
+                    if prediction1124 == 0:
+                        _t1973 = self.parse_or_monoid()
+                        or_monoid1125 = _t1973
+                        _t1974 = logic_pb2.Monoid(or_monoid=or_monoid1125)
+                        _t1972 = _t1974
                     else:
                         raise ParseError("Unexpected token in monoid" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                    _t1895 = _t1898
-                _t1892 = _t1895
-            _t1889 = _t1892
-        result1093 = _t1889
-        self.record_span(span_start1092, "Monoid")
-        return result1093
+                    _t1969 = _t1972
+                _t1966 = _t1969
+            _t1963 = _t1966
+        result1130 = _t1963
+        self.record_span(span_start1129, "Monoid")
+        return result1130
 
     def parse_or_monoid(self) -> logic_pb2.OrMonoid:
-        span_start1094 = self.span_start()
+        span_start1131 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("or")
         self.consume_literal(")")
-        _t1901 = logic_pb2.OrMonoid()
-        result1095 = _t1901
-        self.record_span(span_start1094, "OrMonoid")
-        return result1095
+        _t1975 = logic_pb2.OrMonoid()
+        result1132 = _t1975
+        self.record_span(span_start1131, "OrMonoid")
+        return result1132
 
     def parse_min_monoid(self) -> logic_pb2.MinMonoid:
-        span_start1097 = self.span_start()
+        span_start1134 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("min")
-        _t1902 = self.parse_type()
-        type1096 = _t1902
+        _t1976 = self.parse_type()
+        type1133 = _t1976
         self.consume_literal(")")
-        _t1903 = logic_pb2.MinMonoid(type=type1096)
-        result1098 = _t1903
-        self.record_span(span_start1097, "MinMonoid")
-        return result1098
+        _t1977 = logic_pb2.MinMonoid(type=type1133)
+        result1135 = _t1977
+        self.record_span(span_start1134, "MinMonoid")
+        return result1135
 
     def parse_max_monoid(self) -> logic_pb2.MaxMonoid:
-        span_start1100 = self.span_start()
+        span_start1137 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("max")
-        _t1904 = self.parse_type()
-        type1099 = _t1904
+        _t1978 = self.parse_type()
+        type1136 = _t1978
         self.consume_literal(")")
-        _t1905 = logic_pb2.MaxMonoid(type=type1099)
-        result1101 = _t1905
-        self.record_span(span_start1100, "MaxMonoid")
-        return result1101
+        _t1979 = logic_pb2.MaxMonoid(type=type1136)
+        result1138 = _t1979
+        self.record_span(span_start1137, "MaxMonoid")
+        return result1138
 
     def parse_sum_monoid(self) -> logic_pb2.SumMonoid:
-        span_start1103 = self.span_start()
+        span_start1140 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("sum")
-        _t1906 = self.parse_type()
-        type1102 = _t1906
+        _t1980 = self.parse_type()
+        type1139 = _t1980
         self.consume_literal(")")
-        _t1907 = logic_pb2.SumMonoid(type=type1102)
-        result1104 = _t1907
-        self.record_span(span_start1103, "SumMonoid")
-        return result1104
+        _t1981 = logic_pb2.SumMonoid(type=type1139)
+        result1141 = _t1981
+        self.record_span(span_start1140, "SumMonoid")
+        return result1141
 
     def parse_monus_def(self) -> logic_pb2.MonusDef:
-        span_start1109 = self.span_start()
+        span_start1146 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("monus")
-        _t1908 = self.parse_monoid()
-        monoid1105 = _t1908
-        _t1909 = self.parse_relation_id()
-        relation_id1106 = _t1909
-        _t1910 = self.parse_abstraction_with_arity()
-        abstraction_with_arity1107 = _t1910
+        _t1982 = self.parse_monoid()
+        monoid1142 = _t1982
+        _t1983 = self.parse_relation_id()
+        relation_id1143 = _t1983
+        _t1984 = self.parse_abstraction_with_arity()
+        abstraction_with_arity1144 = _t1984
         if self.match_lookahead_literal("(", 0):
-            _t1912 = self.parse_attrs()
-            _t1911 = _t1912
+            _t1986 = self.parse_attrs()
+            _t1985 = _t1986
         else:
-            _t1911 = None
-        attrs1108 = _t1911
+            _t1985 = None
+        attrs1145 = _t1985
         self.consume_literal(")")
-        _t1913 = logic_pb2.MonusDef(monoid=monoid1105, name=relation_id1106, body=abstraction_with_arity1107[0], attrs=(attrs1108 if attrs1108 is not None else []), value_arity=abstraction_with_arity1107[1])
-        result1110 = _t1913
-        self.record_span(span_start1109, "MonusDef")
-        return result1110
+        _t1987 = logic_pb2.MonusDef(monoid=monoid1142, name=relation_id1143, body=abstraction_with_arity1144[0], attrs=(attrs1145 if attrs1145 is not None else []), value_arity=abstraction_with_arity1144[1])
+        result1147 = _t1987
+        self.record_span(span_start1146, "MonusDef")
+        return result1147
 
     def parse_constraint(self) -> logic_pb2.Constraint:
-        span_start1115 = self.span_start()
+        span_start1152 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("functional_dependency")
-        _t1914 = self.parse_relation_id()
-        relation_id1111 = _t1914
-        _t1915 = self.parse_abstraction()
-        abstraction1112 = _t1915
-        _t1916 = self.parse_functional_dependency_keys()
-        functional_dependency_keys1113 = _t1916
-        _t1917 = self.parse_functional_dependency_values()
-        functional_dependency_values1114 = _t1917
-        self.consume_literal(")")
-        _t1918 = logic_pb2.FunctionalDependency(guard=abstraction1112, keys=functional_dependency_keys1113, values=functional_dependency_values1114)
-        _t1919 = logic_pb2.Constraint(name=relation_id1111, functional_dependency=_t1918)
-        result1116 = _t1919
-        self.record_span(span_start1115, "Constraint")
-        return result1116
+        _t1988 = self.parse_relation_id()
+        relation_id1148 = _t1988
+        _t1989 = self.parse_abstraction()
+        abstraction1149 = _t1989
+        _t1990 = self.parse_functional_dependency_keys()
+        functional_dependency_keys1150 = _t1990
+        _t1991 = self.parse_functional_dependency_values()
+        functional_dependency_values1151 = _t1991
+        self.consume_literal(")")
+        _t1992 = logic_pb2.FunctionalDependency(guard=abstraction1149, keys=functional_dependency_keys1150, values=functional_dependency_values1151)
+        _t1993 = logic_pb2.Constraint(name=relation_id1148, functional_dependency=_t1992)
+        result1153 = _t1993
+        self.record_span(span_start1152, "Constraint")
+        return result1153
 
     def parse_functional_dependency_keys(self) -> Sequence[logic_pb2.Var]:
         self.consume_literal("(")
         self.consume_literal("keys")
-        xs1117 = []
-        cond1118 = self.match_lookahead_terminal("SYMBOL", 0)
-        while cond1118:
-            _t1920 = self.parse_var()
-            item1119 = _t1920
-            xs1117.append(item1119)
-            cond1118 = self.match_lookahead_terminal("SYMBOL", 0)
-        vars1120 = xs1117
+        xs1154 = []
+        cond1155 = self.match_lookahead_terminal("SYMBOL", 0)
+        while cond1155:
+            _t1994 = self.parse_var()
+            item1156 = _t1994
+            xs1154.append(item1156)
+            cond1155 = self.match_lookahead_terminal("SYMBOL", 0)
+        vars1157 = xs1154
         self.consume_literal(")")
-        return vars1120
+        return vars1157
 
     def parse_functional_dependency_values(self) -> Sequence[logic_pb2.Var]:
         self.consume_literal("(")
         self.consume_literal("values")
-        xs1121 = []
-        cond1122 = self.match_lookahead_terminal("SYMBOL", 0)
-        while cond1122:
-            _t1921 = self.parse_var()
-            item1123 = _t1921
-            xs1121.append(item1123)
-            cond1122 = self.match_lookahead_terminal("SYMBOL", 0)
-        vars1124 = xs1121
+        xs1158 = []
+        cond1159 = self.match_lookahead_terminal("SYMBOL", 0)
+        while cond1159:
+            _t1995 = self.parse_var()
+            item1160 = _t1995
+            xs1158.append(item1160)
+            cond1159 = self.match_lookahead_terminal("SYMBOL", 0)
+        vars1161 = xs1158
         self.consume_literal(")")
-        return vars1124
+        return vars1161
 
     def parse_data(self) -> logic_pb2.Data:
-        span_start1130 = self.span_start()
+        span_start1167 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("iceberg_data", 1):
-                _t1923 = 3
+                _t1997 = 3
             else:
                 if self.match_lookahead_literal("edb", 1):
-                    _t1924 = 0
+                    _t1998 = 0
                 else:
                     if self.match_lookahead_literal("csv_data", 1):
-                        _t1925 = 2
+                        _t1999 = 2
                     else:
                         if self.match_lookahead_literal("betree_relation", 1):
-                            _t1926 = 1
+                            _t2000 = 1
                         else:
-                            _t1926 = -1
-                        _t1925 = _t1926
-                    _t1924 = _t1925
-                _t1923 = _t1924
-            _t1922 = _t1923
-        else:
-            _t1922 = -1
-        prediction1125 = _t1922
-        if prediction1125 == 3:
-            _t1928 = self.parse_iceberg_data()
-            iceberg_data1129 = _t1928
-            _t1929 = logic_pb2.Data(iceberg_data=iceberg_data1129)
-            _t1927 = _t1929
-        else:
-            if prediction1125 == 2:
-                _t1931 = self.parse_csv_data()
-                csv_data1128 = _t1931
-                _t1932 = logic_pb2.Data(csv_data=csv_data1128)
-                _t1930 = _t1932
+                            _t2000 = -1
+                        _t1999 = _t2000
+                    _t1998 = _t1999
+                _t1997 = _t1998
+            _t1996 = _t1997
+        else:
+            _t1996 = -1
+        prediction1162 = _t1996
+        if prediction1162 == 3:
+            _t2002 = self.parse_iceberg_data()
+            iceberg_data1166 = _t2002
+            _t2003 = logic_pb2.Data(iceberg_data=iceberg_data1166)
+            _t2001 = _t2003
+        else:
+            if prediction1162 == 2:
+                _t2005 = self.parse_csv_data()
+                csv_data1165 = _t2005
+                _t2006 = logic_pb2.Data(csv_data=csv_data1165)
+                _t2004 = _t2006
             else:
-                if prediction1125 == 1:
-                    _t1934 = self.parse_betree_relation()
-                    betree_relation1127 = _t1934
-                    _t1935 = logic_pb2.Data(betree_relation=betree_relation1127)
-                    _t1933 = _t1935
+                if prediction1162 == 1:
+                    _t2008 = self.parse_betree_relation()
+                    betree_relation1164 = _t2008
+                    _t2009 = logic_pb2.Data(betree_relation=betree_relation1164)
+                    _t2007 = _t2009
                 else:
-                    if prediction1125 == 0:
-                        _t1937 = self.parse_edb()
-                        edb1126 = _t1937
-                        _t1938 = logic_pb2.Data(edb=edb1126)
-                        _t1936 = _t1938
+                    if prediction1162 == 0:
+                        _t2011 = self.parse_edb()
+                        edb1163 = _t2011
+                        _t2012 = logic_pb2.Data(edb=edb1163)
+                        _t2010 = _t2012
                     else:
                         raise ParseError("Unexpected token in data" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                    _t1933 = _t1936
-                _t1930 = _t1933
-            _t1927 = _t1930
-        result1131 = _t1927
-        self.record_span(span_start1130, "Data")
-        return result1131
+                    _t2007 = _t2010
+                _t2004 = _t2007
+            _t2001 = _t2004
+        result1168 = _t2001
+        self.record_span(span_start1167, "Data")
+        return result1168
 
     def parse_edb(self) -> logic_pb2.EDB:
-        span_start1135 = self.span_start()
+        span_start1172 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("edb")
-        _t1939 = self.parse_relation_id()
-        relation_id1132 = _t1939
-        _t1940 = self.parse_edb_path()
-        edb_path1133 = _t1940
-        _t1941 = self.parse_edb_types()
-        edb_types1134 = _t1941
+        _t2013 = self.parse_relation_id()
+        relation_id1169 = _t2013
+        _t2014 = self.parse_edb_path()
+        edb_path1170 = _t2014
+        _t2015 = self.parse_edb_types()
+        edb_types1171 = _t2015
         self.consume_literal(")")
-        _t1942 = logic_pb2.EDB(target_id=relation_id1132, path=edb_path1133, types=edb_types1134)
-        result1136 = _t1942
-        self.record_span(span_start1135, "EDB")
-        return result1136
+        _t2016 = logic_pb2.EDB(target_id=relation_id1169, path=edb_path1170, types=edb_types1171)
+        result1173 = _t2016
+        self.record_span(span_start1172, "EDB")
+        return result1173
 
     def parse_edb_path(self) -> Sequence[str]:
         self.consume_literal("[")
-        xs1137 = []
-        cond1138 = self.match_lookahead_terminal("STRING", 0)
-        while cond1138:
-            item1139 = self.consume_terminal("STRING")
-            xs1137.append(item1139)
-            cond1138 = self.match_lookahead_terminal("STRING", 0)
-        strings1140 = xs1137
+        xs1174 = []
+        cond1175 = self.match_lookahead_terminal("STRING", 0)
+        while cond1175:
+            item1176 = self.consume_terminal("STRING")
+            xs1174.append(item1176)
+            cond1175 = self.match_lookahead_terminal("STRING", 0)
+        strings1177 = xs1174
         self.consume_literal("]")
-        return strings1140
+        return strings1177
 
     def parse_edb_types(self) -> Sequence[logic_pb2.Type]:
         self.consume_literal("[")
-        xs1141 = []
-        cond1142 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
-        while cond1142:
-            _t1943 = self.parse_type()
-            item1143 = _t1943
-            xs1141.append(item1143)
-            cond1142 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
-        types1144 = xs1141
+        xs1178 = []
+        cond1179 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
+        while cond1179:
+            _t2017 = self.parse_type()
+            item1180 = _t2017
+            xs1178.append(item1180)
+            cond1179 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
+        types1181 = xs1178
         self.consume_literal("]")
-        return types1144
+        return types1181
 
     def parse_betree_relation(self) -> logic_pb2.BeTreeRelation:
-        span_start1147 = self.span_start()
+        span_start1184 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("betree_relation")
-        _t1944 = self.parse_relation_id()
-        relation_id1145 = _t1944
-        _t1945 = self.parse_betree_info()
-        betree_info1146 = _t1945
+        _t2018 = self.parse_relation_id()
+        relation_id1182 = _t2018
+        _t2019 = self.parse_betree_info()
+        betree_info1183 = _t2019
         self.consume_literal(")")
-        _t1946 = logic_pb2.BeTreeRelation(name=relation_id1145, relation_info=betree_info1146)
-        result1148 = _t1946
-        self.record_span(span_start1147, "BeTreeRelation")
-        return result1148
+        _t2020 = logic_pb2.BeTreeRelation(name=relation_id1182, relation_info=betree_info1183)
+        result1185 = _t2020
+        self.record_span(span_start1184, "BeTreeRelation")
+        return result1185
 
     def parse_betree_info(self) -> logic_pb2.BeTreeInfo:
-        span_start1152 = self.span_start()
+        span_start1189 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("betree_info")
-        _t1947 = self.parse_betree_info_key_types()
-        betree_info_key_types1149 = _t1947
-        _t1948 = self.parse_betree_info_value_types()
-        betree_info_value_types1150 = _t1948
-        _t1949 = self.parse_config_dict()
-        config_dict1151 = _t1949
-        self.consume_literal(")")
-        _t1950 = self.construct_betree_info(betree_info_key_types1149, betree_info_value_types1150, config_dict1151)
-        result1153 = _t1950
-        self.record_span(span_start1152, "BeTreeInfo")
-        return result1153
+        _t2021 = self.parse_betree_info_key_types()
+        betree_info_key_types1186 = _t2021
+        _t2022 = self.parse_betree_info_value_types()
+        betree_info_value_types1187 = _t2022
+        _t2023 = self.parse_config_dict()
+        config_dict1188 = _t2023
+        self.consume_literal(")")
+        _t2024 = self.construct_betree_info(betree_info_key_types1186, betree_info_value_types1187, config_dict1188)
+        result1190 = _t2024
+        self.record_span(span_start1189, "BeTreeInfo")
+        return result1190
 
     def parse_betree_info_key_types(self) -> Sequence[logic_pb2.Type]:
         self.consume_literal("(")
         self.consume_literal("key_types")
-        xs1154 = []
-        cond1155 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
-        while cond1155:
-            _t1951 = self.parse_type()
-            item1156 = _t1951
-            xs1154.append(item1156)
-            cond1155 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
-        types1157 = xs1154
+        xs1191 = []
+        cond1192 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
+        while cond1192:
+            _t2025 = self.parse_type()
+            item1193 = _t2025
+            xs1191.append(item1193)
+            cond1192 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
+        types1194 = xs1191
         self.consume_literal(")")
-        return types1157
+        return types1194
 
     def parse_betree_info_value_types(self) -> Sequence[logic_pb2.Type]:
         self.consume_literal("(")
         self.consume_literal("value_types")
-        xs1158 = []
-        cond1159 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
-        while cond1159:
-            _t1952 = self.parse_type()
-            item1160 = _t1952
-            xs1158.append(item1160)
-            cond1159 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
-        types1161 = xs1158
+        xs1195 = []
+        cond1196 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
+        while cond1196:
+            _t2026 = self.parse_type()
+            item1197 = _t2026
+            xs1195.append(item1197)
+            cond1196 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
+        types1198 = xs1195
         self.consume_literal(")")
-        return types1161
+        return types1198
 
     def parse_csv_data(self) -> logic_pb2.CSVData:
-        span_start1166 = self.span_start()
+        span_start1204 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("csv_data")
-        _t1953 = self.parse_csvlocator()
-        csvlocator1162 = _t1953
-        _t1954 = self.parse_csv_config()
-        csv_config1163 = _t1954
-        _t1955 = self.parse_gnf_columns()
-        gnf_columns1164 = _t1955
-        _t1956 = self.parse_csv_asof()
-        csv_asof1165 = _t1956
-        self.consume_literal(")")
-        _t1957 = logic_pb2.CSVData(locator=csvlocator1162, config=csv_config1163, columns=gnf_columns1164, asof=csv_asof1165)
-        result1167 = _t1957
-        self.record_span(span_start1166, "CSVData")
-        return result1167
+        _t2027 = self.parse_csvlocator()
+        csvlocator1199 = _t2027
+        _t2028 = self.parse_csv_config()
+        csv_config1200 = _t2028
+        if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("columns", 1)):
+            _t2030 = self.parse_gnf_columns()
+            _t2029 = _t2030
+        else:
+            _t2029 = None
+        gnf_columns1201 = _t2029
+        if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("relations", 1)):
+            _t2032 = self.parse_target_relations()
+            _t2031 = _t2032
+        else:
+            _t2031 = None
+        target_relations1202 = _t2031
+        _t2033 = self.parse_csv_asof()
+        csv_asof1203 = _t2033
+        self.consume_literal(")")
+        _t2034 = self.construct_csv_data(csvlocator1199, csv_config1200, gnf_columns1201, target_relations1202, csv_asof1203)
+        result1205 = _t2034
+        self.record_span(span_start1204, "CSVData")
+        return result1205
 
     def parse_csvlocator(self) -> logic_pb2.CSVLocator:
-        span_start1170 = self.span_start()
+        span_start1208 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("csv_locator")
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("paths", 1)):
-            _t1959 = self.parse_csv_locator_paths()
-            _t1958 = _t1959
+            _t2036 = self.parse_csv_locator_paths()
+            _t2035 = _t2036
         else:
-            _t1958 = None
-        csv_locator_paths1168 = _t1958
+            _t2035 = None
+        csv_locator_paths1206 = _t2035
         if self.match_lookahead_literal("(", 0):
-            _t1961 = self.parse_csv_locator_inline_data()
-            _t1960 = _t1961
+            _t2038 = self.parse_csv_locator_inline_data()
+            _t2037 = _t2038
         else:
-            _t1960 = None
-        csv_locator_inline_data1169 = _t1960
+            _t2037 = None
+        csv_locator_inline_data1207 = _t2037
         self.consume_literal(")")
-        _t1962 = logic_pb2.CSVLocator(paths=(csv_locator_paths1168 if csv_locator_paths1168 is not None else []), inline_data=(csv_locator_inline_data1169 if csv_locator_inline_data1169 is not None else "").encode())
-        result1171 = _t1962
-        self.record_span(span_start1170, "CSVLocator")
-        return result1171
+        _t2039 = logic_pb2.CSVLocator(paths=(csv_locator_paths1206 if csv_locator_paths1206 is not None else []), inline_data=(csv_locator_inline_data1207 if csv_locator_inline_data1207 is not None else "").encode())
+        result1209 = _t2039
+        self.record_span(span_start1208, "CSVLocator")
+        return result1209
 
     def parse_csv_locator_paths(self) -> Sequence[str]:
         self.consume_literal("(")
         self.consume_literal("paths")
-        xs1172 = []
-        cond1173 = self.match_lookahead_terminal("STRING", 0)
-        while cond1173:
-            item1174 = self.consume_terminal("STRING")
-            xs1172.append(item1174)
-            cond1173 = self.match_lookahead_terminal("STRING", 0)
-        strings1175 = xs1172
+        xs1210 = []
+        cond1211 = self.match_lookahead_terminal("STRING", 0)
+        while cond1211:
+            item1212 = self.consume_terminal("STRING")
+            xs1210.append(item1212)
+            cond1211 = self.match_lookahead_terminal("STRING", 0)
+        strings1213 = xs1210
         self.consume_literal(")")
-        return strings1175
+        return strings1213
 
     def parse_csv_locator_inline_data(self) -> str:
         self.consume_literal("(")
         self.consume_literal("inline_data")
-        formatted_string1176 = self.consume_terminal("STRING")
+        formatted_string1214 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return formatted_string1176
+        return formatted_string1214
 
     def parse_csv_config(self) -> logic_pb2.CSVConfig:
-        span_start1179 = self.span_start()
+        span_start1217 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("csv_config")
-        _t1963 = self.parse_config_dict()
-        config_dict1177 = _t1963
+        _t2040 = self.parse_config_dict()
+        config_dict1215 = _t2040
         if self.match_lookahead_literal("(", 0):
-            _t1965 = self.parse__storage_integration()
-            _t1964 = _t1965
+            _t2042 = self.parse__storage_integration()
+            _t2041 = _t2042
         else:
-            _t1964 = None
-        _storage_integration1178 = _t1964
+            _t2041 = None
+        _storage_integration1216 = _t2041
         self.consume_literal(")")
-        _t1966 = self.construct_csv_config(config_dict1177, _storage_integration1178)
-        result1180 = _t1966
-        self.record_span(span_start1179, "CSVConfig")
-        return result1180
+        _t2043 = self.construct_csv_config(config_dict1215, _storage_integration1216)
+        result1218 = _t2043
+        self.record_span(span_start1217, "CSVConfig")
+        return result1218
 
     def parse__storage_integration(self) -> Sequence[tuple[str, logic_pb2.Value]]:
         self.consume_literal("(")
         self.consume_literal("storage_integration")
-        _t1967 = self.parse_config_dict()
-        config_dict1181 = _t1967
+        _t2044 = self.parse_config_dict()
+        config_dict1219 = _t2044
         self.consume_literal(")")
-        return config_dict1181
+        return config_dict1219
 
     def parse_gnf_columns(self) -> Sequence[logic_pb2.GNFColumn]:
         self.consume_literal("(")
         self.consume_literal("columns")
-        xs1182 = []
-        cond1183 = self.match_lookahead_literal("(", 0)
-        while cond1183:
-            _t1968 = self.parse_gnf_column()
-            item1184 = _t1968
-            xs1182.append(item1184)
-            cond1183 = self.match_lookahead_literal("(", 0)
-        gnf_columns1185 = xs1182
+        xs1220 = []
+        cond1221 = self.match_lookahead_literal("(", 0)
+        while cond1221:
+            _t2045 = self.parse_gnf_column()
+            item1222 = _t2045
+            xs1220.append(item1222)
+            cond1221 = self.match_lookahead_literal("(", 0)
+        gnf_columns1223 = xs1220
         self.consume_literal(")")
-        return gnf_columns1185
+        return gnf_columns1223
 
     def parse_gnf_column(self) -> logic_pb2.GNFColumn:
-        span_start1192 = self.span_start()
+        span_start1230 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("column")
-        _t1969 = self.parse_gnf_column_path()
-        gnf_column_path1186 = _t1969
+        _t2046 = self.parse_gnf_column_path()
+        gnf_column_path1224 = _t2046
         if (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0)):
-            _t1971 = self.parse_relation_id()
-            _t1970 = _t1971
+            _t2048 = self.parse_relation_id()
+            _t2047 = _t2048
         else:
-            _t1970 = None
-        relation_id1187 = _t1970
+            _t2047 = None
+        relation_id1225 = _t2047
         self.consume_literal("[")
-        xs1188 = []
-        cond1189 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
-        while cond1189:
-            _t1972 = self.parse_type()
-            item1190 = _t1972
-            xs1188.append(item1190)
-            cond1189 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
-        types1191 = xs1188
+        xs1226 = []
+        cond1227 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
+        while cond1227:
+            _t2049 = self.parse_type()
+            item1228 = _t2049
+            xs1226.append(item1228)
+            cond1227 = (((((((((((((self.match_lookahead_literal("(", 0) or self.match_lookahead_literal("BOOLEAN", 0)) or self.match_lookahead_literal("DATE", 0)) or self.match_lookahead_literal("DATETIME", 0)) or self.match_lookahead_literal("FLOAT", 0)) or self.match_lookahead_literal("FLOAT32", 0)) or self.match_lookahead_literal("INT", 0)) or self.match_lookahead_literal("INT128", 0)) or self.match_lookahead_literal("INT32", 0)) or self.match_lookahead_literal("MISSING", 0)) or self.match_lookahead_literal("STRING", 0)) or self.match_lookahead_literal("UINT128", 0)) or self.match_lookahead_literal("UINT32", 0)) or self.match_lookahead_literal("UNKNOWN", 0))
+        types1229 = xs1226
         self.consume_literal("]")
         self.consume_literal(")")
-        _t1973 = logic_pb2.GNFColumn(column_path=gnf_column_path1186, target_id=relation_id1187, types=types1191)
-        result1193 = _t1973
-        self.record_span(span_start1192, "GNFColumn")
-        return result1193
+        _t2050 = logic_pb2.GNFColumn(column_path=gnf_column_path1224, target_id=relation_id1225, types=types1229)
+        result1231 = _t2050
+        self.record_span(span_start1230, "GNFColumn")
+        return result1231
 
     def parse_gnf_column_path(self) -> Sequence[str]:
         if self.match_lookahead_literal("[", 0):
-            _t1974 = 1
+            _t2051 = 1
         else:
             if self.match_lookahead_terminal("STRING", 0):
-                _t1975 = 0
+                _t2052 = 0
             else:
-                _t1975 = -1
-            _t1974 = _t1975
-        prediction1194 = _t1974
-        if prediction1194 == 1:
+                _t2052 = -1
+            _t2051 = _t2052
+        prediction1232 = _t2051
+        if prediction1232 == 1:
             self.consume_literal("[")
-            xs1196 = []
-            cond1197 = self.match_lookahead_terminal("STRING", 0)
-            while cond1197:
-                item1198 = self.consume_terminal("STRING")
-                xs1196.append(item1198)
-                cond1197 = self.match_lookahead_terminal("STRING", 0)
-            strings1199 = xs1196
+            xs1234 = []
+            cond1235 = self.match_lookahead_terminal("STRING", 0)
+            while cond1235:
+                item1236 = self.consume_terminal("STRING")
+                xs1234.append(item1236)
+                cond1235 = self.match_lookahead_terminal("STRING", 0)
+            strings1237 = xs1234
             self.consume_literal("]")
-            _t1976 = strings1199
+            _t2053 = strings1237
         else:
-            if prediction1194 == 0:
-                string1195 = self.consume_terminal("STRING")
-                _t1977 = [string1195]
+            if prediction1232 == 0:
+                string1233 = self.consume_terminal("STRING")
+                _t2054 = [string1233]
             else:
                 raise ParseError("Unexpected token in gnf_column_path" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1976 = _t1977
-        return _t1976
+            _t2053 = _t2054
+        return _t2053
+
+    def parse_target_relations(self) -> logic_pb2.TargetRelations:
+        span_start1240 = self.span_start()
+        self.consume_literal("(")
+        self.consume_literal("relations")
+        _t2055 = self.parse_relation_keys()
+        relation_keys1238 = _t2055
+        _t2056 = self.parse_relation_body()
+        relation_body1239 = _t2056
+        self.consume_literal(")")
+        _t2057 = self.construct_relations(relation_keys1238, relation_body1239)
+        result1241 = _t2057
+        self.record_span(span_start1240, "TargetRelations")
+        return result1241
+
+    def parse_relation_keys(self) -> Sequence[logic_pb2.NamedColumn]:
+        self.consume_literal("(")
+        self.consume_literal("keys")
+        xs1242 = []
+        cond1243 = self.match_lookahead_literal("(", 0)
+        while cond1243:
+            _t2058 = self.parse_named_column()
+            item1244 = _t2058
+            xs1242.append(item1244)
+            cond1243 = self.match_lookahead_literal("(", 0)
+        named_columns1245 = xs1242
+        self.consume_literal(")")
+        return named_columns1245
+
+    def parse_named_column(self) -> logic_pb2.NamedColumn:
+        span_start1248 = self.span_start()
+        self.consume_literal("(")
+        self.consume_literal("column")
+        string1246 = self.consume_terminal("STRING")
+        _t2059 = self.parse_type()
+        type1247 = _t2059
+        self.consume_literal(")")
+        _t2060 = logic_pb2.NamedColumn(name=string1246, type=type1247)
+        result1249 = _t2060
+        self.record_span(span_start1248, "NamedColumn")
+        return result1249
+
+    def parse_relation_body(self) -> logic_pb2.TargetRelations:
+        span_start1254 = self.span_start()
+        if self.match_lookahead_literal("(", 0):
+            if self.match_lookahead_literal("relation", 1):
+                _t2062 = 0
+            else:
+                if self.match_lookahead_literal("inserts", 1):
+                    _t2063 = 1
+                else:
+                    _t2063 = 0
+                _t2062 = _t2063
+            _t2061 = _t2062
+        else:
+            _t2061 = 0
+        prediction1250 = _t2061
+        if prediction1250 == 1:
+            _t2065 = self.parse_cdc_inserts()
+            cdc_inserts1252 = _t2065
+            _t2066 = self.parse_cdc_deletes()
+            cdc_deletes1253 = _t2066
+            _t2067 = self.construct_cdc_relations(cdc_inserts1252, cdc_deletes1253)
+            _t2064 = _t2067
+        else:
+            if prediction1250 == 0:
+                _t2069 = self.parse_non_cdc_relations()
+                non_cdc_relations1251 = _t2069
+                _t2070 = self.construct_non_cdc_relations(non_cdc_relations1251)
+                _t2068 = _t2070
+            else:
+                raise ParseError("Unexpected token in relation_body" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
+            _t2064 = _t2068
+        result1255 = _t2064
+        self.record_span(span_start1254, "TargetRelations")
+        return result1255
+
+    def parse_non_cdc_relations(self) -> Sequence[logic_pb2.TargetRelation]:
+        xs1256 = []
+        cond1257 = self.match_lookahead_literal("(", 0)
+        while cond1257:
+            _t2071 = self.parse_target_relation()
+            item1258 = _t2071
+            xs1256.append(item1258)
+            cond1257 = self.match_lookahead_literal("(", 0)
+        return xs1256
+
+    def parse_target_relation(self) -> logic_pb2.TargetRelation:
+        span_start1264 = self.span_start()
+        self.consume_literal("(")
+        self.consume_literal("relation")
+        _t2072 = self.parse_relation_id()
+        relation_id1259 = _t2072
+        xs1260 = []
+        cond1261 = self.match_lookahead_literal("(", 0)
+        while cond1261:
+            _t2073 = self.parse_named_column()
+            item1262 = _t2073
+            xs1260.append(item1262)
+            cond1261 = self.match_lookahead_literal("(", 0)
+        named_columns1263 = xs1260
+        self.consume_literal(")")
+        _t2074 = logic_pb2.TargetRelation(target_id=relation_id1259, values=named_columns1263)
+        result1265 = _t2074
+        self.record_span(span_start1264, "TargetRelation")
+        return result1265
+
+    def parse_cdc_inserts(self) -> Sequence[logic_pb2.TargetRelation]:
+        self.consume_literal("(")
+        self.consume_literal("inserts")
+        xs1266 = []
+        cond1267 = self.match_lookahead_literal("(", 0)
+        while cond1267:
+            _t2075 = self.parse_target_relation()
+            item1268 = _t2075
+            xs1266.append(item1268)
+            cond1267 = self.match_lookahead_literal("(", 0)
+        target_relations1269 = xs1266
+        self.consume_literal(")")
+        return target_relations1269
+
+    def parse_cdc_deletes(self) -> Sequence[logic_pb2.TargetRelation]:
+        self.consume_literal("(")
+        self.consume_literal("deletes")
+        xs1270 = []
+        cond1271 = self.match_lookahead_literal("(", 0)
+        while cond1271:
+            _t2076 = self.parse_target_relation()
+            item1272 = _t2076
+            xs1270.append(item1272)
+            cond1271 = self.match_lookahead_literal("(", 0)
+        target_relations1273 = xs1270
+        self.consume_literal(")")
+        return target_relations1273
 
     def parse_csv_asof(self) -> str:
         self.consume_literal("(")
         self.consume_literal("asof")
-        string1200 = self.consume_terminal("STRING")
+        string1274 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1200
+        return string1274
 
     def parse_iceberg_data(self) -> logic_pb2.IcebergData:
-        span_start1207 = self.span_start()
+        span_start1281 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("iceberg_data")
-        _t1978 = self.parse_iceberg_locator()
-        iceberg_locator1201 = _t1978
-        _t1979 = self.parse_iceberg_catalog_config()
-        iceberg_catalog_config1202 = _t1979
-        _t1980 = self.parse_gnf_columns()
-        gnf_columns1203 = _t1980
+        _t2077 = self.parse_iceberg_locator()
+        iceberg_locator1275 = _t2077
+        _t2078 = self.parse_iceberg_catalog_config()
+        iceberg_catalog_config1276 = _t2078
+        _t2079 = self.parse_gnf_columns()
+        gnf_columns1277 = _t2079
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("from_snapshot", 1)):
-            _t1982 = self.parse_iceberg_from_snapshot()
-            _t1981 = _t1982
+            _t2081 = self.parse_iceberg_from_snapshot()
+            _t2080 = _t2081
         else:
-            _t1981 = None
-        iceberg_from_snapshot1204 = _t1981
+            _t2080 = None
+        iceberg_from_snapshot1278 = _t2080
         if self.match_lookahead_literal("(", 0):
-            _t1984 = self.parse_iceberg_to_snapshot()
-            _t1983 = _t1984
+            _t2083 = self.parse_iceberg_to_snapshot()
+            _t2082 = _t2083
         else:
-            _t1983 = None
-        iceberg_to_snapshot1205 = _t1983
-        _t1985 = self.parse_boolean_value()
-        boolean_value1206 = _t1985
+            _t2082 = None
+        iceberg_to_snapshot1279 = _t2082
+        _t2084 = self.parse_boolean_value()
+        boolean_value1280 = _t2084
         self.consume_literal(")")
-        _t1986 = self.construct_iceberg_data(iceberg_locator1201, iceberg_catalog_config1202, gnf_columns1203, iceberg_from_snapshot1204, iceberg_to_snapshot1205, boolean_value1206)
-        result1208 = _t1986
-        self.record_span(span_start1207, "IcebergData")
-        return result1208
+        _t2085 = self.construct_iceberg_data(iceberg_locator1275, iceberg_catalog_config1276, gnf_columns1277, iceberg_from_snapshot1278, iceberg_to_snapshot1279, boolean_value1280)
+        result1282 = _t2085
+        self.record_span(span_start1281, "IcebergData")
+        return result1282
 
     def parse_iceberg_locator(self) -> logic_pb2.IcebergLocator:
-        span_start1212 = self.span_start()
+        span_start1286 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("iceberg_locator")
-        _t1987 = self.parse_iceberg_locator_table_name()
-        iceberg_locator_table_name1209 = _t1987
-        _t1988 = self.parse_iceberg_locator_namespace()
-        iceberg_locator_namespace1210 = _t1988
-        _t1989 = self.parse_iceberg_locator_warehouse()
-        iceberg_locator_warehouse1211 = _t1989
-        self.consume_literal(")")
-        _t1990 = logic_pb2.IcebergLocator(table_name=iceberg_locator_table_name1209, namespace=iceberg_locator_namespace1210, warehouse=iceberg_locator_warehouse1211)
-        result1213 = _t1990
-        self.record_span(span_start1212, "IcebergLocator")
-        return result1213
+        _t2086 = self.parse_iceberg_locator_table_name()
+        iceberg_locator_table_name1283 = _t2086
+        _t2087 = self.parse_iceberg_locator_namespace()
+        iceberg_locator_namespace1284 = _t2087
+        _t2088 = self.parse_iceberg_locator_warehouse()
+        iceberg_locator_warehouse1285 = _t2088
+        self.consume_literal(")")
+        _t2089 = logic_pb2.IcebergLocator(table_name=iceberg_locator_table_name1283, namespace=iceberg_locator_namespace1284, warehouse=iceberg_locator_warehouse1285)
+        result1287 = _t2089
+        self.record_span(span_start1286, "IcebergLocator")
+        return result1287
 
     def parse_iceberg_locator_table_name(self) -> str:
         self.consume_literal("(")
         self.consume_literal("table_name")
-        string1214 = self.consume_terminal("STRING")
+        string1288 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1214
+        return string1288
 
     def parse_iceberg_locator_namespace(self) -> Sequence[str]:
         self.consume_literal("(")
         self.consume_literal("namespace")
-        xs1215 = []
-        cond1216 = self.match_lookahead_terminal("STRING", 0)
-        while cond1216:
-            item1217 = self.consume_terminal("STRING")
-            xs1215.append(item1217)
-            cond1216 = self.match_lookahead_terminal("STRING", 0)
-        strings1218 = xs1215
+        xs1289 = []
+        cond1290 = self.match_lookahead_terminal("STRING", 0)
+        while cond1290:
+            item1291 = self.consume_terminal("STRING")
+            xs1289.append(item1291)
+            cond1290 = self.match_lookahead_terminal("STRING", 0)
+        strings1292 = xs1289
         self.consume_literal(")")
-        return strings1218
+        return strings1292
 
     def parse_iceberg_locator_warehouse(self) -> str:
         self.consume_literal("(")
         self.consume_literal("warehouse")
-        string1219 = self.consume_terminal("STRING")
+        string1293 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1219
+        return string1293
 
     def parse_iceberg_catalog_config(self) -> logic_pb2.IcebergCatalogConfig:
-        span_start1224 = self.span_start()
+        span_start1298 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("iceberg_catalog_config")
-        _t1991 = self.parse_iceberg_catalog_uri()
-        iceberg_catalog_uri1220 = _t1991
+        _t2090 = self.parse_iceberg_catalog_uri()
+        iceberg_catalog_uri1294 = _t2090
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("scope", 1)):
-            _t1993 = self.parse_iceberg_catalog_config_scope()
-            _t1992 = _t1993
+            _t2092 = self.parse_iceberg_catalog_config_scope()
+            _t2091 = _t2092
         else:
-            _t1992 = None
-        iceberg_catalog_config_scope1221 = _t1992
-        _t1994 = self.parse_iceberg_properties()
-        iceberg_properties1222 = _t1994
-        _t1995 = self.parse_iceberg_auth_properties()
-        iceberg_auth_properties1223 = _t1995
+            _t2091 = None
+        iceberg_catalog_config_scope1295 = _t2091
+        _t2093 = self.parse_iceberg_properties()
+        iceberg_properties1296 = _t2093
+        _t2094 = self.parse_iceberg_auth_properties()
+        iceberg_auth_properties1297 = _t2094
         self.consume_literal(")")
-        _t1996 = self.construct_iceberg_catalog_config(iceberg_catalog_uri1220, iceberg_catalog_config_scope1221, iceberg_properties1222, iceberg_auth_properties1223)
-        result1225 = _t1996
-        self.record_span(span_start1224, "IcebergCatalogConfig")
-        return result1225
+        _t2095 = self.construct_iceberg_catalog_config(iceberg_catalog_uri1294, iceberg_catalog_config_scope1295, iceberg_properties1296, iceberg_auth_properties1297)
+        result1299 = _t2095
+        self.record_span(span_start1298, "IcebergCatalogConfig")
+        return result1299
 
     def parse_iceberg_catalog_uri(self) -> str:
         self.consume_literal("(")
         self.consume_literal("catalog_uri")
-        string1226 = self.consume_terminal("STRING")
+        string1300 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1226
+        return string1300
 
     def parse_iceberg_catalog_config_scope(self) -> str:
         self.consume_literal("(")
         self.consume_literal("scope")
-        string1227 = self.consume_terminal("STRING")
+        string1301 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1227
+        return string1301
 
     def parse_iceberg_properties(self) -> Sequence[tuple[str, str]]:
         self.consume_literal("(")
         self.consume_literal("properties")
-        xs1228 = []
-        cond1229 = self.match_lookahead_literal("(", 0)
-        while cond1229:
-            _t1997 = self.parse_iceberg_property_entry()
-            item1230 = _t1997
-            xs1228.append(item1230)
-            cond1229 = self.match_lookahead_literal("(", 0)
-        iceberg_property_entrys1231 = xs1228
+        xs1302 = []
+        cond1303 = self.match_lookahead_literal("(", 0)
+        while cond1303:
+            _t2096 = self.parse_iceberg_property_entry()
+            item1304 = _t2096
+            xs1302.append(item1304)
+            cond1303 = self.match_lookahead_literal("(", 0)
+        iceberg_property_entrys1305 = xs1302
         self.consume_literal(")")
-        return iceberg_property_entrys1231
+        return iceberg_property_entrys1305
 
     def parse_iceberg_property_entry(self) -> tuple[str, str]:
         self.consume_literal("(")
         self.consume_literal("prop")
-        string1232 = self.consume_terminal("STRING")
-        string_31233 = self.consume_terminal("STRING")
+        string1306 = self.consume_terminal("STRING")
+        string_31307 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return (string1232, string_31233,)
+        return (string1306, string_31307,)
 
     def parse_iceberg_auth_properties(self) -> Sequence[tuple[str, str]]:
         self.consume_literal("(")
         self.consume_literal("auth_properties")
-        xs1234 = []
-        cond1235 = self.match_lookahead_literal("(", 0)
-        while cond1235:
-            _t1998 = self.parse_iceberg_masked_property_entry()
-            item1236 = _t1998
-            xs1234.append(item1236)
-            cond1235 = self.match_lookahead_literal("(", 0)
-        iceberg_masked_property_entrys1237 = xs1234
+        xs1308 = []
+        cond1309 = self.match_lookahead_literal("(", 0)
+        while cond1309:
+            _t2097 = self.parse_iceberg_masked_property_entry()
+            item1310 = _t2097
+            xs1308.append(item1310)
+            cond1309 = self.match_lookahead_literal("(", 0)
+        iceberg_masked_property_entrys1311 = xs1308
         self.consume_literal(")")
-        return iceberg_masked_property_entrys1237
+        return iceberg_masked_property_entrys1311
 
     def parse_iceberg_masked_property_entry(self) -> tuple[str, str]:
         self.consume_literal("(")
         self.consume_literal("prop")
-        string1238 = self.consume_terminal("STRING")
-        string_31239 = self.consume_terminal("STRING")
+        string1312 = self.consume_terminal("STRING")
+        string_31313 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return (string1238, string_31239,)
+        return (string1312, string_31313,)
 
     def parse_iceberg_from_snapshot(self) -> str:
         self.consume_literal("(")
         self.consume_literal("from_snapshot")
-        string1240 = self.consume_terminal("STRING")
+        string1314 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1240
+        return string1314
 
     def parse_iceberg_to_snapshot(self) -> str:
         self.consume_literal("(")
         self.consume_literal("to_snapshot")
-        string1241 = self.consume_terminal("STRING")
+        string1315 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1241
+        return string1315
 
     def parse_undefine(self) -> transactions_pb2.Undefine:
-        span_start1243 = self.span_start()
+        span_start1317 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("undefine")
-        _t1999 = self.parse_fragment_id()
-        fragment_id1242 = _t1999
+        _t2098 = self.parse_fragment_id()
+        fragment_id1316 = _t2098
         self.consume_literal(")")
-        _t2000 = transactions_pb2.Undefine(fragment_id=fragment_id1242)
-        result1244 = _t2000
-        self.record_span(span_start1243, "Undefine")
-        return result1244
+        _t2099 = transactions_pb2.Undefine(fragment_id=fragment_id1316)
+        result1318 = _t2099
+        self.record_span(span_start1317, "Undefine")
+        return result1318
 
     def parse_context(self) -> transactions_pb2.Context:
-        span_start1249 = self.span_start()
+        span_start1323 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("context")
-        xs1245 = []
-        cond1246 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
-        while cond1246:
-            _t2001 = self.parse_relation_id()
-            item1247 = _t2001
-            xs1245.append(item1247)
-            cond1246 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
-        relation_ids1248 = xs1245
-        self.consume_literal(")")
-        _t2002 = transactions_pb2.Context(relations=relation_ids1248)
-        result1250 = _t2002
-        self.record_span(span_start1249, "Context")
-        return result1250
+        xs1319 = []
+        cond1320 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
+        while cond1320:
+            _t2100 = self.parse_relation_id()
+            item1321 = _t2100
+            xs1319.append(item1321)
+            cond1320 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
+        relation_ids1322 = xs1319
+        self.consume_literal(")")
+        _t2101 = transactions_pb2.Context(relations=relation_ids1322)
+        result1324 = _t2101
+        self.record_span(span_start1323, "Context")
+        return result1324
 
     def parse_snapshot(self) -> transactions_pb2.Snapshot:
-        span_start1256 = self.span_start()
+        span_start1330 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("snapshot")
-        _t2003 = self.parse_edb_path()
-        edb_path1251 = _t2003
-        xs1252 = []
-        cond1253 = self.match_lookahead_literal("[", 0)
-        while cond1253:
-            _t2004 = self.parse_snapshot_mapping()
-            item1254 = _t2004
-            xs1252.append(item1254)
-            cond1253 = self.match_lookahead_literal("[", 0)
-        snapshot_mappings1255 = xs1252
-        self.consume_literal(")")
-        _t2005 = transactions_pb2.Snapshot(prefix=edb_path1251, mappings=snapshot_mappings1255)
-        result1257 = _t2005
-        self.record_span(span_start1256, "Snapshot")
-        return result1257
+        _t2102 = self.parse_edb_path()
+        edb_path1325 = _t2102
+        xs1326 = []
+        cond1327 = self.match_lookahead_literal("[", 0)
+        while cond1327:
+            _t2103 = self.parse_snapshot_mapping()
+            item1328 = _t2103
+            xs1326.append(item1328)
+            cond1327 = self.match_lookahead_literal("[", 0)
+        snapshot_mappings1329 = xs1326
+        self.consume_literal(")")
+        _t2104 = transactions_pb2.Snapshot(prefix=edb_path1325, mappings=snapshot_mappings1329)
+        result1331 = _t2104
+        self.record_span(span_start1330, "Snapshot")
+        return result1331
 
     def parse_snapshot_mapping(self) -> transactions_pb2.SnapshotMapping:
-        span_start1260 = self.span_start()
-        _t2006 = self.parse_edb_path()
-        edb_path1258 = _t2006
-        _t2007 = self.parse_relation_id()
-        relation_id1259 = _t2007
-        _t2008 = transactions_pb2.SnapshotMapping(destination_path=edb_path1258, source_relation=relation_id1259)
-        result1261 = _t2008
-        self.record_span(span_start1260, "SnapshotMapping")
-        return result1261
+        span_start1334 = self.span_start()
+        _t2105 = self.parse_edb_path()
+        edb_path1332 = _t2105
+        _t2106 = self.parse_relation_id()
+        relation_id1333 = _t2106
+        _t2107 = transactions_pb2.SnapshotMapping(destination_path=edb_path1332, source_relation=relation_id1333)
+        result1335 = _t2107
+        self.record_span(span_start1334, "SnapshotMapping")
+        return result1335
 
     def parse_epoch_reads(self) -> Sequence[transactions_pb2.Read]:
         self.consume_literal("(")
         self.consume_literal("reads")
-        xs1262 = []
-        cond1263 = self.match_lookahead_literal("(", 0)
-        while cond1263:
-            _t2009 = self.parse_read()
-            item1264 = _t2009
-            xs1262.append(item1264)
-            cond1263 = self.match_lookahead_literal("(", 0)
-        reads1265 = xs1262
+        xs1336 = []
+        cond1337 = self.match_lookahead_literal("(", 0)
+        while cond1337:
+            _t2108 = self.parse_read()
+            item1338 = _t2108
+            xs1336.append(item1338)
+            cond1337 = self.match_lookahead_literal("(", 0)
+        reads1339 = xs1336
         self.consume_literal(")")
-        return reads1265
+        return reads1339
 
     def parse_read(self) -> transactions_pb2.Read:
-        span_start1272 = self.span_start()
+        span_start1346 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("what_if", 1):
-                _t2011 = 2
+                _t2110 = 2
             else:
                 if self.match_lookahead_literal("output", 1):
-                    _t2012 = 1
+                    _t2111 = 1
                 else:
                     if self.match_lookahead_literal("export_iceberg", 1):
-                        _t2013 = 4
+                        _t2112 = 4
                     else:
                         if self.match_lookahead_literal("export", 1):
-                            _t2014 = 4
+                            _t2113 = 4
                         else:
                             if self.match_lookahead_literal("demand", 1):
-                                _t2015 = 0
+                                _t2114 = 0
                             else:
                                 if self.match_lookahead_literal("abort", 1):
-                                    _t2016 = 3
+                                    _t2115 = 3
                                 else:
-                                    _t2016 = -1
-                                _t2015 = _t2016
-                            _t2014 = _t2015
-                        _t2013 = _t2014
-                    _t2012 = _t2013
-                _t2011 = _t2012
-            _t2010 = _t2011
-        else:
-            _t2010 = -1
-        prediction1266 = _t2010
-        if prediction1266 == 4:
-            _t2018 = self.parse_export()
-            export1271 = _t2018
-            _t2019 = transactions_pb2.Read(export=export1271)
-            _t2017 = _t2019
-        else:
-            if prediction1266 == 3:
-                _t2021 = self.parse_abort()
-                abort1270 = _t2021
-                _t2022 = transactions_pb2.Read(abort=abort1270)
-                _t2020 = _t2022
+                                    _t2115 = -1
+                                _t2114 = _t2115
+                            _t2113 = _t2114
+                        _t2112 = _t2113
+                    _t2111 = _t2112
+                _t2110 = _t2111
+            _t2109 = _t2110
+        else:
+            _t2109 = -1
+        prediction1340 = _t2109
+        if prediction1340 == 4:
+            _t2117 = self.parse_export()
+            export1345 = _t2117
+            _t2118 = transactions_pb2.Read(export=export1345)
+            _t2116 = _t2118
+        else:
+            if prediction1340 == 3:
+                _t2120 = self.parse_abort()
+                abort1344 = _t2120
+                _t2121 = transactions_pb2.Read(abort=abort1344)
+                _t2119 = _t2121
             else:
-                if prediction1266 == 2:
-                    _t2024 = self.parse_what_if()
-                    what_if1269 = _t2024
-                    _t2025 = transactions_pb2.Read(what_if=what_if1269)
-                    _t2023 = _t2025
+                if prediction1340 == 2:
+                    _t2123 = self.parse_what_if()
+                    what_if1343 = _t2123
+                    _t2124 = transactions_pb2.Read(what_if=what_if1343)
+                    _t2122 = _t2124
                 else:
-                    if prediction1266 == 1:
-                        _t2027 = self.parse_output()
-                        output1268 = _t2027
-                        _t2028 = transactions_pb2.Read(output=output1268)
-                        _t2026 = _t2028
+                    if prediction1340 == 1:
+                        _t2126 = self.parse_output()
+                        output1342 = _t2126
+                        _t2127 = transactions_pb2.Read(output=output1342)
+                        _t2125 = _t2127
                     else:
-                        if prediction1266 == 0:
-                            _t2030 = self.parse_demand()
-                            demand1267 = _t2030
-                            _t2031 = transactions_pb2.Read(demand=demand1267)
-                            _t2029 = _t2031
+                        if prediction1340 == 0:
+                            _t2129 = self.parse_demand()
+                            demand1341 = _t2129
+                            _t2130 = transactions_pb2.Read(demand=demand1341)
+                            _t2128 = _t2130
                         else:
                             raise ParseError("Unexpected token in read" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                        _t2026 = _t2029
-                    _t2023 = _t2026
-                _t2020 = _t2023
-            _t2017 = _t2020
-        result1273 = _t2017
-        self.record_span(span_start1272, "Read")
-        return result1273
+                        _t2125 = _t2128
+                    _t2122 = _t2125
+                _t2119 = _t2122
+            _t2116 = _t2119
+        result1347 = _t2116
+        self.record_span(span_start1346, "Read")
+        return result1347
 
     def parse_demand(self) -> transactions_pb2.Demand:
-        span_start1275 = self.span_start()
+        span_start1349 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("demand")
-        _t2032 = self.parse_relation_id()
-        relation_id1274 = _t2032
+        _t2131 = self.parse_relation_id()
+        relation_id1348 = _t2131
         self.consume_literal(")")
-        _t2033 = transactions_pb2.Demand(relation_id=relation_id1274)
-        result1276 = _t2033
-        self.record_span(span_start1275, "Demand")
-        return result1276
+        _t2132 = transactions_pb2.Demand(relation_id=relation_id1348)
+        result1350 = _t2132
+        self.record_span(span_start1349, "Demand")
+        return result1350
 
     def parse_output(self) -> transactions_pb2.Output:
-        span_start1279 = self.span_start()
+        span_start1353 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("output")
-        _t2034 = self.parse_name()
-        name1277 = _t2034
-        _t2035 = self.parse_relation_id()
-        relation_id1278 = _t2035
+        _t2133 = self.parse_name()
+        name1351 = _t2133
+        _t2134 = self.parse_relation_id()
+        relation_id1352 = _t2134
         self.consume_literal(")")
-        _t2036 = transactions_pb2.Output(name=name1277, relation_id=relation_id1278)
-        result1280 = _t2036
-        self.record_span(span_start1279, "Output")
-        return result1280
+        _t2135 = transactions_pb2.Output(name=name1351, relation_id=relation_id1352)
+        result1354 = _t2135
+        self.record_span(span_start1353, "Output")
+        return result1354
 
     def parse_what_if(self) -> transactions_pb2.WhatIf:
-        span_start1283 = self.span_start()
+        span_start1357 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("what_if")
-        _t2037 = self.parse_name()
-        name1281 = _t2037
-        _t2038 = self.parse_epoch()
-        epoch1282 = _t2038
+        _t2136 = self.parse_name()
+        name1355 = _t2136
+        _t2137 = self.parse_epoch()
+        epoch1356 = _t2137
         self.consume_literal(")")
-        _t2039 = transactions_pb2.WhatIf(branch=name1281, epoch=epoch1282)
-        result1284 = _t2039
-        self.record_span(span_start1283, "WhatIf")
-        return result1284
+        _t2138 = transactions_pb2.WhatIf(branch=name1355, epoch=epoch1356)
+        result1358 = _t2138
+        self.record_span(span_start1357, "WhatIf")
+        return result1358
 
     def parse_abort(self) -> transactions_pb2.Abort:
-        span_start1287 = self.span_start()
+        span_start1361 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("abort")
         if (self.match_lookahead_literal(":", 0) and self.match_lookahead_terminal("SYMBOL", 1)):
-            _t2041 = self.parse_name()
-            _t2040 = _t2041
+            _t2140 = self.parse_name()
+            _t2139 = _t2140
         else:
-            _t2040 = None
-        name1285 = _t2040
-        _t2042 = self.parse_relation_id()
-        relation_id1286 = _t2042
+            _t2139 = None
+        name1359 = _t2139
+        _t2141 = self.parse_relation_id()
+        relation_id1360 = _t2141
         self.consume_literal(")")
-        _t2043 = transactions_pb2.Abort(name=(name1285 if name1285 is not None else "abort"), relation_id=relation_id1286)
-        result1288 = _t2043
-        self.record_span(span_start1287, "Abort")
-        return result1288
+        _t2142 = transactions_pb2.Abort(name=(name1359 if name1359 is not None else "abort"), relation_id=relation_id1360)
+        result1362 = _t2142
+        self.record_span(span_start1361, "Abort")
+        return result1362
 
     def parse_export(self) -> transactions_pb2.Export:
-        span_start1292 = self.span_start()
+        span_start1366 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("export_iceberg", 1):
-                _t2045 = 1
+                _t2144 = 1
             else:
                 if self.match_lookahead_literal("export", 1):
-                    _t2046 = 0
+                    _t2145 = 0
                 else:
-                    _t2046 = -1
-                _t2045 = _t2046
-            _t2044 = _t2045
+                    _t2145 = -1
+                _t2144 = _t2145
+            _t2143 = _t2144
         else:
-            _t2044 = -1
-        prediction1289 = _t2044
-        if prediction1289 == 1:
+            _t2143 = -1
+        prediction1363 = _t2143
+        if prediction1363 == 1:
             self.consume_literal("(")
             self.consume_literal("export_iceberg")
-            _t2048 = self.parse_export_iceberg_config()
-            export_iceberg_config1291 = _t2048
+            _t2147 = self.parse_export_iceberg_config()
+            export_iceberg_config1365 = _t2147
             self.consume_literal(")")
-            _t2049 = transactions_pb2.Export(iceberg_config=export_iceberg_config1291)
-            _t2047 = _t2049
+            _t2148 = transactions_pb2.Export(iceberg_config=export_iceberg_config1365)
+            _t2146 = _t2148
         else:
-            if prediction1289 == 0:
+            if prediction1363 == 0:
                 self.consume_literal("(")
                 self.consume_literal("export")
-                _t2051 = self.parse_export_csv_config()
-                export_csv_config1290 = _t2051
+                _t2150 = self.parse_export_csv_config()
+                export_csv_config1364 = _t2150
                 self.consume_literal(")")
-                _t2052 = transactions_pb2.Export(csv_config=export_csv_config1290)
-                _t2050 = _t2052
+                _t2151 = transactions_pb2.Export(csv_config=export_csv_config1364)
+                _t2149 = _t2151
             else:
                 raise ParseError("Unexpected token in export" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t2047 = _t2050
-        result1293 = _t2047
-        self.record_span(span_start1292, "Export")
-        return result1293
+            _t2146 = _t2149
+        result1367 = _t2146
+        self.record_span(span_start1366, "Export")
+        return result1367
 
     def parse_export_csv_config(self) -> transactions_pb2.ExportCSVConfig:
-        span_start1301 = self.span_start()
+        span_start1375 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("export_csv_config_v2", 1):
-                _t2054 = 0
+                _t2153 = 0
             else:
                 if self.match_lookahead_literal("export_csv_config", 1):
-                    _t2055 = 1
+                    _t2154 = 1
                 else:
-                    _t2055 = -1
-                _t2054 = _t2055
-            _t2053 = _t2054
+                    _t2154 = -1
+                _t2153 = _t2154
+            _t2152 = _t2153
         else:
-            _t2053 = -1
-        prediction1294 = _t2053
-        if prediction1294 == 1:
+            _t2152 = -1
+        prediction1368 = _t2152
+        if prediction1368 == 1:
             self.consume_literal("(")
             self.consume_literal("export_csv_config")
-            _t2057 = self.parse_export_csv_path()
-            export_csv_path1298 = _t2057
-            _t2058 = self.parse_export_csv_columns_list()
-            export_csv_columns_list1299 = _t2058
-            _t2059 = self.parse_config_dict()
-            config_dict1300 = _t2059
+            _t2156 = self.parse_export_csv_path()
+            export_csv_path1372 = _t2156
+            _t2157 = self.parse_export_csv_columns_list()
+            export_csv_columns_list1373 = _t2157
+            _t2158 = self.parse_config_dict()
+            config_dict1374 = _t2158
             self.consume_literal(")")
-            _t2060 = self.construct_export_csv_config(export_csv_path1298, export_csv_columns_list1299, config_dict1300)
-            _t2056 = _t2060
+            _t2159 = self.construct_export_csv_config(export_csv_path1372, export_csv_columns_list1373, config_dict1374)
+            _t2155 = _t2159
         else:
-            if prediction1294 == 0:
+            if prediction1368 == 0:
                 self.consume_literal("(")
                 self.consume_literal("export_csv_config_v2")
-                _t2062 = self.parse_export_csv_path()
-                export_csv_path1295 = _t2062
-                _t2063 = self.parse_export_csv_source()
-                export_csv_source1296 = _t2063
-                _t2064 = self.parse_csv_config()
-                csv_config1297 = _t2064
+                _t2161 = self.parse_export_csv_path()
+                export_csv_path1369 = _t2161
+                _t2162 = self.parse_export_csv_source()
+                export_csv_source1370 = _t2162
+                _t2163 = self.parse_csv_config()
+                csv_config1371 = _t2163
                 self.consume_literal(")")
-                _t2065 = self.construct_export_csv_config_with_source(export_csv_path1295, export_csv_source1296, csv_config1297)
-                _t2061 = _t2065
+                _t2164 = self.construct_export_csv_config_with_source(export_csv_path1369, export_csv_source1370, csv_config1371)
+                _t2160 = _t2164
             else:
                 raise ParseError("Unexpected token in export_csv_config" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t2056 = _t2061
-        result1302 = _t2056
-        self.record_span(span_start1301, "ExportCSVConfig")
-        return result1302
+            _t2155 = _t2160
+        result1376 = _t2155
+        self.record_span(span_start1375, "ExportCSVConfig")
+        return result1376
 
     def parse_export_csv_path(self) -> str:
         self.consume_literal("(")
         self.consume_literal("path")
-        string1303 = self.consume_terminal("STRING")
+        string1377 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1303
+        return string1377
 
     def parse_export_csv_source(self) -> transactions_pb2.ExportCSVSource:
-        span_start1310 = self.span_start()
+        span_start1384 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("table_def", 1):
-                _t2067 = 1
+                _t2166 = 1
             else:
                 if self.match_lookahead_literal("gnf_columns", 1):
-                    _t2068 = 0
+                    _t2167 = 0
                 else:
-                    _t2068 = -1
-                _t2067 = _t2068
-            _t2066 = _t2067
+                    _t2167 = -1
+                _t2166 = _t2167
+            _t2165 = _t2166
         else:
-            _t2066 = -1
-        prediction1304 = _t2066
-        if prediction1304 == 1:
+            _t2165 = -1
+        prediction1378 = _t2165
+        if prediction1378 == 1:
             self.consume_literal("(")
             self.consume_literal("table_def")
-            _t2070 = self.parse_relation_id()
-            relation_id1309 = _t2070
+            _t2169 = self.parse_relation_id()
+            relation_id1383 = _t2169
             self.consume_literal(")")
-            _t2071 = transactions_pb2.ExportCSVSource(table_def=relation_id1309)
-            _t2069 = _t2071
+            _t2170 = transactions_pb2.ExportCSVSource(table_def=relation_id1383)
+            _t2168 = _t2170
         else:
-            if prediction1304 == 0:
+            if prediction1378 == 0:
                 self.consume_literal("(")
                 self.consume_literal("gnf_columns")
-                xs1305 = []
-                cond1306 = self.match_lookahead_literal("(", 0)
-                while cond1306:
-                    _t2073 = self.parse_export_csv_column()
-                    item1307 = _t2073
-                    xs1305.append(item1307)
-                    cond1306 = self.match_lookahead_literal("(", 0)
-                export_csv_columns1308 = xs1305
+                xs1379 = []
+                cond1380 = self.match_lookahead_literal("(", 0)
+                while cond1380:
+                    _t2172 = self.parse_export_csv_column()
+                    item1381 = _t2172
+                    xs1379.append(item1381)
+                    cond1380 = self.match_lookahead_literal("(", 0)
+                export_csv_columns1382 = xs1379
                 self.consume_literal(")")
-                _t2074 = transactions_pb2.ExportCSVColumns(columns=export_csv_columns1308)
-                _t2075 = transactions_pb2.ExportCSVSource(gnf_columns=_t2074)
-                _t2072 = _t2075
+                _t2173 = transactions_pb2.ExportCSVColumns(columns=export_csv_columns1382)
+                _t2174 = transactions_pb2.ExportCSVSource(gnf_columns=_t2173)
+                _t2171 = _t2174
             else:
                 raise ParseError("Unexpected token in export_csv_source" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t2069 = _t2072
-        result1311 = _t2069
-        self.record_span(span_start1310, "ExportCSVSource")
-        return result1311
+            _t2168 = _t2171
+        result1385 = _t2168
+        self.record_span(span_start1384, "ExportCSVSource")
+        return result1385
 
     def parse_export_csv_column(self) -> transactions_pb2.ExportCSVColumn:
-        span_start1314 = self.span_start()
+        span_start1388 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("column")
-        string1312 = self.consume_terminal("STRING")
-        _t2076 = self.parse_relation_id()
-        relation_id1313 = _t2076
+        string1386 = self.consume_terminal("STRING")
+        _t2175 = self.parse_relation_id()
+        relation_id1387 = _t2175
         self.consume_literal(")")
-        _t2077 = transactions_pb2.ExportCSVColumn(column_name=string1312, column_data=relation_id1313)
-        result1315 = _t2077
-        self.record_span(span_start1314, "ExportCSVColumn")
-        return result1315
+        _t2176 = transactions_pb2.ExportCSVColumn(column_name=string1386, column_data=relation_id1387)
+        result1389 = _t2176
+        self.record_span(span_start1388, "ExportCSVColumn")
+        return result1389
 
     def parse_export_csv_columns_list(self) -> Sequence[transactions_pb2.ExportCSVColumn]:
         self.consume_literal("(")
         self.consume_literal("columns")
-        xs1316 = []
-        cond1317 = self.match_lookahead_literal("(", 0)
-        while cond1317:
-            _t2078 = self.parse_export_csv_column()
-            item1318 = _t2078
-            xs1316.append(item1318)
-            cond1317 = self.match_lookahead_literal("(", 0)
-        export_csv_columns1319 = xs1316
+        xs1390 = []
+        cond1391 = self.match_lookahead_literal("(", 0)
+        while cond1391:
+            _t2177 = self.parse_export_csv_column()
+            item1392 = _t2177
+            xs1390.append(item1392)
+            cond1391 = self.match_lookahead_literal("(", 0)
+        export_csv_columns1393 = xs1390
         self.consume_literal(")")
-        return export_csv_columns1319
+        return export_csv_columns1393
 
     def parse_export_iceberg_config(self) -> transactions_pb2.ExportIcebergConfig:
-        span_start1325 = self.span_start()
+        span_start1399 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("export_iceberg_config")
-        _t2079 = self.parse_iceberg_locator()
-        iceberg_locator1320 = _t2079
-        _t2080 = self.parse_iceberg_catalog_config()
-        iceberg_catalog_config1321 = _t2080
-        _t2081 = self.parse_export_iceberg_table_def()
-        export_iceberg_table_def1322 = _t2081
-        _t2082 = self.parse_iceberg_table_properties()
-        iceberg_table_properties1323 = _t2082
+        _t2178 = self.parse_iceberg_locator()
+        iceberg_locator1394 = _t2178
+        _t2179 = self.parse_iceberg_catalog_config()
+        iceberg_catalog_config1395 = _t2179
+        _t2180 = self.parse_export_iceberg_table_def()
+        export_iceberg_table_def1396 = _t2180
+        _t2181 = self.parse_iceberg_table_properties()
+        iceberg_table_properties1397 = _t2181
         if self.match_lookahead_literal("{", 0):
-            _t2084 = self.parse_config_dict()
-            _t2083 = _t2084
+            _t2183 = self.parse_config_dict()
+            _t2182 = _t2183
         else:
-            _t2083 = None
-        config_dict1324 = _t2083
+            _t2182 = None
+        config_dict1398 = _t2182
         self.consume_literal(")")
-        _t2085 = self.construct_export_iceberg_config_full(iceberg_locator1320, iceberg_catalog_config1321, export_iceberg_table_def1322, iceberg_table_properties1323, config_dict1324)
-        result1326 = _t2085
-        self.record_span(span_start1325, "ExportIcebergConfig")
-        return result1326
+        _t2184 = self.construct_export_iceberg_config_full(iceberg_locator1394, iceberg_catalog_config1395, export_iceberg_table_def1396, iceberg_table_properties1397, config_dict1398)
+        result1400 = _t2184
+        self.record_span(span_start1399, "ExportIcebergConfig")
+        return result1400
 
     def parse_export_iceberg_table_def(self) -> logic_pb2.RelationId:
-        span_start1328 = self.span_start()
+        span_start1402 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("table_def")
-        _t2086 = self.parse_relation_id()
-        relation_id1327 = _t2086
+        _t2185 = self.parse_relation_id()
+        relation_id1401 = _t2185
         self.consume_literal(")")
-        result1329 = relation_id1327
-        self.record_span(span_start1328, "RelationId")
-        return result1329
+        result1403 = relation_id1401
+        self.record_span(span_start1402, "RelationId")
+        return result1403
 
     def parse_iceberg_table_properties(self) -> Sequence[tuple[str, str]]:
         self.consume_literal("(")
         self.consume_literal("table_properties")
-        xs1330 = []
-        cond1331 = self.match_lookahead_literal("(", 0)
-        while cond1331:
-            _t2087 = self.parse_iceberg_property_entry()
-            item1332 = _t2087
-            xs1330.append(item1332)
-            cond1331 = self.match_lookahead_literal("(", 0)
-        iceberg_property_entrys1333 = xs1330
-        self.consume_literal(")")
-        return iceberg_property_entrys1333
+        xs1404 = []
+        cond1405 = self.match_lookahead_literal("(", 0)
+        while cond1405:
+            _t2186 = self.parse_iceberg_property_entry()
+            item1406 = _t2186
+            xs1404.append(item1406)
+            cond1405 = self.match_lookahead_literal("(", 0)
+        iceberg_property_entrys1407 = xs1404
+        self.consume_literal(")")
+        return iceberg_property_entrys1407
 
 
 def parse_transaction(input_str: str) -> tuple[Any, dict[int, Span]]:
diff --git a/sdks/python/src/lqp/gen/pretty.py b/sdks/python/src/lqp/gen/pretty.py
index f0b28fa6..38e28e22 100644
--- a/sdks/python/src/lqp/gen/pretty.py
+++ b/sdks/python/src/lqp/gen/pretty.py
@@ -216,160 +216,175 @@ def write_debug_info(self) -> None:
 
     # --- Helper functions ---
 
+    def deconstruct_csv_data_columns_optional(self, msg: logic_pb2.CSVData) -> Sequence[logic_pb2.GNFColumn] | None:
+        if msg.HasField("relations"):
+            return None
+        else:
+            _t1832 = None
+        return msg.columns
+
+    def deconstruct_csv_data_relations_optional(self, msg: logic_pb2.CSVData) -> logic_pb2.TargetRelations | None:
+        if msg.HasField("relations"):
+            assert msg.relations is not None
+            return msg.relations
+        else:
+            _t1833 = None
+        return None
+
     def _make_value_int32(self, v: int) -> logic_pb2.Value:
-        _t1742 = logic_pb2.Value(int32_value=v)
-        return _t1742
+        _t1834 = logic_pb2.Value(int32_value=v)
+        return _t1834
 
     def _make_value_int64(self, v: int) -> logic_pb2.Value:
-        _t1743 = logic_pb2.Value(int_value=v)
-        return _t1743
+        _t1835 = logic_pb2.Value(int_value=v)
+        return _t1835
 
     def _make_value_float64(self, v: float) -> logic_pb2.Value:
-        _t1744 = logic_pb2.Value(float_value=v)
-        return _t1744
+        _t1836 = logic_pb2.Value(float_value=v)
+        return _t1836
 
     def _make_value_string(self, v: str) -> logic_pb2.Value:
-        _t1745 = logic_pb2.Value(string_value=v)
-        return _t1745
+        _t1837 = logic_pb2.Value(string_value=v)
+        return _t1837
 
     def _make_value_boolean(self, v: bool) -> logic_pb2.Value:
-        _t1746 = logic_pb2.Value(boolean_value=v)
-        return _t1746
+        _t1838 = logic_pb2.Value(boolean_value=v)
+        return _t1838
 
     def _make_value_uint128(self, v: logic_pb2.UInt128Value) -> logic_pb2.Value:
-        _t1747 = logic_pb2.Value(uint128_value=v)
-        return _t1747
+        _t1839 = logic_pb2.Value(uint128_value=v)
+        return _t1839
 
     def deconstruct_configure(self, msg: transactions_pb2.Configure) -> list[tuple[str, logic_pb2.Value]]:
         result = []
         if msg.ivm_config.level == transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_AUTO:
-            _t1748 = self._make_value_string("auto")
-            result.append(("ivm.maintenance_level", _t1748,))
+            _t1840 = self._make_value_string("auto")
+            result.append(("ivm.maintenance_level", _t1840,))
         else:
             if msg.ivm_config.level == transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_ALL:
-                _t1749 = self._make_value_string("all")
-                result.append(("ivm.maintenance_level", _t1749,))
+                _t1841 = self._make_value_string("all")
+                result.append(("ivm.maintenance_level", _t1841,))
             else:
                 if msg.ivm_config.level == transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_OFF:
-                    _t1750 = self._make_value_string("off")
-                    result.append(("ivm.maintenance_level", _t1750,))
-        _t1751 = self._make_value_int64(msg.semantics_version)
-        result.append(("semantics_version", _t1751,))
+                    _t1842 = self._make_value_string("off")
+                    result.append(("ivm.maintenance_level", _t1842,))
+        _t1843 = self._make_value_int64(msg.semantics_version)
+        result.append(("semantics_version", _t1843,))
         return sorted(result)
 
     def deconstruct_csv_config(self, msg: logic_pb2.CSVConfig) -> list[tuple[str, logic_pb2.Value]]:
         result = []
-        _t1752 = self._make_value_int32(msg.header_row)
-        result.append(("csv_header_row", _t1752,))
-        _t1753 = self._make_value_int64(msg.skip)
-        result.append(("csv_skip", _t1753,))
+        _t1844 = self._make_value_int32(msg.header_row)
+        result.append(("csv_header_row", _t1844,))
+        _t1845 = self._make_value_int64(msg.skip)
+        result.append(("csv_skip", _t1845,))
         if msg.new_line != "":
-            _t1754 = self._make_value_string(msg.new_line)
-            result.append(("csv_new_line", _t1754,))
-        _t1755 = self._make_value_string(msg.delimiter)
-        result.append(("csv_delimiter", _t1755,))
-        _t1756 = self._make_value_string(msg.quotechar)
-        result.append(("csv_quotechar", _t1756,))
-        _t1757 = self._make_value_string(msg.escapechar)
-        result.append(("csv_escapechar", _t1757,))
+            _t1846 = self._make_value_string(msg.new_line)
+            result.append(("csv_new_line", _t1846,))
+        _t1847 = self._make_value_string(msg.delimiter)
+        result.append(("csv_delimiter", _t1847,))
+        _t1848 = self._make_value_string(msg.quotechar)
+        result.append(("csv_quotechar", _t1848,))
+        _t1849 = self._make_value_string(msg.escapechar)
+        result.append(("csv_escapechar", _t1849,))
         if msg.comment != "":
-            _t1758 = self._make_value_string(msg.comment)
-            result.append(("csv_comment", _t1758,))
+            _t1850 = self._make_value_string(msg.comment)
+            result.append(("csv_comment", _t1850,))
         for missing_string in msg.missing_strings:
-            _t1759 = self._make_value_string(missing_string)
-            result.append(("csv_missing_strings", _t1759,))
-        _t1760 = self._make_value_string(msg.decimal_separator)
-        result.append(("csv_decimal_separator", _t1760,))
-        _t1761 = self._make_value_string(msg.encoding)
-        result.append(("csv_encoding", _t1761,))
-        _t1762 = self._make_value_string(msg.compression)
-        result.append(("csv_compression", _t1762,))
+            _t1851 = self._make_value_string(missing_string)
+            result.append(("csv_missing_strings", _t1851,))
+        _t1852 = self._make_value_string(msg.decimal_separator)
+        result.append(("csv_decimal_separator", _t1852,))
+        _t1853 = self._make_value_string(msg.encoding)
+        result.append(("csv_encoding", _t1853,))
+        _t1854 = self._make_value_string(msg.compression)
+        result.append(("csv_compression", _t1854,))
         if msg.partition_size_mb != 0:
-            _t1763 = self._make_value_int64(msg.partition_size_mb)
-            result.append(("csv_partition_size_mb", _t1763,))
+            _t1855 = self._make_value_int64(msg.partition_size_mb)
+            result.append(("csv_partition_size_mb", _t1855,))
         return sorted(result)
 
     def deconstruct_csv_storage_integration_optional(self, msg: logic_pb2.CSVConfig) -> Sequence[tuple[str, logic_pb2.Value]] | None:
         if not msg.HasField("storage_integration"):
             return None
         else:
-            _t1764 = None
+            _t1856 = None
         assert msg.storage_integration is not None
         si = msg.storage_integration
         result = []
         if si.provider != "":
-            _t1765 = self._make_value_string(si.provider)
-            result.append(("provider", _t1765,))
+            _t1857 = self._make_value_string(si.provider)
+            result.append(("provider", _t1857,))
         if si.azure_sas_token != "":
-            _t1766 = self._make_value_string("***")
-            result.append(("azure_sas_token", _t1766,))
+            _t1858 = self._make_value_string("***")
+            result.append(("azure_sas_token", _t1858,))
         if si.s3_region != "":
-            _t1767 = self._make_value_string(si.s3_region)
-            result.append(("s3_region", _t1767,))
+            _t1859 = self._make_value_string(si.s3_region)
+            result.append(("s3_region", _t1859,))
         if si.s3_access_key_id != "":
-            _t1768 = self._make_value_string("***")
-            result.append(("s3_access_key_id", _t1768,))
+            _t1860 = self._make_value_string("***")
+            result.append(("s3_access_key_id", _t1860,))
         if si.s3_secret_access_key != "":
-            _t1769 = self._make_value_string("***")
-            result.append(("s3_secret_access_key", _t1769,))
+            _t1861 = self._make_value_string("***")
+            result.append(("s3_secret_access_key", _t1861,))
         return sorted(result)
 
     def deconstruct_betree_info_config(self, msg: logic_pb2.BeTreeInfo) -> list[tuple[str, logic_pb2.Value]]:
         result = []
-        _t1770 = self._make_value_float64(msg.storage_config.epsilon)
-        result.append(("betree_config_epsilon", _t1770,))
-        _t1771 = self._make_value_int64(msg.storage_config.max_pivots)
-        result.append(("betree_config_max_pivots", _t1771,))
-        _t1772 = self._make_value_int64(msg.storage_config.max_deltas)
-        result.append(("betree_config_max_deltas", _t1772,))
-        _t1773 = self._make_value_int64(msg.storage_config.max_leaf)
-        result.append(("betree_config_max_leaf", _t1773,))
+        _t1862 = self._make_value_float64(msg.storage_config.epsilon)
+        result.append(("betree_config_epsilon", _t1862,))
+        _t1863 = self._make_value_int64(msg.storage_config.max_pivots)
+        result.append(("betree_config_max_pivots", _t1863,))
+        _t1864 = self._make_value_int64(msg.storage_config.max_deltas)
+        result.append(("betree_config_max_deltas", _t1864,))
+        _t1865 = self._make_value_int64(msg.storage_config.max_leaf)
+        result.append(("betree_config_max_leaf", _t1865,))
         if msg.relation_locator.HasField("root_pageid"):
             if msg.relation_locator.root_pageid is not None:
                 assert msg.relation_locator.root_pageid is not None
-                _t1774 = self._make_value_uint128(msg.relation_locator.root_pageid)
-                result.append(("betree_locator_root_pageid", _t1774,))
+                _t1866 = self._make_value_uint128(msg.relation_locator.root_pageid)
+                result.append(("betree_locator_root_pageid", _t1866,))
         if msg.relation_locator.HasField("inline_data"):
             if msg.relation_locator.inline_data is not None:
                 assert msg.relation_locator.inline_data is not None
-                _t1775 = self._make_value_string(msg.relation_locator.inline_data.decode('utf-8'))
-                result.append(("betree_locator_inline_data", _t1775,))
-        _t1776 = self._make_value_int64(msg.relation_locator.element_count)
-        result.append(("betree_locator_element_count", _t1776,))
-        _t1777 = self._make_value_int64(msg.relation_locator.tree_height)
-        result.append(("betree_locator_tree_height", _t1777,))
+                _t1867 = self._make_value_string(msg.relation_locator.inline_data.decode('utf-8'))
+                result.append(("betree_locator_inline_data", _t1867,))
+        _t1868 = self._make_value_int64(msg.relation_locator.element_count)
+        result.append(("betree_locator_element_count", _t1868,))
+        _t1869 = self._make_value_int64(msg.relation_locator.tree_height)
+        result.append(("betree_locator_tree_height", _t1869,))
         return sorted(result)
 
     def deconstruct_export_csv_config(self, msg: transactions_pb2.ExportCSVConfig) -> list[tuple[str, logic_pb2.Value]]:
         result = []
         if msg.partition_size is not None:
             assert msg.partition_size is not None
-            _t1778 = self._make_value_int64(msg.partition_size)
-            result.append(("partition_size", _t1778,))
+            _t1870 = self._make_value_int64(msg.partition_size)
+            result.append(("partition_size", _t1870,))
         if msg.compression is not None:
             assert msg.compression is not None
-            _t1779 = self._make_value_string(msg.compression)
-            result.append(("compression", _t1779,))
+            _t1871 = self._make_value_string(msg.compression)
+            result.append(("compression", _t1871,))
         if msg.syntax_header_row is not None:
             assert msg.syntax_header_row is not None
-            _t1780 = self._make_value_boolean(msg.syntax_header_row)
-            result.append(("syntax_header_row", _t1780,))
+            _t1872 = self._make_value_boolean(msg.syntax_header_row)
+            result.append(("syntax_header_row", _t1872,))
         if msg.syntax_missing_string is not None:
             assert msg.syntax_missing_string is not None
-            _t1781 = self._make_value_string(msg.syntax_missing_string)
-            result.append(("syntax_missing_string", _t1781,))
+            _t1873 = self._make_value_string(msg.syntax_missing_string)
+            result.append(("syntax_missing_string", _t1873,))
         if msg.syntax_delim is not None:
             assert msg.syntax_delim is not None
-            _t1782 = self._make_value_string(msg.syntax_delim)
-            result.append(("syntax_delim", _t1782,))
+            _t1874 = self._make_value_string(msg.syntax_delim)
+            result.append(("syntax_delim", _t1874,))
         if msg.syntax_quotechar is not None:
             assert msg.syntax_quotechar is not None
-            _t1783 = self._make_value_string(msg.syntax_quotechar)
-            result.append(("syntax_quotechar", _t1783,))
+            _t1875 = self._make_value_string(msg.syntax_quotechar)
+            result.append(("syntax_quotechar", _t1875,))
         if msg.syntax_escapechar is not None:
             assert msg.syntax_escapechar is not None
-            _t1784 = self._make_value_string(msg.syntax_escapechar)
-            result.append(("syntax_escapechar", _t1784,))
+            _t1876 = self._make_value_string(msg.syntax_escapechar)
+            result.append(("syntax_escapechar", _t1876,))
         return sorted(result)
 
     def mask_secret_value(self, pair: tuple[str, str]) -> str:
@@ -381,7 +396,7 @@ def deconstruct_iceberg_catalog_config_scope_optional(self, msg: logic_pb2.Icebe
             assert msg.scope is not None
             return msg.scope
         else:
-            _t1785 = None
+            _t1877 = None
         return None
 
     def deconstruct_iceberg_data_from_snapshot_optional(self, msg: logic_pb2.IcebergData) -> str | None:
@@ -390,7 +405,7 @@ def deconstruct_iceberg_data_from_snapshot_optional(self, msg: logic_pb2.Iceberg
             assert msg.from_snapshot is not None
             return msg.from_snapshot
         else:
-            _t1786 = None
+            _t1878 = None
         return None
 
     def deconstruct_iceberg_data_to_snapshot_optional(self, msg: logic_pb2.IcebergData) -> str | None:
@@ -399,7 +414,7 @@ def deconstruct_iceberg_data_to_snapshot_optional(self, msg: logic_pb2.IcebergDa
             assert msg.to_snapshot is not None
             return msg.to_snapshot
         else:
-            _t1787 = None
+            _t1879 = None
         return None
 
     def deconstruct_export_iceberg_config_optional(self, msg: transactions_pb2.ExportIcebergConfig) -> Sequence[tuple[str, logic_pb2.Value]] | None:
@@ -407,20 +422,20 @@ def deconstruct_export_iceberg_config_optional(self, msg: transactions_pb2.Expor
         assert msg.prefix is not None
         if msg.prefix != "":
             assert msg.prefix is not None
-            _t1788 = self._make_value_string(msg.prefix)
-            result.append(("prefix", _t1788,))
+            _t1880 = self._make_value_string(msg.prefix)
+            result.append(("prefix", _t1880,))
         assert msg.target_file_size_bytes is not None
         if msg.target_file_size_bytes != 0:
             assert msg.target_file_size_bytes is not None
-            _t1789 = self._make_value_int64(msg.target_file_size_bytes)
-            result.append(("target_file_size_bytes", _t1789,))
+            _t1881 = self._make_value_int64(msg.target_file_size_bytes)
+            result.append(("target_file_size_bytes", _t1881,))
         if msg.compression != "":
-            _t1790 = self._make_value_string(msg.compression)
-            result.append(("compression", _t1790,))
+            _t1882 = self._make_value_string(msg.compression)
+            result.append(("compression", _t1882,))
         if len(result) == 0:
             return None
         else:
-            _t1791 = None
+            _t1883 = None
         return sorted(result)
 
     def deconstruct_relation_id_string(self, msg: logic_pb2.RelationId) -> str:
@@ -433,7 +448,7 @@ def deconstruct_relation_id_uint128(self, msg: logic_pb2.RelationId) -> logic_pb
         if name is None:
             return self.relation_id_to_uint128(msg)
         else:
-            _t1792 = None
+            _t1884 = None
         return None
 
     def deconstruct_bindings(self, abs: logic_pb2.Abstraction) -> tuple[Sequence[logic_pb2.Binding], Sequence[logic_pb2.Binding]]:
@@ -448,3936 +463,4122 @@ def deconstruct_bindings_with_arity(self, abs: logic_pb2.Abstraction, value_arit
     # --- Pretty-print methods ---
 
     def pretty_transaction(self, msg: transactions_pb2.Transaction):
-        flat808 = self._try_flat(msg, self.pretty_transaction)
-        if flat808 is not None:
-            assert flat808 is not None
-            self.write(flat808)
+        flat851 = self._try_flat(msg, self.pretty_transaction)
+        if flat851 is not None:
+            assert flat851 is not None
+            self.write(flat851)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("configure"):
-                _t1598 = _dollar_dollar.configure
+                _t1684 = _dollar_dollar.configure
             else:
-                _t1598 = None
+                _t1684 = None
             if _dollar_dollar.HasField("sync"):
-                _t1599 = _dollar_dollar.sync
+                _t1685 = _dollar_dollar.sync
             else:
-                _t1599 = None
-            fields799 = (_t1598, _t1599, _dollar_dollar.epochs,)
-            assert fields799 is not None
-            unwrapped_fields800 = fields799
+                _t1685 = None
+            fields842 = (_t1684, _t1685, _dollar_dollar.epochs,)
+            assert fields842 is not None
+            unwrapped_fields843 = fields842
             self.write("(transaction")
             self.indent_sexp()
-            field801 = unwrapped_fields800[0]
-            if field801 is not None:
+            field844 = unwrapped_fields843[0]
+            if field844 is not None:
                 self.newline()
-                assert field801 is not None
-                opt_val802 = field801
-                self.pretty_configure(opt_val802)
-            field803 = unwrapped_fields800[1]
-            if field803 is not None:
+                assert field844 is not None
+                opt_val845 = field844
+                self.pretty_configure(opt_val845)
+            field846 = unwrapped_fields843[1]
+            if field846 is not None:
                 self.newline()
-                assert field803 is not None
-                opt_val804 = field803
-                self.pretty_sync(opt_val804)
-            field805 = unwrapped_fields800[2]
-            if not len(field805) == 0:
+                assert field846 is not None
+                opt_val847 = field846
+                self.pretty_sync(opt_val847)
+            field848 = unwrapped_fields843[2]
+            if not len(field848) == 0:
                 self.newline()
-                for i807, elem806 in enumerate(field805):
-                    if (i807 > 0):
+                for i850, elem849 in enumerate(field848):
+                    if (i850 > 0):
                         self.newline()
-                    self.pretty_epoch(elem806)
+                    self.pretty_epoch(elem849)
             self.dedent()
             self.write(")")
 
     def pretty_configure(self, msg: transactions_pb2.Configure):
-        flat811 = self._try_flat(msg, self.pretty_configure)
-        if flat811 is not None:
-            assert flat811 is not None
-            self.write(flat811)
+        flat854 = self._try_flat(msg, self.pretty_configure)
+        if flat854 is not None:
+            assert flat854 is not None
+            self.write(flat854)
             return None
         else:
             _dollar_dollar = msg
-            _t1600 = self.deconstruct_configure(_dollar_dollar)
-            fields809 = _t1600
-            assert fields809 is not None
-            unwrapped_fields810 = fields809
+            _t1686 = self.deconstruct_configure(_dollar_dollar)
+            fields852 = _t1686
+            assert fields852 is not None
+            unwrapped_fields853 = fields852
             self.write("(configure")
             self.indent_sexp()
             self.newline()
-            self.pretty_config_dict(unwrapped_fields810)
+            self.pretty_config_dict(unwrapped_fields853)
             self.dedent()
             self.write(")")
 
     def pretty_config_dict(self, msg: Sequence[tuple[str, logic_pb2.Value]]):
-        flat815 = self._try_flat(msg, self.pretty_config_dict)
-        if flat815 is not None:
-            assert flat815 is not None
-            self.write(flat815)
+        flat858 = self._try_flat(msg, self.pretty_config_dict)
+        if flat858 is not None:
+            assert flat858 is not None
+            self.write(flat858)
             return None
         else:
-            fields812 = msg
+            fields855 = msg
             self.write("{")
             self.indent()
-            if not len(fields812) == 0:
+            if not len(fields855) == 0:
                 self.newline()
-                for i814, elem813 in enumerate(fields812):
-                    if (i814 > 0):
+                for i857, elem856 in enumerate(fields855):
+                    if (i857 > 0):
                         self.newline()
-                    self.pretty_config_key_value(elem813)
+                    self.pretty_config_key_value(elem856)
             self.dedent()
             self.write("}")
 
     def pretty_config_key_value(self, msg: tuple[str, logic_pb2.Value]):
-        flat820 = self._try_flat(msg, self.pretty_config_key_value)
-        if flat820 is not None:
-            assert flat820 is not None
-            self.write(flat820)
+        flat863 = self._try_flat(msg, self.pretty_config_key_value)
+        if flat863 is not None:
+            assert flat863 is not None
+            self.write(flat863)
             return None
         else:
             _dollar_dollar = msg
-            fields816 = (_dollar_dollar[0], _dollar_dollar[1],)
-            assert fields816 is not None
-            unwrapped_fields817 = fields816
+            fields859 = (_dollar_dollar[0], _dollar_dollar[1],)
+            assert fields859 is not None
+            unwrapped_fields860 = fields859
             self.write(":")
-            field818 = unwrapped_fields817[0]
-            self.write(field818)
+            field861 = unwrapped_fields860[0]
+            self.write(field861)
             self.write(" ")
-            field819 = unwrapped_fields817[1]
-            self.pretty_raw_value(field819)
+            field862 = unwrapped_fields860[1]
+            self.pretty_raw_value(field862)
 
     def pretty_raw_value(self, msg: logic_pb2.Value):
-        flat846 = self._try_flat(msg, self.pretty_raw_value)
-        if flat846 is not None:
-            assert flat846 is not None
-            self.write(flat846)
+        flat889 = self._try_flat(msg, self.pretty_raw_value)
+        if flat889 is not None:
+            assert flat889 is not None
+            self.write(flat889)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("date_value"):
-                _t1601 = _dollar_dollar.date_value
+                _t1687 = _dollar_dollar.date_value
             else:
-                _t1601 = None
-            deconstruct_result844 = _t1601
-            if deconstruct_result844 is not None:
-                assert deconstruct_result844 is not None
-                unwrapped845 = deconstruct_result844
-                self.pretty_raw_date(unwrapped845)
+                _t1687 = None
+            deconstruct_result887 = _t1687
+            if deconstruct_result887 is not None:
+                assert deconstruct_result887 is not None
+                unwrapped888 = deconstruct_result887
+                self.pretty_raw_date(unwrapped888)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("datetime_value"):
-                    _t1602 = _dollar_dollar.datetime_value
+                    _t1688 = _dollar_dollar.datetime_value
                 else:
-                    _t1602 = None
-                deconstruct_result842 = _t1602
-                if deconstruct_result842 is not None:
-                    assert deconstruct_result842 is not None
-                    unwrapped843 = deconstruct_result842
-                    self.pretty_raw_datetime(unwrapped843)
+                    _t1688 = None
+                deconstruct_result885 = _t1688
+                if deconstruct_result885 is not None:
+                    assert deconstruct_result885 is not None
+                    unwrapped886 = deconstruct_result885
+                    self.pretty_raw_datetime(unwrapped886)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("string_value"):
-                        _t1603 = _dollar_dollar.string_value
+                        _t1689 = _dollar_dollar.string_value
                     else:
-                        _t1603 = None
-                    deconstruct_result840 = _t1603
-                    if deconstruct_result840 is not None:
-                        assert deconstruct_result840 is not None
-                        unwrapped841 = deconstruct_result840
-                        self.write(self.format_string_value(unwrapped841))
+                        _t1689 = None
+                    deconstruct_result883 = _t1689
+                    if deconstruct_result883 is not None:
+                        assert deconstruct_result883 is not None
+                        unwrapped884 = deconstruct_result883
+                        self.write(self.format_string_value(unwrapped884))
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("int32_value"):
-                            _t1604 = _dollar_dollar.int32_value
+                            _t1690 = _dollar_dollar.int32_value
                         else:
-                            _t1604 = None
-                        deconstruct_result838 = _t1604
-                        if deconstruct_result838 is not None:
-                            assert deconstruct_result838 is not None
-                            unwrapped839 = deconstruct_result838
-                            self.write((str(unwrapped839) + 'i32'))
+                            _t1690 = None
+                        deconstruct_result881 = _t1690
+                        if deconstruct_result881 is not None:
+                            assert deconstruct_result881 is not None
+                            unwrapped882 = deconstruct_result881
+                            self.write((str(unwrapped882) + 'i32'))
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("int_value"):
-                                _t1605 = _dollar_dollar.int_value
+                                _t1691 = _dollar_dollar.int_value
                             else:
-                                _t1605 = None
-                            deconstruct_result836 = _t1605
-                            if deconstruct_result836 is not None:
-                                assert deconstruct_result836 is not None
-                                unwrapped837 = deconstruct_result836
-                                self.write(str(unwrapped837))
+                                _t1691 = None
+                            deconstruct_result879 = _t1691
+                            if deconstruct_result879 is not None:
+                                assert deconstruct_result879 is not None
+                                unwrapped880 = deconstruct_result879
+                                self.write(str(unwrapped880))
                             else:
                                 _dollar_dollar = msg
                                 if _dollar_dollar.HasField("float32_value"):
-                                    _t1606 = _dollar_dollar.float32_value
+                                    _t1692 = _dollar_dollar.float32_value
                                 else:
-                                    _t1606 = None
-                                deconstruct_result834 = _t1606
-                                if deconstruct_result834 is not None:
-                                    assert deconstruct_result834 is not None
-                                    unwrapped835 = deconstruct_result834
-                                    self.write(self.format_float32_literal(unwrapped835))
+                                    _t1692 = None
+                                deconstruct_result877 = _t1692
+                                if deconstruct_result877 is not None:
+                                    assert deconstruct_result877 is not None
+                                    unwrapped878 = deconstruct_result877
+                                    self.write(self.format_float32_literal(unwrapped878))
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.HasField("float_value"):
-                                        _t1607 = _dollar_dollar.float_value
+                                        _t1693 = _dollar_dollar.float_value
                                     else:
-                                        _t1607 = None
-                                    deconstruct_result832 = _t1607
-                                    if deconstruct_result832 is not None:
-                                        assert deconstruct_result832 is not None
-                                        unwrapped833 = deconstruct_result832
-                                        self.write(str(unwrapped833))
+                                        _t1693 = None
+                                    deconstruct_result875 = _t1693
+                                    if deconstruct_result875 is not None:
+                                        assert deconstruct_result875 is not None
+                                        unwrapped876 = deconstruct_result875
+                                        self.write(str(unwrapped876))
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.HasField("uint32_value"):
-                                            _t1608 = _dollar_dollar.uint32_value
+                                            _t1694 = _dollar_dollar.uint32_value
                                         else:
-                                            _t1608 = None
-                                        deconstruct_result830 = _t1608
-                                        if deconstruct_result830 is not None:
-                                            assert deconstruct_result830 is not None
-                                            unwrapped831 = deconstruct_result830
-                                            self.write((str(unwrapped831) + 'u32'))
+                                            _t1694 = None
+                                        deconstruct_result873 = _t1694
+                                        if deconstruct_result873 is not None:
+                                            assert deconstruct_result873 is not None
+                                            unwrapped874 = deconstruct_result873
+                                            self.write((str(unwrapped874) + 'u32'))
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.HasField("uint128_value"):
-                                                _t1609 = _dollar_dollar.uint128_value
+                                                _t1695 = _dollar_dollar.uint128_value
                                             else:
-                                                _t1609 = None
-                                            deconstruct_result828 = _t1609
-                                            if deconstruct_result828 is not None:
-                                                assert deconstruct_result828 is not None
-                                                unwrapped829 = deconstruct_result828
-                                                self.write(self.format_uint128(unwrapped829))
+                                                _t1695 = None
+                                            deconstruct_result871 = _t1695
+                                            if deconstruct_result871 is not None:
+                                                assert deconstruct_result871 is not None
+                                                unwrapped872 = deconstruct_result871
+                                                self.write(self.format_uint128(unwrapped872))
                                             else:
                                                 _dollar_dollar = msg
                                                 if _dollar_dollar.HasField("int128_value"):
-                                                    _t1610 = _dollar_dollar.int128_value
+                                                    _t1696 = _dollar_dollar.int128_value
                                                 else:
-                                                    _t1610 = None
-                                                deconstruct_result826 = _t1610
-                                                if deconstruct_result826 is not None:
-                                                    assert deconstruct_result826 is not None
-                                                    unwrapped827 = deconstruct_result826
-                                                    self.write(self.format_int128(unwrapped827))
+                                                    _t1696 = None
+                                                deconstruct_result869 = _t1696
+                                                if deconstruct_result869 is not None:
+                                                    assert deconstruct_result869 is not None
+                                                    unwrapped870 = deconstruct_result869
+                                                    self.write(self.format_int128(unwrapped870))
                                                 else:
                                                     _dollar_dollar = msg
                                                     if _dollar_dollar.HasField("decimal_value"):
-                                                        _t1611 = _dollar_dollar.decimal_value
+                                                        _t1697 = _dollar_dollar.decimal_value
                                                     else:
-                                                        _t1611 = None
-                                                    deconstruct_result824 = _t1611
-                                                    if deconstruct_result824 is not None:
-                                                        assert deconstruct_result824 is not None
-                                                        unwrapped825 = deconstruct_result824
-                                                        self.write(self.format_decimal(unwrapped825))
+                                                        _t1697 = None
+                                                    deconstruct_result867 = _t1697
+                                                    if deconstruct_result867 is not None:
+                                                        assert deconstruct_result867 is not None
+                                                        unwrapped868 = deconstruct_result867
+                                                        self.write(self.format_decimal(unwrapped868))
                                                     else:
                                                         _dollar_dollar = msg
                                                         if _dollar_dollar.HasField("boolean_value"):
-                                                            _t1612 = _dollar_dollar.boolean_value
+                                                            _t1698 = _dollar_dollar.boolean_value
                                                         else:
-                                                            _t1612 = None
-                                                        deconstruct_result822 = _t1612
-                                                        if deconstruct_result822 is not None:
-                                                            assert deconstruct_result822 is not None
-                                                            unwrapped823 = deconstruct_result822
-                                                            self.pretty_boolean_value(unwrapped823)
+                                                            _t1698 = None
+                                                        deconstruct_result865 = _t1698
+                                                        if deconstruct_result865 is not None:
+                                                            assert deconstruct_result865 is not None
+                                                            unwrapped866 = deconstruct_result865
+                                                            self.pretty_boolean_value(unwrapped866)
                                                         else:
-                                                            fields821 = msg
+                                                            fields864 = msg
                                                             self.write("missing")
 
     def pretty_raw_date(self, msg: logic_pb2.DateValue):
-        flat852 = self._try_flat(msg, self.pretty_raw_date)
-        if flat852 is not None:
-            assert flat852 is not None
-            self.write(flat852)
+        flat895 = self._try_flat(msg, self.pretty_raw_date)
+        if flat895 is not None:
+            assert flat895 is not None
+            self.write(flat895)
             return None
         else:
             _dollar_dollar = msg
-            fields847 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day),)
-            assert fields847 is not None
-            unwrapped_fields848 = fields847
+            fields890 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day),)
+            assert fields890 is not None
+            unwrapped_fields891 = fields890
             self.write("(date")
             self.indent_sexp()
             self.newline()
-            field849 = unwrapped_fields848[0]
-            self.write(str(field849))
+            field892 = unwrapped_fields891[0]
+            self.write(str(field892))
             self.newline()
-            field850 = unwrapped_fields848[1]
-            self.write(str(field850))
+            field893 = unwrapped_fields891[1]
+            self.write(str(field893))
             self.newline()
-            field851 = unwrapped_fields848[2]
-            self.write(str(field851))
+            field894 = unwrapped_fields891[2]
+            self.write(str(field894))
             self.dedent()
             self.write(")")
 
     def pretty_raw_datetime(self, msg: logic_pb2.DateTimeValue):
-        flat863 = self._try_flat(msg, self.pretty_raw_datetime)
-        if flat863 is not None:
-            assert flat863 is not None
-            self.write(flat863)
+        flat906 = self._try_flat(msg, self.pretty_raw_datetime)
+        if flat906 is not None:
+            assert flat906 is not None
+            self.write(flat906)
             return None
         else:
             _dollar_dollar = msg
-            fields853 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day), int(_dollar_dollar.hour), int(_dollar_dollar.minute), int(_dollar_dollar.second), int(_dollar_dollar.microsecond),)
-            assert fields853 is not None
-            unwrapped_fields854 = fields853
+            fields896 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day), int(_dollar_dollar.hour), int(_dollar_dollar.minute), int(_dollar_dollar.second), int(_dollar_dollar.microsecond),)
+            assert fields896 is not None
+            unwrapped_fields897 = fields896
             self.write("(datetime")
             self.indent_sexp()
             self.newline()
-            field855 = unwrapped_fields854[0]
-            self.write(str(field855))
+            field898 = unwrapped_fields897[0]
+            self.write(str(field898))
             self.newline()
-            field856 = unwrapped_fields854[1]
-            self.write(str(field856))
+            field899 = unwrapped_fields897[1]
+            self.write(str(field899))
             self.newline()
-            field857 = unwrapped_fields854[2]
-            self.write(str(field857))
+            field900 = unwrapped_fields897[2]
+            self.write(str(field900))
             self.newline()
-            field858 = unwrapped_fields854[3]
-            self.write(str(field858))
+            field901 = unwrapped_fields897[3]
+            self.write(str(field901))
             self.newline()
-            field859 = unwrapped_fields854[4]
-            self.write(str(field859))
+            field902 = unwrapped_fields897[4]
+            self.write(str(field902))
             self.newline()
-            field860 = unwrapped_fields854[5]
-            self.write(str(field860))
-            field861 = unwrapped_fields854[6]
-            if field861 is not None:
+            field903 = unwrapped_fields897[5]
+            self.write(str(field903))
+            field904 = unwrapped_fields897[6]
+            if field904 is not None:
                 self.newline()
-                assert field861 is not None
-                opt_val862 = field861
-                self.write(str(opt_val862))
+                assert field904 is not None
+                opt_val905 = field904
+                self.write(str(opt_val905))
             self.dedent()
             self.write(")")
 
     def pretty_boolean_value(self, msg: bool):
         _dollar_dollar = msg
         if _dollar_dollar:
-            _t1613 = ()
+            _t1699 = ()
         else:
-            _t1613 = None
-        deconstruct_result866 = _t1613
-        if deconstruct_result866 is not None:
-            assert deconstruct_result866 is not None
-            unwrapped867 = deconstruct_result866
+            _t1699 = None
+        deconstruct_result909 = _t1699
+        if deconstruct_result909 is not None:
+            assert deconstruct_result909 is not None
+            unwrapped910 = deconstruct_result909
             self.write("true")
         else:
             _dollar_dollar = msg
             if not _dollar_dollar:
-                _t1614 = ()
+                _t1700 = ()
             else:
-                _t1614 = None
-            deconstruct_result864 = _t1614
-            if deconstruct_result864 is not None:
-                assert deconstruct_result864 is not None
-                unwrapped865 = deconstruct_result864
+                _t1700 = None
+            deconstruct_result907 = _t1700
+            if deconstruct_result907 is not None:
+                assert deconstruct_result907 is not None
+                unwrapped908 = deconstruct_result907
                 self.write("false")
             else:
                 raise ParseError("No matching rule for boolean_value")
 
     def pretty_sync(self, msg: transactions_pb2.Sync):
-        flat872 = self._try_flat(msg, self.pretty_sync)
-        if flat872 is not None:
-            assert flat872 is not None
-            self.write(flat872)
+        flat915 = self._try_flat(msg, self.pretty_sync)
+        if flat915 is not None:
+            assert flat915 is not None
+            self.write(flat915)
             return None
         else:
             _dollar_dollar = msg
-            fields868 = _dollar_dollar.fragments
-            assert fields868 is not None
-            unwrapped_fields869 = fields868
+            fields911 = _dollar_dollar.fragments
+            assert fields911 is not None
+            unwrapped_fields912 = fields911
             self.write("(sync")
             self.indent_sexp()
-            if not len(unwrapped_fields869) == 0:
+            if not len(unwrapped_fields912) == 0:
                 self.newline()
-                for i871, elem870 in enumerate(unwrapped_fields869):
-                    if (i871 > 0):
+                for i914, elem913 in enumerate(unwrapped_fields912):
+                    if (i914 > 0):
                         self.newline()
-                    self.pretty_fragment_id(elem870)
+                    self.pretty_fragment_id(elem913)
             self.dedent()
             self.write(")")
 
     def pretty_fragment_id(self, msg: fragments_pb2.FragmentId):
-        flat875 = self._try_flat(msg, self.pretty_fragment_id)
-        if flat875 is not None:
-            assert flat875 is not None
-            self.write(flat875)
+        flat918 = self._try_flat(msg, self.pretty_fragment_id)
+        if flat918 is not None:
+            assert flat918 is not None
+            self.write(flat918)
             return None
         else:
             _dollar_dollar = msg
-            fields873 = self.fragment_id_to_string(_dollar_dollar)
-            assert fields873 is not None
-            unwrapped_fields874 = fields873
+            fields916 = self.fragment_id_to_string(_dollar_dollar)
+            assert fields916 is not None
+            unwrapped_fields917 = fields916
             self.write(":")
-            self.write(unwrapped_fields874)
+            self.write(unwrapped_fields917)
 
     def pretty_epoch(self, msg: transactions_pb2.Epoch):
-        flat882 = self._try_flat(msg, self.pretty_epoch)
-        if flat882 is not None:
-            assert flat882 is not None
-            self.write(flat882)
+        flat925 = self._try_flat(msg, self.pretty_epoch)
+        if flat925 is not None:
+            assert flat925 is not None
+            self.write(flat925)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.writes) == 0:
-                _t1615 = _dollar_dollar.writes
+                _t1701 = _dollar_dollar.writes
             else:
-                _t1615 = None
+                _t1701 = None
             if not len(_dollar_dollar.reads) == 0:
-                _t1616 = _dollar_dollar.reads
+                _t1702 = _dollar_dollar.reads
             else:
-                _t1616 = None
-            fields876 = (_t1615, _t1616,)
-            assert fields876 is not None
-            unwrapped_fields877 = fields876
+                _t1702 = None
+            fields919 = (_t1701, _t1702,)
+            assert fields919 is not None
+            unwrapped_fields920 = fields919
             self.write("(epoch")
             self.indent_sexp()
-            field878 = unwrapped_fields877[0]
-            if field878 is not None:
+            field921 = unwrapped_fields920[0]
+            if field921 is not None:
                 self.newline()
-                assert field878 is not None
-                opt_val879 = field878
-                self.pretty_epoch_writes(opt_val879)
-            field880 = unwrapped_fields877[1]
-            if field880 is not None:
+                assert field921 is not None
+                opt_val922 = field921
+                self.pretty_epoch_writes(opt_val922)
+            field923 = unwrapped_fields920[1]
+            if field923 is not None:
                 self.newline()
-                assert field880 is not None
-                opt_val881 = field880
-                self.pretty_epoch_reads(opt_val881)
+                assert field923 is not None
+                opt_val924 = field923
+                self.pretty_epoch_reads(opt_val924)
             self.dedent()
             self.write(")")
 
     def pretty_epoch_writes(self, msg: Sequence[transactions_pb2.Write]):
-        flat886 = self._try_flat(msg, self.pretty_epoch_writes)
-        if flat886 is not None:
-            assert flat886 is not None
-            self.write(flat886)
+        flat929 = self._try_flat(msg, self.pretty_epoch_writes)
+        if flat929 is not None:
+            assert flat929 is not None
+            self.write(flat929)
             return None
         else:
-            fields883 = msg
+            fields926 = msg
             self.write("(writes")
             self.indent_sexp()
-            if not len(fields883) == 0:
+            if not len(fields926) == 0:
                 self.newline()
-                for i885, elem884 in enumerate(fields883):
-                    if (i885 > 0):
+                for i928, elem927 in enumerate(fields926):
+                    if (i928 > 0):
                         self.newline()
-                    self.pretty_write(elem884)
+                    self.pretty_write(elem927)
             self.dedent()
             self.write(")")
 
     def pretty_write(self, msg: transactions_pb2.Write):
-        flat895 = self._try_flat(msg, self.pretty_write)
-        if flat895 is not None:
-            assert flat895 is not None
-            self.write(flat895)
+        flat938 = self._try_flat(msg, self.pretty_write)
+        if flat938 is not None:
+            assert flat938 is not None
+            self.write(flat938)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("define"):
-                _t1617 = _dollar_dollar.define
+                _t1703 = _dollar_dollar.define
             else:
-                _t1617 = None
-            deconstruct_result893 = _t1617
-            if deconstruct_result893 is not None:
-                assert deconstruct_result893 is not None
-                unwrapped894 = deconstruct_result893
-                self.pretty_define(unwrapped894)
+                _t1703 = None
+            deconstruct_result936 = _t1703
+            if deconstruct_result936 is not None:
+                assert deconstruct_result936 is not None
+                unwrapped937 = deconstruct_result936
+                self.pretty_define(unwrapped937)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("undefine"):
-                    _t1618 = _dollar_dollar.undefine
+                    _t1704 = _dollar_dollar.undefine
                 else:
-                    _t1618 = None
-                deconstruct_result891 = _t1618
-                if deconstruct_result891 is not None:
-                    assert deconstruct_result891 is not None
-                    unwrapped892 = deconstruct_result891
-                    self.pretty_undefine(unwrapped892)
+                    _t1704 = None
+                deconstruct_result934 = _t1704
+                if deconstruct_result934 is not None:
+                    assert deconstruct_result934 is not None
+                    unwrapped935 = deconstruct_result934
+                    self.pretty_undefine(unwrapped935)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("context"):
-                        _t1619 = _dollar_dollar.context
+                        _t1705 = _dollar_dollar.context
                     else:
-                        _t1619 = None
-                    deconstruct_result889 = _t1619
-                    if deconstruct_result889 is not None:
-                        assert deconstruct_result889 is not None
-                        unwrapped890 = deconstruct_result889
-                        self.pretty_context(unwrapped890)
+                        _t1705 = None
+                    deconstruct_result932 = _t1705
+                    if deconstruct_result932 is not None:
+                        assert deconstruct_result932 is not None
+                        unwrapped933 = deconstruct_result932
+                        self.pretty_context(unwrapped933)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("snapshot"):
-                            _t1620 = _dollar_dollar.snapshot
+                            _t1706 = _dollar_dollar.snapshot
                         else:
-                            _t1620 = None
-                        deconstruct_result887 = _t1620
-                        if deconstruct_result887 is not None:
-                            assert deconstruct_result887 is not None
-                            unwrapped888 = deconstruct_result887
-                            self.pretty_snapshot(unwrapped888)
+                            _t1706 = None
+                        deconstruct_result930 = _t1706
+                        if deconstruct_result930 is not None:
+                            assert deconstruct_result930 is not None
+                            unwrapped931 = deconstruct_result930
+                            self.pretty_snapshot(unwrapped931)
                         else:
                             raise ParseError("No matching rule for write")
 
     def pretty_define(self, msg: transactions_pb2.Define):
-        flat898 = self._try_flat(msg, self.pretty_define)
-        if flat898 is not None:
-            assert flat898 is not None
-            self.write(flat898)
+        flat941 = self._try_flat(msg, self.pretty_define)
+        if flat941 is not None:
+            assert flat941 is not None
+            self.write(flat941)
             return None
         else:
             _dollar_dollar = msg
-            fields896 = _dollar_dollar.fragment
-            assert fields896 is not None
-            unwrapped_fields897 = fields896
+            fields939 = _dollar_dollar.fragment
+            assert fields939 is not None
+            unwrapped_fields940 = fields939
             self.write("(define")
             self.indent_sexp()
             self.newline()
-            self.pretty_fragment(unwrapped_fields897)
+            self.pretty_fragment(unwrapped_fields940)
             self.dedent()
             self.write(")")
 
     def pretty_fragment(self, msg: fragments_pb2.Fragment):
-        flat905 = self._try_flat(msg, self.pretty_fragment)
-        if flat905 is not None:
-            assert flat905 is not None
-            self.write(flat905)
+        flat948 = self._try_flat(msg, self.pretty_fragment)
+        if flat948 is not None:
+            assert flat948 is not None
+            self.write(flat948)
             return None
         else:
             _dollar_dollar = msg
             self.start_pretty_fragment(_dollar_dollar)
-            fields899 = (_dollar_dollar.id, _dollar_dollar.declarations,)
-            assert fields899 is not None
-            unwrapped_fields900 = fields899
+            fields942 = (_dollar_dollar.id, _dollar_dollar.declarations,)
+            assert fields942 is not None
+            unwrapped_fields943 = fields942
             self.write("(fragment")
             self.indent_sexp()
             self.newline()
-            field901 = unwrapped_fields900[0]
-            self.pretty_new_fragment_id(field901)
-            field902 = unwrapped_fields900[1]
-            if not len(field902) == 0:
+            field944 = unwrapped_fields943[0]
+            self.pretty_new_fragment_id(field944)
+            field945 = unwrapped_fields943[1]
+            if not len(field945) == 0:
                 self.newline()
-                for i904, elem903 in enumerate(field902):
-                    if (i904 > 0):
+                for i947, elem946 in enumerate(field945):
+                    if (i947 > 0):
                         self.newline()
-                    self.pretty_declaration(elem903)
+                    self.pretty_declaration(elem946)
             self.dedent()
             self.write(")")
 
     def pretty_new_fragment_id(self, msg: fragments_pb2.FragmentId):
-        flat907 = self._try_flat(msg, self.pretty_new_fragment_id)
-        if flat907 is not None:
-            assert flat907 is not None
-            self.write(flat907)
+        flat950 = self._try_flat(msg, self.pretty_new_fragment_id)
+        if flat950 is not None:
+            assert flat950 is not None
+            self.write(flat950)
             return None
         else:
-            fields906 = msg
-            self.pretty_fragment_id(fields906)
+            fields949 = msg
+            self.pretty_fragment_id(fields949)
 
     def pretty_declaration(self, msg: logic_pb2.Declaration):
-        flat916 = self._try_flat(msg, self.pretty_declaration)
-        if flat916 is not None:
-            assert flat916 is not None
-            self.write(flat916)
+        flat959 = self._try_flat(msg, self.pretty_declaration)
+        if flat959 is not None:
+            assert flat959 is not None
+            self.write(flat959)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("def"):
-                _t1621 = getattr(_dollar_dollar, 'def')
+                _t1707 = getattr(_dollar_dollar, 'def')
             else:
-                _t1621 = None
-            deconstruct_result914 = _t1621
-            if deconstruct_result914 is not None:
-                assert deconstruct_result914 is not None
-                unwrapped915 = deconstruct_result914
-                self.pretty_def(unwrapped915)
+                _t1707 = None
+            deconstruct_result957 = _t1707
+            if deconstruct_result957 is not None:
+                assert deconstruct_result957 is not None
+                unwrapped958 = deconstruct_result957
+                self.pretty_def(unwrapped958)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("algorithm"):
-                    _t1622 = _dollar_dollar.algorithm
+                    _t1708 = _dollar_dollar.algorithm
                 else:
-                    _t1622 = None
-                deconstruct_result912 = _t1622
-                if deconstruct_result912 is not None:
-                    assert deconstruct_result912 is not None
-                    unwrapped913 = deconstruct_result912
-                    self.pretty_algorithm(unwrapped913)
+                    _t1708 = None
+                deconstruct_result955 = _t1708
+                if deconstruct_result955 is not None:
+                    assert deconstruct_result955 is not None
+                    unwrapped956 = deconstruct_result955
+                    self.pretty_algorithm(unwrapped956)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("constraint"):
-                        _t1623 = _dollar_dollar.constraint
+                        _t1709 = _dollar_dollar.constraint
                     else:
-                        _t1623 = None
-                    deconstruct_result910 = _t1623
-                    if deconstruct_result910 is not None:
-                        assert deconstruct_result910 is not None
-                        unwrapped911 = deconstruct_result910
-                        self.pretty_constraint(unwrapped911)
+                        _t1709 = None
+                    deconstruct_result953 = _t1709
+                    if deconstruct_result953 is not None:
+                        assert deconstruct_result953 is not None
+                        unwrapped954 = deconstruct_result953
+                        self.pretty_constraint(unwrapped954)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("data"):
-                            _t1624 = _dollar_dollar.data
+                            _t1710 = _dollar_dollar.data
                         else:
-                            _t1624 = None
-                        deconstruct_result908 = _t1624
-                        if deconstruct_result908 is not None:
-                            assert deconstruct_result908 is not None
-                            unwrapped909 = deconstruct_result908
-                            self.pretty_data(unwrapped909)
+                            _t1710 = None
+                        deconstruct_result951 = _t1710
+                        if deconstruct_result951 is not None:
+                            assert deconstruct_result951 is not None
+                            unwrapped952 = deconstruct_result951
+                            self.pretty_data(unwrapped952)
                         else:
                             raise ParseError("No matching rule for declaration")
 
     def pretty_def(self, msg: logic_pb2.Def):
-        flat923 = self._try_flat(msg, self.pretty_def)
-        if flat923 is not None:
-            assert flat923 is not None
-            self.write(flat923)
+        flat966 = self._try_flat(msg, self.pretty_def)
+        if flat966 is not None:
+            assert flat966 is not None
+            self.write(flat966)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1625 = _dollar_dollar.attrs
+                _t1711 = _dollar_dollar.attrs
             else:
-                _t1625 = None
-            fields917 = (_dollar_dollar.name, _dollar_dollar.body, _t1625,)
-            assert fields917 is not None
-            unwrapped_fields918 = fields917
+                _t1711 = None
+            fields960 = (_dollar_dollar.name, _dollar_dollar.body, _t1711,)
+            assert fields960 is not None
+            unwrapped_fields961 = fields960
             self.write("(def")
             self.indent_sexp()
             self.newline()
-            field919 = unwrapped_fields918[0]
-            self.pretty_relation_id(field919)
+            field962 = unwrapped_fields961[0]
+            self.pretty_relation_id(field962)
             self.newline()
-            field920 = unwrapped_fields918[1]
-            self.pretty_abstraction(field920)
-            field921 = unwrapped_fields918[2]
-            if field921 is not None:
+            field963 = unwrapped_fields961[1]
+            self.pretty_abstraction(field963)
+            field964 = unwrapped_fields961[2]
+            if field964 is not None:
                 self.newline()
-                assert field921 is not None
-                opt_val922 = field921
-                self.pretty_attrs(opt_val922)
+                assert field964 is not None
+                opt_val965 = field964
+                self.pretty_attrs(opt_val965)
             self.dedent()
             self.write(")")
 
     def pretty_relation_id(self, msg: logic_pb2.RelationId):
-        flat928 = self._try_flat(msg, self.pretty_relation_id)
-        if flat928 is not None:
-            assert flat928 is not None
-            self.write(flat928)
+        flat971 = self._try_flat(msg, self.pretty_relation_id)
+        if flat971 is not None:
+            assert flat971 is not None
+            self.write(flat971)
             return None
         else:
             _dollar_dollar = msg
             if self.relation_id_to_string(_dollar_dollar) is not None:
-                _t1627 = self.deconstruct_relation_id_string(_dollar_dollar)
-                _t1626 = _t1627
+                _t1713 = self.deconstruct_relation_id_string(_dollar_dollar)
+                _t1712 = _t1713
             else:
-                _t1626 = None
-            deconstruct_result926 = _t1626
-            if deconstruct_result926 is not None:
-                assert deconstruct_result926 is not None
-                unwrapped927 = deconstruct_result926
+                _t1712 = None
+            deconstruct_result969 = _t1712
+            if deconstruct_result969 is not None:
+                assert deconstruct_result969 is not None
+                unwrapped970 = deconstruct_result969
                 self.write(":")
-                self.write(unwrapped927)
+                self.write(unwrapped970)
             else:
                 _dollar_dollar = msg
-                _t1628 = self.deconstruct_relation_id_uint128(_dollar_dollar)
-                deconstruct_result924 = _t1628
-                if deconstruct_result924 is not None:
-                    assert deconstruct_result924 is not None
-                    unwrapped925 = deconstruct_result924
-                    self.write(self.format_uint128(unwrapped925))
+                _t1714 = self.deconstruct_relation_id_uint128(_dollar_dollar)
+                deconstruct_result967 = _t1714
+                if deconstruct_result967 is not None:
+                    assert deconstruct_result967 is not None
+                    unwrapped968 = deconstruct_result967
+                    self.write(self.format_uint128(unwrapped968))
                 else:
                     raise ParseError("No matching rule for relation_id")
 
     def pretty_abstraction(self, msg: logic_pb2.Abstraction):
-        flat933 = self._try_flat(msg, self.pretty_abstraction)
-        if flat933 is not None:
-            assert flat933 is not None
-            self.write(flat933)
+        flat976 = self._try_flat(msg, self.pretty_abstraction)
+        if flat976 is not None:
+            assert flat976 is not None
+            self.write(flat976)
             return None
         else:
             _dollar_dollar = msg
-            _t1629 = self.deconstruct_bindings(_dollar_dollar)
-            fields929 = (_t1629, _dollar_dollar.value,)
-            assert fields929 is not None
-            unwrapped_fields930 = fields929
+            _t1715 = self.deconstruct_bindings(_dollar_dollar)
+            fields972 = (_t1715, _dollar_dollar.value,)
+            assert fields972 is not None
+            unwrapped_fields973 = fields972
             self.write("(")
             self.indent()
-            field931 = unwrapped_fields930[0]
-            self.pretty_bindings(field931)
+            field974 = unwrapped_fields973[0]
+            self.pretty_bindings(field974)
             self.newline()
-            field932 = unwrapped_fields930[1]
-            self.pretty_formula(field932)
+            field975 = unwrapped_fields973[1]
+            self.pretty_formula(field975)
             self.dedent()
             self.write(")")
 
     def pretty_bindings(self, msg: tuple[Sequence[logic_pb2.Binding], Sequence[logic_pb2.Binding]]):
-        flat941 = self._try_flat(msg, self.pretty_bindings)
-        if flat941 is not None:
-            assert flat941 is not None
-            self.write(flat941)
+        flat984 = self._try_flat(msg, self.pretty_bindings)
+        if flat984 is not None:
+            assert flat984 is not None
+            self.write(flat984)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar[1]) == 0:
-                _t1630 = _dollar_dollar[1]
+                _t1716 = _dollar_dollar[1]
             else:
-                _t1630 = None
-            fields934 = (_dollar_dollar[0], _t1630,)
-            assert fields934 is not None
-            unwrapped_fields935 = fields934
+                _t1716 = None
+            fields977 = (_dollar_dollar[0], _t1716,)
+            assert fields977 is not None
+            unwrapped_fields978 = fields977
             self.write("[")
             self.indent()
-            field936 = unwrapped_fields935[0]
-            for i938, elem937 in enumerate(field936):
-                if (i938 > 0):
+            field979 = unwrapped_fields978[0]
+            for i981, elem980 in enumerate(field979):
+                if (i981 > 0):
                     self.newline()
-                self.pretty_binding(elem937)
-            field939 = unwrapped_fields935[1]
-            if field939 is not None:
+                self.pretty_binding(elem980)
+            field982 = unwrapped_fields978[1]
+            if field982 is not None:
                 self.newline()
-                assert field939 is not None
-                opt_val940 = field939
-                self.pretty_value_bindings(opt_val940)
+                assert field982 is not None
+                opt_val983 = field982
+                self.pretty_value_bindings(opt_val983)
             self.dedent()
             self.write("]")
 
     def pretty_binding(self, msg: logic_pb2.Binding):
-        flat946 = self._try_flat(msg, self.pretty_binding)
-        if flat946 is not None:
-            assert flat946 is not None
-            self.write(flat946)
+        flat989 = self._try_flat(msg, self.pretty_binding)
+        if flat989 is not None:
+            assert flat989 is not None
+            self.write(flat989)
             return None
         else:
             _dollar_dollar = msg
-            fields942 = (_dollar_dollar.var.name, _dollar_dollar.type,)
-            assert fields942 is not None
-            unwrapped_fields943 = fields942
-            field944 = unwrapped_fields943[0]
-            self.write(field944)
+            fields985 = (_dollar_dollar.var.name, _dollar_dollar.type,)
+            assert fields985 is not None
+            unwrapped_fields986 = fields985
+            field987 = unwrapped_fields986[0]
+            self.write(field987)
             self.write("::")
-            field945 = unwrapped_fields943[1]
-            self.pretty_type(field945)
+            field988 = unwrapped_fields986[1]
+            self.pretty_type(field988)
 
     def pretty_type(self, msg: logic_pb2.Type):
-        flat975 = self._try_flat(msg, self.pretty_type)
-        if flat975 is not None:
-            assert flat975 is not None
-            self.write(flat975)
+        flat1018 = self._try_flat(msg, self.pretty_type)
+        if flat1018 is not None:
+            assert flat1018 is not None
+            self.write(flat1018)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("unspecified_type"):
-                _t1631 = _dollar_dollar.unspecified_type
+                _t1717 = _dollar_dollar.unspecified_type
             else:
-                _t1631 = None
-            deconstruct_result973 = _t1631
-            if deconstruct_result973 is not None:
-                assert deconstruct_result973 is not None
-                unwrapped974 = deconstruct_result973
-                self.pretty_unspecified_type(unwrapped974)
+                _t1717 = None
+            deconstruct_result1016 = _t1717
+            if deconstruct_result1016 is not None:
+                assert deconstruct_result1016 is not None
+                unwrapped1017 = deconstruct_result1016
+                self.pretty_unspecified_type(unwrapped1017)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("string_type"):
-                    _t1632 = _dollar_dollar.string_type
+                    _t1718 = _dollar_dollar.string_type
                 else:
-                    _t1632 = None
-                deconstruct_result971 = _t1632
-                if deconstruct_result971 is not None:
-                    assert deconstruct_result971 is not None
-                    unwrapped972 = deconstruct_result971
-                    self.pretty_string_type(unwrapped972)
+                    _t1718 = None
+                deconstruct_result1014 = _t1718
+                if deconstruct_result1014 is not None:
+                    assert deconstruct_result1014 is not None
+                    unwrapped1015 = deconstruct_result1014
+                    self.pretty_string_type(unwrapped1015)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("int_type"):
-                        _t1633 = _dollar_dollar.int_type
+                        _t1719 = _dollar_dollar.int_type
                     else:
-                        _t1633 = None
-                    deconstruct_result969 = _t1633
-                    if deconstruct_result969 is not None:
-                        assert deconstruct_result969 is not None
-                        unwrapped970 = deconstruct_result969
-                        self.pretty_int_type(unwrapped970)
+                        _t1719 = None
+                    deconstruct_result1012 = _t1719
+                    if deconstruct_result1012 is not None:
+                        assert deconstruct_result1012 is not None
+                        unwrapped1013 = deconstruct_result1012
+                        self.pretty_int_type(unwrapped1013)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("float_type"):
-                            _t1634 = _dollar_dollar.float_type
+                            _t1720 = _dollar_dollar.float_type
                         else:
-                            _t1634 = None
-                        deconstruct_result967 = _t1634
-                        if deconstruct_result967 is not None:
-                            assert deconstruct_result967 is not None
-                            unwrapped968 = deconstruct_result967
-                            self.pretty_float_type(unwrapped968)
+                            _t1720 = None
+                        deconstruct_result1010 = _t1720
+                        if deconstruct_result1010 is not None:
+                            assert deconstruct_result1010 is not None
+                            unwrapped1011 = deconstruct_result1010
+                            self.pretty_float_type(unwrapped1011)
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("uint128_type"):
-                                _t1635 = _dollar_dollar.uint128_type
+                                _t1721 = _dollar_dollar.uint128_type
                             else:
-                                _t1635 = None
-                            deconstruct_result965 = _t1635
-                            if deconstruct_result965 is not None:
-                                assert deconstruct_result965 is not None
-                                unwrapped966 = deconstruct_result965
-                                self.pretty_uint128_type(unwrapped966)
+                                _t1721 = None
+                            deconstruct_result1008 = _t1721
+                            if deconstruct_result1008 is not None:
+                                assert deconstruct_result1008 is not None
+                                unwrapped1009 = deconstruct_result1008
+                                self.pretty_uint128_type(unwrapped1009)
                             else:
                                 _dollar_dollar = msg
                                 if _dollar_dollar.HasField("int128_type"):
-                                    _t1636 = _dollar_dollar.int128_type
+                                    _t1722 = _dollar_dollar.int128_type
                                 else:
-                                    _t1636 = None
-                                deconstruct_result963 = _t1636
-                                if deconstruct_result963 is not None:
-                                    assert deconstruct_result963 is not None
-                                    unwrapped964 = deconstruct_result963
-                                    self.pretty_int128_type(unwrapped964)
+                                    _t1722 = None
+                                deconstruct_result1006 = _t1722
+                                if deconstruct_result1006 is not None:
+                                    assert deconstruct_result1006 is not None
+                                    unwrapped1007 = deconstruct_result1006
+                                    self.pretty_int128_type(unwrapped1007)
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.HasField("date_type"):
-                                        _t1637 = _dollar_dollar.date_type
+                                        _t1723 = _dollar_dollar.date_type
                                     else:
-                                        _t1637 = None
-                                    deconstruct_result961 = _t1637
-                                    if deconstruct_result961 is not None:
-                                        assert deconstruct_result961 is not None
-                                        unwrapped962 = deconstruct_result961
-                                        self.pretty_date_type(unwrapped962)
+                                        _t1723 = None
+                                    deconstruct_result1004 = _t1723
+                                    if deconstruct_result1004 is not None:
+                                        assert deconstruct_result1004 is not None
+                                        unwrapped1005 = deconstruct_result1004
+                                        self.pretty_date_type(unwrapped1005)
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.HasField("datetime_type"):
-                                            _t1638 = _dollar_dollar.datetime_type
+                                            _t1724 = _dollar_dollar.datetime_type
                                         else:
-                                            _t1638 = None
-                                        deconstruct_result959 = _t1638
-                                        if deconstruct_result959 is not None:
-                                            assert deconstruct_result959 is not None
-                                            unwrapped960 = deconstruct_result959
-                                            self.pretty_datetime_type(unwrapped960)
+                                            _t1724 = None
+                                        deconstruct_result1002 = _t1724
+                                        if deconstruct_result1002 is not None:
+                                            assert deconstruct_result1002 is not None
+                                            unwrapped1003 = deconstruct_result1002
+                                            self.pretty_datetime_type(unwrapped1003)
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.HasField("missing_type"):
-                                                _t1639 = _dollar_dollar.missing_type
+                                                _t1725 = _dollar_dollar.missing_type
                                             else:
-                                                _t1639 = None
-                                            deconstruct_result957 = _t1639
-                                            if deconstruct_result957 is not None:
-                                                assert deconstruct_result957 is not None
-                                                unwrapped958 = deconstruct_result957
-                                                self.pretty_missing_type(unwrapped958)
+                                                _t1725 = None
+                                            deconstruct_result1000 = _t1725
+                                            if deconstruct_result1000 is not None:
+                                                assert deconstruct_result1000 is not None
+                                                unwrapped1001 = deconstruct_result1000
+                                                self.pretty_missing_type(unwrapped1001)
                                             else:
                                                 _dollar_dollar = msg
                                                 if _dollar_dollar.HasField("decimal_type"):
-                                                    _t1640 = _dollar_dollar.decimal_type
+                                                    _t1726 = _dollar_dollar.decimal_type
                                                 else:
-                                                    _t1640 = None
-                                                deconstruct_result955 = _t1640
-                                                if deconstruct_result955 is not None:
-                                                    assert deconstruct_result955 is not None
-                                                    unwrapped956 = deconstruct_result955
-                                                    self.pretty_decimal_type(unwrapped956)
+                                                    _t1726 = None
+                                                deconstruct_result998 = _t1726
+                                                if deconstruct_result998 is not None:
+                                                    assert deconstruct_result998 is not None
+                                                    unwrapped999 = deconstruct_result998
+                                                    self.pretty_decimal_type(unwrapped999)
                                                 else:
                                                     _dollar_dollar = msg
                                                     if _dollar_dollar.HasField("boolean_type"):
-                                                        _t1641 = _dollar_dollar.boolean_type
+                                                        _t1727 = _dollar_dollar.boolean_type
                                                     else:
-                                                        _t1641 = None
-                                                    deconstruct_result953 = _t1641
-                                                    if deconstruct_result953 is not None:
-                                                        assert deconstruct_result953 is not None
-                                                        unwrapped954 = deconstruct_result953
-                                                        self.pretty_boolean_type(unwrapped954)
+                                                        _t1727 = None
+                                                    deconstruct_result996 = _t1727
+                                                    if deconstruct_result996 is not None:
+                                                        assert deconstruct_result996 is not None
+                                                        unwrapped997 = deconstruct_result996
+                                                        self.pretty_boolean_type(unwrapped997)
                                                     else:
                                                         _dollar_dollar = msg
                                                         if _dollar_dollar.HasField("int32_type"):
-                                                            _t1642 = _dollar_dollar.int32_type
+                                                            _t1728 = _dollar_dollar.int32_type
                                                         else:
-                                                            _t1642 = None
-                                                        deconstruct_result951 = _t1642
-                                                        if deconstruct_result951 is not None:
-                                                            assert deconstruct_result951 is not None
-                                                            unwrapped952 = deconstruct_result951
-                                                            self.pretty_int32_type(unwrapped952)
+                                                            _t1728 = None
+                                                        deconstruct_result994 = _t1728
+                                                        if deconstruct_result994 is not None:
+                                                            assert deconstruct_result994 is not None
+                                                            unwrapped995 = deconstruct_result994
+                                                            self.pretty_int32_type(unwrapped995)
                                                         else:
                                                             _dollar_dollar = msg
                                                             if _dollar_dollar.HasField("float32_type"):
-                                                                _t1643 = _dollar_dollar.float32_type
+                                                                _t1729 = _dollar_dollar.float32_type
                                                             else:
-                                                                _t1643 = None
-                                                            deconstruct_result949 = _t1643
-                                                            if deconstruct_result949 is not None:
-                                                                assert deconstruct_result949 is not None
-                                                                unwrapped950 = deconstruct_result949
-                                                                self.pretty_float32_type(unwrapped950)
+                                                                _t1729 = None
+                                                            deconstruct_result992 = _t1729
+                                                            if deconstruct_result992 is not None:
+                                                                assert deconstruct_result992 is not None
+                                                                unwrapped993 = deconstruct_result992
+                                                                self.pretty_float32_type(unwrapped993)
                                                             else:
                                                                 _dollar_dollar = msg
                                                                 if _dollar_dollar.HasField("uint32_type"):
-                                                                    _t1644 = _dollar_dollar.uint32_type
+                                                                    _t1730 = _dollar_dollar.uint32_type
                                                                 else:
-                                                                    _t1644 = None
-                                                                deconstruct_result947 = _t1644
-                                                                if deconstruct_result947 is not None:
-                                                                    assert deconstruct_result947 is not None
-                                                                    unwrapped948 = deconstruct_result947
-                                                                    self.pretty_uint32_type(unwrapped948)
+                                                                    _t1730 = None
+                                                                deconstruct_result990 = _t1730
+                                                                if deconstruct_result990 is not None:
+                                                                    assert deconstruct_result990 is not None
+                                                                    unwrapped991 = deconstruct_result990
+                                                                    self.pretty_uint32_type(unwrapped991)
                                                                 else:
                                                                     raise ParseError("No matching rule for type")
 
     def pretty_unspecified_type(self, msg: logic_pb2.UnspecifiedType):
-        fields976 = msg
+        fields1019 = msg
         self.write("UNKNOWN")
 
     def pretty_string_type(self, msg: logic_pb2.StringType):
-        fields977 = msg
+        fields1020 = msg
         self.write("STRING")
 
     def pretty_int_type(self, msg: logic_pb2.IntType):
-        fields978 = msg
+        fields1021 = msg
         self.write("INT")
 
     def pretty_float_type(self, msg: logic_pb2.FloatType):
-        fields979 = msg
+        fields1022 = msg
         self.write("FLOAT")
 
     def pretty_uint128_type(self, msg: logic_pb2.UInt128Type):
-        fields980 = msg
+        fields1023 = msg
         self.write("UINT128")
 
     def pretty_int128_type(self, msg: logic_pb2.Int128Type):
-        fields981 = msg
+        fields1024 = msg
         self.write("INT128")
 
     def pretty_date_type(self, msg: logic_pb2.DateType):
-        fields982 = msg
+        fields1025 = msg
         self.write("DATE")
 
     def pretty_datetime_type(self, msg: logic_pb2.DateTimeType):
-        fields983 = msg
+        fields1026 = msg
         self.write("DATETIME")
 
     def pretty_missing_type(self, msg: logic_pb2.MissingType):
-        fields984 = msg
+        fields1027 = msg
         self.write("MISSING")
 
     def pretty_decimal_type(self, msg: logic_pb2.DecimalType):
-        flat989 = self._try_flat(msg, self.pretty_decimal_type)
-        if flat989 is not None:
-            assert flat989 is not None
-            self.write(flat989)
+        flat1032 = self._try_flat(msg, self.pretty_decimal_type)
+        if flat1032 is not None:
+            assert flat1032 is not None
+            self.write(flat1032)
             return None
         else:
             _dollar_dollar = msg
-            fields985 = (int(_dollar_dollar.precision), int(_dollar_dollar.scale),)
-            assert fields985 is not None
-            unwrapped_fields986 = fields985
+            fields1028 = (int(_dollar_dollar.precision), int(_dollar_dollar.scale),)
+            assert fields1028 is not None
+            unwrapped_fields1029 = fields1028
             self.write("(DECIMAL")
             self.indent_sexp()
             self.newline()
-            field987 = unwrapped_fields986[0]
-            self.write(str(field987))
+            field1030 = unwrapped_fields1029[0]
+            self.write(str(field1030))
             self.newline()
-            field988 = unwrapped_fields986[1]
-            self.write(str(field988))
+            field1031 = unwrapped_fields1029[1]
+            self.write(str(field1031))
             self.dedent()
             self.write(")")
 
     def pretty_boolean_type(self, msg: logic_pb2.BooleanType):
-        fields990 = msg
+        fields1033 = msg
         self.write("BOOLEAN")
 
     def pretty_int32_type(self, msg: logic_pb2.Int32Type):
-        fields991 = msg
+        fields1034 = msg
         self.write("INT32")
 
     def pretty_float32_type(self, msg: logic_pb2.Float32Type):
-        fields992 = msg
+        fields1035 = msg
         self.write("FLOAT32")
 
     def pretty_uint32_type(self, msg: logic_pb2.UInt32Type):
-        fields993 = msg
+        fields1036 = msg
         self.write("UINT32")
 
     def pretty_value_bindings(self, msg: Sequence[logic_pb2.Binding]):
-        flat997 = self._try_flat(msg, self.pretty_value_bindings)
-        if flat997 is not None:
-            assert flat997 is not None
-            self.write(flat997)
+        flat1040 = self._try_flat(msg, self.pretty_value_bindings)
+        if flat1040 is not None:
+            assert flat1040 is not None
+            self.write(flat1040)
             return None
         else:
-            fields994 = msg
+            fields1037 = msg
             self.write("|")
-            if not len(fields994) == 0:
+            if not len(fields1037) == 0:
                 self.write(" ")
-                for i996, elem995 in enumerate(fields994):
-                    if (i996 > 0):
+                for i1039, elem1038 in enumerate(fields1037):
+                    if (i1039 > 0):
                         self.newline()
-                    self.pretty_binding(elem995)
+                    self.pretty_binding(elem1038)
 
     def pretty_formula(self, msg: logic_pb2.Formula):
-        flat1024 = self._try_flat(msg, self.pretty_formula)
-        if flat1024 is not None:
-            assert flat1024 is not None
-            self.write(flat1024)
+        flat1067 = self._try_flat(msg, self.pretty_formula)
+        if flat1067 is not None:
+            assert flat1067 is not None
+            self.write(flat1067)
             return None
         else:
             _dollar_dollar = msg
             if (_dollar_dollar.HasField("conjunction") and len(_dollar_dollar.conjunction.args) == 0):
-                _t1645 = _dollar_dollar.conjunction
+                _t1731 = _dollar_dollar.conjunction
             else:
-                _t1645 = None
-            deconstruct_result1022 = _t1645
-            if deconstruct_result1022 is not None:
-                assert deconstruct_result1022 is not None
-                unwrapped1023 = deconstruct_result1022
-                self.pretty_true(unwrapped1023)
+                _t1731 = None
+            deconstruct_result1065 = _t1731
+            if deconstruct_result1065 is not None:
+                assert deconstruct_result1065 is not None
+                unwrapped1066 = deconstruct_result1065
+                self.pretty_true(unwrapped1066)
             else:
                 _dollar_dollar = msg
                 if (_dollar_dollar.HasField("disjunction") and len(_dollar_dollar.disjunction.args) == 0):
-                    _t1646 = _dollar_dollar.disjunction
+                    _t1732 = _dollar_dollar.disjunction
                 else:
-                    _t1646 = None
-                deconstruct_result1020 = _t1646
-                if deconstruct_result1020 is not None:
-                    assert deconstruct_result1020 is not None
-                    unwrapped1021 = deconstruct_result1020
-                    self.pretty_false(unwrapped1021)
+                    _t1732 = None
+                deconstruct_result1063 = _t1732
+                if deconstruct_result1063 is not None:
+                    assert deconstruct_result1063 is not None
+                    unwrapped1064 = deconstruct_result1063
+                    self.pretty_false(unwrapped1064)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("exists"):
-                        _t1647 = _dollar_dollar.exists
+                        _t1733 = _dollar_dollar.exists
                     else:
-                        _t1647 = None
-                    deconstruct_result1018 = _t1647
-                    if deconstruct_result1018 is not None:
-                        assert deconstruct_result1018 is not None
-                        unwrapped1019 = deconstruct_result1018
-                        self.pretty_exists(unwrapped1019)
+                        _t1733 = None
+                    deconstruct_result1061 = _t1733
+                    if deconstruct_result1061 is not None:
+                        assert deconstruct_result1061 is not None
+                        unwrapped1062 = deconstruct_result1061
+                        self.pretty_exists(unwrapped1062)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("reduce"):
-                            _t1648 = _dollar_dollar.reduce
+                            _t1734 = _dollar_dollar.reduce
                         else:
-                            _t1648 = None
-                        deconstruct_result1016 = _t1648
-                        if deconstruct_result1016 is not None:
-                            assert deconstruct_result1016 is not None
-                            unwrapped1017 = deconstruct_result1016
-                            self.pretty_reduce(unwrapped1017)
+                            _t1734 = None
+                        deconstruct_result1059 = _t1734
+                        if deconstruct_result1059 is not None:
+                            assert deconstruct_result1059 is not None
+                            unwrapped1060 = deconstruct_result1059
+                            self.pretty_reduce(unwrapped1060)
                         else:
                             _dollar_dollar = msg
                             if (_dollar_dollar.HasField("conjunction") and not len(_dollar_dollar.conjunction.args) == 0):
-                                _t1649 = _dollar_dollar.conjunction
+                                _t1735 = _dollar_dollar.conjunction
                             else:
-                                _t1649 = None
-                            deconstruct_result1014 = _t1649
-                            if deconstruct_result1014 is not None:
-                                assert deconstruct_result1014 is not None
-                                unwrapped1015 = deconstruct_result1014
-                                self.pretty_conjunction(unwrapped1015)
+                                _t1735 = None
+                            deconstruct_result1057 = _t1735
+                            if deconstruct_result1057 is not None:
+                                assert deconstruct_result1057 is not None
+                                unwrapped1058 = deconstruct_result1057
+                                self.pretty_conjunction(unwrapped1058)
                             else:
                                 _dollar_dollar = msg
                                 if (_dollar_dollar.HasField("disjunction") and not len(_dollar_dollar.disjunction.args) == 0):
-                                    _t1650 = _dollar_dollar.disjunction
+                                    _t1736 = _dollar_dollar.disjunction
                                 else:
-                                    _t1650 = None
-                                deconstruct_result1012 = _t1650
-                                if deconstruct_result1012 is not None:
-                                    assert deconstruct_result1012 is not None
-                                    unwrapped1013 = deconstruct_result1012
-                                    self.pretty_disjunction(unwrapped1013)
+                                    _t1736 = None
+                                deconstruct_result1055 = _t1736
+                                if deconstruct_result1055 is not None:
+                                    assert deconstruct_result1055 is not None
+                                    unwrapped1056 = deconstruct_result1055
+                                    self.pretty_disjunction(unwrapped1056)
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.HasField("not"):
-                                        _t1651 = getattr(_dollar_dollar, 'not')
+                                        _t1737 = getattr(_dollar_dollar, 'not')
                                     else:
-                                        _t1651 = None
-                                    deconstruct_result1010 = _t1651
-                                    if deconstruct_result1010 is not None:
-                                        assert deconstruct_result1010 is not None
-                                        unwrapped1011 = deconstruct_result1010
-                                        self.pretty_not(unwrapped1011)
+                                        _t1737 = None
+                                    deconstruct_result1053 = _t1737
+                                    if deconstruct_result1053 is not None:
+                                        assert deconstruct_result1053 is not None
+                                        unwrapped1054 = deconstruct_result1053
+                                        self.pretty_not(unwrapped1054)
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.HasField("ffi"):
-                                            _t1652 = _dollar_dollar.ffi
+                                            _t1738 = _dollar_dollar.ffi
                                         else:
-                                            _t1652 = None
-                                        deconstruct_result1008 = _t1652
-                                        if deconstruct_result1008 is not None:
-                                            assert deconstruct_result1008 is not None
-                                            unwrapped1009 = deconstruct_result1008
-                                            self.pretty_ffi(unwrapped1009)
+                                            _t1738 = None
+                                        deconstruct_result1051 = _t1738
+                                        if deconstruct_result1051 is not None:
+                                            assert deconstruct_result1051 is not None
+                                            unwrapped1052 = deconstruct_result1051
+                                            self.pretty_ffi(unwrapped1052)
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.HasField("atom"):
-                                                _t1653 = _dollar_dollar.atom
+                                                _t1739 = _dollar_dollar.atom
                                             else:
-                                                _t1653 = None
-                                            deconstruct_result1006 = _t1653
-                                            if deconstruct_result1006 is not None:
-                                                assert deconstruct_result1006 is not None
-                                                unwrapped1007 = deconstruct_result1006
-                                                self.pretty_atom(unwrapped1007)
+                                                _t1739 = None
+                                            deconstruct_result1049 = _t1739
+                                            if deconstruct_result1049 is not None:
+                                                assert deconstruct_result1049 is not None
+                                                unwrapped1050 = deconstruct_result1049
+                                                self.pretty_atom(unwrapped1050)
                                             else:
                                                 _dollar_dollar = msg
                                                 if _dollar_dollar.HasField("pragma"):
-                                                    _t1654 = _dollar_dollar.pragma
+                                                    _t1740 = _dollar_dollar.pragma
                                                 else:
-                                                    _t1654 = None
-                                                deconstruct_result1004 = _t1654
-                                                if deconstruct_result1004 is not None:
-                                                    assert deconstruct_result1004 is not None
-                                                    unwrapped1005 = deconstruct_result1004
-                                                    self.pretty_pragma(unwrapped1005)
+                                                    _t1740 = None
+                                                deconstruct_result1047 = _t1740
+                                                if deconstruct_result1047 is not None:
+                                                    assert deconstruct_result1047 is not None
+                                                    unwrapped1048 = deconstruct_result1047
+                                                    self.pretty_pragma(unwrapped1048)
                                                 else:
                                                     _dollar_dollar = msg
                                                     if _dollar_dollar.HasField("primitive"):
-                                                        _t1655 = _dollar_dollar.primitive
+                                                        _t1741 = _dollar_dollar.primitive
                                                     else:
-                                                        _t1655 = None
-                                                    deconstruct_result1002 = _t1655
-                                                    if deconstruct_result1002 is not None:
-                                                        assert deconstruct_result1002 is not None
-                                                        unwrapped1003 = deconstruct_result1002
-                                                        self.pretty_primitive(unwrapped1003)
+                                                        _t1741 = None
+                                                    deconstruct_result1045 = _t1741
+                                                    if deconstruct_result1045 is not None:
+                                                        assert deconstruct_result1045 is not None
+                                                        unwrapped1046 = deconstruct_result1045
+                                                        self.pretty_primitive(unwrapped1046)
                                                     else:
                                                         _dollar_dollar = msg
                                                         if _dollar_dollar.HasField("rel_atom"):
-                                                            _t1656 = _dollar_dollar.rel_atom
+                                                            _t1742 = _dollar_dollar.rel_atom
                                                         else:
-                                                            _t1656 = None
-                                                        deconstruct_result1000 = _t1656
-                                                        if deconstruct_result1000 is not None:
-                                                            assert deconstruct_result1000 is not None
-                                                            unwrapped1001 = deconstruct_result1000
-                                                            self.pretty_rel_atom(unwrapped1001)
+                                                            _t1742 = None
+                                                        deconstruct_result1043 = _t1742
+                                                        if deconstruct_result1043 is not None:
+                                                            assert deconstruct_result1043 is not None
+                                                            unwrapped1044 = deconstruct_result1043
+                                                            self.pretty_rel_atom(unwrapped1044)
                                                         else:
                                                             _dollar_dollar = msg
                                                             if _dollar_dollar.HasField("cast"):
-                                                                _t1657 = _dollar_dollar.cast
+                                                                _t1743 = _dollar_dollar.cast
                                                             else:
-                                                                _t1657 = None
-                                                            deconstruct_result998 = _t1657
-                                                            if deconstruct_result998 is not None:
-                                                                assert deconstruct_result998 is not None
-                                                                unwrapped999 = deconstruct_result998
-                                                                self.pretty_cast(unwrapped999)
+                                                                _t1743 = None
+                                                            deconstruct_result1041 = _t1743
+                                                            if deconstruct_result1041 is not None:
+                                                                assert deconstruct_result1041 is not None
+                                                                unwrapped1042 = deconstruct_result1041
+                                                                self.pretty_cast(unwrapped1042)
                                                             else:
                                                                 raise ParseError("No matching rule for formula")
 
     def pretty_true(self, msg: logic_pb2.Conjunction):
-        fields1025 = msg
+        fields1068 = msg
         self.write("(true)")
 
     def pretty_false(self, msg: logic_pb2.Disjunction):
-        fields1026 = msg
+        fields1069 = msg
         self.write("(false)")
 
     def pretty_exists(self, msg: logic_pb2.Exists):
-        flat1031 = self._try_flat(msg, self.pretty_exists)
-        if flat1031 is not None:
-            assert flat1031 is not None
-            self.write(flat1031)
+        flat1074 = self._try_flat(msg, self.pretty_exists)
+        if flat1074 is not None:
+            assert flat1074 is not None
+            self.write(flat1074)
             return None
         else:
             _dollar_dollar = msg
-            _t1658 = self.deconstruct_bindings(_dollar_dollar.body)
-            fields1027 = (_t1658, _dollar_dollar.body.value,)
-            assert fields1027 is not None
-            unwrapped_fields1028 = fields1027
+            _t1744 = self.deconstruct_bindings(_dollar_dollar.body)
+            fields1070 = (_t1744, _dollar_dollar.body.value,)
+            assert fields1070 is not None
+            unwrapped_fields1071 = fields1070
             self.write("(exists")
             self.indent_sexp()
             self.newline()
-            field1029 = unwrapped_fields1028[0]
-            self.pretty_bindings(field1029)
+            field1072 = unwrapped_fields1071[0]
+            self.pretty_bindings(field1072)
             self.newline()
-            field1030 = unwrapped_fields1028[1]
-            self.pretty_formula(field1030)
+            field1073 = unwrapped_fields1071[1]
+            self.pretty_formula(field1073)
             self.dedent()
             self.write(")")
 
     def pretty_reduce(self, msg: logic_pb2.Reduce):
-        flat1037 = self._try_flat(msg, self.pretty_reduce)
-        if flat1037 is not None:
-            assert flat1037 is not None
-            self.write(flat1037)
+        flat1080 = self._try_flat(msg, self.pretty_reduce)
+        if flat1080 is not None:
+            assert flat1080 is not None
+            self.write(flat1080)
             return None
         else:
             _dollar_dollar = msg
-            fields1032 = (_dollar_dollar.op, _dollar_dollar.body, _dollar_dollar.terms,)
-            assert fields1032 is not None
-            unwrapped_fields1033 = fields1032
+            fields1075 = (_dollar_dollar.op, _dollar_dollar.body, _dollar_dollar.terms,)
+            assert fields1075 is not None
+            unwrapped_fields1076 = fields1075
             self.write("(reduce")
             self.indent_sexp()
             self.newline()
-            field1034 = unwrapped_fields1033[0]
-            self.pretty_abstraction(field1034)
+            field1077 = unwrapped_fields1076[0]
+            self.pretty_abstraction(field1077)
             self.newline()
-            field1035 = unwrapped_fields1033[1]
-            self.pretty_abstraction(field1035)
+            field1078 = unwrapped_fields1076[1]
+            self.pretty_abstraction(field1078)
             self.newline()
-            field1036 = unwrapped_fields1033[2]
-            self.pretty_terms(field1036)
+            field1079 = unwrapped_fields1076[2]
+            self.pretty_terms(field1079)
             self.dedent()
             self.write(")")
 
     def pretty_terms(self, msg: Sequence[logic_pb2.Term]):
-        flat1041 = self._try_flat(msg, self.pretty_terms)
-        if flat1041 is not None:
-            assert flat1041 is not None
-            self.write(flat1041)
+        flat1084 = self._try_flat(msg, self.pretty_terms)
+        if flat1084 is not None:
+            assert flat1084 is not None
+            self.write(flat1084)
             return None
         else:
-            fields1038 = msg
+            fields1081 = msg
             self.write("(terms")
             self.indent_sexp()
-            if not len(fields1038) == 0:
+            if not len(fields1081) == 0:
                 self.newline()
-                for i1040, elem1039 in enumerate(fields1038):
-                    if (i1040 > 0):
+                for i1083, elem1082 in enumerate(fields1081):
+                    if (i1083 > 0):
                         self.newline()
-                    self.pretty_term(elem1039)
+                    self.pretty_term(elem1082)
             self.dedent()
             self.write(")")
 
     def pretty_term(self, msg: logic_pb2.Term):
-        flat1046 = self._try_flat(msg, self.pretty_term)
-        if flat1046 is not None:
-            assert flat1046 is not None
-            self.write(flat1046)
+        flat1089 = self._try_flat(msg, self.pretty_term)
+        if flat1089 is not None:
+            assert flat1089 is not None
+            self.write(flat1089)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("var"):
-                _t1659 = _dollar_dollar.var
+                _t1745 = _dollar_dollar.var
             else:
-                _t1659 = None
-            deconstruct_result1044 = _t1659
-            if deconstruct_result1044 is not None:
-                assert deconstruct_result1044 is not None
-                unwrapped1045 = deconstruct_result1044
-                self.pretty_var(unwrapped1045)
+                _t1745 = None
+            deconstruct_result1087 = _t1745
+            if deconstruct_result1087 is not None:
+                assert deconstruct_result1087 is not None
+                unwrapped1088 = deconstruct_result1087
+                self.pretty_var(unwrapped1088)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("constant"):
-                    _t1660 = _dollar_dollar.constant
+                    _t1746 = _dollar_dollar.constant
                 else:
-                    _t1660 = None
-                deconstruct_result1042 = _t1660
-                if deconstruct_result1042 is not None:
-                    assert deconstruct_result1042 is not None
-                    unwrapped1043 = deconstruct_result1042
-                    self.pretty_value(unwrapped1043)
+                    _t1746 = None
+                deconstruct_result1085 = _t1746
+                if deconstruct_result1085 is not None:
+                    assert deconstruct_result1085 is not None
+                    unwrapped1086 = deconstruct_result1085
+                    self.pretty_value(unwrapped1086)
                 else:
                     raise ParseError("No matching rule for term")
 
     def pretty_var(self, msg: logic_pb2.Var):
-        flat1049 = self._try_flat(msg, self.pretty_var)
-        if flat1049 is not None:
-            assert flat1049 is not None
-            self.write(flat1049)
+        flat1092 = self._try_flat(msg, self.pretty_var)
+        if flat1092 is not None:
+            assert flat1092 is not None
+            self.write(flat1092)
             return None
         else:
             _dollar_dollar = msg
-            fields1047 = _dollar_dollar.name
-            assert fields1047 is not None
-            unwrapped_fields1048 = fields1047
-            self.write(unwrapped_fields1048)
+            fields1090 = _dollar_dollar.name
+            assert fields1090 is not None
+            unwrapped_fields1091 = fields1090
+            self.write(unwrapped_fields1091)
 
     def pretty_value(self, msg: logic_pb2.Value):
-        flat1075 = self._try_flat(msg, self.pretty_value)
-        if flat1075 is not None:
-            assert flat1075 is not None
-            self.write(flat1075)
+        flat1118 = self._try_flat(msg, self.pretty_value)
+        if flat1118 is not None:
+            assert flat1118 is not None
+            self.write(flat1118)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("date_value"):
-                _t1661 = _dollar_dollar.date_value
+                _t1747 = _dollar_dollar.date_value
             else:
-                _t1661 = None
-            deconstruct_result1073 = _t1661
-            if deconstruct_result1073 is not None:
-                assert deconstruct_result1073 is not None
-                unwrapped1074 = deconstruct_result1073
-                self.pretty_date(unwrapped1074)
+                _t1747 = None
+            deconstruct_result1116 = _t1747
+            if deconstruct_result1116 is not None:
+                assert deconstruct_result1116 is not None
+                unwrapped1117 = deconstruct_result1116
+                self.pretty_date(unwrapped1117)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("datetime_value"):
-                    _t1662 = _dollar_dollar.datetime_value
+                    _t1748 = _dollar_dollar.datetime_value
                 else:
-                    _t1662 = None
-                deconstruct_result1071 = _t1662
-                if deconstruct_result1071 is not None:
-                    assert deconstruct_result1071 is not None
-                    unwrapped1072 = deconstruct_result1071
-                    self.pretty_datetime(unwrapped1072)
+                    _t1748 = None
+                deconstruct_result1114 = _t1748
+                if deconstruct_result1114 is not None:
+                    assert deconstruct_result1114 is not None
+                    unwrapped1115 = deconstruct_result1114
+                    self.pretty_datetime(unwrapped1115)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("string_value"):
-                        _t1663 = _dollar_dollar.string_value
+                        _t1749 = _dollar_dollar.string_value
                     else:
-                        _t1663 = None
-                    deconstruct_result1069 = _t1663
-                    if deconstruct_result1069 is not None:
-                        assert deconstruct_result1069 is not None
-                        unwrapped1070 = deconstruct_result1069
-                        self.write(self.format_string_value(unwrapped1070))
+                        _t1749 = None
+                    deconstruct_result1112 = _t1749
+                    if deconstruct_result1112 is not None:
+                        assert deconstruct_result1112 is not None
+                        unwrapped1113 = deconstruct_result1112
+                        self.write(self.format_string_value(unwrapped1113))
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("int32_value"):
-                            _t1664 = _dollar_dollar.int32_value
+                            _t1750 = _dollar_dollar.int32_value
                         else:
-                            _t1664 = None
-                        deconstruct_result1067 = _t1664
-                        if deconstruct_result1067 is not None:
-                            assert deconstruct_result1067 is not None
-                            unwrapped1068 = deconstruct_result1067
-                            self.write((str(unwrapped1068) + 'i32'))
+                            _t1750 = None
+                        deconstruct_result1110 = _t1750
+                        if deconstruct_result1110 is not None:
+                            assert deconstruct_result1110 is not None
+                            unwrapped1111 = deconstruct_result1110
+                            self.write((str(unwrapped1111) + 'i32'))
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("int_value"):
-                                _t1665 = _dollar_dollar.int_value
+                                _t1751 = _dollar_dollar.int_value
                             else:
-                                _t1665 = None
-                            deconstruct_result1065 = _t1665
-                            if deconstruct_result1065 is not None:
-                                assert deconstruct_result1065 is not None
-                                unwrapped1066 = deconstruct_result1065
-                                self.write(str(unwrapped1066))
+                                _t1751 = None
+                            deconstruct_result1108 = _t1751
+                            if deconstruct_result1108 is not None:
+                                assert deconstruct_result1108 is not None
+                                unwrapped1109 = deconstruct_result1108
+                                self.write(str(unwrapped1109))
                             else:
                                 _dollar_dollar = msg
                                 if _dollar_dollar.HasField("float32_value"):
-                                    _t1666 = _dollar_dollar.float32_value
+                                    _t1752 = _dollar_dollar.float32_value
                                 else:
-                                    _t1666 = None
-                                deconstruct_result1063 = _t1666
-                                if deconstruct_result1063 is not None:
-                                    assert deconstruct_result1063 is not None
-                                    unwrapped1064 = deconstruct_result1063
-                                    self.write(self.format_float32_literal(unwrapped1064))
+                                    _t1752 = None
+                                deconstruct_result1106 = _t1752
+                                if deconstruct_result1106 is not None:
+                                    assert deconstruct_result1106 is not None
+                                    unwrapped1107 = deconstruct_result1106
+                                    self.write(self.format_float32_literal(unwrapped1107))
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.HasField("float_value"):
-                                        _t1667 = _dollar_dollar.float_value
+                                        _t1753 = _dollar_dollar.float_value
                                     else:
-                                        _t1667 = None
-                                    deconstruct_result1061 = _t1667
-                                    if deconstruct_result1061 is not None:
-                                        assert deconstruct_result1061 is not None
-                                        unwrapped1062 = deconstruct_result1061
-                                        self.write(str(unwrapped1062))
+                                        _t1753 = None
+                                    deconstruct_result1104 = _t1753
+                                    if deconstruct_result1104 is not None:
+                                        assert deconstruct_result1104 is not None
+                                        unwrapped1105 = deconstruct_result1104
+                                        self.write(str(unwrapped1105))
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.HasField("uint32_value"):
-                                            _t1668 = _dollar_dollar.uint32_value
+                                            _t1754 = _dollar_dollar.uint32_value
                                         else:
-                                            _t1668 = None
-                                        deconstruct_result1059 = _t1668
-                                        if deconstruct_result1059 is not None:
-                                            assert deconstruct_result1059 is not None
-                                            unwrapped1060 = deconstruct_result1059
-                                            self.write((str(unwrapped1060) + 'u32'))
+                                            _t1754 = None
+                                        deconstruct_result1102 = _t1754
+                                        if deconstruct_result1102 is not None:
+                                            assert deconstruct_result1102 is not None
+                                            unwrapped1103 = deconstruct_result1102
+                                            self.write((str(unwrapped1103) + 'u32'))
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.HasField("uint128_value"):
-                                                _t1669 = _dollar_dollar.uint128_value
+                                                _t1755 = _dollar_dollar.uint128_value
                                             else:
-                                                _t1669 = None
-                                            deconstruct_result1057 = _t1669
-                                            if deconstruct_result1057 is not None:
-                                                assert deconstruct_result1057 is not None
-                                                unwrapped1058 = deconstruct_result1057
-                                                self.write(self.format_uint128(unwrapped1058))
+                                                _t1755 = None
+                                            deconstruct_result1100 = _t1755
+                                            if deconstruct_result1100 is not None:
+                                                assert deconstruct_result1100 is not None
+                                                unwrapped1101 = deconstruct_result1100
+                                                self.write(self.format_uint128(unwrapped1101))
                                             else:
                                                 _dollar_dollar = msg
                                                 if _dollar_dollar.HasField("int128_value"):
-                                                    _t1670 = _dollar_dollar.int128_value
+                                                    _t1756 = _dollar_dollar.int128_value
                                                 else:
-                                                    _t1670 = None
-                                                deconstruct_result1055 = _t1670
-                                                if deconstruct_result1055 is not None:
-                                                    assert deconstruct_result1055 is not None
-                                                    unwrapped1056 = deconstruct_result1055
-                                                    self.write(self.format_int128(unwrapped1056))
+                                                    _t1756 = None
+                                                deconstruct_result1098 = _t1756
+                                                if deconstruct_result1098 is not None:
+                                                    assert deconstruct_result1098 is not None
+                                                    unwrapped1099 = deconstruct_result1098
+                                                    self.write(self.format_int128(unwrapped1099))
                                                 else:
                                                     _dollar_dollar = msg
                                                     if _dollar_dollar.HasField("decimal_value"):
-                                                        _t1671 = _dollar_dollar.decimal_value
+                                                        _t1757 = _dollar_dollar.decimal_value
                                                     else:
-                                                        _t1671 = None
-                                                    deconstruct_result1053 = _t1671
-                                                    if deconstruct_result1053 is not None:
-                                                        assert deconstruct_result1053 is not None
-                                                        unwrapped1054 = deconstruct_result1053
-                                                        self.write(self.format_decimal(unwrapped1054))
+                                                        _t1757 = None
+                                                    deconstruct_result1096 = _t1757
+                                                    if deconstruct_result1096 is not None:
+                                                        assert deconstruct_result1096 is not None
+                                                        unwrapped1097 = deconstruct_result1096
+                                                        self.write(self.format_decimal(unwrapped1097))
                                                     else:
                                                         _dollar_dollar = msg
                                                         if _dollar_dollar.HasField("boolean_value"):
-                                                            _t1672 = _dollar_dollar.boolean_value
+                                                            _t1758 = _dollar_dollar.boolean_value
                                                         else:
-                                                            _t1672 = None
-                                                        deconstruct_result1051 = _t1672
-                                                        if deconstruct_result1051 is not None:
-                                                            assert deconstruct_result1051 is not None
-                                                            unwrapped1052 = deconstruct_result1051
-                                                            self.pretty_boolean_value(unwrapped1052)
+                                                            _t1758 = None
+                                                        deconstruct_result1094 = _t1758
+                                                        if deconstruct_result1094 is not None:
+                                                            assert deconstruct_result1094 is not None
+                                                            unwrapped1095 = deconstruct_result1094
+                                                            self.pretty_boolean_value(unwrapped1095)
                                                         else:
-                                                            fields1050 = msg
+                                                            fields1093 = msg
                                                             self.write("missing")
 
     def pretty_date(self, msg: logic_pb2.DateValue):
-        flat1081 = self._try_flat(msg, self.pretty_date)
-        if flat1081 is not None:
-            assert flat1081 is not None
-            self.write(flat1081)
+        flat1124 = self._try_flat(msg, self.pretty_date)
+        if flat1124 is not None:
+            assert flat1124 is not None
+            self.write(flat1124)
             return None
         else:
             _dollar_dollar = msg
-            fields1076 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day),)
-            assert fields1076 is not None
-            unwrapped_fields1077 = fields1076
+            fields1119 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day),)
+            assert fields1119 is not None
+            unwrapped_fields1120 = fields1119
             self.write("(date")
             self.indent_sexp()
             self.newline()
-            field1078 = unwrapped_fields1077[0]
-            self.write(str(field1078))
+            field1121 = unwrapped_fields1120[0]
+            self.write(str(field1121))
             self.newline()
-            field1079 = unwrapped_fields1077[1]
-            self.write(str(field1079))
+            field1122 = unwrapped_fields1120[1]
+            self.write(str(field1122))
             self.newline()
-            field1080 = unwrapped_fields1077[2]
-            self.write(str(field1080))
+            field1123 = unwrapped_fields1120[2]
+            self.write(str(field1123))
             self.dedent()
             self.write(")")
 
     def pretty_datetime(self, msg: logic_pb2.DateTimeValue):
-        flat1092 = self._try_flat(msg, self.pretty_datetime)
-        if flat1092 is not None:
-            assert flat1092 is not None
-            self.write(flat1092)
+        flat1135 = self._try_flat(msg, self.pretty_datetime)
+        if flat1135 is not None:
+            assert flat1135 is not None
+            self.write(flat1135)
             return None
         else:
             _dollar_dollar = msg
-            fields1082 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day), int(_dollar_dollar.hour), int(_dollar_dollar.minute), int(_dollar_dollar.second), int(_dollar_dollar.microsecond),)
-            assert fields1082 is not None
-            unwrapped_fields1083 = fields1082
+            fields1125 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day), int(_dollar_dollar.hour), int(_dollar_dollar.minute), int(_dollar_dollar.second), int(_dollar_dollar.microsecond),)
+            assert fields1125 is not None
+            unwrapped_fields1126 = fields1125
             self.write("(datetime")
             self.indent_sexp()
             self.newline()
-            field1084 = unwrapped_fields1083[0]
-            self.write(str(field1084))
+            field1127 = unwrapped_fields1126[0]
+            self.write(str(field1127))
             self.newline()
-            field1085 = unwrapped_fields1083[1]
-            self.write(str(field1085))
+            field1128 = unwrapped_fields1126[1]
+            self.write(str(field1128))
             self.newline()
-            field1086 = unwrapped_fields1083[2]
-            self.write(str(field1086))
+            field1129 = unwrapped_fields1126[2]
+            self.write(str(field1129))
             self.newline()
-            field1087 = unwrapped_fields1083[3]
-            self.write(str(field1087))
+            field1130 = unwrapped_fields1126[3]
+            self.write(str(field1130))
             self.newline()
-            field1088 = unwrapped_fields1083[4]
-            self.write(str(field1088))
+            field1131 = unwrapped_fields1126[4]
+            self.write(str(field1131))
             self.newline()
-            field1089 = unwrapped_fields1083[5]
-            self.write(str(field1089))
-            field1090 = unwrapped_fields1083[6]
-            if field1090 is not None:
+            field1132 = unwrapped_fields1126[5]
+            self.write(str(field1132))
+            field1133 = unwrapped_fields1126[6]
+            if field1133 is not None:
                 self.newline()
-                assert field1090 is not None
-                opt_val1091 = field1090
-                self.write(str(opt_val1091))
+                assert field1133 is not None
+                opt_val1134 = field1133
+                self.write(str(opt_val1134))
             self.dedent()
             self.write(")")
 
     def pretty_conjunction(self, msg: logic_pb2.Conjunction):
-        flat1097 = self._try_flat(msg, self.pretty_conjunction)
-        if flat1097 is not None:
-            assert flat1097 is not None
-            self.write(flat1097)
+        flat1140 = self._try_flat(msg, self.pretty_conjunction)
+        if flat1140 is not None:
+            assert flat1140 is not None
+            self.write(flat1140)
             return None
         else:
             _dollar_dollar = msg
-            fields1093 = _dollar_dollar.args
-            assert fields1093 is not None
-            unwrapped_fields1094 = fields1093
+            fields1136 = _dollar_dollar.args
+            assert fields1136 is not None
+            unwrapped_fields1137 = fields1136
             self.write("(and")
             self.indent_sexp()
-            if not len(unwrapped_fields1094) == 0:
+            if not len(unwrapped_fields1137) == 0:
                 self.newline()
-                for i1096, elem1095 in enumerate(unwrapped_fields1094):
-                    if (i1096 > 0):
+                for i1139, elem1138 in enumerate(unwrapped_fields1137):
+                    if (i1139 > 0):
                         self.newline()
-                    self.pretty_formula(elem1095)
+                    self.pretty_formula(elem1138)
             self.dedent()
             self.write(")")
 
     def pretty_disjunction(self, msg: logic_pb2.Disjunction):
-        flat1102 = self._try_flat(msg, self.pretty_disjunction)
-        if flat1102 is not None:
-            assert flat1102 is not None
-            self.write(flat1102)
+        flat1145 = self._try_flat(msg, self.pretty_disjunction)
+        if flat1145 is not None:
+            assert flat1145 is not None
+            self.write(flat1145)
             return None
         else:
             _dollar_dollar = msg
-            fields1098 = _dollar_dollar.args
-            assert fields1098 is not None
-            unwrapped_fields1099 = fields1098
+            fields1141 = _dollar_dollar.args
+            assert fields1141 is not None
+            unwrapped_fields1142 = fields1141
             self.write("(or")
             self.indent_sexp()
-            if not len(unwrapped_fields1099) == 0:
+            if not len(unwrapped_fields1142) == 0:
                 self.newline()
-                for i1101, elem1100 in enumerate(unwrapped_fields1099):
-                    if (i1101 > 0):
+                for i1144, elem1143 in enumerate(unwrapped_fields1142):
+                    if (i1144 > 0):
                         self.newline()
-                    self.pretty_formula(elem1100)
+                    self.pretty_formula(elem1143)
             self.dedent()
             self.write(")")
 
     def pretty_not(self, msg: logic_pb2.Not):
-        flat1105 = self._try_flat(msg, self.pretty_not)
-        if flat1105 is not None:
-            assert flat1105 is not None
-            self.write(flat1105)
+        flat1148 = self._try_flat(msg, self.pretty_not)
+        if flat1148 is not None:
+            assert flat1148 is not None
+            self.write(flat1148)
             return None
         else:
             _dollar_dollar = msg
-            fields1103 = _dollar_dollar.arg
-            assert fields1103 is not None
-            unwrapped_fields1104 = fields1103
+            fields1146 = _dollar_dollar.arg
+            assert fields1146 is not None
+            unwrapped_fields1147 = fields1146
             self.write("(not")
             self.indent_sexp()
             self.newline()
-            self.pretty_formula(unwrapped_fields1104)
+            self.pretty_formula(unwrapped_fields1147)
             self.dedent()
             self.write(")")
 
     def pretty_ffi(self, msg: logic_pb2.FFI):
-        flat1111 = self._try_flat(msg, self.pretty_ffi)
-        if flat1111 is not None:
-            assert flat1111 is not None
-            self.write(flat1111)
+        flat1154 = self._try_flat(msg, self.pretty_ffi)
+        if flat1154 is not None:
+            assert flat1154 is not None
+            self.write(flat1154)
             return None
         else:
             _dollar_dollar = msg
-            fields1106 = (_dollar_dollar.name, _dollar_dollar.args, _dollar_dollar.terms,)
-            assert fields1106 is not None
-            unwrapped_fields1107 = fields1106
+            fields1149 = (_dollar_dollar.name, _dollar_dollar.args, _dollar_dollar.terms,)
+            assert fields1149 is not None
+            unwrapped_fields1150 = fields1149
             self.write("(ffi")
             self.indent_sexp()
             self.newline()
-            field1108 = unwrapped_fields1107[0]
-            self.pretty_name(field1108)
+            field1151 = unwrapped_fields1150[0]
+            self.pretty_name(field1151)
             self.newline()
-            field1109 = unwrapped_fields1107[1]
-            self.pretty_ffi_args(field1109)
+            field1152 = unwrapped_fields1150[1]
+            self.pretty_ffi_args(field1152)
             self.newline()
-            field1110 = unwrapped_fields1107[2]
-            self.pretty_terms(field1110)
+            field1153 = unwrapped_fields1150[2]
+            self.pretty_terms(field1153)
             self.dedent()
             self.write(")")
 
     def pretty_name(self, msg: str):
-        flat1113 = self._try_flat(msg, self.pretty_name)
-        if flat1113 is not None:
-            assert flat1113 is not None
-            self.write(flat1113)
+        flat1156 = self._try_flat(msg, self.pretty_name)
+        if flat1156 is not None:
+            assert flat1156 is not None
+            self.write(flat1156)
             return None
         else:
-            fields1112 = msg
+            fields1155 = msg
             self.write(":")
-            self.write(fields1112)
+            self.write(fields1155)
 
     def pretty_ffi_args(self, msg: Sequence[logic_pb2.Abstraction]):
-        flat1117 = self._try_flat(msg, self.pretty_ffi_args)
-        if flat1117 is not None:
-            assert flat1117 is not None
-            self.write(flat1117)
+        flat1160 = self._try_flat(msg, self.pretty_ffi_args)
+        if flat1160 is not None:
+            assert flat1160 is not None
+            self.write(flat1160)
             return None
         else:
-            fields1114 = msg
+            fields1157 = msg
             self.write("(args")
             self.indent_sexp()
-            if not len(fields1114) == 0:
+            if not len(fields1157) == 0:
                 self.newline()
-                for i1116, elem1115 in enumerate(fields1114):
-                    if (i1116 > 0):
+                for i1159, elem1158 in enumerate(fields1157):
+                    if (i1159 > 0):
                         self.newline()
-                    self.pretty_abstraction(elem1115)
+                    self.pretty_abstraction(elem1158)
             self.dedent()
             self.write(")")
 
     def pretty_atom(self, msg: logic_pb2.Atom):
-        flat1124 = self._try_flat(msg, self.pretty_atom)
-        if flat1124 is not None:
-            assert flat1124 is not None
-            self.write(flat1124)
+        flat1167 = self._try_flat(msg, self.pretty_atom)
+        if flat1167 is not None:
+            assert flat1167 is not None
+            self.write(flat1167)
             return None
         else:
             _dollar_dollar = msg
-            fields1118 = (_dollar_dollar.name, _dollar_dollar.terms,)
-            assert fields1118 is not None
-            unwrapped_fields1119 = fields1118
+            fields1161 = (_dollar_dollar.name, _dollar_dollar.terms,)
+            assert fields1161 is not None
+            unwrapped_fields1162 = fields1161
             self.write("(atom")
             self.indent_sexp()
             self.newline()
-            field1120 = unwrapped_fields1119[0]
-            self.pretty_relation_id(field1120)
-            field1121 = unwrapped_fields1119[1]
-            if not len(field1121) == 0:
+            field1163 = unwrapped_fields1162[0]
+            self.pretty_relation_id(field1163)
+            field1164 = unwrapped_fields1162[1]
+            if not len(field1164) == 0:
                 self.newline()
-                for i1123, elem1122 in enumerate(field1121):
-                    if (i1123 > 0):
+                for i1166, elem1165 in enumerate(field1164):
+                    if (i1166 > 0):
                         self.newline()
-                    self.pretty_term(elem1122)
+                    self.pretty_term(elem1165)
             self.dedent()
             self.write(")")
 
     def pretty_pragma(self, msg: logic_pb2.Pragma):
-        flat1131 = self._try_flat(msg, self.pretty_pragma)
-        if flat1131 is not None:
-            assert flat1131 is not None
-            self.write(flat1131)
+        flat1174 = self._try_flat(msg, self.pretty_pragma)
+        if flat1174 is not None:
+            assert flat1174 is not None
+            self.write(flat1174)
             return None
         else:
             _dollar_dollar = msg
-            fields1125 = (_dollar_dollar.name, _dollar_dollar.terms,)
-            assert fields1125 is not None
-            unwrapped_fields1126 = fields1125
+            fields1168 = (_dollar_dollar.name, _dollar_dollar.terms,)
+            assert fields1168 is not None
+            unwrapped_fields1169 = fields1168
             self.write("(pragma")
             self.indent_sexp()
             self.newline()
-            field1127 = unwrapped_fields1126[0]
-            self.pretty_name(field1127)
-            field1128 = unwrapped_fields1126[1]
-            if not len(field1128) == 0:
+            field1170 = unwrapped_fields1169[0]
+            self.pretty_name(field1170)
+            field1171 = unwrapped_fields1169[1]
+            if not len(field1171) == 0:
                 self.newline()
-                for i1130, elem1129 in enumerate(field1128):
-                    if (i1130 > 0):
+                for i1173, elem1172 in enumerate(field1171):
+                    if (i1173 > 0):
                         self.newline()
-                    self.pretty_term(elem1129)
+                    self.pretty_term(elem1172)
             self.dedent()
             self.write(")")
 
     def pretty_primitive(self, msg: logic_pb2.Primitive):
-        flat1147 = self._try_flat(msg, self.pretty_primitive)
-        if flat1147 is not None:
-            assert flat1147 is not None
-            self.write(flat1147)
+        flat1190 = self._try_flat(msg, self.pretty_primitive)
+        if flat1190 is not None:
+            assert flat1190 is not None
+            self.write(flat1190)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_eq":
-                _t1673 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1759 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1673 = None
-            guard_result1146 = _t1673
-            if guard_result1146 is not None:
+                _t1759 = None
+            guard_result1189 = _t1759
+            if guard_result1189 is not None:
                 self.pretty_eq(msg)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.name == "rel_primitive_lt_monotype":
-                    _t1674 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                    _t1760 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
                 else:
-                    _t1674 = None
-                guard_result1145 = _t1674
-                if guard_result1145 is not None:
+                    _t1760 = None
+                guard_result1188 = _t1760
+                if guard_result1188 is not None:
                     self.pretty_lt(msg)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.name == "rel_primitive_lt_eq_monotype":
-                        _t1675 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                        _t1761 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
                     else:
-                        _t1675 = None
-                    guard_result1144 = _t1675
-                    if guard_result1144 is not None:
+                        _t1761 = None
+                    guard_result1187 = _t1761
+                    if guard_result1187 is not None:
                         self.pretty_lt_eq(msg)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.name == "rel_primitive_gt_monotype":
-                            _t1676 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                            _t1762 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
                         else:
-                            _t1676 = None
-                        guard_result1143 = _t1676
-                        if guard_result1143 is not None:
+                            _t1762 = None
+                        guard_result1186 = _t1762
+                        if guard_result1186 is not None:
                             self.pretty_gt(msg)
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.name == "rel_primitive_gt_eq_monotype":
-                                _t1677 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                                _t1763 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
                             else:
-                                _t1677 = None
-                            guard_result1142 = _t1677
-                            if guard_result1142 is not None:
+                                _t1763 = None
+                            guard_result1185 = _t1763
+                            if guard_result1185 is not None:
                                 self.pretty_gt_eq(msg)
                             else:
                                 _dollar_dollar = msg
                                 if _dollar_dollar.name == "rel_primitive_add_monotype":
-                                    _t1678 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                                    _t1764 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
                                 else:
-                                    _t1678 = None
-                                guard_result1141 = _t1678
-                                if guard_result1141 is not None:
+                                    _t1764 = None
+                                guard_result1184 = _t1764
+                                if guard_result1184 is not None:
                                     self.pretty_add(msg)
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.name == "rel_primitive_subtract_monotype":
-                                        _t1679 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                                        _t1765 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
                                     else:
-                                        _t1679 = None
-                                    guard_result1140 = _t1679
-                                    if guard_result1140 is not None:
+                                        _t1765 = None
+                                    guard_result1183 = _t1765
+                                    if guard_result1183 is not None:
                                         self.pretty_minus(msg)
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.name == "rel_primitive_multiply_monotype":
-                                            _t1680 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                                            _t1766 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
                                         else:
-                                            _t1680 = None
-                                        guard_result1139 = _t1680
-                                        if guard_result1139 is not None:
+                                            _t1766 = None
+                                        guard_result1182 = _t1766
+                                        if guard_result1182 is not None:
                                             self.pretty_multiply(msg)
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.name == "rel_primitive_divide_monotype":
-                                                _t1681 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                                                _t1767 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
                                             else:
-                                                _t1681 = None
-                                            guard_result1138 = _t1681
-                                            if guard_result1138 is not None:
+                                                _t1767 = None
+                                            guard_result1181 = _t1767
+                                            if guard_result1181 is not None:
                                                 self.pretty_divide(msg)
                                             else:
                                                 _dollar_dollar = msg
-                                                fields1132 = (_dollar_dollar.name, _dollar_dollar.terms,)
-                                                assert fields1132 is not None
-                                                unwrapped_fields1133 = fields1132
+                                                fields1175 = (_dollar_dollar.name, _dollar_dollar.terms,)
+                                                assert fields1175 is not None
+                                                unwrapped_fields1176 = fields1175
                                                 self.write("(primitive")
                                                 self.indent_sexp()
                                                 self.newline()
-                                                field1134 = unwrapped_fields1133[0]
-                                                self.pretty_name(field1134)
-                                                field1135 = unwrapped_fields1133[1]
-                                                if not len(field1135) == 0:
+                                                field1177 = unwrapped_fields1176[0]
+                                                self.pretty_name(field1177)
+                                                field1178 = unwrapped_fields1176[1]
+                                                if not len(field1178) == 0:
                                                     self.newline()
-                                                    for i1137, elem1136 in enumerate(field1135):
-                                                        if (i1137 > 0):
+                                                    for i1180, elem1179 in enumerate(field1178):
+                                                        if (i1180 > 0):
                                                             self.newline()
-                                                        self.pretty_rel_term(elem1136)
+                                                        self.pretty_rel_term(elem1179)
                                                 self.dedent()
                                                 self.write(")")
 
     def pretty_eq(self, msg: logic_pb2.Primitive):
-        flat1152 = self._try_flat(msg, self.pretty_eq)
-        if flat1152 is not None:
-            assert flat1152 is not None
-            self.write(flat1152)
+        flat1195 = self._try_flat(msg, self.pretty_eq)
+        if flat1195 is not None:
+            assert flat1195 is not None
+            self.write(flat1195)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_eq":
-                _t1682 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1768 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1682 = None
-            fields1148 = _t1682
-            assert fields1148 is not None
-            unwrapped_fields1149 = fields1148
+                _t1768 = None
+            fields1191 = _t1768
+            assert fields1191 is not None
+            unwrapped_fields1192 = fields1191
             self.write("(=")
             self.indent_sexp()
             self.newline()
-            field1150 = unwrapped_fields1149[0]
-            self.pretty_term(field1150)
+            field1193 = unwrapped_fields1192[0]
+            self.pretty_term(field1193)
             self.newline()
-            field1151 = unwrapped_fields1149[1]
-            self.pretty_term(field1151)
+            field1194 = unwrapped_fields1192[1]
+            self.pretty_term(field1194)
             self.dedent()
             self.write(")")
 
     def pretty_lt(self, msg: logic_pb2.Primitive):
-        flat1157 = self._try_flat(msg, self.pretty_lt)
-        if flat1157 is not None:
-            assert flat1157 is not None
-            self.write(flat1157)
+        flat1200 = self._try_flat(msg, self.pretty_lt)
+        if flat1200 is not None:
+            assert flat1200 is not None
+            self.write(flat1200)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_lt_monotype":
-                _t1683 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1769 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1683 = None
-            fields1153 = _t1683
-            assert fields1153 is not None
-            unwrapped_fields1154 = fields1153
+                _t1769 = None
+            fields1196 = _t1769
+            assert fields1196 is not None
+            unwrapped_fields1197 = fields1196
             self.write("(<")
             self.indent_sexp()
             self.newline()
-            field1155 = unwrapped_fields1154[0]
-            self.pretty_term(field1155)
+            field1198 = unwrapped_fields1197[0]
+            self.pretty_term(field1198)
             self.newline()
-            field1156 = unwrapped_fields1154[1]
-            self.pretty_term(field1156)
+            field1199 = unwrapped_fields1197[1]
+            self.pretty_term(field1199)
             self.dedent()
             self.write(")")
 
     def pretty_lt_eq(self, msg: logic_pb2.Primitive):
-        flat1162 = self._try_flat(msg, self.pretty_lt_eq)
-        if flat1162 is not None:
-            assert flat1162 is not None
-            self.write(flat1162)
+        flat1205 = self._try_flat(msg, self.pretty_lt_eq)
+        if flat1205 is not None:
+            assert flat1205 is not None
+            self.write(flat1205)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_lt_eq_monotype":
-                _t1684 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1770 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1684 = None
-            fields1158 = _t1684
-            assert fields1158 is not None
-            unwrapped_fields1159 = fields1158
+                _t1770 = None
+            fields1201 = _t1770
+            assert fields1201 is not None
+            unwrapped_fields1202 = fields1201
             self.write("(<=")
             self.indent_sexp()
             self.newline()
-            field1160 = unwrapped_fields1159[0]
-            self.pretty_term(field1160)
+            field1203 = unwrapped_fields1202[0]
+            self.pretty_term(field1203)
             self.newline()
-            field1161 = unwrapped_fields1159[1]
-            self.pretty_term(field1161)
+            field1204 = unwrapped_fields1202[1]
+            self.pretty_term(field1204)
             self.dedent()
             self.write(")")
 
     def pretty_gt(self, msg: logic_pb2.Primitive):
-        flat1167 = self._try_flat(msg, self.pretty_gt)
-        if flat1167 is not None:
-            assert flat1167 is not None
-            self.write(flat1167)
+        flat1210 = self._try_flat(msg, self.pretty_gt)
+        if flat1210 is not None:
+            assert flat1210 is not None
+            self.write(flat1210)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_gt_monotype":
-                _t1685 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1771 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1685 = None
-            fields1163 = _t1685
-            assert fields1163 is not None
-            unwrapped_fields1164 = fields1163
+                _t1771 = None
+            fields1206 = _t1771
+            assert fields1206 is not None
+            unwrapped_fields1207 = fields1206
             self.write("(>")
             self.indent_sexp()
             self.newline()
-            field1165 = unwrapped_fields1164[0]
-            self.pretty_term(field1165)
+            field1208 = unwrapped_fields1207[0]
+            self.pretty_term(field1208)
             self.newline()
-            field1166 = unwrapped_fields1164[1]
-            self.pretty_term(field1166)
+            field1209 = unwrapped_fields1207[1]
+            self.pretty_term(field1209)
             self.dedent()
             self.write(")")
 
     def pretty_gt_eq(self, msg: logic_pb2.Primitive):
-        flat1172 = self._try_flat(msg, self.pretty_gt_eq)
-        if flat1172 is not None:
-            assert flat1172 is not None
-            self.write(flat1172)
+        flat1215 = self._try_flat(msg, self.pretty_gt_eq)
+        if flat1215 is not None:
+            assert flat1215 is not None
+            self.write(flat1215)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_gt_eq_monotype":
-                _t1686 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1772 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1686 = None
-            fields1168 = _t1686
-            assert fields1168 is not None
-            unwrapped_fields1169 = fields1168
+                _t1772 = None
+            fields1211 = _t1772
+            assert fields1211 is not None
+            unwrapped_fields1212 = fields1211
             self.write("(>=")
             self.indent_sexp()
             self.newline()
-            field1170 = unwrapped_fields1169[0]
-            self.pretty_term(field1170)
+            field1213 = unwrapped_fields1212[0]
+            self.pretty_term(field1213)
             self.newline()
-            field1171 = unwrapped_fields1169[1]
-            self.pretty_term(field1171)
+            field1214 = unwrapped_fields1212[1]
+            self.pretty_term(field1214)
             self.dedent()
             self.write(")")
 
     def pretty_add(self, msg: logic_pb2.Primitive):
-        flat1178 = self._try_flat(msg, self.pretty_add)
-        if flat1178 is not None:
-            assert flat1178 is not None
-            self.write(flat1178)
+        flat1221 = self._try_flat(msg, self.pretty_add)
+        if flat1221 is not None:
+            assert flat1221 is not None
+            self.write(flat1221)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_add_monotype":
-                _t1687 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                _t1773 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
             else:
-                _t1687 = None
-            fields1173 = _t1687
-            assert fields1173 is not None
-            unwrapped_fields1174 = fields1173
+                _t1773 = None
+            fields1216 = _t1773
+            assert fields1216 is not None
+            unwrapped_fields1217 = fields1216
             self.write("(+")
             self.indent_sexp()
             self.newline()
-            field1175 = unwrapped_fields1174[0]
-            self.pretty_term(field1175)
+            field1218 = unwrapped_fields1217[0]
+            self.pretty_term(field1218)
             self.newline()
-            field1176 = unwrapped_fields1174[1]
-            self.pretty_term(field1176)
+            field1219 = unwrapped_fields1217[1]
+            self.pretty_term(field1219)
             self.newline()
-            field1177 = unwrapped_fields1174[2]
-            self.pretty_term(field1177)
+            field1220 = unwrapped_fields1217[2]
+            self.pretty_term(field1220)
             self.dedent()
             self.write(")")
 
     def pretty_minus(self, msg: logic_pb2.Primitive):
-        flat1184 = self._try_flat(msg, self.pretty_minus)
-        if flat1184 is not None:
-            assert flat1184 is not None
-            self.write(flat1184)
+        flat1227 = self._try_flat(msg, self.pretty_minus)
+        if flat1227 is not None:
+            assert flat1227 is not None
+            self.write(flat1227)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_subtract_monotype":
-                _t1688 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                _t1774 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
             else:
-                _t1688 = None
-            fields1179 = _t1688
-            assert fields1179 is not None
-            unwrapped_fields1180 = fields1179
+                _t1774 = None
+            fields1222 = _t1774
+            assert fields1222 is not None
+            unwrapped_fields1223 = fields1222
             self.write("(-")
             self.indent_sexp()
             self.newline()
-            field1181 = unwrapped_fields1180[0]
-            self.pretty_term(field1181)
+            field1224 = unwrapped_fields1223[0]
+            self.pretty_term(field1224)
             self.newline()
-            field1182 = unwrapped_fields1180[1]
-            self.pretty_term(field1182)
+            field1225 = unwrapped_fields1223[1]
+            self.pretty_term(field1225)
             self.newline()
-            field1183 = unwrapped_fields1180[2]
-            self.pretty_term(field1183)
+            field1226 = unwrapped_fields1223[2]
+            self.pretty_term(field1226)
             self.dedent()
             self.write(")")
 
     def pretty_multiply(self, msg: logic_pb2.Primitive):
-        flat1190 = self._try_flat(msg, self.pretty_multiply)
-        if flat1190 is not None:
-            assert flat1190 is not None
-            self.write(flat1190)
+        flat1233 = self._try_flat(msg, self.pretty_multiply)
+        if flat1233 is not None:
+            assert flat1233 is not None
+            self.write(flat1233)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_multiply_monotype":
-                _t1689 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                _t1775 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
             else:
-                _t1689 = None
-            fields1185 = _t1689
-            assert fields1185 is not None
-            unwrapped_fields1186 = fields1185
+                _t1775 = None
+            fields1228 = _t1775
+            assert fields1228 is not None
+            unwrapped_fields1229 = fields1228
             self.write("(*")
             self.indent_sexp()
             self.newline()
-            field1187 = unwrapped_fields1186[0]
-            self.pretty_term(field1187)
+            field1230 = unwrapped_fields1229[0]
+            self.pretty_term(field1230)
             self.newline()
-            field1188 = unwrapped_fields1186[1]
-            self.pretty_term(field1188)
+            field1231 = unwrapped_fields1229[1]
+            self.pretty_term(field1231)
             self.newline()
-            field1189 = unwrapped_fields1186[2]
-            self.pretty_term(field1189)
+            field1232 = unwrapped_fields1229[2]
+            self.pretty_term(field1232)
             self.dedent()
             self.write(")")
 
     def pretty_divide(self, msg: logic_pb2.Primitive):
-        flat1196 = self._try_flat(msg, self.pretty_divide)
-        if flat1196 is not None:
-            assert flat1196 is not None
-            self.write(flat1196)
+        flat1239 = self._try_flat(msg, self.pretty_divide)
+        if flat1239 is not None:
+            assert flat1239 is not None
+            self.write(flat1239)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_divide_monotype":
-                _t1690 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                _t1776 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
             else:
-                _t1690 = None
-            fields1191 = _t1690
-            assert fields1191 is not None
-            unwrapped_fields1192 = fields1191
+                _t1776 = None
+            fields1234 = _t1776
+            assert fields1234 is not None
+            unwrapped_fields1235 = fields1234
             self.write("(/")
             self.indent_sexp()
             self.newline()
-            field1193 = unwrapped_fields1192[0]
-            self.pretty_term(field1193)
+            field1236 = unwrapped_fields1235[0]
+            self.pretty_term(field1236)
             self.newline()
-            field1194 = unwrapped_fields1192[1]
-            self.pretty_term(field1194)
+            field1237 = unwrapped_fields1235[1]
+            self.pretty_term(field1237)
             self.newline()
-            field1195 = unwrapped_fields1192[2]
-            self.pretty_term(field1195)
+            field1238 = unwrapped_fields1235[2]
+            self.pretty_term(field1238)
             self.dedent()
             self.write(")")
 
     def pretty_rel_term(self, msg: logic_pb2.RelTerm):
-        flat1201 = self._try_flat(msg, self.pretty_rel_term)
-        if flat1201 is not None:
-            assert flat1201 is not None
-            self.write(flat1201)
+        flat1244 = self._try_flat(msg, self.pretty_rel_term)
+        if flat1244 is not None:
+            assert flat1244 is not None
+            self.write(flat1244)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("specialized_value"):
-                _t1691 = _dollar_dollar.specialized_value
+                _t1777 = _dollar_dollar.specialized_value
             else:
-                _t1691 = None
-            deconstruct_result1199 = _t1691
-            if deconstruct_result1199 is not None:
-                assert deconstruct_result1199 is not None
-                unwrapped1200 = deconstruct_result1199
-                self.pretty_specialized_value(unwrapped1200)
+                _t1777 = None
+            deconstruct_result1242 = _t1777
+            if deconstruct_result1242 is not None:
+                assert deconstruct_result1242 is not None
+                unwrapped1243 = deconstruct_result1242
+                self.pretty_specialized_value(unwrapped1243)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("term"):
-                    _t1692 = _dollar_dollar.term
+                    _t1778 = _dollar_dollar.term
                 else:
-                    _t1692 = None
-                deconstruct_result1197 = _t1692
-                if deconstruct_result1197 is not None:
-                    assert deconstruct_result1197 is not None
-                    unwrapped1198 = deconstruct_result1197
-                    self.pretty_term(unwrapped1198)
+                    _t1778 = None
+                deconstruct_result1240 = _t1778
+                if deconstruct_result1240 is not None:
+                    assert deconstruct_result1240 is not None
+                    unwrapped1241 = deconstruct_result1240
+                    self.pretty_term(unwrapped1241)
                 else:
                     raise ParseError("No matching rule for rel_term")
 
     def pretty_specialized_value(self, msg: logic_pb2.Value):
-        flat1203 = self._try_flat(msg, self.pretty_specialized_value)
-        if flat1203 is not None:
-            assert flat1203 is not None
-            self.write(flat1203)
+        flat1246 = self._try_flat(msg, self.pretty_specialized_value)
+        if flat1246 is not None:
+            assert flat1246 is not None
+            self.write(flat1246)
             return None
         else:
-            fields1202 = msg
+            fields1245 = msg
             self.write("#")
-            self.pretty_raw_value(fields1202)
+            self.pretty_raw_value(fields1245)
 
     def pretty_rel_atom(self, msg: logic_pb2.RelAtom):
-        flat1210 = self._try_flat(msg, self.pretty_rel_atom)
-        if flat1210 is not None:
-            assert flat1210 is not None
-            self.write(flat1210)
+        flat1253 = self._try_flat(msg, self.pretty_rel_atom)
+        if flat1253 is not None:
+            assert flat1253 is not None
+            self.write(flat1253)
             return None
         else:
             _dollar_dollar = msg
-            fields1204 = (_dollar_dollar.name, _dollar_dollar.terms,)
-            assert fields1204 is not None
-            unwrapped_fields1205 = fields1204
+            fields1247 = (_dollar_dollar.name, _dollar_dollar.terms,)
+            assert fields1247 is not None
+            unwrapped_fields1248 = fields1247
             self.write("(relatom")
             self.indent_sexp()
             self.newline()
-            field1206 = unwrapped_fields1205[0]
-            self.pretty_name(field1206)
-            field1207 = unwrapped_fields1205[1]
-            if not len(field1207) == 0:
+            field1249 = unwrapped_fields1248[0]
+            self.pretty_name(field1249)
+            field1250 = unwrapped_fields1248[1]
+            if not len(field1250) == 0:
                 self.newline()
-                for i1209, elem1208 in enumerate(field1207):
-                    if (i1209 > 0):
+                for i1252, elem1251 in enumerate(field1250):
+                    if (i1252 > 0):
                         self.newline()
-                    self.pretty_rel_term(elem1208)
+                    self.pretty_rel_term(elem1251)
             self.dedent()
             self.write(")")
 
     def pretty_cast(self, msg: logic_pb2.Cast):
-        flat1215 = self._try_flat(msg, self.pretty_cast)
-        if flat1215 is not None:
-            assert flat1215 is not None
-            self.write(flat1215)
+        flat1258 = self._try_flat(msg, self.pretty_cast)
+        if flat1258 is not None:
+            assert flat1258 is not None
+            self.write(flat1258)
             return None
         else:
             _dollar_dollar = msg
-            fields1211 = (_dollar_dollar.input, _dollar_dollar.result,)
-            assert fields1211 is not None
-            unwrapped_fields1212 = fields1211
+            fields1254 = (_dollar_dollar.input, _dollar_dollar.result,)
+            assert fields1254 is not None
+            unwrapped_fields1255 = fields1254
             self.write("(cast")
             self.indent_sexp()
             self.newline()
-            field1213 = unwrapped_fields1212[0]
-            self.pretty_term(field1213)
+            field1256 = unwrapped_fields1255[0]
+            self.pretty_term(field1256)
             self.newline()
-            field1214 = unwrapped_fields1212[1]
-            self.pretty_term(field1214)
+            field1257 = unwrapped_fields1255[1]
+            self.pretty_term(field1257)
             self.dedent()
             self.write(")")
 
     def pretty_attrs(self, msg: Sequence[logic_pb2.Attribute]):
-        flat1219 = self._try_flat(msg, self.pretty_attrs)
-        if flat1219 is not None:
-            assert flat1219 is not None
-            self.write(flat1219)
+        flat1262 = self._try_flat(msg, self.pretty_attrs)
+        if flat1262 is not None:
+            assert flat1262 is not None
+            self.write(flat1262)
             return None
         else:
-            fields1216 = msg
+            fields1259 = msg
             self.write("(attrs")
             self.indent_sexp()
-            if not len(fields1216) == 0:
+            if not len(fields1259) == 0:
                 self.newline()
-                for i1218, elem1217 in enumerate(fields1216):
-                    if (i1218 > 0):
+                for i1261, elem1260 in enumerate(fields1259):
+                    if (i1261 > 0):
                         self.newline()
-                    self.pretty_attribute(elem1217)
+                    self.pretty_attribute(elem1260)
             self.dedent()
             self.write(")")
 
     def pretty_attribute(self, msg: logic_pb2.Attribute):
-        flat1226 = self._try_flat(msg, self.pretty_attribute)
-        if flat1226 is not None:
-            assert flat1226 is not None
-            self.write(flat1226)
+        flat1269 = self._try_flat(msg, self.pretty_attribute)
+        if flat1269 is not None:
+            assert flat1269 is not None
+            self.write(flat1269)
             return None
         else:
             _dollar_dollar = msg
-            fields1220 = (_dollar_dollar.name, _dollar_dollar.args,)
-            assert fields1220 is not None
-            unwrapped_fields1221 = fields1220
+            fields1263 = (_dollar_dollar.name, _dollar_dollar.args,)
+            assert fields1263 is not None
+            unwrapped_fields1264 = fields1263
             self.write("(attribute")
             self.indent_sexp()
             self.newline()
-            field1222 = unwrapped_fields1221[0]
-            self.pretty_name(field1222)
-            field1223 = unwrapped_fields1221[1]
-            if not len(field1223) == 0:
+            field1265 = unwrapped_fields1264[0]
+            self.pretty_name(field1265)
+            field1266 = unwrapped_fields1264[1]
+            if not len(field1266) == 0:
                 self.newline()
-                for i1225, elem1224 in enumerate(field1223):
-                    if (i1225 > 0):
+                for i1268, elem1267 in enumerate(field1266):
+                    if (i1268 > 0):
                         self.newline()
-                    self.pretty_raw_value(elem1224)
+                    self.pretty_raw_value(elem1267)
             self.dedent()
             self.write(")")
 
     def pretty_algorithm(self, msg: logic_pb2.Algorithm):
-        flat1235 = self._try_flat(msg, self.pretty_algorithm)
-        if flat1235 is not None:
-            assert flat1235 is not None
-            self.write(flat1235)
+        flat1278 = self._try_flat(msg, self.pretty_algorithm)
+        if flat1278 is not None:
+            assert flat1278 is not None
+            self.write(flat1278)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1693 = _dollar_dollar.attrs
+                _t1779 = _dollar_dollar.attrs
             else:
-                _t1693 = None
-            fields1227 = (getattr(_dollar_dollar, 'global'), _dollar_dollar.body, _t1693,)
-            assert fields1227 is not None
-            unwrapped_fields1228 = fields1227
+                _t1779 = None
+            fields1270 = (getattr(_dollar_dollar, 'global'), _dollar_dollar.body, _t1779,)
+            assert fields1270 is not None
+            unwrapped_fields1271 = fields1270
             self.write("(algorithm")
             self.indent_sexp()
-            field1229 = unwrapped_fields1228[0]
-            if not len(field1229) == 0:
+            field1272 = unwrapped_fields1271[0]
+            if not len(field1272) == 0:
                 self.newline()
-                for i1231, elem1230 in enumerate(field1229):
-                    if (i1231 > 0):
+                for i1274, elem1273 in enumerate(field1272):
+                    if (i1274 > 0):
                         self.newline()
-                    self.pretty_relation_id(elem1230)
+                    self.pretty_relation_id(elem1273)
             self.newline()
-            field1232 = unwrapped_fields1228[1]
-            self.pretty_script(field1232)
-            field1233 = unwrapped_fields1228[2]
-            if field1233 is not None:
+            field1275 = unwrapped_fields1271[1]
+            self.pretty_script(field1275)
+            field1276 = unwrapped_fields1271[2]
+            if field1276 is not None:
                 self.newline()
-                assert field1233 is not None
-                opt_val1234 = field1233
-                self.pretty_attrs(opt_val1234)
+                assert field1276 is not None
+                opt_val1277 = field1276
+                self.pretty_attrs(opt_val1277)
             self.dedent()
             self.write(")")
 
     def pretty_script(self, msg: logic_pb2.Script):
-        flat1240 = self._try_flat(msg, self.pretty_script)
-        if flat1240 is not None:
-            assert flat1240 is not None
-            self.write(flat1240)
+        flat1283 = self._try_flat(msg, self.pretty_script)
+        if flat1283 is not None:
+            assert flat1283 is not None
+            self.write(flat1283)
             return None
         else:
             _dollar_dollar = msg
-            fields1236 = _dollar_dollar.constructs
-            assert fields1236 is not None
-            unwrapped_fields1237 = fields1236
+            fields1279 = _dollar_dollar.constructs
+            assert fields1279 is not None
+            unwrapped_fields1280 = fields1279
             self.write("(script")
             self.indent_sexp()
-            if not len(unwrapped_fields1237) == 0:
+            if not len(unwrapped_fields1280) == 0:
                 self.newline()
-                for i1239, elem1238 in enumerate(unwrapped_fields1237):
-                    if (i1239 > 0):
+                for i1282, elem1281 in enumerate(unwrapped_fields1280):
+                    if (i1282 > 0):
                         self.newline()
-                    self.pretty_construct(elem1238)
+                    self.pretty_construct(elem1281)
             self.dedent()
             self.write(")")
 
     def pretty_construct(self, msg: logic_pb2.Construct):
-        flat1245 = self._try_flat(msg, self.pretty_construct)
-        if flat1245 is not None:
-            assert flat1245 is not None
-            self.write(flat1245)
+        flat1288 = self._try_flat(msg, self.pretty_construct)
+        if flat1288 is not None:
+            assert flat1288 is not None
+            self.write(flat1288)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("loop"):
-                _t1694 = _dollar_dollar.loop
+                _t1780 = _dollar_dollar.loop
             else:
-                _t1694 = None
-            deconstruct_result1243 = _t1694
-            if deconstruct_result1243 is not None:
-                assert deconstruct_result1243 is not None
-                unwrapped1244 = deconstruct_result1243
-                self.pretty_loop(unwrapped1244)
+                _t1780 = None
+            deconstruct_result1286 = _t1780
+            if deconstruct_result1286 is not None:
+                assert deconstruct_result1286 is not None
+                unwrapped1287 = deconstruct_result1286
+                self.pretty_loop(unwrapped1287)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("instruction"):
-                    _t1695 = _dollar_dollar.instruction
+                    _t1781 = _dollar_dollar.instruction
                 else:
-                    _t1695 = None
-                deconstruct_result1241 = _t1695
-                if deconstruct_result1241 is not None:
-                    assert deconstruct_result1241 is not None
-                    unwrapped1242 = deconstruct_result1241
-                    self.pretty_instruction(unwrapped1242)
+                    _t1781 = None
+                deconstruct_result1284 = _t1781
+                if deconstruct_result1284 is not None:
+                    assert deconstruct_result1284 is not None
+                    unwrapped1285 = deconstruct_result1284
+                    self.pretty_instruction(unwrapped1285)
                 else:
                     raise ParseError("No matching rule for construct")
 
     def pretty_loop(self, msg: logic_pb2.Loop):
-        flat1252 = self._try_flat(msg, self.pretty_loop)
-        if flat1252 is not None:
-            assert flat1252 is not None
-            self.write(flat1252)
+        flat1295 = self._try_flat(msg, self.pretty_loop)
+        if flat1295 is not None:
+            assert flat1295 is not None
+            self.write(flat1295)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1696 = _dollar_dollar.attrs
+                _t1782 = _dollar_dollar.attrs
             else:
-                _t1696 = None
-            fields1246 = (_dollar_dollar.init, _dollar_dollar.body, _t1696,)
-            assert fields1246 is not None
-            unwrapped_fields1247 = fields1246
+                _t1782 = None
+            fields1289 = (_dollar_dollar.init, _dollar_dollar.body, _t1782,)
+            assert fields1289 is not None
+            unwrapped_fields1290 = fields1289
             self.write("(loop")
             self.indent_sexp()
             self.newline()
-            field1248 = unwrapped_fields1247[0]
-            self.pretty_init(field1248)
+            field1291 = unwrapped_fields1290[0]
+            self.pretty_init(field1291)
             self.newline()
-            field1249 = unwrapped_fields1247[1]
-            self.pretty_script(field1249)
-            field1250 = unwrapped_fields1247[2]
-            if field1250 is not None:
+            field1292 = unwrapped_fields1290[1]
+            self.pretty_script(field1292)
+            field1293 = unwrapped_fields1290[2]
+            if field1293 is not None:
                 self.newline()
-                assert field1250 is not None
-                opt_val1251 = field1250
-                self.pretty_attrs(opt_val1251)
+                assert field1293 is not None
+                opt_val1294 = field1293
+                self.pretty_attrs(opt_val1294)
             self.dedent()
             self.write(")")
 
     def pretty_init(self, msg: Sequence[logic_pb2.Instruction]):
-        flat1256 = self._try_flat(msg, self.pretty_init)
-        if flat1256 is not None:
-            assert flat1256 is not None
-            self.write(flat1256)
+        flat1299 = self._try_flat(msg, self.pretty_init)
+        if flat1299 is not None:
+            assert flat1299 is not None
+            self.write(flat1299)
             return None
         else:
-            fields1253 = msg
+            fields1296 = msg
             self.write("(init")
             self.indent_sexp()
-            if not len(fields1253) == 0:
+            if not len(fields1296) == 0:
                 self.newline()
-                for i1255, elem1254 in enumerate(fields1253):
-                    if (i1255 > 0):
+                for i1298, elem1297 in enumerate(fields1296):
+                    if (i1298 > 0):
                         self.newline()
-                    self.pretty_instruction(elem1254)
+                    self.pretty_instruction(elem1297)
             self.dedent()
             self.write(")")
 
     def pretty_instruction(self, msg: logic_pb2.Instruction):
-        flat1267 = self._try_flat(msg, self.pretty_instruction)
-        if flat1267 is not None:
-            assert flat1267 is not None
-            self.write(flat1267)
+        flat1310 = self._try_flat(msg, self.pretty_instruction)
+        if flat1310 is not None:
+            assert flat1310 is not None
+            self.write(flat1310)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("assign"):
-                _t1697 = _dollar_dollar.assign
+                _t1783 = _dollar_dollar.assign
             else:
-                _t1697 = None
-            deconstruct_result1265 = _t1697
-            if deconstruct_result1265 is not None:
-                assert deconstruct_result1265 is not None
-                unwrapped1266 = deconstruct_result1265
-                self.pretty_assign(unwrapped1266)
+                _t1783 = None
+            deconstruct_result1308 = _t1783
+            if deconstruct_result1308 is not None:
+                assert deconstruct_result1308 is not None
+                unwrapped1309 = deconstruct_result1308
+                self.pretty_assign(unwrapped1309)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("upsert"):
-                    _t1698 = _dollar_dollar.upsert
+                    _t1784 = _dollar_dollar.upsert
                 else:
-                    _t1698 = None
-                deconstruct_result1263 = _t1698
-                if deconstruct_result1263 is not None:
-                    assert deconstruct_result1263 is not None
-                    unwrapped1264 = deconstruct_result1263
-                    self.pretty_upsert(unwrapped1264)
+                    _t1784 = None
+                deconstruct_result1306 = _t1784
+                if deconstruct_result1306 is not None:
+                    assert deconstruct_result1306 is not None
+                    unwrapped1307 = deconstruct_result1306
+                    self.pretty_upsert(unwrapped1307)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("break"):
-                        _t1699 = getattr(_dollar_dollar, 'break')
+                        _t1785 = getattr(_dollar_dollar, 'break')
                     else:
-                        _t1699 = None
-                    deconstruct_result1261 = _t1699
-                    if deconstruct_result1261 is not None:
-                        assert deconstruct_result1261 is not None
-                        unwrapped1262 = deconstruct_result1261
-                        self.pretty_break(unwrapped1262)
+                        _t1785 = None
+                    deconstruct_result1304 = _t1785
+                    if deconstruct_result1304 is not None:
+                        assert deconstruct_result1304 is not None
+                        unwrapped1305 = deconstruct_result1304
+                        self.pretty_break(unwrapped1305)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("monoid_def"):
-                            _t1700 = _dollar_dollar.monoid_def
+                            _t1786 = _dollar_dollar.monoid_def
                         else:
-                            _t1700 = None
-                        deconstruct_result1259 = _t1700
-                        if deconstruct_result1259 is not None:
-                            assert deconstruct_result1259 is not None
-                            unwrapped1260 = deconstruct_result1259
-                            self.pretty_monoid_def(unwrapped1260)
+                            _t1786 = None
+                        deconstruct_result1302 = _t1786
+                        if deconstruct_result1302 is not None:
+                            assert deconstruct_result1302 is not None
+                            unwrapped1303 = deconstruct_result1302
+                            self.pretty_monoid_def(unwrapped1303)
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("monus_def"):
-                                _t1701 = _dollar_dollar.monus_def
+                                _t1787 = _dollar_dollar.monus_def
                             else:
-                                _t1701 = None
-                            deconstruct_result1257 = _t1701
-                            if deconstruct_result1257 is not None:
-                                assert deconstruct_result1257 is not None
-                                unwrapped1258 = deconstruct_result1257
-                                self.pretty_monus_def(unwrapped1258)
+                                _t1787 = None
+                            deconstruct_result1300 = _t1787
+                            if deconstruct_result1300 is not None:
+                                assert deconstruct_result1300 is not None
+                                unwrapped1301 = deconstruct_result1300
+                                self.pretty_monus_def(unwrapped1301)
                             else:
                                 raise ParseError("No matching rule for instruction")
 
     def pretty_assign(self, msg: logic_pb2.Assign):
-        flat1274 = self._try_flat(msg, self.pretty_assign)
-        if flat1274 is not None:
-            assert flat1274 is not None
-            self.write(flat1274)
+        flat1317 = self._try_flat(msg, self.pretty_assign)
+        if flat1317 is not None:
+            assert flat1317 is not None
+            self.write(flat1317)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1702 = _dollar_dollar.attrs
+                _t1788 = _dollar_dollar.attrs
             else:
-                _t1702 = None
-            fields1268 = (_dollar_dollar.name, _dollar_dollar.body, _t1702,)
-            assert fields1268 is not None
-            unwrapped_fields1269 = fields1268
+                _t1788 = None
+            fields1311 = (_dollar_dollar.name, _dollar_dollar.body, _t1788,)
+            assert fields1311 is not None
+            unwrapped_fields1312 = fields1311
             self.write("(assign")
             self.indent_sexp()
             self.newline()
-            field1270 = unwrapped_fields1269[0]
-            self.pretty_relation_id(field1270)
+            field1313 = unwrapped_fields1312[0]
+            self.pretty_relation_id(field1313)
             self.newline()
-            field1271 = unwrapped_fields1269[1]
-            self.pretty_abstraction(field1271)
-            field1272 = unwrapped_fields1269[2]
-            if field1272 is not None:
+            field1314 = unwrapped_fields1312[1]
+            self.pretty_abstraction(field1314)
+            field1315 = unwrapped_fields1312[2]
+            if field1315 is not None:
                 self.newline()
-                assert field1272 is not None
-                opt_val1273 = field1272
-                self.pretty_attrs(opt_val1273)
+                assert field1315 is not None
+                opt_val1316 = field1315
+                self.pretty_attrs(opt_val1316)
             self.dedent()
             self.write(")")
 
     def pretty_upsert(self, msg: logic_pb2.Upsert):
-        flat1281 = self._try_flat(msg, self.pretty_upsert)
-        if flat1281 is not None:
-            assert flat1281 is not None
-            self.write(flat1281)
+        flat1324 = self._try_flat(msg, self.pretty_upsert)
+        if flat1324 is not None:
+            assert flat1324 is not None
+            self.write(flat1324)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1703 = _dollar_dollar.attrs
+                _t1789 = _dollar_dollar.attrs
             else:
-                _t1703 = None
-            fields1275 = (_dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1703,)
-            assert fields1275 is not None
-            unwrapped_fields1276 = fields1275
+                _t1789 = None
+            fields1318 = (_dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1789,)
+            assert fields1318 is not None
+            unwrapped_fields1319 = fields1318
             self.write("(upsert")
             self.indent_sexp()
             self.newline()
-            field1277 = unwrapped_fields1276[0]
-            self.pretty_relation_id(field1277)
+            field1320 = unwrapped_fields1319[0]
+            self.pretty_relation_id(field1320)
             self.newline()
-            field1278 = unwrapped_fields1276[1]
-            self.pretty_abstraction_with_arity(field1278)
-            field1279 = unwrapped_fields1276[2]
-            if field1279 is not None:
+            field1321 = unwrapped_fields1319[1]
+            self.pretty_abstraction_with_arity(field1321)
+            field1322 = unwrapped_fields1319[2]
+            if field1322 is not None:
                 self.newline()
-                assert field1279 is not None
-                opt_val1280 = field1279
-                self.pretty_attrs(opt_val1280)
+                assert field1322 is not None
+                opt_val1323 = field1322
+                self.pretty_attrs(opt_val1323)
             self.dedent()
             self.write(")")
 
     def pretty_abstraction_with_arity(self, msg: tuple[logic_pb2.Abstraction, int]):
-        flat1286 = self._try_flat(msg, self.pretty_abstraction_with_arity)
-        if flat1286 is not None:
-            assert flat1286 is not None
-            self.write(flat1286)
+        flat1329 = self._try_flat(msg, self.pretty_abstraction_with_arity)
+        if flat1329 is not None:
+            assert flat1329 is not None
+            self.write(flat1329)
             return None
         else:
             _dollar_dollar = msg
-            _t1704 = self.deconstruct_bindings_with_arity(_dollar_dollar[0], _dollar_dollar[1])
-            fields1282 = (_t1704, _dollar_dollar[0].value,)
-            assert fields1282 is not None
-            unwrapped_fields1283 = fields1282
+            _t1790 = self.deconstruct_bindings_with_arity(_dollar_dollar[0], _dollar_dollar[1])
+            fields1325 = (_t1790, _dollar_dollar[0].value,)
+            assert fields1325 is not None
+            unwrapped_fields1326 = fields1325
             self.write("(")
             self.indent()
-            field1284 = unwrapped_fields1283[0]
-            self.pretty_bindings(field1284)
+            field1327 = unwrapped_fields1326[0]
+            self.pretty_bindings(field1327)
             self.newline()
-            field1285 = unwrapped_fields1283[1]
-            self.pretty_formula(field1285)
+            field1328 = unwrapped_fields1326[1]
+            self.pretty_formula(field1328)
             self.dedent()
             self.write(")")
 
     def pretty_break(self, msg: logic_pb2.Break):
-        flat1293 = self._try_flat(msg, self.pretty_break)
-        if flat1293 is not None:
-            assert flat1293 is not None
-            self.write(flat1293)
+        flat1336 = self._try_flat(msg, self.pretty_break)
+        if flat1336 is not None:
+            assert flat1336 is not None
+            self.write(flat1336)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1705 = _dollar_dollar.attrs
+                _t1791 = _dollar_dollar.attrs
             else:
-                _t1705 = None
-            fields1287 = (_dollar_dollar.name, _dollar_dollar.body, _t1705,)
-            assert fields1287 is not None
-            unwrapped_fields1288 = fields1287
+                _t1791 = None
+            fields1330 = (_dollar_dollar.name, _dollar_dollar.body, _t1791,)
+            assert fields1330 is not None
+            unwrapped_fields1331 = fields1330
             self.write("(break")
             self.indent_sexp()
             self.newline()
-            field1289 = unwrapped_fields1288[0]
-            self.pretty_relation_id(field1289)
+            field1332 = unwrapped_fields1331[0]
+            self.pretty_relation_id(field1332)
             self.newline()
-            field1290 = unwrapped_fields1288[1]
-            self.pretty_abstraction(field1290)
-            field1291 = unwrapped_fields1288[2]
-            if field1291 is not None:
+            field1333 = unwrapped_fields1331[1]
+            self.pretty_abstraction(field1333)
+            field1334 = unwrapped_fields1331[2]
+            if field1334 is not None:
                 self.newline()
-                assert field1291 is not None
-                opt_val1292 = field1291
-                self.pretty_attrs(opt_val1292)
+                assert field1334 is not None
+                opt_val1335 = field1334
+                self.pretty_attrs(opt_val1335)
             self.dedent()
             self.write(")")
 
     def pretty_monoid_def(self, msg: logic_pb2.MonoidDef):
-        flat1301 = self._try_flat(msg, self.pretty_monoid_def)
-        if flat1301 is not None:
-            assert flat1301 is not None
-            self.write(flat1301)
+        flat1344 = self._try_flat(msg, self.pretty_monoid_def)
+        if flat1344 is not None:
+            assert flat1344 is not None
+            self.write(flat1344)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1706 = _dollar_dollar.attrs
+                _t1792 = _dollar_dollar.attrs
             else:
-                _t1706 = None
-            fields1294 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1706,)
-            assert fields1294 is not None
-            unwrapped_fields1295 = fields1294
+                _t1792 = None
+            fields1337 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1792,)
+            assert fields1337 is not None
+            unwrapped_fields1338 = fields1337
             self.write("(monoid")
             self.indent_sexp()
             self.newline()
-            field1296 = unwrapped_fields1295[0]
-            self.pretty_monoid(field1296)
+            field1339 = unwrapped_fields1338[0]
+            self.pretty_monoid(field1339)
             self.newline()
-            field1297 = unwrapped_fields1295[1]
-            self.pretty_relation_id(field1297)
+            field1340 = unwrapped_fields1338[1]
+            self.pretty_relation_id(field1340)
             self.newline()
-            field1298 = unwrapped_fields1295[2]
-            self.pretty_abstraction_with_arity(field1298)
-            field1299 = unwrapped_fields1295[3]
-            if field1299 is not None:
+            field1341 = unwrapped_fields1338[2]
+            self.pretty_abstraction_with_arity(field1341)
+            field1342 = unwrapped_fields1338[3]
+            if field1342 is not None:
                 self.newline()
-                assert field1299 is not None
-                opt_val1300 = field1299
-                self.pretty_attrs(opt_val1300)
+                assert field1342 is not None
+                opt_val1343 = field1342
+                self.pretty_attrs(opt_val1343)
             self.dedent()
             self.write(")")
 
     def pretty_monoid(self, msg: logic_pb2.Monoid):
-        flat1310 = self._try_flat(msg, self.pretty_monoid)
-        if flat1310 is not None:
-            assert flat1310 is not None
-            self.write(flat1310)
+        flat1353 = self._try_flat(msg, self.pretty_monoid)
+        if flat1353 is not None:
+            assert flat1353 is not None
+            self.write(flat1353)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("or_monoid"):
-                _t1707 = _dollar_dollar.or_monoid
+                _t1793 = _dollar_dollar.or_monoid
             else:
-                _t1707 = None
-            deconstruct_result1308 = _t1707
-            if deconstruct_result1308 is not None:
-                assert deconstruct_result1308 is not None
-                unwrapped1309 = deconstruct_result1308
-                self.pretty_or_monoid(unwrapped1309)
+                _t1793 = None
+            deconstruct_result1351 = _t1793
+            if deconstruct_result1351 is not None:
+                assert deconstruct_result1351 is not None
+                unwrapped1352 = deconstruct_result1351
+                self.pretty_or_monoid(unwrapped1352)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("min_monoid"):
-                    _t1708 = _dollar_dollar.min_monoid
+                    _t1794 = _dollar_dollar.min_monoid
                 else:
-                    _t1708 = None
-                deconstruct_result1306 = _t1708
-                if deconstruct_result1306 is not None:
-                    assert deconstruct_result1306 is not None
-                    unwrapped1307 = deconstruct_result1306
-                    self.pretty_min_monoid(unwrapped1307)
+                    _t1794 = None
+                deconstruct_result1349 = _t1794
+                if deconstruct_result1349 is not None:
+                    assert deconstruct_result1349 is not None
+                    unwrapped1350 = deconstruct_result1349
+                    self.pretty_min_monoid(unwrapped1350)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("max_monoid"):
-                        _t1709 = _dollar_dollar.max_monoid
+                        _t1795 = _dollar_dollar.max_monoid
                     else:
-                        _t1709 = None
-                    deconstruct_result1304 = _t1709
-                    if deconstruct_result1304 is not None:
-                        assert deconstruct_result1304 is not None
-                        unwrapped1305 = deconstruct_result1304
-                        self.pretty_max_monoid(unwrapped1305)
+                        _t1795 = None
+                    deconstruct_result1347 = _t1795
+                    if deconstruct_result1347 is not None:
+                        assert deconstruct_result1347 is not None
+                        unwrapped1348 = deconstruct_result1347
+                        self.pretty_max_monoid(unwrapped1348)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("sum_monoid"):
-                            _t1710 = _dollar_dollar.sum_monoid
+                            _t1796 = _dollar_dollar.sum_monoid
                         else:
-                            _t1710 = None
-                        deconstruct_result1302 = _t1710
-                        if deconstruct_result1302 is not None:
-                            assert deconstruct_result1302 is not None
-                            unwrapped1303 = deconstruct_result1302
-                            self.pretty_sum_monoid(unwrapped1303)
+                            _t1796 = None
+                        deconstruct_result1345 = _t1796
+                        if deconstruct_result1345 is not None:
+                            assert deconstruct_result1345 is not None
+                            unwrapped1346 = deconstruct_result1345
+                            self.pretty_sum_monoid(unwrapped1346)
                         else:
                             raise ParseError("No matching rule for monoid")
 
     def pretty_or_monoid(self, msg: logic_pb2.OrMonoid):
-        fields1311 = msg
+        fields1354 = msg
         self.write("(or)")
 
     def pretty_min_monoid(self, msg: logic_pb2.MinMonoid):
-        flat1314 = self._try_flat(msg, self.pretty_min_monoid)
-        if flat1314 is not None:
-            assert flat1314 is not None
-            self.write(flat1314)
+        flat1357 = self._try_flat(msg, self.pretty_min_monoid)
+        if flat1357 is not None:
+            assert flat1357 is not None
+            self.write(flat1357)
             return None
         else:
             _dollar_dollar = msg
-            fields1312 = _dollar_dollar.type
-            assert fields1312 is not None
-            unwrapped_fields1313 = fields1312
+            fields1355 = _dollar_dollar.type
+            assert fields1355 is not None
+            unwrapped_fields1356 = fields1355
             self.write("(min")
             self.indent_sexp()
             self.newline()
-            self.pretty_type(unwrapped_fields1313)
+            self.pretty_type(unwrapped_fields1356)
             self.dedent()
             self.write(")")
 
     def pretty_max_monoid(self, msg: logic_pb2.MaxMonoid):
-        flat1317 = self._try_flat(msg, self.pretty_max_monoid)
-        if flat1317 is not None:
-            assert flat1317 is not None
-            self.write(flat1317)
+        flat1360 = self._try_flat(msg, self.pretty_max_monoid)
+        if flat1360 is not None:
+            assert flat1360 is not None
+            self.write(flat1360)
             return None
         else:
             _dollar_dollar = msg
-            fields1315 = _dollar_dollar.type
-            assert fields1315 is not None
-            unwrapped_fields1316 = fields1315
+            fields1358 = _dollar_dollar.type
+            assert fields1358 is not None
+            unwrapped_fields1359 = fields1358
             self.write("(max")
             self.indent_sexp()
             self.newline()
-            self.pretty_type(unwrapped_fields1316)
+            self.pretty_type(unwrapped_fields1359)
             self.dedent()
             self.write(")")
 
     def pretty_sum_monoid(self, msg: logic_pb2.SumMonoid):
-        flat1320 = self._try_flat(msg, self.pretty_sum_monoid)
-        if flat1320 is not None:
-            assert flat1320 is not None
-            self.write(flat1320)
+        flat1363 = self._try_flat(msg, self.pretty_sum_monoid)
+        if flat1363 is not None:
+            assert flat1363 is not None
+            self.write(flat1363)
             return None
         else:
             _dollar_dollar = msg
-            fields1318 = _dollar_dollar.type
-            assert fields1318 is not None
-            unwrapped_fields1319 = fields1318
+            fields1361 = _dollar_dollar.type
+            assert fields1361 is not None
+            unwrapped_fields1362 = fields1361
             self.write("(sum")
             self.indent_sexp()
             self.newline()
-            self.pretty_type(unwrapped_fields1319)
+            self.pretty_type(unwrapped_fields1362)
             self.dedent()
             self.write(")")
 
     def pretty_monus_def(self, msg: logic_pb2.MonusDef):
-        flat1328 = self._try_flat(msg, self.pretty_monus_def)
-        if flat1328 is not None:
-            assert flat1328 is not None
-            self.write(flat1328)
+        flat1371 = self._try_flat(msg, self.pretty_monus_def)
+        if flat1371 is not None:
+            assert flat1371 is not None
+            self.write(flat1371)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1711 = _dollar_dollar.attrs
+                _t1797 = _dollar_dollar.attrs
             else:
-                _t1711 = None
-            fields1321 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1711,)
-            assert fields1321 is not None
-            unwrapped_fields1322 = fields1321
+                _t1797 = None
+            fields1364 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1797,)
+            assert fields1364 is not None
+            unwrapped_fields1365 = fields1364
             self.write("(monus")
             self.indent_sexp()
             self.newline()
-            field1323 = unwrapped_fields1322[0]
-            self.pretty_monoid(field1323)
+            field1366 = unwrapped_fields1365[0]
+            self.pretty_monoid(field1366)
             self.newline()
-            field1324 = unwrapped_fields1322[1]
-            self.pretty_relation_id(field1324)
+            field1367 = unwrapped_fields1365[1]
+            self.pretty_relation_id(field1367)
             self.newline()
-            field1325 = unwrapped_fields1322[2]
-            self.pretty_abstraction_with_arity(field1325)
-            field1326 = unwrapped_fields1322[3]
-            if field1326 is not None:
+            field1368 = unwrapped_fields1365[2]
+            self.pretty_abstraction_with_arity(field1368)
+            field1369 = unwrapped_fields1365[3]
+            if field1369 is not None:
                 self.newline()
-                assert field1326 is not None
-                opt_val1327 = field1326
-                self.pretty_attrs(opt_val1327)
+                assert field1369 is not None
+                opt_val1370 = field1369
+                self.pretty_attrs(opt_val1370)
             self.dedent()
             self.write(")")
 
     def pretty_constraint(self, msg: logic_pb2.Constraint):
-        flat1335 = self._try_flat(msg, self.pretty_constraint)
-        if flat1335 is not None:
-            assert flat1335 is not None
-            self.write(flat1335)
+        flat1378 = self._try_flat(msg, self.pretty_constraint)
+        if flat1378 is not None:
+            assert flat1378 is not None
+            self.write(flat1378)
             return None
         else:
             _dollar_dollar = msg
-            fields1329 = (_dollar_dollar.name, _dollar_dollar.functional_dependency.guard, _dollar_dollar.functional_dependency.keys, _dollar_dollar.functional_dependency.values,)
-            assert fields1329 is not None
-            unwrapped_fields1330 = fields1329
+            fields1372 = (_dollar_dollar.name, _dollar_dollar.functional_dependency.guard, _dollar_dollar.functional_dependency.keys, _dollar_dollar.functional_dependency.values,)
+            assert fields1372 is not None
+            unwrapped_fields1373 = fields1372
             self.write("(functional_dependency")
             self.indent_sexp()
             self.newline()
-            field1331 = unwrapped_fields1330[0]
-            self.pretty_relation_id(field1331)
+            field1374 = unwrapped_fields1373[0]
+            self.pretty_relation_id(field1374)
             self.newline()
-            field1332 = unwrapped_fields1330[1]
-            self.pretty_abstraction(field1332)
+            field1375 = unwrapped_fields1373[1]
+            self.pretty_abstraction(field1375)
             self.newline()
-            field1333 = unwrapped_fields1330[2]
-            self.pretty_functional_dependency_keys(field1333)
+            field1376 = unwrapped_fields1373[2]
+            self.pretty_functional_dependency_keys(field1376)
             self.newline()
-            field1334 = unwrapped_fields1330[3]
-            self.pretty_functional_dependency_values(field1334)
+            field1377 = unwrapped_fields1373[3]
+            self.pretty_functional_dependency_values(field1377)
             self.dedent()
             self.write(")")
 
     def pretty_functional_dependency_keys(self, msg: Sequence[logic_pb2.Var]):
-        flat1339 = self._try_flat(msg, self.pretty_functional_dependency_keys)
-        if flat1339 is not None:
-            assert flat1339 is not None
-            self.write(flat1339)
+        flat1382 = self._try_flat(msg, self.pretty_functional_dependency_keys)
+        if flat1382 is not None:
+            assert flat1382 is not None
+            self.write(flat1382)
             return None
         else:
-            fields1336 = msg
+            fields1379 = msg
             self.write("(keys")
             self.indent_sexp()
-            if not len(fields1336) == 0:
+            if not len(fields1379) == 0:
                 self.newline()
-                for i1338, elem1337 in enumerate(fields1336):
-                    if (i1338 > 0):
+                for i1381, elem1380 in enumerate(fields1379):
+                    if (i1381 > 0):
                         self.newline()
-                    self.pretty_var(elem1337)
+                    self.pretty_var(elem1380)
             self.dedent()
             self.write(")")
 
     def pretty_functional_dependency_values(self, msg: Sequence[logic_pb2.Var]):
-        flat1343 = self._try_flat(msg, self.pretty_functional_dependency_values)
-        if flat1343 is not None:
-            assert flat1343 is not None
-            self.write(flat1343)
+        flat1386 = self._try_flat(msg, self.pretty_functional_dependency_values)
+        if flat1386 is not None:
+            assert flat1386 is not None
+            self.write(flat1386)
             return None
         else:
-            fields1340 = msg
+            fields1383 = msg
             self.write("(values")
             self.indent_sexp()
-            if not len(fields1340) == 0:
+            if not len(fields1383) == 0:
                 self.newline()
-                for i1342, elem1341 in enumerate(fields1340):
-                    if (i1342 > 0):
+                for i1385, elem1384 in enumerate(fields1383):
+                    if (i1385 > 0):
                         self.newline()
-                    self.pretty_var(elem1341)
+                    self.pretty_var(elem1384)
             self.dedent()
             self.write(")")
 
     def pretty_data(self, msg: logic_pb2.Data):
-        flat1352 = self._try_flat(msg, self.pretty_data)
-        if flat1352 is not None:
-            assert flat1352 is not None
-            self.write(flat1352)
+        flat1395 = self._try_flat(msg, self.pretty_data)
+        if flat1395 is not None:
+            assert flat1395 is not None
+            self.write(flat1395)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("edb"):
-                _t1712 = _dollar_dollar.edb
+                _t1798 = _dollar_dollar.edb
             else:
-                _t1712 = None
-            deconstruct_result1350 = _t1712
-            if deconstruct_result1350 is not None:
-                assert deconstruct_result1350 is not None
-                unwrapped1351 = deconstruct_result1350
-                self.pretty_edb(unwrapped1351)
+                _t1798 = None
+            deconstruct_result1393 = _t1798
+            if deconstruct_result1393 is not None:
+                assert deconstruct_result1393 is not None
+                unwrapped1394 = deconstruct_result1393
+                self.pretty_edb(unwrapped1394)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("betree_relation"):
-                    _t1713 = _dollar_dollar.betree_relation
+                    _t1799 = _dollar_dollar.betree_relation
                 else:
-                    _t1713 = None
-                deconstruct_result1348 = _t1713
-                if deconstruct_result1348 is not None:
-                    assert deconstruct_result1348 is not None
-                    unwrapped1349 = deconstruct_result1348
-                    self.pretty_betree_relation(unwrapped1349)
+                    _t1799 = None
+                deconstruct_result1391 = _t1799
+                if deconstruct_result1391 is not None:
+                    assert deconstruct_result1391 is not None
+                    unwrapped1392 = deconstruct_result1391
+                    self.pretty_betree_relation(unwrapped1392)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("csv_data"):
-                        _t1714 = _dollar_dollar.csv_data
+                        _t1800 = _dollar_dollar.csv_data
                     else:
-                        _t1714 = None
-                    deconstruct_result1346 = _t1714
-                    if deconstruct_result1346 is not None:
-                        assert deconstruct_result1346 is not None
-                        unwrapped1347 = deconstruct_result1346
-                        self.pretty_csv_data(unwrapped1347)
+                        _t1800 = None
+                    deconstruct_result1389 = _t1800
+                    if deconstruct_result1389 is not None:
+                        assert deconstruct_result1389 is not None
+                        unwrapped1390 = deconstruct_result1389
+                        self.pretty_csv_data(unwrapped1390)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("iceberg_data"):
-                            _t1715 = _dollar_dollar.iceberg_data
+                            _t1801 = _dollar_dollar.iceberg_data
                         else:
-                            _t1715 = None
-                        deconstruct_result1344 = _t1715
-                        if deconstruct_result1344 is not None:
-                            assert deconstruct_result1344 is not None
-                            unwrapped1345 = deconstruct_result1344
-                            self.pretty_iceberg_data(unwrapped1345)
+                            _t1801 = None
+                        deconstruct_result1387 = _t1801
+                        if deconstruct_result1387 is not None:
+                            assert deconstruct_result1387 is not None
+                            unwrapped1388 = deconstruct_result1387
+                            self.pretty_iceberg_data(unwrapped1388)
                         else:
                             raise ParseError("No matching rule for data")
 
     def pretty_edb(self, msg: logic_pb2.EDB):
-        flat1358 = self._try_flat(msg, self.pretty_edb)
-        if flat1358 is not None:
-            assert flat1358 is not None
-            self.write(flat1358)
+        flat1401 = self._try_flat(msg, self.pretty_edb)
+        if flat1401 is not None:
+            assert flat1401 is not None
+            self.write(flat1401)
             return None
         else:
             _dollar_dollar = msg
-            fields1353 = (_dollar_dollar.target_id, _dollar_dollar.path, _dollar_dollar.types,)
-            assert fields1353 is not None
-            unwrapped_fields1354 = fields1353
+            fields1396 = (_dollar_dollar.target_id, _dollar_dollar.path, _dollar_dollar.types,)
+            assert fields1396 is not None
+            unwrapped_fields1397 = fields1396
             self.write("(edb")
             self.indent_sexp()
             self.newline()
-            field1355 = unwrapped_fields1354[0]
-            self.pretty_relation_id(field1355)
+            field1398 = unwrapped_fields1397[0]
+            self.pretty_relation_id(field1398)
             self.newline()
-            field1356 = unwrapped_fields1354[1]
-            self.pretty_edb_path(field1356)
+            field1399 = unwrapped_fields1397[1]
+            self.pretty_edb_path(field1399)
             self.newline()
-            field1357 = unwrapped_fields1354[2]
-            self.pretty_edb_types(field1357)
+            field1400 = unwrapped_fields1397[2]
+            self.pretty_edb_types(field1400)
             self.dedent()
             self.write(")")
 
     def pretty_edb_path(self, msg: Sequence[str]):
-        flat1362 = self._try_flat(msg, self.pretty_edb_path)
-        if flat1362 is not None:
-            assert flat1362 is not None
-            self.write(flat1362)
+        flat1405 = self._try_flat(msg, self.pretty_edb_path)
+        if flat1405 is not None:
+            assert flat1405 is not None
+            self.write(flat1405)
             return None
         else:
-            fields1359 = msg
+            fields1402 = msg
             self.write("[")
             self.indent()
-            for i1361, elem1360 in enumerate(fields1359):
-                if (i1361 > 0):
+            for i1404, elem1403 in enumerate(fields1402):
+                if (i1404 > 0):
                     self.newline()
-                self.write(self.format_string_value(elem1360))
+                self.write(self.format_string_value(elem1403))
             self.dedent()
             self.write("]")
 
     def pretty_edb_types(self, msg: Sequence[logic_pb2.Type]):
-        flat1366 = self._try_flat(msg, self.pretty_edb_types)
-        if flat1366 is not None:
-            assert flat1366 is not None
-            self.write(flat1366)
+        flat1409 = self._try_flat(msg, self.pretty_edb_types)
+        if flat1409 is not None:
+            assert flat1409 is not None
+            self.write(flat1409)
             return None
         else:
-            fields1363 = msg
+            fields1406 = msg
             self.write("[")
             self.indent()
-            for i1365, elem1364 in enumerate(fields1363):
-                if (i1365 > 0):
+            for i1408, elem1407 in enumerate(fields1406):
+                if (i1408 > 0):
                     self.newline()
-                self.pretty_type(elem1364)
+                self.pretty_type(elem1407)
             self.dedent()
             self.write("]")
 
     def pretty_betree_relation(self, msg: logic_pb2.BeTreeRelation):
-        flat1371 = self._try_flat(msg, self.pretty_betree_relation)
-        if flat1371 is not None:
-            assert flat1371 is not None
-            self.write(flat1371)
+        flat1414 = self._try_flat(msg, self.pretty_betree_relation)
+        if flat1414 is not None:
+            assert flat1414 is not None
+            self.write(flat1414)
             return None
         else:
             _dollar_dollar = msg
-            fields1367 = (_dollar_dollar.name, _dollar_dollar.relation_info,)
-            assert fields1367 is not None
-            unwrapped_fields1368 = fields1367
+            fields1410 = (_dollar_dollar.name, _dollar_dollar.relation_info,)
+            assert fields1410 is not None
+            unwrapped_fields1411 = fields1410
             self.write("(betree_relation")
             self.indent_sexp()
             self.newline()
-            field1369 = unwrapped_fields1368[0]
-            self.pretty_relation_id(field1369)
+            field1412 = unwrapped_fields1411[0]
+            self.pretty_relation_id(field1412)
             self.newline()
-            field1370 = unwrapped_fields1368[1]
-            self.pretty_betree_info(field1370)
+            field1413 = unwrapped_fields1411[1]
+            self.pretty_betree_info(field1413)
             self.dedent()
             self.write(")")
 
     def pretty_betree_info(self, msg: logic_pb2.BeTreeInfo):
-        flat1377 = self._try_flat(msg, self.pretty_betree_info)
-        if flat1377 is not None:
-            assert flat1377 is not None
-            self.write(flat1377)
+        flat1420 = self._try_flat(msg, self.pretty_betree_info)
+        if flat1420 is not None:
+            assert flat1420 is not None
+            self.write(flat1420)
             return None
         else:
             _dollar_dollar = msg
-            _t1716 = self.deconstruct_betree_info_config(_dollar_dollar)
-            fields1372 = (_dollar_dollar.key_types, _dollar_dollar.value_types, _t1716,)
-            assert fields1372 is not None
-            unwrapped_fields1373 = fields1372
+            _t1802 = self.deconstruct_betree_info_config(_dollar_dollar)
+            fields1415 = (_dollar_dollar.key_types, _dollar_dollar.value_types, _t1802,)
+            assert fields1415 is not None
+            unwrapped_fields1416 = fields1415
             self.write("(betree_info")
             self.indent_sexp()
             self.newline()
-            field1374 = unwrapped_fields1373[0]
-            self.pretty_betree_info_key_types(field1374)
+            field1417 = unwrapped_fields1416[0]
+            self.pretty_betree_info_key_types(field1417)
             self.newline()
-            field1375 = unwrapped_fields1373[1]
-            self.pretty_betree_info_value_types(field1375)
+            field1418 = unwrapped_fields1416[1]
+            self.pretty_betree_info_value_types(field1418)
             self.newline()
-            field1376 = unwrapped_fields1373[2]
-            self.pretty_config_dict(field1376)
+            field1419 = unwrapped_fields1416[2]
+            self.pretty_config_dict(field1419)
             self.dedent()
             self.write(")")
 
     def pretty_betree_info_key_types(self, msg: Sequence[logic_pb2.Type]):
-        flat1381 = self._try_flat(msg, self.pretty_betree_info_key_types)
-        if flat1381 is not None:
-            assert flat1381 is not None
-            self.write(flat1381)
+        flat1424 = self._try_flat(msg, self.pretty_betree_info_key_types)
+        if flat1424 is not None:
+            assert flat1424 is not None
+            self.write(flat1424)
             return None
         else:
-            fields1378 = msg
+            fields1421 = msg
             self.write("(key_types")
             self.indent_sexp()
-            if not len(fields1378) == 0:
+            if not len(fields1421) == 0:
                 self.newline()
-                for i1380, elem1379 in enumerate(fields1378):
-                    if (i1380 > 0):
+                for i1423, elem1422 in enumerate(fields1421):
+                    if (i1423 > 0):
                         self.newline()
-                    self.pretty_type(elem1379)
+                    self.pretty_type(elem1422)
             self.dedent()
             self.write(")")
 
     def pretty_betree_info_value_types(self, msg: Sequence[logic_pb2.Type]):
-        flat1385 = self._try_flat(msg, self.pretty_betree_info_value_types)
-        if flat1385 is not None:
-            assert flat1385 is not None
-            self.write(flat1385)
+        flat1428 = self._try_flat(msg, self.pretty_betree_info_value_types)
+        if flat1428 is not None:
+            assert flat1428 is not None
+            self.write(flat1428)
             return None
         else:
-            fields1382 = msg
+            fields1425 = msg
             self.write("(value_types")
             self.indent_sexp()
-            if not len(fields1382) == 0:
+            if not len(fields1425) == 0:
                 self.newline()
-                for i1384, elem1383 in enumerate(fields1382):
-                    if (i1384 > 0):
+                for i1427, elem1426 in enumerate(fields1425):
+                    if (i1427 > 0):
                         self.newline()
-                    self.pretty_type(elem1383)
+                    self.pretty_type(elem1426)
             self.dedent()
             self.write(")")
 
     def pretty_csv_data(self, msg: logic_pb2.CSVData):
-        flat1392 = self._try_flat(msg, self.pretty_csv_data)
-        if flat1392 is not None:
-            assert flat1392 is not None
-            self.write(flat1392)
+        flat1438 = self._try_flat(msg, self.pretty_csv_data)
+        if flat1438 is not None:
+            assert flat1438 is not None
+            self.write(flat1438)
             return None
         else:
             _dollar_dollar = msg
-            fields1386 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _dollar_dollar.asof,)
-            assert fields1386 is not None
-            unwrapped_fields1387 = fields1386
+            _t1803 = self.deconstruct_csv_data_columns_optional(_dollar_dollar)
+            _t1804 = self.deconstruct_csv_data_relations_optional(_dollar_dollar)
+            fields1429 = (_dollar_dollar.locator, _dollar_dollar.config, _t1803, _t1804, _dollar_dollar.asof,)
+            assert fields1429 is not None
+            unwrapped_fields1430 = fields1429
             self.write("(csv_data")
             self.indent_sexp()
             self.newline()
-            field1388 = unwrapped_fields1387[0]
-            self.pretty_csvlocator(field1388)
-            self.newline()
-            field1389 = unwrapped_fields1387[1]
-            self.pretty_csv_config(field1389)
+            field1431 = unwrapped_fields1430[0]
+            self.pretty_csvlocator(field1431)
             self.newline()
-            field1390 = unwrapped_fields1387[2]
-            self.pretty_gnf_columns(field1390)
+            field1432 = unwrapped_fields1430[1]
+            self.pretty_csv_config(field1432)
+            field1433 = unwrapped_fields1430[2]
+            if field1433 is not None:
+                self.newline()
+                assert field1433 is not None
+                opt_val1434 = field1433
+                self.pretty_gnf_columns(opt_val1434)
+            field1435 = unwrapped_fields1430[3]
+            if field1435 is not None:
+                self.newline()
+                assert field1435 is not None
+                opt_val1436 = field1435
+                self.pretty_target_relations(opt_val1436)
             self.newline()
-            field1391 = unwrapped_fields1387[3]
-            self.pretty_csv_asof(field1391)
+            field1437 = unwrapped_fields1430[4]
+            self.pretty_csv_asof(field1437)
             self.dedent()
             self.write(")")
 
     def pretty_csvlocator(self, msg: logic_pb2.CSVLocator):
-        flat1399 = self._try_flat(msg, self.pretty_csvlocator)
-        if flat1399 is not None:
-            assert flat1399 is not None
-            self.write(flat1399)
+        flat1445 = self._try_flat(msg, self.pretty_csvlocator)
+        if flat1445 is not None:
+            assert flat1445 is not None
+            self.write(flat1445)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.paths) == 0:
-                _t1717 = _dollar_dollar.paths
+                _t1805 = _dollar_dollar.paths
             else:
-                _t1717 = None
+                _t1805 = None
             if _dollar_dollar.inline_data.decode('utf-8') != "":
-                _t1718 = _dollar_dollar.inline_data.decode('utf-8')
+                _t1806 = _dollar_dollar.inline_data.decode('utf-8')
             else:
-                _t1718 = None
-            fields1393 = (_t1717, _t1718,)
-            assert fields1393 is not None
-            unwrapped_fields1394 = fields1393
+                _t1806 = None
+            fields1439 = (_t1805, _t1806,)
+            assert fields1439 is not None
+            unwrapped_fields1440 = fields1439
             self.write("(csv_locator")
             self.indent_sexp()
-            field1395 = unwrapped_fields1394[0]
-            if field1395 is not None:
+            field1441 = unwrapped_fields1440[0]
+            if field1441 is not None:
                 self.newline()
-                assert field1395 is not None
-                opt_val1396 = field1395
-                self.pretty_csv_locator_paths(opt_val1396)
-            field1397 = unwrapped_fields1394[1]
-            if field1397 is not None:
+                assert field1441 is not None
+                opt_val1442 = field1441
+                self.pretty_csv_locator_paths(opt_val1442)
+            field1443 = unwrapped_fields1440[1]
+            if field1443 is not None:
                 self.newline()
-                assert field1397 is not None
-                opt_val1398 = field1397
-                self.pretty_csv_locator_inline_data(opt_val1398)
+                assert field1443 is not None
+                opt_val1444 = field1443
+                self.pretty_csv_locator_inline_data(opt_val1444)
             self.dedent()
             self.write(")")
 
     def pretty_csv_locator_paths(self, msg: Sequence[str]):
-        flat1403 = self._try_flat(msg, self.pretty_csv_locator_paths)
-        if flat1403 is not None:
-            assert flat1403 is not None
-            self.write(flat1403)
+        flat1449 = self._try_flat(msg, self.pretty_csv_locator_paths)
+        if flat1449 is not None:
+            assert flat1449 is not None
+            self.write(flat1449)
             return None
         else:
-            fields1400 = msg
+            fields1446 = msg
             self.write("(paths")
             self.indent_sexp()
-            if not len(fields1400) == 0:
+            if not len(fields1446) == 0:
                 self.newline()
-                for i1402, elem1401 in enumerate(fields1400):
-                    if (i1402 > 0):
+                for i1448, elem1447 in enumerate(fields1446):
+                    if (i1448 > 0):
                         self.newline()
-                    self.write(self.format_string_value(elem1401))
+                    self.write(self.format_string_value(elem1447))
             self.dedent()
             self.write(")")
 
     def pretty_csv_locator_inline_data(self, msg: str):
-        flat1405 = self._try_flat(msg, self.pretty_csv_locator_inline_data)
-        if flat1405 is not None:
-            assert flat1405 is not None
-            self.write(flat1405)
+        flat1451 = self._try_flat(msg, self.pretty_csv_locator_inline_data)
+        if flat1451 is not None:
+            assert flat1451 is not None
+            self.write(flat1451)
             return None
         else:
-            fields1404 = msg
+            fields1450 = msg
             self.write("(inline_data")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1404))
+            self.write(self.format_string_value(fields1450))
             self.dedent()
             self.write(")")
 
     def pretty_csv_config(self, msg: logic_pb2.CSVConfig):
-        flat1411 = self._try_flat(msg, self.pretty_csv_config)
-        if flat1411 is not None:
-            assert flat1411 is not None
-            self.write(flat1411)
+        flat1457 = self._try_flat(msg, self.pretty_csv_config)
+        if flat1457 is not None:
+            assert flat1457 is not None
+            self.write(flat1457)
             return None
         else:
             _dollar_dollar = msg
-            _t1719 = self.deconstruct_csv_config(_dollar_dollar)
-            _t1720 = self.deconstruct_csv_storage_integration_optional(_dollar_dollar)
-            fields1406 = (_t1719, _t1720,)
-            assert fields1406 is not None
-            unwrapped_fields1407 = fields1406
+            _t1807 = self.deconstruct_csv_config(_dollar_dollar)
+            _t1808 = self.deconstruct_csv_storage_integration_optional(_dollar_dollar)
+            fields1452 = (_t1807, _t1808,)
+            assert fields1452 is not None
+            unwrapped_fields1453 = fields1452
             self.write("(csv_config")
             self.indent_sexp()
             self.newline()
-            field1408 = unwrapped_fields1407[0]
-            self.pretty_config_dict(field1408)
-            field1409 = unwrapped_fields1407[1]
-            if field1409 is not None:
+            field1454 = unwrapped_fields1453[0]
+            self.pretty_config_dict(field1454)
+            field1455 = unwrapped_fields1453[1]
+            if field1455 is not None:
                 self.newline()
-                assert field1409 is not None
-                opt_val1410 = field1409
-                self.pretty__storage_integration(opt_val1410)
+                assert field1455 is not None
+                opt_val1456 = field1455
+                self.pretty__storage_integration(opt_val1456)
             self.dedent()
             self.write(")")
 
     def pretty__storage_integration(self, msg: Sequence[tuple[str, logic_pb2.Value]]):
-        flat1413 = self._try_flat(msg, self.pretty__storage_integration)
-        if flat1413 is not None:
-            assert flat1413 is not None
-            self.write(flat1413)
+        flat1459 = self._try_flat(msg, self.pretty__storage_integration)
+        if flat1459 is not None:
+            assert flat1459 is not None
+            self.write(flat1459)
             return None
         else:
-            fields1412 = msg
+            fields1458 = msg
             self.write("(storage_integration")
             self.indent_sexp()
             self.newline()
-            self.pretty_config_dict(fields1412)
+            self.pretty_config_dict(fields1458)
             self.dedent()
             self.write(")")
 
     def pretty_gnf_columns(self, msg: Sequence[logic_pb2.GNFColumn]):
-        flat1417 = self._try_flat(msg, self.pretty_gnf_columns)
-        if flat1417 is not None:
-            assert flat1417 is not None
-            self.write(flat1417)
+        flat1463 = self._try_flat(msg, self.pretty_gnf_columns)
+        if flat1463 is not None:
+            assert flat1463 is not None
+            self.write(flat1463)
             return None
         else:
-            fields1414 = msg
+            fields1460 = msg
             self.write("(columns")
             self.indent_sexp()
-            if not len(fields1414) == 0:
+            if not len(fields1460) == 0:
                 self.newline()
-                for i1416, elem1415 in enumerate(fields1414):
-                    if (i1416 > 0):
+                for i1462, elem1461 in enumerate(fields1460):
+                    if (i1462 > 0):
                         self.newline()
-                    self.pretty_gnf_column(elem1415)
+                    self.pretty_gnf_column(elem1461)
             self.dedent()
             self.write(")")
 
     def pretty_gnf_column(self, msg: logic_pb2.GNFColumn):
-        flat1426 = self._try_flat(msg, self.pretty_gnf_column)
-        if flat1426 is not None:
-            assert flat1426 is not None
-            self.write(flat1426)
+        flat1472 = self._try_flat(msg, self.pretty_gnf_column)
+        if flat1472 is not None:
+            assert flat1472 is not None
+            self.write(flat1472)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("target_id"):
-                _t1721 = _dollar_dollar.target_id
+                _t1809 = _dollar_dollar.target_id
             else:
-                _t1721 = None
-            fields1418 = (_dollar_dollar.column_path, _t1721, _dollar_dollar.types,)
-            assert fields1418 is not None
-            unwrapped_fields1419 = fields1418
+                _t1809 = None
+            fields1464 = (_dollar_dollar.column_path, _t1809, _dollar_dollar.types,)
+            assert fields1464 is not None
+            unwrapped_fields1465 = fields1464
             self.write("(column")
             self.indent_sexp()
             self.newline()
-            field1420 = unwrapped_fields1419[0]
-            self.pretty_gnf_column_path(field1420)
-            field1421 = unwrapped_fields1419[1]
-            if field1421 is not None:
+            field1466 = unwrapped_fields1465[0]
+            self.pretty_gnf_column_path(field1466)
+            field1467 = unwrapped_fields1465[1]
+            if field1467 is not None:
                 self.newline()
-                assert field1421 is not None
-                opt_val1422 = field1421
-                self.pretty_relation_id(opt_val1422)
+                assert field1467 is not None
+                opt_val1468 = field1467
+                self.pretty_relation_id(opt_val1468)
             self.newline()
             self.write("[")
-            field1423 = unwrapped_fields1419[2]
-            for i1425, elem1424 in enumerate(field1423):
-                if (i1425 > 0):
+            field1469 = unwrapped_fields1465[2]
+            for i1471, elem1470 in enumerate(field1469):
+                if (i1471 > 0):
                     self.newline()
-                self.pretty_type(elem1424)
+                self.pretty_type(elem1470)
             self.write("]")
             self.dedent()
             self.write(")")
 
     def pretty_gnf_column_path(self, msg: Sequence[str]):
-        flat1433 = self._try_flat(msg, self.pretty_gnf_column_path)
-        if flat1433 is not None:
-            assert flat1433 is not None
-            self.write(flat1433)
+        flat1479 = self._try_flat(msg, self.pretty_gnf_column_path)
+        if flat1479 is not None:
+            assert flat1479 is not None
+            self.write(flat1479)
             return None
         else:
             _dollar_dollar = msg
             if len(_dollar_dollar) == 1:
-                _t1722 = _dollar_dollar[0]
+                _t1810 = _dollar_dollar[0]
             else:
-                _t1722 = None
-            deconstruct_result1431 = _t1722
-            if deconstruct_result1431 is not None:
-                assert deconstruct_result1431 is not None
-                unwrapped1432 = deconstruct_result1431
-                self.write(self.format_string_value(unwrapped1432))
+                _t1810 = None
+            deconstruct_result1477 = _t1810
+            if deconstruct_result1477 is not None:
+                assert deconstruct_result1477 is not None
+                unwrapped1478 = deconstruct_result1477
+                self.write(self.format_string_value(unwrapped1478))
             else:
                 _dollar_dollar = msg
                 if len(_dollar_dollar) != 1:
-                    _t1723 = _dollar_dollar
+                    _t1811 = _dollar_dollar
                 else:
-                    _t1723 = None
-                deconstruct_result1427 = _t1723
-                if deconstruct_result1427 is not None:
-                    assert deconstruct_result1427 is not None
-                    unwrapped1428 = deconstruct_result1427
+                    _t1811 = None
+                deconstruct_result1473 = _t1811
+                if deconstruct_result1473 is not None:
+                    assert deconstruct_result1473 is not None
+                    unwrapped1474 = deconstruct_result1473
                     self.write("[")
                     self.indent()
-                    for i1430, elem1429 in enumerate(unwrapped1428):
-                        if (i1430 > 0):
+                    for i1476, elem1475 in enumerate(unwrapped1474):
+                        if (i1476 > 0):
                             self.newline()
-                        self.write(self.format_string_value(elem1429))
+                        self.write(self.format_string_value(elem1475))
                     self.dedent()
                     self.write("]")
                 else:
                     raise ParseError("No matching rule for gnf_column_path")
 
+    def pretty_target_relations(self, msg: logic_pb2.TargetRelations):
+        flat1484 = self._try_flat(msg, self.pretty_target_relations)
+        if flat1484 is not None:
+            assert flat1484 is not None
+            self.write(flat1484)
+            return None
+        else:
+            _dollar_dollar = msg
+            fields1480 = (_dollar_dollar.keys, _dollar_dollar,)
+            assert fields1480 is not None
+            unwrapped_fields1481 = fields1480
+            self.write("(relations")
+            self.indent_sexp()
+            self.newline()
+            field1482 = unwrapped_fields1481[0]
+            self.pretty_relation_keys(field1482)
+            self.newline()
+            field1483 = unwrapped_fields1481[1]
+            self.pretty_relation_body(field1483)
+            self.dedent()
+            self.write(")")
+
+    def pretty_relation_keys(self, msg: Sequence[logic_pb2.NamedColumn]):
+        flat1488 = self._try_flat(msg, self.pretty_relation_keys)
+        if flat1488 is not None:
+            assert flat1488 is not None
+            self.write(flat1488)
+            return None
+        else:
+            fields1485 = msg
+            self.write("(keys")
+            self.indent_sexp()
+            if not len(fields1485) == 0:
+                self.newline()
+                for i1487, elem1486 in enumerate(fields1485):
+                    if (i1487 > 0):
+                        self.newline()
+                    self.pretty_named_column(elem1486)
+            self.dedent()
+            self.write(")")
+
+    def pretty_named_column(self, msg: logic_pb2.NamedColumn):
+        flat1493 = self._try_flat(msg, self.pretty_named_column)
+        if flat1493 is not None:
+            assert flat1493 is not None
+            self.write(flat1493)
+            return None
+        else:
+            _dollar_dollar = msg
+            fields1489 = (_dollar_dollar.name, _dollar_dollar.type,)
+            assert fields1489 is not None
+            unwrapped_fields1490 = fields1489
+            self.write("(column")
+            self.indent_sexp()
+            self.newline()
+            field1491 = unwrapped_fields1490[0]
+            self.write(self.format_string_value(field1491))
+            self.newline()
+            field1492 = unwrapped_fields1490[1]
+            self.pretty_type(field1492)
+            self.dedent()
+            self.write(")")
+
+    def pretty_relation_body(self, msg: logic_pb2.TargetRelations):
+        flat1500 = self._try_flat(msg, self.pretty_relation_body)
+        if flat1500 is not None:
+            assert flat1500 is not None
+            self.write(flat1500)
+            return None
+        else:
+            _dollar_dollar = msg
+            if _dollar_dollar.HasField("plain"):
+                _t1812 = _dollar_dollar.plain.targets
+            else:
+                _t1812 = None
+            deconstruct_result1498 = _t1812
+            if deconstruct_result1498 is not None:
+                assert deconstruct_result1498 is not None
+                unwrapped1499 = deconstruct_result1498
+                self.pretty_non_cdc_relations(unwrapped1499)
+            else:
+                _dollar_dollar = msg
+                if _dollar_dollar.HasField("cdc"):
+                    _t1813 = (_dollar_dollar.cdc.inserts, _dollar_dollar.cdc.deletes,)
+                else:
+                    _t1813 = None
+                deconstruct_result1494 = _t1813
+                if deconstruct_result1494 is not None:
+                    assert deconstruct_result1494 is not None
+                    unwrapped1495 = deconstruct_result1494
+                    field1496 = unwrapped1495[0]
+                    self.pretty_cdc_inserts(field1496)
+                    self.write(" ")
+                    field1497 = unwrapped1495[1]
+                    self.pretty_cdc_deletes(field1497)
+                else:
+                    raise ParseError("No matching rule for relation_body")
+
+    def pretty_non_cdc_relations(self, msg: Sequence[logic_pb2.TargetRelation]):
+        flat1504 = self._try_flat(msg, self.pretty_non_cdc_relations)
+        if flat1504 is not None:
+            assert flat1504 is not None
+            self.write(flat1504)
+            return None
+        else:
+            fields1501 = msg
+            for i1503, elem1502 in enumerate(fields1501):
+                if (i1503 > 0):
+                    self.newline()
+                self.pretty_target_relation(elem1502)
+
+    def pretty_target_relation(self, msg: logic_pb2.TargetRelation):
+        flat1511 = self._try_flat(msg, self.pretty_target_relation)
+        if flat1511 is not None:
+            assert flat1511 is not None
+            self.write(flat1511)
+            return None
+        else:
+            _dollar_dollar = msg
+            fields1505 = (_dollar_dollar.target_id, _dollar_dollar.values,)
+            assert fields1505 is not None
+            unwrapped_fields1506 = fields1505
+            self.write("(relation")
+            self.indent_sexp()
+            self.newline()
+            field1507 = unwrapped_fields1506[0]
+            self.pretty_relation_id(field1507)
+            field1508 = unwrapped_fields1506[1]
+            if not len(field1508) == 0:
+                self.newline()
+                for i1510, elem1509 in enumerate(field1508):
+                    if (i1510 > 0):
+                        self.newline()
+                    self.pretty_named_column(elem1509)
+            self.dedent()
+            self.write(")")
+
+    def pretty_cdc_inserts(self, msg: Sequence[logic_pb2.TargetRelation]):
+        flat1515 = self._try_flat(msg, self.pretty_cdc_inserts)
+        if flat1515 is not None:
+            assert flat1515 is not None
+            self.write(flat1515)
+            return None
+        else:
+            fields1512 = msg
+            self.write("(inserts")
+            self.indent_sexp()
+            if not len(fields1512) == 0:
+                self.newline()
+                for i1514, elem1513 in enumerate(fields1512):
+                    if (i1514 > 0):
+                        self.newline()
+                    self.pretty_target_relation(elem1513)
+            self.dedent()
+            self.write(")")
+
+    def pretty_cdc_deletes(self, msg: Sequence[logic_pb2.TargetRelation]):
+        flat1519 = self._try_flat(msg, self.pretty_cdc_deletes)
+        if flat1519 is not None:
+            assert flat1519 is not None
+            self.write(flat1519)
+            return None
+        else:
+            fields1516 = msg
+            self.write("(deletes")
+            self.indent_sexp()
+            if not len(fields1516) == 0:
+                self.newline()
+                for i1518, elem1517 in enumerate(fields1516):
+                    if (i1518 > 0):
+                        self.newline()
+                    self.pretty_target_relation(elem1517)
+            self.dedent()
+            self.write(")")
+
     def pretty_csv_asof(self, msg: str):
-        flat1435 = self._try_flat(msg, self.pretty_csv_asof)
-        if flat1435 is not None:
-            assert flat1435 is not None
-            self.write(flat1435)
+        flat1521 = self._try_flat(msg, self.pretty_csv_asof)
+        if flat1521 is not None:
+            assert flat1521 is not None
+            self.write(flat1521)
             return None
         else:
-            fields1434 = msg
+            fields1520 = msg
             self.write("(asof")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1434))
+            self.write(self.format_string_value(fields1520))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_data(self, msg: logic_pb2.IcebergData):
-        flat1446 = self._try_flat(msg, self.pretty_iceberg_data)
-        if flat1446 is not None:
-            assert flat1446 is not None
-            self.write(flat1446)
+        flat1532 = self._try_flat(msg, self.pretty_iceberg_data)
+        if flat1532 is not None:
+            assert flat1532 is not None
+            self.write(flat1532)
             return None
         else:
             _dollar_dollar = msg
-            _t1724 = self.deconstruct_iceberg_data_from_snapshot_optional(_dollar_dollar)
-            _t1725 = self.deconstruct_iceberg_data_to_snapshot_optional(_dollar_dollar)
-            fields1436 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _t1724, _t1725, _dollar_dollar.returns_delta,)
-            assert fields1436 is not None
-            unwrapped_fields1437 = fields1436
+            _t1814 = self.deconstruct_iceberg_data_from_snapshot_optional(_dollar_dollar)
+            _t1815 = self.deconstruct_iceberg_data_to_snapshot_optional(_dollar_dollar)
+            fields1522 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _t1814, _t1815, _dollar_dollar.returns_delta,)
+            assert fields1522 is not None
+            unwrapped_fields1523 = fields1522
             self.write("(iceberg_data")
             self.indent_sexp()
             self.newline()
-            field1438 = unwrapped_fields1437[0]
-            self.pretty_iceberg_locator(field1438)
+            field1524 = unwrapped_fields1523[0]
+            self.pretty_iceberg_locator(field1524)
             self.newline()
-            field1439 = unwrapped_fields1437[1]
-            self.pretty_iceberg_catalog_config(field1439)
+            field1525 = unwrapped_fields1523[1]
+            self.pretty_iceberg_catalog_config(field1525)
             self.newline()
-            field1440 = unwrapped_fields1437[2]
-            self.pretty_gnf_columns(field1440)
-            field1441 = unwrapped_fields1437[3]
-            if field1441 is not None:
+            field1526 = unwrapped_fields1523[2]
+            self.pretty_gnf_columns(field1526)
+            field1527 = unwrapped_fields1523[3]
+            if field1527 is not None:
                 self.newline()
-                assert field1441 is not None
-                opt_val1442 = field1441
-                self.pretty_iceberg_from_snapshot(opt_val1442)
-            field1443 = unwrapped_fields1437[4]
-            if field1443 is not None:
+                assert field1527 is not None
+                opt_val1528 = field1527
+                self.pretty_iceberg_from_snapshot(opt_val1528)
+            field1529 = unwrapped_fields1523[4]
+            if field1529 is not None:
                 self.newline()
-                assert field1443 is not None
-                opt_val1444 = field1443
-                self.pretty_iceberg_to_snapshot(opt_val1444)
+                assert field1529 is not None
+                opt_val1530 = field1529
+                self.pretty_iceberg_to_snapshot(opt_val1530)
             self.newline()
-            field1445 = unwrapped_fields1437[5]
-            self.pretty_boolean_value(field1445)
+            field1531 = unwrapped_fields1523[5]
+            self.pretty_boolean_value(field1531)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_locator(self, msg: logic_pb2.IcebergLocator):
-        flat1452 = self._try_flat(msg, self.pretty_iceberg_locator)
-        if flat1452 is not None:
-            assert flat1452 is not None
-            self.write(flat1452)
+        flat1538 = self._try_flat(msg, self.pretty_iceberg_locator)
+        if flat1538 is not None:
+            assert flat1538 is not None
+            self.write(flat1538)
             return None
         else:
             _dollar_dollar = msg
-            fields1447 = (_dollar_dollar.table_name, _dollar_dollar.namespace, _dollar_dollar.warehouse,)
-            assert fields1447 is not None
-            unwrapped_fields1448 = fields1447
+            fields1533 = (_dollar_dollar.table_name, _dollar_dollar.namespace, _dollar_dollar.warehouse,)
+            assert fields1533 is not None
+            unwrapped_fields1534 = fields1533
             self.write("(iceberg_locator")
             self.indent_sexp()
             self.newline()
-            field1449 = unwrapped_fields1448[0]
-            self.pretty_iceberg_locator_table_name(field1449)
+            field1535 = unwrapped_fields1534[0]
+            self.pretty_iceberg_locator_table_name(field1535)
             self.newline()
-            field1450 = unwrapped_fields1448[1]
-            self.pretty_iceberg_locator_namespace(field1450)
+            field1536 = unwrapped_fields1534[1]
+            self.pretty_iceberg_locator_namespace(field1536)
             self.newline()
-            field1451 = unwrapped_fields1448[2]
-            self.pretty_iceberg_locator_warehouse(field1451)
+            field1537 = unwrapped_fields1534[2]
+            self.pretty_iceberg_locator_warehouse(field1537)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_locator_table_name(self, msg: str):
-        flat1454 = self._try_flat(msg, self.pretty_iceberg_locator_table_name)
-        if flat1454 is not None:
-            assert flat1454 is not None
-            self.write(flat1454)
+        flat1540 = self._try_flat(msg, self.pretty_iceberg_locator_table_name)
+        if flat1540 is not None:
+            assert flat1540 is not None
+            self.write(flat1540)
             return None
         else:
-            fields1453 = msg
+            fields1539 = msg
             self.write("(table_name")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1453))
+            self.write(self.format_string_value(fields1539))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_locator_namespace(self, msg: Sequence[str]):
-        flat1458 = self._try_flat(msg, self.pretty_iceberg_locator_namespace)
-        if flat1458 is not None:
-            assert flat1458 is not None
-            self.write(flat1458)
+        flat1544 = self._try_flat(msg, self.pretty_iceberg_locator_namespace)
+        if flat1544 is not None:
+            assert flat1544 is not None
+            self.write(flat1544)
             return None
         else:
-            fields1455 = msg
+            fields1541 = msg
             self.write("(namespace")
             self.indent_sexp()
-            if not len(fields1455) == 0:
+            if not len(fields1541) == 0:
                 self.newline()
-                for i1457, elem1456 in enumerate(fields1455):
-                    if (i1457 > 0):
+                for i1543, elem1542 in enumerate(fields1541):
+                    if (i1543 > 0):
                         self.newline()
-                    self.write(self.format_string_value(elem1456))
+                    self.write(self.format_string_value(elem1542))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_locator_warehouse(self, msg: str):
-        flat1460 = self._try_flat(msg, self.pretty_iceberg_locator_warehouse)
-        if flat1460 is not None:
-            assert flat1460 is not None
-            self.write(flat1460)
+        flat1546 = self._try_flat(msg, self.pretty_iceberg_locator_warehouse)
+        if flat1546 is not None:
+            assert flat1546 is not None
+            self.write(flat1546)
             return None
         else:
-            fields1459 = msg
+            fields1545 = msg
             self.write("(warehouse")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1459))
+            self.write(self.format_string_value(fields1545))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_catalog_config(self, msg: logic_pb2.IcebergCatalogConfig):
-        flat1468 = self._try_flat(msg, self.pretty_iceberg_catalog_config)
-        if flat1468 is not None:
-            assert flat1468 is not None
-            self.write(flat1468)
+        flat1554 = self._try_flat(msg, self.pretty_iceberg_catalog_config)
+        if flat1554 is not None:
+            assert flat1554 is not None
+            self.write(flat1554)
             return None
         else:
             _dollar_dollar = msg
-            _t1726 = self.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
-            fields1461 = (_dollar_dollar.catalog_uri, _t1726, sorted(_dollar_dollar.properties.items()), sorted(_dollar_dollar.auth_properties.items()),)
-            assert fields1461 is not None
-            unwrapped_fields1462 = fields1461
+            _t1816 = self.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
+            fields1547 = (_dollar_dollar.catalog_uri, _t1816, sorted(_dollar_dollar.properties.items()), sorted(_dollar_dollar.auth_properties.items()),)
+            assert fields1547 is not None
+            unwrapped_fields1548 = fields1547
             self.write("(iceberg_catalog_config")
             self.indent_sexp()
             self.newline()
-            field1463 = unwrapped_fields1462[0]
-            self.pretty_iceberg_catalog_uri(field1463)
-            field1464 = unwrapped_fields1462[1]
-            if field1464 is not None:
+            field1549 = unwrapped_fields1548[0]
+            self.pretty_iceberg_catalog_uri(field1549)
+            field1550 = unwrapped_fields1548[1]
+            if field1550 is not None:
                 self.newline()
-                assert field1464 is not None
-                opt_val1465 = field1464
-                self.pretty_iceberg_catalog_config_scope(opt_val1465)
+                assert field1550 is not None
+                opt_val1551 = field1550
+                self.pretty_iceberg_catalog_config_scope(opt_val1551)
             self.newline()
-            field1466 = unwrapped_fields1462[2]
-            self.pretty_iceberg_properties(field1466)
+            field1552 = unwrapped_fields1548[2]
+            self.pretty_iceberg_properties(field1552)
             self.newline()
-            field1467 = unwrapped_fields1462[3]
-            self.pretty_iceberg_auth_properties(field1467)
+            field1553 = unwrapped_fields1548[3]
+            self.pretty_iceberg_auth_properties(field1553)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_catalog_uri(self, msg: str):
-        flat1470 = self._try_flat(msg, self.pretty_iceberg_catalog_uri)
-        if flat1470 is not None:
-            assert flat1470 is not None
-            self.write(flat1470)
+        flat1556 = self._try_flat(msg, self.pretty_iceberg_catalog_uri)
+        if flat1556 is not None:
+            assert flat1556 is not None
+            self.write(flat1556)
             return None
         else:
-            fields1469 = msg
+            fields1555 = msg
             self.write("(catalog_uri")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1469))
+            self.write(self.format_string_value(fields1555))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_catalog_config_scope(self, msg: str):
-        flat1472 = self._try_flat(msg, self.pretty_iceberg_catalog_config_scope)
-        if flat1472 is not None:
-            assert flat1472 is not None
-            self.write(flat1472)
+        flat1558 = self._try_flat(msg, self.pretty_iceberg_catalog_config_scope)
+        if flat1558 is not None:
+            assert flat1558 is not None
+            self.write(flat1558)
             return None
         else:
-            fields1471 = msg
+            fields1557 = msg
             self.write("(scope")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1471))
+            self.write(self.format_string_value(fields1557))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_properties(self, msg: Sequence[tuple[str, str]]):
-        flat1476 = self._try_flat(msg, self.pretty_iceberg_properties)
-        if flat1476 is not None:
-            assert flat1476 is not None
-            self.write(flat1476)
+        flat1562 = self._try_flat(msg, self.pretty_iceberg_properties)
+        if flat1562 is not None:
+            assert flat1562 is not None
+            self.write(flat1562)
             return None
         else:
-            fields1473 = msg
+            fields1559 = msg
             self.write("(properties")
             self.indent_sexp()
-            if not len(fields1473) == 0:
+            if not len(fields1559) == 0:
                 self.newline()
-                for i1475, elem1474 in enumerate(fields1473):
-                    if (i1475 > 0):
+                for i1561, elem1560 in enumerate(fields1559):
+                    if (i1561 > 0):
                         self.newline()
-                    self.pretty_iceberg_property_entry(elem1474)
+                    self.pretty_iceberg_property_entry(elem1560)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_property_entry(self, msg: tuple[str, str]):
-        flat1481 = self._try_flat(msg, self.pretty_iceberg_property_entry)
-        if flat1481 is not None:
-            assert flat1481 is not None
-            self.write(flat1481)
+        flat1567 = self._try_flat(msg, self.pretty_iceberg_property_entry)
+        if flat1567 is not None:
+            assert flat1567 is not None
+            self.write(flat1567)
             return None
         else:
             _dollar_dollar = msg
-            fields1477 = (_dollar_dollar[0], _dollar_dollar[1],)
-            assert fields1477 is not None
-            unwrapped_fields1478 = fields1477
+            fields1563 = (_dollar_dollar[0], _dollar_dollar[1],)
+            assert fields1563 is not None
+            unwrapped_fields1564 = fields1563
             self.write("(prop")
             self.indent_sexp()
             self.newline()
-            field1479 = unwrapped_fields1478[0]
-            self.write(self.format_string_value(field1479))
+            field1565 = unwrapped_fields1564[0]
+            self.write(self.format_string_value(field1565))
             self.newline()
-            field1480 = unwrapped_fields1478[1]
-            self.write(self.format_string_value(field1480))
+            field1566 = unwrapped_fields1564[1]
+            self.write(self.format_string_value(field1566))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_auth_properties(self, msg: Sequence[tuple[str, str]]):
-        flat1485 = self._try_flat(msg, self.pretty_iceberg_auth_properties)
-        if flat1485 is not None:
-            assert flat1485 is not None
-            self.write(flat1485)
+        flat1571 = self._try_flat(msg, self.pretty_iceberg_auth_properties)
+        if flat1571 is not None:
+            assert flat1571 is not None
+            self.write(flat1571)
             return None
         else:
-            fields1482 = msg
+            fields1568 = msg
             self.write("(auth_properties")
             self.indent_sexp()
-            if not len(fields1482) == 0:
+            if not len(fields1568) == 0:
                 self.newline()
-                for i1484, elem1483 in enumerate(fields1482):
-                    if (i1484 > 0):
+                for i1570, elem1569 in enumerate(fields1568):
+                    if (i1570 > 0):
                         self.newline()
-                    self.pretty_iceberg_masked_property_entry(elem1483)
+                    self.pretty_iceberg_masked_property_entry(elem1569)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_masked_property_entry(self, msg: tuple[str, str]):
-        flat1490 = self._try_flat(msg, self.pretty_iceberg_masked_property_entry)
-        if flat1490 is not None:
-            assert flat1490 is not None
-            self.write(flat1490)
+        flat1576 = self._try_flat(msg, self.pretty_iceberg_masked_property_entry)
+        if flat1576 is not None:
+            assert flat1576 is not None
+            self.write(flat1576)
             return None
         else:
             _dollar_dollar = msg
-            _t1727 = self.mask_secret_value(_dollar_dollar)
-            fields1486 = (_dollar_dollar[0], _t1727,)
-            assert fields1486 is not None
-            unwrapped_fields1487 = fields1486
+            _t1817 = self.mask_secret_value(_dollar_dollar)
+            fields1572 = (_dollar_dollar[0], _t1817,)
+            assert fields1572 is not None
+            unwrapped_fields1573 = fields1572
             self.write("(prop")
             self.indent_sexp()
             self.newline()
-            field1488 = unwrapped_fields1487[0]
-            self.write(self.format_string_value(field1488))
+            field1574 = unwrapped_fields1573[0]
+            self.write(self.format_string_value(field1574))
             self.newline()
-            field1489 = unwrapped_fields1487[1]
-            self.write(self.format_string_value(field1489))
+            field1575 = unwrapped_fields1573[1]
+            self.write(self.format_string_value(field1575))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_from_snapshot(self, msg: str):
-        flat1492 = self._try_flat(msg, self.pretty_iceberg_from_snapshot)
-        if flat1492 is not None:
-            assert flat1492 is not None
-            self.write(flat1492)
+        flat1578 = self._try_flat(msg, self.pretty_iceberg_from_snapshot)
+        if flat1578 is not None:
+            assert flat1578 is not None
+            self.write(flat1578)
             return None
         else:
-            fields1491 = msg
+            fields1577 = msg
             self.write("(from_snapshot")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1491))
+            self.write(self.format_string_value(fields1577))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_to_snapshot(self, msg: str):
-        flat1494 = self._try_flat(msg, self.pretty_iceberg_to_snapshot)
-        if flat1494 is not None:
-            assert flat1494 is not None
-            self.write(flat1494)
+        flat1580 = self._try_flat(msg, self.pretty_iceberg_to_snapshot)
+        if flat1580 is not None:
+            assert flat1580 is not None
+            self.write(flat1580)
             return None
         else:
-            fields1493 = msg
+            fields1579 = msg
             self.write("(to_snapshot")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1493))
+            self.write(self.format_string_value(fields1579))
             self.dedent()
             self.write(")")
 
     def pretty_undefine(self, msg: transactions_pb2.Undefine):
-        flat1497 = self._try_flat(msg, self.pretty_undefine)
-        if flat1497 is not None:
-            assert flat1497 is not None
-            self.write(flat1497)
+        flat1583 = self._try_flat(msg, self.pretty_undefine)
+        if flat1583 is not None:
+            assert flat1583 is not None
+            self.write(flat1583)
             return None
         else:
             _dollar_dollar = msg
-            fields1495 = _dollar_dollar.fragment_id
-            assert fields1495 is not None
-            unwrapped_fields1496 = fields1495
+            fields1581 = _dollar_dollar.fragment_id
+            assert fields1581 is not None
+            unwrapped_fields1582 = fields1581
             self.write("(undefine")
             self.indent_sexp()
             self.newline()
-            self.pretty_fragment_id(unwrapped_fields1496)
+            self.pretty_fragment_id(unwrapped_fields1582)
             self.dedent()
             self.write(")")
 
     def pretty_context(self, msg: transactions_pb2.Context):
-        flat1502 = self._try_flat(msg, self.pretty_context)
-        if flat1502 is not None:
-            assert flat1502 is not None
-            self.write(flat1502)
+        flat1588 = self._try_flat(msg, self.pretty_context)
+        if flat1588 is not None:
+            assert flat1588 is not None
+            self.write(flat1588)
             return None
         else:
             _dollar_dollar = msg
-            fields1498 = _dollar_dollar.relations
-            assert fields1498 is not None
-            unwrapped_fields1499 = fields1498
+            fields1584 = _dollar_dollar.relations
+            assert fields1584 is not None
+            unwrapped_fields1585 = fields1584
             self.write("(context")
             self.indent_sexp()
-            if not len(unwrapped_fields1499) == 0:
+            if not len(unwrapped_fields1585) == 0:
                 self.newline()
-                for i1501, elem1500 in enumerate(unwrapped_fields1499):
-                    if (i1501 > 0):
+                for i1587, elem1586 in enumerate(unwrapped_fields1585):
+                    if (i1587 > 0):
                         self.newline()
-                    self.pretty_relation_id(elem1500)
+                    self.pretty_relation_id(elem1586)
             self.dedent()
             self.write(")")
 
     def pretty_snapshot(self, msg: transactions_pb2.Snapshot):
-        flat1509 = self._try_flat(msg, self.pretty_snapshot)
-        if flat1509 is not None:
-            assert flat1509 is not None
-            self.write(flat1509)
+        flat1595 = self._try_flat(msg, self.pretty_snapshot)
+        if flat1595 is not None:
+            assert flat1595 is not None
+            self.write(flat1595)
             return None
         else:
             _dollar_dollar = msg
-            fields1503 = (_dollar_dollar.prefix, _dollar_dollar.mappings,)
-            assert fields1503 is not None
-            unwrapped_fields1504 = fields1503
+            fields1589 = (_dollar_dollar.prefix, _dollar_dollar.mappings,)
+            assert fields1589 is not None
+            unwrapped_fields1590 = fields1589
             self.write("(snapshot")
             self.indent_sexp()
             self.newline()
-            field1505 = unwrapped_fields1504[0]
-            self.pretty_edb_path(field1505)
-            field1506 = unwrapped_fields1504[1]
-            if not len(field1506) == 0:
+            field1591 = unwrapped_fields1590[0]
+            self.pretty_edb_path(field1591)
+            field1592 = unwrapped_fields1590[1]
+            if not len(field1592) == 0:
                 self.newline()
-                for i1508, elem1507 in enumerate(field1506):
-                    if (i1508 > 0):
+                for i1594, elem1593 in enumerate(field1592):
+                    if (i1594 > 0):
                         self.newline()
-                    self.pretty_snapshot_mapping(elem1507)
+                    self.pretty_snapshot_mapping(elem1593)
             self.dedent()
             self.write(")")
 
     def pretty_snapshot_mapping(self, msg: transactions_pb2.SnapshotMapping):
-        flat1514 = self._try_flat(msg, self.pretty_snapshot_mapping)
-        if flat1514 is not None:
-            assert flat1514 is not None
-            self.write(flat1514)
+        flat1600 = self._try_flat(msg, self.pretty_snapshot_mapping)
+        if flat1600 is not None:
+            assert flat1600 is not None
+            self.write(flat1600)
             return None
         else:
             _dollar_dollar = msg
-            fields1510 = (_dollar_dollar.destination_path, _dollar_dollar.source_relation,)
-            assert fields1510 is not None
-            unwrapped_fields1511 = fields1510
-            field1512 = unwrapped_fields1511[0]
-            self.pretty_edb_path(field1512)
+            fields1596 = (_dollar_dollar.destination_path, _dollar_dollar.source_relation,)
+            assert fields1596 is not None
+            unwrapped_fields1597 = fields1596
+            field1598 = unwrapped_fields1597[0]
+            self.pretty_edb_path(field1598)
             self.write(" ")
-            field1513 = unwrapped_fields1511[1]
-            self.pretty_relation_id(field1513)
+            field1599 = unwrapped_fields1597[1]
+            self.pretty_relation_id(field1599)
 
     def pretty_epoch_reads(self, msg: Sequence[transactions_pb2.Read]):
-        flat1518 = self._try_flat(msg, self.pretty_epoch_reads)
-        if flat1518 is not None:
-            assert flat1518 is not None
-            self.write(flat1518)
+        flat1604 = self._try_flat(msg, self.pretty_epoch_reads)
+        if flat1604 is not None:
+            assert flat1604 is not None
+            self.write(flat1604)
             return None
         else:
-            fields1515 = msg
+            fields1601 = msg
             self.write("(reads")
             self.indent_sexp()
-            if not len(fields1515) == 0:
+            if not len(fields1601) == 0:
                 self.newline()
-                for i1517, elem1516 in enumerate(fields1515):
-                    if (i1517 > 0):
+                for i1603, elem1602 in enumerate(fields1601):
+                    if (i1603 > 0):
                         self.newline()
-                    self.pretty_read(elem1516)
+                    self.pretty_read(elem1602)
             self.dedent()
             self.write(")")
 
     def pretty_read(self, msg: transactions_pb2.Read):
-        flat1529 = self._try_flat(msg, self.pretty_read)
-        if flat1529 is not None:
-            assert flat1529 is not None
-            self.write(flat1529)
+        flat1615 = self._try_flat(msg, self.pretty_read)
+        if flat1615 is not None:
+            assert flat1615 is not None
+            self.write(flat1615)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("demand"):
-                _t1728 = _dollar_dollar.demand
+                _t1818 = _dollar_dollar.demand
             else:
-                _t1728 = None
-            deconstruct_result1527 = _t1728
-            if deconstruct_result1527 is not None:
-                assert deconstruct_result1527 is not None
-                unwrapped1528 = deconstruct_result1527
-                self.pretty_demand(unwrapped1528)
+                _t1818 = None
+            deconstruct_result1613 = _t1818
+            if deconstruct_result1613 is not None:
+                assert deconstruct_result1613 is not None
+                unwrapped1614 = deconstruct_result1613
+                self.pretty_demand(unwrapped1614)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("output"):
-                    _t1729 = _dollar_dollar.output
+                    _t1819 = _dollar_dollar.output
                 else:
-                    _t1729 = None
-                deconstruct_result1525 = _t1729
-                if deconstruct_result1525 is not None:
-                    assert deconstruct_result1525 is not None
-                    unwrapped1526 = deconstruct_result1525
-                    self.pretty_output(unwrapped1526)
+                    _t1819 = None
+                deconstruct_result1611 = _t1819
+                if deconstruct_result1611 is not None:
+                    assert deconstruct_result1611 is not None
+                    unwrapped1612 = deconstruct_result1611
+                    self.pretty_output(unwrapped1612)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("what_if"):
-                        _t1730 = _dollar_dollar.what_if
+                        _t1820 = _dollar_dollar.what_if
                     else:
-                        _t1730 = None
-                    deconstruct_result1523 = _t1730
-                    if deconstruct_result1523 is not None:
-                        assert deconstruct_result1523 is not None
-                        unwrapped1524 = deconstruct_result1523
-                        self.pretty_what_if(unwrapped1524)
+                        _t1820 = None
+                    deconstruct_result1609 = _t1820
+                    if deconstruct_result1609 is not None:
+                        assert deconstruct_result1609 is not None
+                        unwrapped1610 = deconstruct_result1609
+                        self.pretty_what_if(unwrapped1610)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("abort"):
-                            _t1731 = _dollar_dollar.abort
+                            _t1821 = _dollar_dollar.abort
                         else:
-                            _t1731 = None
-                        deconstruct_result1521 = _t1731
-                        if deconstruct_result1521 is not None:
-                            assert deconstruct_result1521 is not None
-                            unwrapped1522 = deconstruct_result1521
-                            self.pretty_abort(unwrapped1522)
+                            _t1821 = None
+                        deconstruct_result1607 = _t1821
+                        if deconstruct_result1607 is not None:
+                            assert deconstruct_result1607 is not None
+                            unwrapped1608 = deconstruct_result1607
+                            self.pretty_abort(unwrapped1608)
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("export"):
-                                _t1732 = _dollar_dollar.export
+                                _t1822 = _dollar_dollar.export
                             else:
-                                _t1732 = None
-                            deconstruct_result1519 = _t1732
-                            if deconstruct_result1519 is not None:
-                                assert deconstruct_result1519 is not None
-                                unwrapped1520 = deconstruct_result1519
-                                self.pretty_export(unwrapped1520)
+                                _t1822 = None
+                            deconstruct_result1605 = _t1822
+                            if deconstruct_result1605 is not None:
+                                assert deconstruct_result1605 is not None
+                                unwrapped1606 = deconstruct_result1605
+                                self.pretty_export(unwrapped1606)
                             else:
                                 raise ParseError("No matching rule for read")
 
     def pretty_demand(self, msg: transactions_pb2.Demand):
-        flat1532 = self._try_flat(msg, self.pretty_demand)
-        if flat1532 is not None:
-            assert flat1532 is not None
-            self.write(flat1532)
+        flat1618 = self._try_flat(msg, self.pretty_demand)
+        if flat1618 is not None:
+            assert flat1618 is not None
+            self.write(flat1618)
             return None
         else:
             _dollar_dollar = msg
-            fields1530 = _dollar_dollar.relation_id
-            assert fields1530 is not None
-            unwrapped_fields1531 = fields1530
+            fields1616 = _dollar_dollar.relation_id
+            assert fields1616 is not None
+            unwrapped_fields1617 = fields1616
             self.write("(demand")
             self.indent_sexp()
             self.newline()
-            self.pretty_relation_id(unwrapped_fields1531)
+            self.pretty_relation_id(unwrapped_fields1617)
             self.dedent()
             self.write(")")
 
     def pretty_output(self, msg: transactions_pb2.Output):
-        flat1537 = self._try_flat(msg, self.pretty_output)
-        if flat1537 is not None:
-            assert flat1537 is not None
-            self.write(flat1537)
+        flat1623 = self._try_flat(msg, self.pretty_output)
+        if flat1623 is not None:
+            assert flat1623 is not None
+            self.write(flat1623)
             return None
         else:
             _dollar_dollar = msg
-            fields1533 = (_dollar_dollar.name, _dollar_dollar.relation_id,)
-            assert fields1533 is not None
-            unwrapped_fields1534 = fields1533
+            fields1619 = (_dollar_dollar.name, _dollar_dollar.relation_id,)
+            assert fields1619 is not None
+            unwrapped_fields1620 = fields1619
             self.write("(output")
             self.indent_sexp()
             self.newline()
-            field1535 = unwrapped_fields1534[0]
-            self.pretty_name(field1535)
+            field1621 = unwrapped_fields1620[0]
+            self.pretty_name(field1621)
             self.newline()
-            field1536 = unwrapped_fields1534[1]
-            self.pretty_relation_id(field1536)
+            field1622 = unwrapped_fields1620[1]
+            self.pretty_relation_id(field1622)
             self.dedent()
             self.write(")")
 
     def pretty_what_if(self, msg: transactions_pb2.WhatIf):
-        flat1542 = self._try_flat(msg, self.pretty_what_if)
-        if flat1542 is not None:
-            assert flat1542 is not None
-            self.write(flat1542)
+        flat1628 = self._try_flat(msg, self.pretty_what_if)
+        if flat1628 is not None:
+            assert flat1628 is not None
+            self.write(flat1628)
             return None
         else:
             _dollar_dollar = msg
-            fields1538 = (_dollar_dollar.branch, _dollar_dollar.epoch,)
-            assert fields1538 is not None
-            unwrapped_fields1539 = fields1538
+            fields1624 = (_dollar_dollar.branch, _dollar_dollar.epoch,)
+            assert fields1624 is not None
+            unwrapped_fields1625 = fields1624
             self.write("(what_if")
             self.indent_sexp()
             self.newline()
-            field1540 = unwrapped_fields1539[0]
-            self.pretty_name(field1540)
+            field1626 = unwrapped_fields1625[0]
+            self.pretty_name(field1626)
             self.newline()
-            field1541 = unwrapped_fields1539[1]
-            self.pretty_epoch(field1541)
+            field1627 = unwrapped_fields1625[1]
+            self.pretty_epoch(field1627)
             self.dedent()
             self.write(")")
 
     def pretty_abort(self, msg: transactions_pb2.Abort):
-        flat1548 = self._try_flat(msg, self.pretty_abort)
-        if flat1548 is not None:
-            assert flat1548 is not None
-            self.write(flat1548)
+        flat1634 = self._try_flat(msg, self.pretty_abort)
+        if flat1634 is not None:
+            assert flat1634 is not None
+            self.write(flat1634)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name != "abort":
-                _t1733 = _dollar_dollar.name
+                _t1823 = _dollar_dollar.name
             else:
-                _t1733 = None
-            fields1543 = (_t1733, _dollar_dollar.relation_id,)
-            assert fields1543 is not None
-            unwrapped_fields1544 = fields1543
+                _t1823 = None
+            fields1629 = (_t1823, _dollar_dollar.relation_id,)
+            assert fields1629 is not None
+            unwrapped_fields1630 = fields1629
             self.write("(abort")
             self.indent_sexp()
-            field1545 = unwrapped_fields1544[0]
-            if field1545 is not None:
+            field1631 = unwrapped_fields1630[0]
+            if field1631 is not None:
                 self.newline()
-                assert field1545 is not None
-                opt_val1546 = field1545
-                self.pretty_name(opt_val1546)
+                assert field1631 is not None
+                opt_val1632 = field1631
+                self.pretty_name(opt_val1632)
             self.newline()
-            field1547 = unwrapped_fields1544[1]
-            self.pretty_relation_id(field1547)
+            field1633 = unwrapped_fields1630[1]
+            self.pretty_relation_id(field1633)
             self.dedent()
             self.write(")")
 
     def pretty_export(self, msg: transactions_pb2.Export):
-        flat1553 = self._try_flat(msg, self.pretty_export)
-        if flat1553 is not None:
-            assert flat1553 is not None
-            self.write(flat1553)
+        flat1639 = self._try_flat(msg, self.pretty_export)
+        if flat1639 is not None:
+            assert flat1639 is not None
+            self.write(flat1639)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("csv_config"):
-                _t1734 = _dollar_dollar.csv_config
+                _t1824 = _dollar_dollar.csv_config
             else:
-                _t1734 = None
-            deconstruct_result1551 = _t1734
-            if deconstruct_result1551 is not None:
-                assert deconstruct_result1551 is not None
-                unwrapped1552 = deconstruct_result1551
+                _t1824 = None
+            deconstruct_result1637 = _t1824
+            if deconstruct_result1637 is not None:
+                assert deconstruct_result1637 is not None
+                unwrapped1638 = deconstruct_result1637
                 self.write("(export")
                 self.indent_sexp()
                 self.newline()
-                self.pretty_export_csv_config(unwrapped1552)
+                self.pretty_export_csv_config(unwrapped1638)
                 self.dedent()
                 self.write(")")
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("iceberg_config"):
-                    _t1735 = _dollar_dollar.iceberg_config
+                    _t1825 = _dollar_dollar.iceberg_config
                 else:
-                    _t1735 = None
-                deconstruct_result1549 = _t1735
-                if deconstruct_result1549 is not None:
-                    assert deconstruct_result1549 is not None
-                    unwrapped1550 = deconstruct_result1549
+                    _t1825 = None
+                deconstruct_result1635 = _t1825
+                if deconstruct_result1635 is not None:
+                    assert deconstruct_result1635 is not None
+                    unwrapped1636 = deconstruct_result1635
                     self.write("(export_iceberg")
                     self.indent_sexp()
                     self.newline()
-                    self.pretty_export_iceberg_config(unwrapped1550)
+                    self.pretty_export_iceberg_config(unwrapped1636)
                     self.dedent()
                     self.write(")")
                 else:
                     raise ParseError("No matching rule for export")
 
     def pretty_export_csv_config(self, msg: transactions_pb2.ExportCSVConfig):
-        flat1564 = self._try_flat(msg, self.pretty_export_csv_config)
-        if flat1564 is not None:
-            assert flat1564 is not None
-            self.write(flat1564)
+        flat1650 = self._try_flat(msg, self.pretty_export_csv_config)
+        if flat1650 is not None:
+            assert flat1650 is not None
+            self.write(flat1650)
             return None
         else:
             _dollar_dollar = msg
             if len(_dollar_dollar.data_columns) == 0:
-                _t1736 = (_dollar_dollar.path, _dollar_dollar.csv_source, _dollar_dollar.csv_config,)
+                _t1826 = (_dollar_dollar.path, _dollar_dollar.csv_source, _dollar_dollar.csv_config,)
             else:
-                _t1736 = None
-            deconstruct_result1559 = _t1736
-            if deconstruct_result1559 is not None:
-                assert deconstruct_result1559 is not None
-                unwrapped1560 = deconstruct_result1559
+                _t1826 = None
+            deconstruct_result1645 = _t1826
+            if deconstruct_result1645 is not None:
+                assert deconstruct_result1645 is not None
+                unwrapped1646 = deconstruct_result1645
                 self.write("(export_csv_config_v2")
                 self.indent_sexp()
                 self.newline()
-                field1561 = unwrapped1560[0]
-                self.pretty_export_csv_path(field1561)
+                field1647 = unwrapped1646[0]
+                self.pretty_export_csv_path(field1647)
                 self.newline()
-                field1562 = unwrapped1560[1]
-                self.pretty_export_csv_source(field1562)
+                field1648 = unwrapped1646[1]
+                self.pretty_export_csv_source(field1648)
                 self.newline()
-                field1563 = unwrapped1560[2]
-                self.pretty_csv_config(field1563)
+                field1649 = unwrapped1646[2]
+                self.pretty_csv_config(field1649)
                 self.dedent()
                 self.write(")")
             else:
                 _dollar_dollar = msg
                 if len(_dollar_dollar.data_columns) != 0:
-                    _t1738 = self.deconstruct_export_csv_config(_dollar_dollar)
-                    _t1737 = (_dollar_dollar.path, _dollar_dollar.data_columns, _t1738,)
+                    _t1828 = self.deconstruct_export_csv_config(_dollar_dollar)
+                    _t1827 = (_dollar_dollar.path, _dollar_dollar.data_columns, _t1828,)
                 else:
-                    _t1737 = None
-                deconstruct_result1554 = _t1737
-                if deconstruct_result1554 is not None:
-                    assert deconstruct_result1554 is not None
-                    unwrapped1555 = deconstruct_result1554
+                    _t1827 = None
+                deconstruct_result1640 = _t1827
+                if deconstruct_result1640 is not None:
+                    assert deconstruct_result1640 is not None
+                    unwrapped1641 = deconstruct_result1640
                     self.write("(export_csv_config")
                     self.indent_sexp()
                     self.newline()
-                    field1556 = unwrapped1555[0]
-                    self.pretty_export_csv_path(field1556)
+                    field1642 = unwrapped1641[0]
+                    self.pretty_export_csv_path(field1642)
                     self.newline()
-                    field1557 = unwrapped1555[1]
-                    self.pretty_export_csv_columns_list(field1557)
+                    field1643 = unwrapped1641[1]
+                    self.pretty_export_csv_columns_list(field1643)
                     self.newline()
-                    field1558 = unwrapped1555[2]
-                    self.pretty_config_dict(field1558)
+                    field1644 = unwrapped1641[2]
+                    self.pretty_config_dict(field1644)
                     self.dedent()
                     self.write(")")
                 else:
                     raise ParseError("No matching rule for export_csv_config")
 
     def pretty_export_csv_path(self, msg: str):
-        flat1566 = self._try_flat(msg, self.pretty_export_csv_path)
-        if flat1566 is not None:
-            assert flat1566 is not None
-            self.write(flat1566)
+        flat1652 = self._try_flat(msg, self.pretty_export_csv_path)
+        if flat1652 is not None:
+            assert flat1652 is not None
+            self.write(flat1652)
             return None
         else:
-            fields1565 = msg
+            fields1651 = msg
             self.write("(path")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1565))
+            self.write(self.format_string_value(fields1651))
             self.dedent()
             self.write(")")
 
     def pretty_export_csv_source(self, msg: transactions_pb2.ExportCSVSource):
-        flat1573 = self._try_flat(msg, self.pretty_export_csv_source)
-        if flat1573 is not None:
-            assert flat1573 is not None
-            self.write(flat1573)
+        flat1659 = self._try_flat(msg, self.pretty_export_csv_source)
+        if flat1659 is not None:
+            assert flat1659 is not None
+            self.write(flat1659)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("gnf_columns"):
-                _t1739 = _dollar_dollar.gnf_columns.columns
+                _t1829 = _dollar_dollar.gnf_columns.columns
             else:
-                _t1739 = None
-            deconstruct_result1569 = _t1739
-            if deconstruct_result1569 is not None:
-                assert deconstruct_result1569 is not None
-                unwrapped1570 = deconstruct_result1569
+                _t1829 = None
+            deconstruct_result1655 = _t1829
+            if deconstruct_result1655 is not None:
+                assert deconstruct_result1655 is not None
+                unwrapped1656 = deconstruct_result1655
                 self.write("(gnf_columns")
                 self.indent_sexp()
-                if not len(unwrapped1570) == 0:
+                if not len(unwrapped1656) == 0:
                     self.newline()
-                    for i1572, elem1571 in enumerate(unwrapped1570):
-                        if (i1572 > 0):
+                    for i1658, elem1657 in enumerate(unwrapped1656):
+                        if (i1658 > 0):
                             self.newline()
-                        self.pretty_export_csv_column(elem1571)
+                        self.pretty_export_csv_column(elem1657)
                 self.dedent()
                 self.write(")")
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("table_def"):
-                    _t1740 = _dollar_dollar.table_def
+                    _t1830 = _dollar_dollar.table_def
                 else:
-                    _t1740 = None
-                deconstruct_result1567 = _t1740
-                if deconstruct_result1567 is not None:
-                    assert deconstruct_result1567 is not None
-                    unwrapped1568 = deconstruct_result1567
+                    _t1830 = None
+                deconstruct_result1653 = _t1830
+                if deconstruct_result1653 is not None:
+                    assert deconstruct_result1653 is not None
+                    unwrapped1654 = deconstruct_result1653
                     self.write("(table_def")
                     self.indent_sexp()
                     self.newline()
-                    self.pretty_relation_id(unwrapped1568)
+                    self.pretty_relation_id(unwrapped1654)
                     self.dedent()
                     self.write(")")
                 else:
                     raise ParseError("No matching rule for export_csv_source")
 
     def pretty_export_csv_column(self, msg: transactions_pb2.ExportCSVColumn):
-        flat1578 = self._try_flat(msg, self.pretty_export_csv_column)
-        if flat1578 is not None:
-            assert flat1578 is not None
-            self.write(flat1578)
+        flat1664 = self._try_flat(msg, self.pretty_export_csv_column)
+        if flat1664 is not None:
+            assert flat1664 is not None
+            self.write(flat1664)
             return None
         else:
             _dollar_dollar = msg
-            fields1574 = (_dollar_dollar.column_name, _dollar_dollar.column_data,)
-            assert fields1574 is not None
-            unwrapped_fields1575 = fields1574
+            fields1660 = (_dollar_dollar.column_name, _dollar_dollar.column_data,)
+            assert fields1660 is not None
+            unwrapped_fields1661 = fields1660
             self.write("(column")
             self.indent_sexp()
             self.newline()
-            field1576 = unwrapped_fields1575[0]
-            self.write(self.format_string_value(field1576))
+            field1662 = unwrapped_fields1661[0]
+            self.write(self.format_string_value(field1662))
             self.newline()
-            field1577 = unwrapped_fields1575[1]
-            self.pretty_relation_id(field1577)
+            field1663 = unwrapped_fields1661[1]
+            self.pretty_relation_id(field1663)
             self.dedent()
             self.write(")")
 
     def pretty_export_csv_columns_list(self, msg: Sequence[transactions_pb2.ExportCSVColumn]):
-        flat1582 = self._try_flat(msg, self.pretty_export_csv_columns_list)
-        if flat1582 is not None:
-            assert flat1582 is not None
-            self.write(flat1582)
+        flat1668 = self._try_flat(msg, self.pretty_export_csv_columns_list)
+        if flat1668 is not None:
+            assert flat1668 is not None
+            self.write(flat1668)
             return None
         else:
-            fields1579 = msg
+            fields1665 = msg
             self.write("(columns")
             self.indent_sexp()
-            if not len(fields1579) == 0:
+            if not len(fields1665) == 0:
                 self.newline()
-                for i1581, elem1580 in enumerate(fields1579):
-                    if (i1581 > 0):
+                for i1667, elem1666 in enumerate(fields1665):
+                    if (i1667 > 0):
                         self.newline()
-                    self.pretty_export_csv_column(elem1580)
+                    self.pretty_export_csv_column(elem1666)
             self.dedent()
             self.write(")")
 
     def pretty_export_iceberg_config(self, msg: transactions_pb2.ExportIcebergConfig):
-        flat1591 = self._try_flat(msg, self.pretty_export_iceberg_config)
-        if flat1591 is not None:
-            assert flat1591 is not None
-            self.write(flat1591)
+        flat1677 = self._try_flat(msg, self.pretty_export_iceberg_config)
+        if flat1677 is not None:
+            assert flat1677 is not None
+            self.write(flat1677)
             return None
         else:
             _dollar_dollar = msg
-            _t1741 = self.deconstruct_export_iceberg_config_optional(_dollar_dollar)
-            fields1583 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.table_def, sorted(_dollar_dollar.table_properties.items()), _t1741,)
-            assert fields1583 is not None
-            unwrapped_fields1584 = fields1583
+            _t1831 = self.deconstruct_export_iceberg_config_optional(_dollar_dollar)
+            fields1669 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.table_def, sorted(_dollar_dollar.table_properties.items()), _t1831,)
+            assert fields1669 is not None
+            unwrapped_fields1670 = fields1669
             self.write("(export_iceberg_config")
             self.indent_sexp()
             self.newline()
-            field1585 = unwrapped_fields1584[0]
-            self.pretty_iceberg_locator(field1585)
+            field1671 = unwrapped_fields1670[0]
+            self.pretty_iceberg_locator(field1671)
             self.newline()
-            field1586 = unwrapped_fields1584[1]
-            self.pretty_iceberg_catalog_config(field1586)
+            field1672 = unwrapped_fields1670[1]
+            self.pretty_iceberg_catalog_config(field1672)
             self.newline()
-            field1587 = unwrapped_fields1584[2]
-            self.pretty_export_iceberg_table_def(field1587)
+            field1673 = unwrapped_fields1670[2]
+            self.pretty_export_iceberg_table_def(field1673)
             self.newline()
-            field1588 = unwrapped_fields1584[3]
-            self.pretty_iceberg_table_properties(field1588)
-            field1589 = unwrapped_fields1584[4]
-            if field1589 is not None:
+            field1674 = unwrapped_fields1670[3]
+            self.pretty_iceberg_table_properties(field1674)
+            field1675 = unwrapped_fields1670[4]
+            if field1675 is not None:
                 self.newline()
-                assert field1589 is not None
-                opt_val1590 = field1589
-                self.pretty_config_dict(opt_val1590)
+                assert field1675 is not None
+                opt_val1676 = field1675
+                self.pretty_config_dict(opt_val1676)
             self.dedent()
             self.write(")")
 
     def pretty_export_iceberg_table_def(self, msg: logic_pb2.RelationId):
-        flat1593 = self._try_flat(msg, self.pretty_export_iceberg_table_def)
-        if flat1593 is not None:
-            assert flat1593 is not None
-            self.write(flat1593)
+        flat1679 = self._try_flat(msg, self.pretty_export_iceberg_table_def)
+        if flat1679 is not None:
+            assert flat1679 is not None
+            self.write(flat1679)
             return None
         else:
-            fields1592 = msg
+            fields1678 = msg
             self.write("(table_def")
             self.indent_sexp()
             self.newline()
-            self.pretty_relation_id(fields1592)
+            self.pretty_relation_id(fields1678)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_table_properties(self, msg: Sequence[tuple[str, str]]):
-        flat1597 = self._try_flat(msg, self.pretty_iceberg_table_properties)
-        if flat1597 is not None:
-            assert flat1597 is not None
-            self.write(flat1597)
+        flat1683 = self._try_flat(msg, self.pretty_iceberg_table_properties)
+        if flat1683 is not None:
+            assert flat1683 is not None
+            self.write(flat1683)
             return None
         else:
-            fields1594 = msg
+            fields1680 = msg
             self.write("(table_properties")
             self.indent_sexp()
-            if not len(fields1594) == 0:
+            if not len(fields1680) == 0:
                 self.newline()
-                for i1596, elem1595 in enumerate(fields1594):
-                    if (i1596 > 0):
+                for i1682, elem1681 in enumerate(fields1680):
+                    if (i1682 > 0):
                         self.newline()
-                    self.pretty_iceberg_property_entry(elem1595)
+                    self.pretty_iceberg_property_entry(elem1681)
             self.dedent()
             self.write(")")
 
@@ -4390,8 +4591,8 @@ def pretty_debug_info(self, msg: fragments_pb2.DebugInfo):
         for _idx, _rid in enumerate(msg.ids):
             self.newline()
             self.write("(")
-            _t1793 = logic_pb2.UInt128Value(low=_rid.id_low, high=_rid.id_high)
-            self.pprint_dispatch(_t1793)
+            _t1885 = logic_pb2.UInt128Value(low=_rid.id_low, high=_rid.id_high)
+            self.pprint_dispatch(_t1885)
             self.write(" ")
             self.write(self.format_string_value(msg.orig_names[_idx]))
             self.write(")")
@@ -4441,6 +4642,25 @@ def pretty_be_tree_locator(self, msg: logic_pb2.BeTreeLocator):
         self.write(")")
         self.dedent()
 
+    def pretty_cdc_targets(self, msg: logic_pb2.CdcTargets):
+        self.write("(cdc_targets")
+        self.indent_sexp()
+        self.newline()
+        self.write(":inserts (")
+        for _idx, _elem in enumerate(msg.inserts):
+            if (_idx > 0):
+                self.write(" ")
+            self.pprint_dispatch(_elem)
+        self.write(")")
+        self.newline()
+        self.write(":deletes (")
+        for _idx, _elem in enumerate(msg.deletes):
+            if (_idx > 0):
+                self.write(" ")
+            self.pprint_dispatch(_elem)
+        self.write("))")
+        self.dedent()
+
     def pretty_decimal_value(self, msg: logic_pb2.DecimalValue):
         self.write(self.format_decimal(msg))
 
@@ -4472,6 +4692,18 @@ def pretty_int128_value(self, msg: logic_pb2.Int128Value):
     def pretty_missing_value(self, msg: logic_pb2.MissingValue):
         self.write("missing")
 
+    def pretty_plain_targets(self, msg: logic_pb2.PlainTargets):
+        self.write("(plain_targets")
+        self.indent_sexp()
+        self.newline()
+        self.write(":targets (")
+        for _idx, _elem in enumerate(msg.targets):
+            if (_idx > 0):
+                self.write(" ")
+            self.pprint_dispatch(_elem)
+        self.write("))")
+        self.dedent()
+
     def pretty_storage_integration(self, msg: logic_pb2.StorageIntegration):
         self.write("(storage_integration")
         self.indent_sexp()
@@ -4679,6 +4911,12 @@ def pprint_dispatch(self, msg):
             self.pretty_csv_config(msg)
         elif isinstance(msg, logic_pb2.GNFColumn):
             self.pretty_gnf_column(msg)
+        elif isinstance(msg, logic_pb2.TargetRelations):
+            self.pretty_target_relations(msg)
+        elif isinstance(msg, logic_pb2.NamedColumn):
+            self.pretty_named_column(msg)
+        elif isinstance(msg, logic_pb2.TargetRelation):
+            self.pretty_target_relation(msg)
         elif isinstance(msg, logic_pb2.IcebergData):
             self.pretty_iceberg_data(msg)
         elif isinstance(msg, logic_pb2.IcebergLocator):
@@ -4719,6 +4957,8 @@ def pprint_dispatch(self, msg):
             self.pretty_be_tree_config(msg)
         elif isinstance(msg, logic_pb2.BeTreeLocator):
             self.pretty_be_tree_locator(msg)
+        elif isinstance(msg, logic_pb2.CdcTargets):
+            self.pretty_cdc_targets(msg)
         elif isinstance(msg, logic_pb2.DecimalValue):
             self.pretty_decimal_value(msg)
         elif isinstance(msg, logic_pb2.FunctionalDependency):
@@ -4727,6 +4967,8 @@ def pprint_dispatch(self, msg):
             self.pretty_int128_value(msg)
         elif isinstance(msg, logic_pb2.MissingValue):
             self.pretty_missing_value(msg)
+        elif isinstance(msg, logic_pb2.PlainTargets):
+            self.pretty_plain_targets(msg)
         elif isinstance(msg, logic_pb2.StorageIntegration):
             self.pretty_storage_integration(msg)
         elif isinstance(msg, logic_pb2.UInt128Value):
diff --git a/sdks/python/src/lqp/proto/v1/logic_pb2.py b/sdks/python/src/lqp/proto/v1/logic_pb2.py
index 1c9590dc..f37b4882 100644
--- a/sdks/python/src/lqp/proto/v1/logic_pb2.py
+++ b/sdks/python/src/lqp/proto/v1/logic_pb2.py
@@ -24,7 +24,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1frelationalai/lqp/v1/logic.proto\x12\x13relationalai.lqp.v1\"\x83\x02\n\x0b\x44\x65\x63laration\x12,\n\x03\x64\x65\x66\x18\x01 \x01(\x0b\x32\x18.relationalai.lqp.v1.DefH\x00R\x03\x64\x65\x66\x12>\n\talgorithm\x18\x02 \x01(\x0b\x32\x1e.relationalai.lqp.v1.AlgorithmH\x00R\talgorithm\x12\x41\n\nconstraint\x18\x03 \x01(\x0b\x32\x1f.relationalai.lqp.v1.ConstraintH\x00R\nconstraint\x12/\n\x04\x64\x61ta\x18\x04 \x01(\x0b\x32\x19.relationalai.lqp.v1.DataH\x00R\x04\x64\x61taB\x12\n\x10\x64\x65\x63laration_type\"\xa6\x01\n\x03\x44\x65\x66\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"\xb6\x01\n\nConstraint\x12\x33\n\x04name\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12`\n\x15\x66unctional_dependency\x18\x01 \x01(\x0b\x32).relationalai.lqp.v1.FunctionalDependencyH\x00R\x14\x66unctionalDependencyB\x11\n\x0f\x63onstraint_type\"\xae\x01\n\x14\x46unctionalDependency\x12\x36\n\x05guard\x18\x01 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x05guard\x12,\n\x04keys\x18\x02 \x03(\x0b\x32\x18.relationalai.lqp.v1.VarR\x04keys\x12\x30\n\x06values\x18\x03 \x03(\x0b\x32\x18.relationalai.lqp.v1.VarR\x06values\"\xab\x01\n\tAlgorithm\x12\x37\n\x06global\x18\x01 \x03(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x06global\x12/\n\x04\x62ody\x18\x02 \x01(\x0b\x32\x1b.relationalai.lqp.v1.ScriptR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"H\n\x06Script\x12>\n\nconstructs\x18\x01 \x03(\x0b\x32\x1e.relationalai.lqp.v1.ConstructR\nconstructs\"\x94\x01\n\tConstruct\x12/\n\x04loop\x18\x01 \x01(\x0b\x32\x19.relationalai.lqp.v1.LoopH\x00R\x04loop\x12\x44\n\x0binstruction\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.InstructionH\x00R\x0binstructionB\x10\n\x0e\x63onstruct_type\"\xa3\x01\n\x04Loop\x12\x34\n\x04init\x18\x01 \x03(\x0b\x32 .relationalai.lqp.v1.InstructionR\x04init\x12/\n\x04\x62ody\x18\x02 \x01(\x0b\x32\x1b.relationalai.lqp.v1.ScriptR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"\xc2\x02\n\x0bInstruction\x12\x35\n\x06\x61ssign\x18\x01 \x01(\x0b\x32\x1b.relationalai.lqp.v1.AssignH\x00R\x06\x61ssign\x12\x35\n\x06upsert\x18\x02 \x01(\x0b\x32\x1b.relationalai.lqp.v1.UpsertH\x00R\x06upsert\x12\x32\n\x05\x62reak\x18\x03 \x01(\x0b\x32\x1a.relationalai.lqp.v1.BreakH\x00R\x05\x62reak\x12?\n\nmonoid_def\x18\x05 \x01(\x0b\x32\x1e.relationalai.lqp.v1.MonoidDefH\x00R\tmonoidDef\x12<\n\tmonus_def\x18\x06 \x01(\x0b\x32\x1d.relationalai.lqp.v1.MonusDefH\x00R\x08monusDefB\x0c\n\ninstr_typeJ\x04\x08\x04\x10\x05\"\xa9\x01\n\x06\x41ssign\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"\xca\x01\n\x06Upsert\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\x12\x1f\n\x0bvalue_arity\x18\x04 \x01(\x03R\nvalueArity\"\xa8\x01\n\x05\x42reak\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"\x82\x02\n\tMonoidDef\x12\x33\n\x06monoid\x18\x01 \x01(\x0b\x32\x1b.relationalai.lqp.v1.MonoidR\x06monoid\x12\x33\n\x04name\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x04 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\x12\x1f\n\x0bvalue_arity\x18\x05 \x01(\x03R\nvalueArity\"\x81\x02\n\x08MonusDef\x12\x33\n\x06monoid\x18\x01 \x01(\x0b\x32\x1b.relationalai.lqp.v1.MonoidR\x06monoid\x12\x33\n\x04name\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x04 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\x12\x1f\n\x0bvalue_arity\x18\x05 \x01(\x03R\nvalueArity\"\x92\x02\n\x06Monoid\x12<\n\tor_monoid\x18\x01 \x01(\x0b\x32\x1d.relationalai.lqp.v1.OrMonoidH\x00R\x08orMonoid\x12?\n\nmin_monoid\x18\x02 \x01(\x0b\x32\x1e.relationalai.lqp.v1.MinMonoidH\x00R\tminMonoid\x12?\n\nmax_monoid\x18\x03 \x01(\x0b\x32\x1e.relationalai.lqp.v1.MaxMonoidH\x00R\tmaxMonoid\x12?\n\nsum_monoid\x18\x04 \x01(\x0b\x32\x1e.relationalai.lqp.v1.SumMonoidH\x00R\tsumMonoidB\x07\n\x05value\"\n\n\x08OrMonoid\":\n\tMinMonoid\x12-\n\x04type\x18\x01 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\":\n\tMaxMonoid\x12-\n\x04type\x18\x01 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\":\n\tSumMonoid\x12-\n\x04type\x18\x01 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\"d\n\x07\x42inding\x12*\n\x03var\x18\x01 \x01(\x0b\x32\x18.relationalai.lqp.v1.VarR\x03var\x12-\n\x04type\x18\x02 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\"s\n\x0b\x41\x62straction\x12\x30\n\x04vars\x18\x01 \x03(\x0b\x32\x1c.relationalai.lqp.v1.BindingR\x04vars\x12\x32\n\x05value\x18\x02 \x01(\x0b\x32\x1c.relationalai.lqp.v1.FormulaR\x05value\"\x83\x05\n\x07\x46ormula\x12\x35\n\x06\x65xists\x18\x01 \x01(\x0b\x32\x1b.relationalai.lqp.v1.ExistsH\x00R\x06\x65xists\x12\x35\n\x06reduce\x18\x02 \x01(\x0b\x32\x1b.relationalai.lqp.v1.ReduceH\x00R\x06reduce\x12\x44\n\x0b\x63onjunction\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.ConjunctionH\x00R\x0b\x63onjunction\x12\x44\n\x0b\x64isjunction\x18\x04 \x01(\x0b\x32 .relationalai.lqp.v1.DisjunctionH\x00R\x0b\x64isjunction\x12,\n\x03not\x18\x05 \x01(\x0b\x32\x18.relationalai.lqp.v1.NotH\x00R\x03not\x12,\n\x03\x66\x66i\x18\x06 \x01(\x0b\x32\x18.relationalai.lqp.v1.FFIH\x00R\x03\x66\x66i\x12/\n\x04\x61tom\x18\x07 \x01(\x0b\x32\x19.relationalai.lqp.v1.AtomH\x00R\x04\x61tom\x12\x35\n\x06pragma\x18\x08 \x01(\x0b\x32\x1b.relationalai.lqp.v1.PragmaH\x00R\x06pragma\x12>\n\tprimitive\x18\t \x01(\x0b\x32\x1e.relationalai.lqp.v1.PrimitiveH\x00R\tprimitive\x12\x39\n\x08rel_atom\x18\n \x01(\x0b\x32\x1c.relationalai.lqp.v1.RelAtomH\x00R\x07relAtom\x12/\n\x04\x63\x61st\x18\x0b \x01(\x0b\x32\x19.relationalai.lqp.v1.CastH\x00R\x04\x63\x61stB\x0e\n\x0c\x66ormula_type\">\n\x06\x45xists\x12\x34\n\x04\x62ody\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\"\xa1\x01\n\x06Reduce\x12\x30\n\x02op\x18\x01 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x02op\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12/\n\x05terms\x18\x03 \x03(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05terms\"?\n\x0b\x43onjunction\x12\x30\n\x04\x61rgs\x18\x01 \x03(\x0b\x32\x1c.relationalai.lqp.v1.FormulaR\x04\x61rgs\"?\n\x0b\x44isjunction\x12\x30\n\x04\x61rgs\x18\x01 \x03(\x0b\x32\x1c.relationalai.lqp.v1.FormulaR\x04\x61rgs\"5\n\x03Not\x12.\n\x03\x61rg\x18\x01 \x01(\x0b\x32\x1c.relationalai.lqp.v1.FormulaR\x03\x61rg\"\x80\x01\n\x03\x46\x46I\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x34\n\x04\x61rgs\x18\x02 \x03(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x61rgs\x12/\n\x05terms\x18\x03 \x03(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05terms\"l\n\x04\x41tom\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12/\n\x05terms\x18\x02 \x03(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05terms\"M\n\x06Pragma\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12/\n\x05terms\x18\x02 \x03(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05terms\"S\n\tPrimitive\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x32\n\x05terms\x18\x02 \x03(\x0b\x32\x1c.relationalai.lqp.v1.RelTermR\x05terms\"Q\n\x07RelAtom\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x32\n\x05terms\x18\x02 \x03(\x0b\x32\x1c.relationalai.lqp.v1.RelTermR\x05terms\"j\n\x04\x43\x61st\x12/\n\x05input\x18\x02 \x01(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05input\x12\x31\n\x06result\x18\x03 \x01(\x0b\x32\x19.relationalai.lqp.v1.TermR\x06result\"\x96\x01\n\x07RelTerm\x12I\n\x11specialized_value\x18\x01 \x01(\x0b\x32\x1a.relationalai.lqp.v1.ValueH\x00R\x10specializedValue\x12/\n\x04term\x18\x02 \x01(\x0b\x32\x19.relationalai.lqp.v1.TermH\x00R\x04termB\x0f\n\rrel_term_type\"{\n\x04Term\x12,\n\x03var\x18\x01 \x01(\x0b\x32\x18.relationalai.lqp.v1.VarH\x00R\x03var\x12\x38\n\x08\x63onstant\x18\x02 \x01(\x0b\x32\x1a.relationalai.lqp.v1.ValueH\x00R\x08\x63onstantB\x0b\n\tterm_type\"\x19\n\x03Var\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"O\n\tAttribute\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12.\n\x04\x61rgs\x18\x02 \x03(\x0b\x32\x1a.relationalai.lqp.v1.ValueR\x04\x61rgs\"\x93\x02\n\x04\x44\x61ta\x12,\n\x03\x65\x64\x62\x18\x01 \x01(\x0b\x32\x18.relationalai.lqp.v1.EDBH\x00R\x03\x65\x64\x62\x12N\n\x0f\x62\x65tree_relation\x18\x02 \x01(\x0b\x32#.relationalai.lqp.v1.BeTreeRelationH\x00R\x0e\x62\x65treeRelation\x12\x39\n\x08\x63sv_data\x18\x03 \x01(\x0b\x32\x1c.relationalai.lqp.v1.CSVDataH\x00R\x07\x63svData\x12\x45\n\x0ciceberg_data\x18\x04 \x01(\x0b\x32 .relationalai.lqp.v1.IcebergDataH\x00R\x0bicebergDataB\x0b\n\tdata_type\"\x88\x01\n\x03\x45\x44\x42\x12<\n\ttarget_id\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x08targetId\x12\x12\n\x04path\x18\x02 \x03(\tR\x04path\x12/\n\x05types\x18\x03 \x03(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x05types\"\x8b\x01\n\x0e\x42\x65TreeRelation\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x44\n\rrelation_info\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.BeTreeInfoR\x0crelationInfo\"\x9f\x02\n\nBeTreeInfo\x12\x36\n\tkey_types\x18\x01 \x03(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x08keyTypes\x12:\n\x0bvalue_types\x18\x02 \x03(\x0b\x32\x19.relationalai.lqp.v1.TypeR\nvalueTypes\x12H\n\x0estorage_config\x18\x04 \x01(\x0b\x32!.relationalai.lqp.v1.BeTreeConfigR\rstorageConfig\x12M\n\x10relation_locator\x18\x05 \x01(\x0b\x32\".relationalai.lqp.v1.BeTreeLocatorR\x0frelationLocatorJ\x04\x08\x03\x10\x04\"\x81\x01\n\x0c\x42\x65TreeConfig\x12\x18\n\x07\x65psilon\x18\x01 \x01(\x01R\x07\x65psilon\x12\x1d\n\nmax_pivots\x18\x02 \x01(\x03R\tmaxPivots\x12\x1d\n\nmax_deltas\x18\x03 \x01(\x03R\tmaxDeltas\x12\x19\n\x08max_leaf\x18\x04 \x01(\x03R\x07maxLeaf\"\xca\x01\n\rBeTreeLocator\x12\x44\n\x0broot_pageid\x18\x01 \x01(\x0b\x32!.relationalai.lqp.v1.UInt128ValueH\x00R\nrootPageid\x12!\n\x0binline_data\x18\x04 \x01(\x0cH\x00R\ninlineData\x12#\n\relement_count\x18\x02 \x01(\x03R\x0c\x65lementCount\x12\x1f\n\x0btree_height\x18\x03 \x01(\x03R\ntreeHeightB\n\n\x08location\"\xcf\x01\n\x12StorageIntegration\x12\x1a\n\x08provider\x18\x01 \x01(\tR\x08provider\x12&\n\x0f\x61zure_sas_token\x18\x02 \x01(\tR\razureSasToken\x12\x1b\n\ts3_region\x18\x03 \x01(\tR\x08s3Region\x12\'\n\x10s3_access_key_id\x18\x04 \x01(\tR\rs3AccessKeyId\x12/\n\x14s3_secret_access_key\x18\x05 \x01(\tR\x11s3SecretAccessKey\"\xca\x01\n\x07\x43SVData\x12\x39\n\x07locator\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.CSVLocatorR\x07locator\x12\x36\n\x06\x63onfig\x18\x02 \x01(\x0b\x32\x1e.relationalai.lqp.v1.CSVConfigR\x06\x63onfig\x12\x38\n\x07\x63olumns\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.GNFColumnR\x07\x63olumns\x12\x12\n\x04\x61sof\x18\x04 \x01(\tR\x04\x61sof\"C\n\nCSVLocator\x12\x14\n\x05paths\x18\x01 \x03(\tR\x05paths\x12\x1f\n\x0binline_data\x18\x02 \x01(\x0cR\ninlineData\"\x86\x04\n\tCSVConfig\x12\x1d\n\nheader_row\x18\x01 \x01(\x05R\theaderRow\x12\x12\n\x04skip\x18\x02 \x01(\x03R\x04skip\x12\x19\n\x08new_line\x18\x03 \x01(\tR\x07newLine\x12\x1c\n\tdelimiter\x18\x04 \x01(\tR\tdelimiter\x12\x1c\n\tquotechar\x18\x05 \x01(\tR\tquotechar\x12\x1e\n\nescapechar\x18\x06 \x01(\tR\nescapechar\x12\x18\n\x07\x63omment\x18\x07 \x01(\tR\x07\x63omment\x12\'\n\x0fmissing_strings\x18\x08 \x03(\tR\x0emissingStrings\x12+\n\x11\x64\x65\x63imal_separator\x18\t \x01(\tR\x10\x64\x65\x63imalSeparator\x12\x1a\n\x08\x65ncoding\x18\n \x01(\tR\x08\x65ncoding\x12 \n\x0b\x63ompression\x18\x0b \x01(\tR\x0b\x63ompression\x12*\n\x11partition_size_mb\x18\x0c \x01(\x03R\x0fpartitionSizeMb\x12]\n\x13storage_integration\x18\r \x01(\x0b\x32\'.relationalai.lqp.v1.StorageIntegrationH\x00R\x12storageIntegration\x88\x01\x01\x42\x16\n\x14_storage_integration\"\xe0\x02\n\x0bIcebergData\x12=\n\x07locator\x18\x01 \x01(\x0b\x32#.relationalai.lqp.v1.IcebergLocatorR\x07locator\x12\x41\n\x06\x63onfig\x18\x02 \x01(\x0b\x32).relationalai.lqp.v1.IcebergCatalogConfigR\x06\x63onfig\x12\x38\n\x07\x63olumns\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.GNFColumnR\x07\x63olumns\x12(\n\rfrom_snapshot\x18\x04 \x01(\tH\x00R\x0c\x66romSnapshot\x88\x01\x01\x12$\n\x0bto_snapshot\x18\x05 \x01(\tH\x01R\ntoSnapshot\x88\x01\x01\x12#\n\rreturns_delta\x18\x06 \x01(\x08R\x0creturnsDeltaB\x10\n\x0e_from_snapshotB\x0e\n\x0c_to_snapshot\"k\n\x0eIcebergLocator\x12\x1d\n\ntable_name\x18\x01 \x01(\tR\ttableName\x12\x1c\n\tnamespace\x18\x02 \x03(\tR\tnamespace\x12\x1c\n\twarehouse\x18\x03 \x01(\tR\twarehouse\"\xa1\x03\n\x14IcebergCatalogConfig\x12\x1f\n\x0b\x63\x61talog_uri\x18\x01 \x01(\tR\ncatalogUri\x12\x19\n\x05scope\x18\x02 \x01(\tH\x00R\x05scope\x88\x01\x01\x12Y\n\nproperties\x18\x03 \x03(\x0b\x32\x39.relationalai.lqp.v1.IcebergCatalogConfig.PropertiesEntryR\nproperties\x12\x66\n\x0f\x61uth_properties\x18\x04 \x03(\x0b\x32=.relationalai.lqp.v1.IcebergCatalogConfig.AuthPropertiesEntryR\x0e\x61uthProperties\x1a=\n\x0fPropertiesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a\x41\n\x13\x41uthPropertiesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x08\n\x06_scope\"\xae\x01\n\tGNFColumn\x12\x1f\n\x0b\x63olumn_path\x18\x01 \x03(\tR\ncolumnPath\x12\x41\n\ttarget_id\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdH\x00R\x08targetId\x88\x01\x01\x12/\n\x05types\x18\x03 \x03(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x05typesB\x0c\n\n_target_id\"<\n\nRelationId\x12\x15\n\x06id_low\x18\x01 \x01(\x06R\x05idLow\x12\x17\n\x07id_high\x18\x02 \x01(\x06R\x06idHigh\"\xd5\x07\n\x04Type\x12Q\n\x10unspecified_type\x18\x01 \x01(\x0b\x32$.relationalai.lqp.v1.UnspecifiedTypeH\x00R\x0funspecifiedType\x12\x42\n\x0bstring_type\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.StringTypeH\x00R\nstringType\x12\x39\n\x08int_type\x18\x03 \x01(\x0b\x32\x1c.relationalai.lqp.v1.IntTypeH\x00R\x07intType\x12?\n\nfloat_type\x18\x04 \x01(\x0b\x32\x1e.relationalai.lqp.v1.FloatTypeH\x00R\tfloatType\x12\x45\n\x0cuint128_type\x18\x05 \x01(\x0b\x32 .relationalai.lqp.v1.UInt128TypeH\x00R\x0buint128Type\x12\x42\n\x0bint128_type\x18\x06 \x01(\x0b\x32\x1f.relationalai.lqp.v1.Int128TypeH\x00R\nint128Type\x12<\n\tdate_type\x18\x07 \x01(\x0b\x32\x1d.relationalai.lqp.v1.DateTypeH\x00R\x08\x64\x61teType\x12H\n\rdatetime_type\x18\x08 \x01(\x0b\x32!.relationalai.lqp.v1.DateTimeTypeH\x00R\x0c\x64\x61tetimeType\x12\x45\n\x0cmissing_type\x18\t \x01(\x0b\x32 .relationalai.lqp.v1.MissingTypeH\x00R\x0bmissingType\x12\x45\n\x0c\x64\x65\x63imal_type\x18\n \x01(\x0b\x32 .relationalai.lqp.v1.DecimalTypeH\x00R\x0b\x64\x65\x63imalType\x12\x45\n\x0c\x62oolean_type\x18\x0b \x01(\x0b\x32 .relationalai.lqp.v1.BooleanTypeH\x00R\x0b\x62ooleanType\x12?\n\nint32_type\x18\x0c \x01(\x0b\x32\x1e.relationalai.lqp.v1.Int32TypeH\x00R\tint32Type\x12\x45\n\x0c\x66loat32_type\x18\r \x01(\x0b\x32 .relationalai.lqp.v1.Float32TypeH\x00R\x0b\x66loat32Type\x12\x42\n\x0buint32_type\x18\x0e \x01(\x0b\x32\x1f.relationalai.lqp.v1.UInt32TypeH\x00R\nuint32TypeB\x06\n\x04type\"\x11\n\x0fUnspecifiedType\"\x0c\n\nStringType\"\t\n\x07IntType\"\x0b\n\tFloatType\"\r\n\x0bUInt128Type\"\x0c\n\nInt128Type\"\n\n\x08\x44\x61teType\"\x0e\n\x0c\x44\x61teTimeType\"\r\n\x0bMissingType\"A\n\x0b\x44\x65\x63imalType\x12\x1c\n\tprecision\x18\x01 \x01(\x05R\tprecision\x12\x14\n\x05scale\x18\x02 \x01(\x05R\x05scale\"\r\n\x0b\x42ooleanType\"\x0b\n\tInt32Type\"\r\n\x0b\x46loat32Type\"\x0c\n\nUInt32Type\"\xc0\x05\n\x05Value\x12#\n\x0cstring_value\x18\x01 \x01(\tH\x00R\x0bstringValue\x12\x1d\n\tint_value\x18\x02 \x01(\x03H\x00R\x08intValue\x12!\n\x0b\x66loat_value\x18\x03 \x01(\x01H\x00R\nfloatValue\x12H\n\ruint128_value\x18\x04 \x01(\x0b\x32!.relationalai.lqp.v1.UInt128ValueH\x00R\x0cuint128Value\x12\x45\n\x0cint128_value\x18\x05 \x01(\x0b\x32 .relationalai.lqp.v1.Int128ValueH\x00R\x0bint128Value\x12H\n\rmissing_value\x18\x06 \x01(\x0b\x32!.relationalai.lqp.v1.MissingValueH\x00R\x0cmissingValue\x12?\n\ndate_value\x18\x07 \x01(\x0b\x32\x1e.relationalai.lqp.v1.DateValueH\x00R\tdateValue\x12K\n\x0e\x64\x61tetime_value\x18\x08 \x01(\x0b\x32\".relationalai.lqp.v1.DateTimeValueH\x00R\rdatetimeValue\x12H\n\rdecimal_value\x18\t \x01(\x0b\x32!.relationalai.lqp.v1.DecimalValueH\x00R\x0c\x64\x65\x63imalValue\x12%\n\rboolean_value\x18\n \x01(\x08H\x00R\x0c\x62ooleanValue\x12!\n\x0bint32_value\x18\x0b \x01(\x05H\x00R\nint32Value\x12%\n\rfloat32_value\x18\x0c \x01(\x02H\x00R\x0c\x66loat32Value\x12#\n\x0cuint32_value\x18\r \x01(\rH\x00R\x0buint32ValueB\x07\n\x05value\"4\n\x0cUInt128Value\x12\x10\n\x03low\x18\x01 \x01(\x06R\x03low\x12\x12\n\x04high\x18\x02 \x01(\x06R\x04high\"3\n\x0bInt128Value\x12\x10\n\x03low\x18\x01 \x01(\x06R\x03low\x12\x12\n\x04high\x18\x02 \x01(\x06R\x04high\"\x0e\n\x0cMissingValue\"G\n\tDateValue\x12\x12\n\x04year\x18\x01 \x01(\x05R\x04year\x12\x14\n\x05month\x18\x02 \x01(\x05R\x05month\x12\x10\n\x03\x64\x61y\x18\x03 \x01(\x05R\x03\x64\x61y\"\xb1\x01\n\rDateTimeValue\x12\x12\n\x04year\x18\x01 \x01(\x05R\x04year\x12\x14\n\x05month\x18\x02 \x01(\x05R\x05month\x12\x10\n\x03\x64\x61y\x18\x03 \x01(\x05R\x03\x64\x61y\x12\x12\n\x04hour\x18\x04 \x01(\x05R\x04hour\x12\x16\n\x06minute\x18\x05 \x01(\x05R\x06minute\x12\x16\n\x06second\x18\x06 \x01(\x05R\x06second\x12 \n\x0bmicrosecond\x18\x07 \x01(\x05R\x0bmicrosecond\"z\n\x0c\x44\x65\x63imalValue\x12\x1c\n\tprecision\x18\x01 \x01(\x05R\tprecision\x12\x14\n\x05scale\x18\x02 \x01(\x05R\x05scale\x12\x36\n\x05value\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.Int128ValueR\x05valueBCZAgithub.com/RelationalAI/logical-query-protocol/sdks/go/src/lqp/v1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1frelationalai/lqp/v1/logic.proto\x12\x13relationalai.lqp.v1\"\x83\x02\n\x0b\x44\x65\x63laration\x12,\n\x03\x64\x65\x66\x18\x01 \x01(\x0b\x32\x18.relationalai.lqp.v1.DefH\x00R\x03\x64\x65\x66\x12>\n\talgorithm\x18\x02 \x01(\x0b\x32\x1e.relationalai.lqp.v1.AlgorithmH\x00R\talgorithm\x12\x41\n\nconstraint\x18\x03 \x01(\x0b\x32\x1f.relationalai.lqp.v1.ConstraintH\x00R\nconstraint\x12/\n\x04\x64\x61ta\x18\x04 \x01(\x0b\x32\x19.relationalai.lqp.v1.DataH\x00R\x04\x64\x61taB\x12\n\x10\x64\x65\x63laration_type\"\xa6\x01\n\x03\x44\x65\x66\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"\xb6\x01\n\nConstraint\x12\x33\n\x04name\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12`\n\x15\x66unctional_dependency\x18\x01 \x01(\x0b\x32).relationalai.lqp.v1.FunctionalDependencyH\x00R\x14\x66unctionalDependencyB\x11\n\x0f\x63onstraint_type\"\xae\x01\n\x14\x46unctionalDependency\x12\x36\n\x05guard\x18\x01 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x05guard\x12,\n\x04keys\x18\x02 \x03(\x0b\x32\x18.relationalai.lqp.v1.VarR\x04keys\x12\x30\n\x06values\x18\x03 \x03(\x0b\x32\x18.relationalai.lqp.v1.VarR\x06values\"\xab\x01\n\tAlgorithm\x12\x37\n\x06global\x18\x01 \x03(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x06global\x12/\n\x04\x62ody\x18\x02 \x01(\x0b\x32\x1b.relationalai.lqp.v1.ScriptR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"H\n\x06Script\x12>\n\nconstructs\x18\x01 \x03(\x0b\x32\x1e.relationalai.lqp.v1.ConstructR\nconstructs\"\x94\x01\n\tConstruct\x12/\n\x04loop\x18\x01 \x01(\x0b\x32\x19.relationalai.lqp.v1.LoopH\x00R\x04loop\x12\x44\n\x0binstruction\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.InstructionH\x00R\x0binstructionB\x10\n\x0e\x63onstruct_type\"\xa3\x01\n\x04Loop\x12\x34\n\x04init\x18\x01 \x03(\x0b\x32 .relationalai.lqp.v1.InstructionR\x04init\x12/\n\x04\x62ody\x18\x02 \x01(\x0b\x32\x1b.relationalai.lqp.v1.ScriptR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"\xc2\x02\n\x0bInstruction\x12\x35\n\x06\x61ssign\x18\x01 \x01(\x0b\x32\x1b.relationalai.lqp.v1.AssignH\x00R\x06\x61ssign\x12\x35\n\x06upsert\x18\x02 \x01(\x0b\x32\x1b.relationalai.lqp.v1.UpsertH\x00R\x06upsert\x12\x32\n\x05\x62reak\x18\x03 \x01(\x0b\x32\x1a.relationalai.lqp.v1.BreakH\x00R\x05\x62reak\x12?\n\nmonoid_def\x18\x05 \x01(\x0b\x32\x1e.relationalai.lqp.v1.MonoidDefH\x00R\tmonoidDef\x12<\n\tmonus_def\x18\x06 \x01(\x0b\x32\x1d.relationalai.lqp.v1.MonusDefH\x00R\x08monusDefB\x0c\n\ninstr_typeJ\x04\x08\x04\x10\x05\"\xa9\x01\n\x06\x41ssign\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"\xca\x01\n\x06Upsert\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\x12\x1f\n\x0bvalue_arity\x18\x04 \x01(\x03R\nvalueArity\"\xa8\x01\n\x05\x42reak\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\"\x82\x02\n\tMonoidDef\x12\x33\n\x06monoid\x18\x01 \x01(\x0b\x32\x1b.relationalai.lqp.v1.MonoidR\x06monoid\x12\x33\n\x04name\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x04 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\x12\x1f\n\x0bvalue_arity\x18\x05 \x01(\x03R\nvalueArity\"\x81\x02\n\x08MonusDef\x12\x33\n\x06monoid\x18\x01 \x01(\x0b\x32\x1b.relationalai.lqp.v1.MonoidR\x06monoid\x12\x33\n\x04name\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x34\n\x04\x62ody\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12\x34\n\x05\x61ttrs\x18\x04 \x03(\x0b\x32\x1e.relationalai.lqp.v1.AttributeR\x05\x61ttrs\x12\x1f\n\x0bvalue_arity\x18\x05 \x01(\x03R\nvalueArity\"\x92\x02\n\x06Monoid\x12<\n\tor_monoid\x18\x01 \x01(\x0b\x32\x1d.relationalai.lqp.v1.OrMonoidH\x00R\x08orMonoid\x12?\n\nmin_monoid\x18\x02 \x01(\x0b\x32\x1e.relationalai.lqp.v1.MinMonoidH\x00R\tminMonoid\x12?\n\nmax_monoid\x18\x03 \x01(\x0b\x32\x1e.relationalai.lqp.v1.MaxMonoidH\x00R\tmaxMonoid\x12?\n\nsum_monoid\x18\x04 \x01(\x0b\x32\x1e.relationalai.lqp.v1.SumMonoidH\x00R\tsumMonoidB\x07\n\x05value\"\n\n\x08OrMonoid\":\n\tMinMonoid\x12-\n\x04type\x18\x01 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\":\n\tMaxMonoid\x12-\n\x04type\x18\x01 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\":\n\tSumMonoid\x12-\n\x04type\x18\x01 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\"d\n\x07\x42inding\x12*\n\x03var\x18\x01 \x01(\x0b\x32\x18.relationalai.lqp.v1.VarR\x03var\x12-\n\x04type\x18\x02 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\"s\n\x0b\x41\x62straction\x12\x30\n\x04vars\x18\x01 \x03(\x0b\x32\x1c.relationalai.lqp.v1.BindingR\x04vars\x12\x32\n\x05value\x18\x02 \x01(\x0b\x32\x1c.relationalai.lqp.v1.FormulaR\x05value\"\x83\x05\n\x07\x46ormula\x12\x35\n\x06\x65xists\x18\x01 \x01(\x0b\x32\x1b.relationalai.lqp.v1.ExistsH\x00R\x06\x65xists\x12\x35\n\x06reduce\x18\x02 \x01(\x0b\x32\x1b.relationalai.lqp.v1.ReduceH\x00R\x06reduce\x12\x44\n\x0b\x63onjunction\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.ConjunctionH\x00R\x0b\x63onjunction\x12\x44\n\x0b\x64isjunction\x18\x04 \x01(\x0b\x32 .relationalai.lqp.v1.DisjunctionH\x00R\x0b\x64isjunction\x12,\n\x03not\x18\x05 \x01(\x0b\x32\x18.relationalai.lqp.v1.NotH\x00R\x03not\x12,\n\x03\x66\x66i\x18\x06 \x01(\x0b\x32\x18.relationalai.lqp.v1.FFIH\x00R\x03\x66\x66i\x12/\n\x04\x61tom\x18\x07 \x01(\x0b\x32\x19.relationalai.lqp.v1.AtomH\x00R\x04\x61tom\x12\x35\n\x06pragma\x18\x08 \x01(\x0b\x32\x1b.relationalai.lqp.v1.PragmaH\x00R\x06pragma\x12>\n\tprimitive\x18\t \x01(\x0b\x32\x1e.relationalai.lqp.v1.PrimitiveH\x00R\tprimitive\x12\x39\n\x08rel_atom\x18\n \x01(\x0b\x32\x1c.relationalai.lqp.v1.RelAtomH\x00R\x07relAtom\x12/\n\x04\x63\x61st\x18\x0b \x01(\x0b\x32\x19.relationalai.lqp.v1.CastH\x00R\x04\x63\x61stB\x0e\n\x0c\x66ormula_type\">\n\x06\x45xists\x12\x34\n\x04\x62ody\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\"\xa1\x01\n\x06Reduce\x12\x30\n\x02op\x18\x01 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x02op\x12\x34\n\x04\x62ody\x18\x02 \x01(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x62ody\x12/\n\x05terms\x18\x03 \x03(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05terms\"?\n\x0b\x43onjunction\x12\x30\n\x04\x61rgs\x18\x01 \x03(\x0b\x32\x1c.relationalai.lqp.v1.FormulaR\x04\x61rgs\"?\n\x0b\x44isjunction\x12\x30\n\x04\x61rgs\x18\x01 \x03(\x0b\x32\x1c.relationalai.lqp.v1.FormulaR\x04\x61rgs\"5\n\x03Not\x12.\n\x03\x61rg\x18\x01 \x01(\x0b\x32\x1c.relationalai.lqp.v1.FormulaR\x03\x61rg\"\x80\x01\n\x03\x46\x46I\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x34\n\x04\x61rgs\x18\x02 \x03(\x0b\x32 .relationalai.lqp.v1.AbstractionR\x04\x61rgs\x12/\n\x05terms\x18\x03 \x03(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05terms\"l\n\x04\x41tom\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12/\n\x05terms\x18\x02 \x03(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05terms\"M\n\x06Pragma\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12/\n\x05terms\x18\x02 \x03(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05terms\"S\n\tPrimitive\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x32\n\x05terms\x18\x02 \x03(\x0b\x32\x1c.relationalai.lqp.v1.RelTermR\x05terms\"Q\n\x07RelAtom\x12\x12\n\x04name\x18\x03 \x01(\tR\x04name\x12\x32\n\x05terms\x18\x02 \x03(\x0b\x32\x1c.relationalai.lqp.v1.RelTermR\x05terms\"j\n\x04\x43\x61st\x12/\n\x05input\x18\x02 \x01(\x0b\x32\x19.relationalai.lqp.v1.TermR\x05input\x12\x31\n\x06result\x18\x03 \x01(\x0b\x32\x19.relationalai.lqp.v1.TermR\x06result\"\x96\x01\n\x07RelTerm\x12I\n\x11specialized_value\x18\x01 \x01(\x0b\x32\x1a.relationalai.lqp.v1.ValueH\x00R\x10specializedValue\x12/\n\x04term\x18\x02 \x01(\x0b\x32\x19.relationalai.lqp.v1.TermH\x00R\x04termB\x0f\n\rrel_term_type\"{\n\x04Term\x12,\n\x03var\x18\x01 \x01(\x0b\x32\x18.relationalai.lqp.v1.VarH\x00R\x03var\x12\x38\n\x08\x63onstant\x18\x02 \x01(\x0b\x32\x1a.relationalai.lqp.v1.ValueH\x00R\x08\x63onstantB\x0b\n\tterm_type\"\x19\n\x03Var\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"O\n\tAttribute\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12.\n\x04\x61rgs\x18\x02 \x03(\x0b\x32\x1a.relationalai.lqp.v1.ValueR\x04\x61rgs\"\x93\x02\n\x04\x44\x61ta\x12,\n\x03\x65\x64\x62\x18\x01 \x01(\x0b\x32\x18.relationalai.lqp.v1.EDBH\x00R\x03\x65\x64\x62\x12N\n\x0f\x62\x65tree_relation\x18\x02 \x01(\x0b\x32#.relationalai.lqp.v1.BeTreeRelationH\x00R\x0e\x62\x65treeRelation\x12\x39\n\x08\x63sv_data\x18\x03 \x01(\x0b\x32\x1c.relationalai.lqp.v1.CSVDataH\x00R\x07\x63svData\x12\x45\n\x0ciceberg_data\x18\x04 \x01(\x0b\x32 .relationalai.lqp.v1.IcebergDataH\x00R\x0bicebergDataB\x0b\n\tdata_type\"\x88\x01\n\x03\x45\x44\x42\x12<\n\ttarget_id\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x08targetId\x12\x12\n\x04path\x18\x02 \x03(\tR\x04path\x12/\n\x05types\x18\x03 \x03(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x05types\"\x8b\x01\n\x0e\x42\x65TreeRelation\x12\x33\n\x04name\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x04name\x12\x44\n\rrelation_info\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.BeTreeInfoR\x0crelationInfo\"\x9f\x02\n\nBeTreeInfo\x12\x36\n\tkey_types\x18\x01 \x03(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x08keyTypes\x12:\n\x0bvalue_types\x18\x02 \x03(\x0b\x32\x19.relationalai.lqp.v1.TypeR\nvalueTypes\x12H\n\x0estorage_config\x18\x04 \x01(\x0b\x32!.relationalai.lqp.v1.BeTreeConfigR\rstorageConfig\x12M\n\x10relation_locator\x18\x05 \x01(\x0b\x32\".relationalai.lqp.v1.BeTreeLocatorR\x0frelationLocatorJ\x04\x08\x03\x10\x04\"\x81\x01\n\x0c\x42\x65TreeConfig\x12\x18\n\x07\x65psilon\x18\x01 \x01(\x01R\x07\x65psilon\x12\x1d\n\nmax_pivots\x18\x02 \x01(\x03R\tmaxPivots\x12\x1d\n\nmax_deltas\x18\x03 \x01(\x03R\tmaxDeltas\x12\x19\n\x08max_leaf\x18\x04 \x01(\x03R\x07maxLeaf\"\xca\x01\n\rBeTreeLocator\x12\x44\n\x0broot_pageid\x18\x01 \x01(\x0b\x32!.relationalai.lqp.v1.UInt128ValueH\x00R\nrootPageid\x12!\n\x0binline_data\x18\x04 \x01(\x0cH\x00R\ninlineData\x12#\n\relement_count\x18\x02 \x01(\x03R\x0c\x65lementCount\x12\x1f\n\x0btree_height\x18\x03 \x01(\x03R\ntreeHeightB\n\n\x08location\"\xcf\x01\n\x12StorageIntegration\x12\x1a\n\x08provider\x18\x01 \x01(\tR\x08provider\x12&\n\x0f\x61zure_sas_token\x18\x02 \x01(\tR\razureSasToken\x12\x1b\n\ts3_region\x18\x03 \x01(\tR\x08s3Region\x12\'\n\x10s3_access_key_id\x18\x04 \x01(\tR\rs3AccessKeyId\x12/\n\x14s3_secret_access_key\x18\x05 \x01(\tR\x11s3SecretAccessKey\"P\n\x0bNamedColumn\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12-\n\x04type\x18\x02 \x01(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x04type\"\x88\x01\n\x0eTargetRelation\x12<\n\ttarget_id\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdR\x08targetId\x12\x38\n\x06values\x18\x02 \x03(\x0b\x32 .relationalai.lqp.v1.NamedColumnR\x06values\"M\n\x0cPlainTargets\x12=\n\x07targets\x18\x01 \x03(\x0b\x32#.relationalai.lqp.v1.TargetRelationR\x07targets\"\x8a\x01\n\nCdcTargets\x12=\n\x07inserts\x18\x01 \x03(\x0b\x32#.relationalai.lqp.v1.TargetRelationR\x07inserts\x12=\n\x07\x64\x65letes\x18\x02 \x03(\x0b\x32#.relationalai.lqp.v1.TargetRelationR\x07\x64\x65letes\"\xbf\x01\n\x0fTargetRelations\x12\x34\n\x04keys\x18\x01 \x03(\x0b\x32 .relationalai.lqp.v1.NamedColumnR\x04keys\x12\x39\n\x05plain\x18\x02 \x01(\x0b\x32!.relationalai.lqp.v1.PlainTargetsH\x00R\x05plain\x12\x33\n\x03\x63\x64\x63\x18\x03 \x01(\x0b\x32\x1f.relationalai.lqp.v1.CdcTargetsH\x00R\x03\x63\x64\x63\x42\x06\n\x04\x62ody\"\xa1\x02\n\x07\x43SVData\x12\x39\n\x07locator\x18\x01 \x01(\x0b\x32\x1f.relationalai.lqp.v1.CSVLocatorR\x07locator\x12\x36\n\x06\x63onfig\x18\x02 \x01(\x0b\x32\x1e.relationalai.lqp.v1.CSVConfigR\x06\x63onfig\x12\x38\n\x07\x63olumns\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.GNFColumnR\x07\x63olumns\x12\x12\n\x04\x61sof\x18\x04 \x01(\tR\x04\x61sof\x12G\n\trelations\x18\x05 \x01(\x0b\x32$.relationalai.lqp.v1.TargetRelationsH\x00R\trelations\x88\x01\x01\x42\x0c\n\n_relations\"C\n\nCSVLocator\x12\x14\n\x05paths\x18\x01 \x03(\tR\x05paths\x12\x1f\n\x0binline_data\x18\x02 \x01(\x0cR\ninlineData\"\x86\x04\n\tCSVConfig\x12\x1d\n\nheader_row\x18\x01 \x01(\x05R\theaderRow\x12\x12\n\x04skip\x18\x02 \x01(\x03R\x04skip\x12\x19\n\x08new_line\x18\x03 \x01(\tR\x07newLine\x12\x1c\n\tdelimiter\x18\x04 \x01(\tR\tdelimiter\x12\x1c\n\tquotechar\x18\x05 \x01(\tR\tquotechar\x12\x1e\n\nescapechar\x18\x06 \x01(\tR\nescapechar\x12\x18\n\x07\x63omment\x18\x07 \x01(\tR\x07\x63omment\x12\'\n\x0fmissing_strings\x18\x08 \x03(\tR\x0emissingStrings\x12+\n\x11\x64\x65\x63imal_separator\x18\t \x01(\tR\x10\x64\x65\x63imalSeparator\x12\x1a\n\x08\x65ncoding\x18\n \x01(\tR\x08\x65ncoding\x12 \n\x0b\x63ompression\x18\x0b \x01(\tR\x0b\x63ompression\x12*\n\x11partition_size_mb\x18\x0c \x01(\x03R\x0fpartitionSizeMb\x12]\n\x13storage_integration\x18\r \x01(\x0b\x32\'.relationalai.lqp.v1.StorageIntegrationH\x00R\x12storageIntegration\x88\x01\x01\x42\x16\n\x14_storage_integration\"\xe0\x02\n\x0bIcebergData\x12=\n\x07locator\x18\x01 \x01(\x0b\x32#.relationalai.lqp.v1.IcebergLocatorR\x07locator\x12\x41\n\x06\x63onfig\x18\x02 \x01(\x0b\x32).relationalai.lqp.v1.IcebergCatalogConfigR\x06\x63onfig\x12\x38\n\x07\x63olumns\x18\x03 \x03(\x0b\x32\x1e.relationalai.lqp.v1.GNFColumnR\x07\x63olumns\x12(\n\rfrom_snapshot\x18\x04 \x01(\tH\x00R\x0c\x66romSnapshot\x88\x01\x01\x12$\n\x0bto_snapshot\x18\x05 \x01(\tH\x01R\ntoSnapshot\x88\x01\x01\x12#\n\rreturns_delta\x18\x06 \x01(\x08R\x0creturnsDeltaB\x10\n\x0e_from_snapshotB\x0e\n\x0c_to_snapshot\"k\n\x0eIcebergLocator\x12\x1d\n\ntable_name\x18\x01 \x01(\tR\ttableName\x12\x1c\n\tnamespace\x18\x02 \x03(\tR\tnamespace\x12\x1c\n\twarehouse\x18\x03 \x01(\tR\twarehouse\"\xa1\x03\n\x14IcebergCatalogConfig\x12\x1f\n\x0b\x63\x61talog_uri\x18\x01 \x01(\tR\ncatalogUri\x12\x19\n\x05scope\x18\x02 \x01(\tH\x00R\x05scope\x88\x01\x01\x12Y\n\nproperties\x18\x03 \x03(\x0b\x32\x39.relationalai.lqp.v1.IcebergCatalogConfig.PropertiesEntryR\nproperties\x12\x66\n\x0f\x61uth_properties\x18\x04 \x03(\x0b\x32=.relationalai.lqp.v1.IcebergCatalogConfig.AuthPropertiesEntryR\x0e\x61uthProperties\x1a=\n\x0fPropertiesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a\x41\n\x13\x41uthPropertiesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x08\n\x06_scope\"\xae\x01\n\tGNFColumn\x12\x1f\n\x0b\x63olumn_path\x18\x01 \x03(\tR\ncolumnPath\x12\x41\n\ttarget_id\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.RelationIdH\x00R\x08targetId\x88\x01\x01\x12/\n\x05types\x18\x03 \x03(\x0b\x32\x19.relationalai.lqp.v1.TypeR\x05typesB\x0c\n\n_target_id\"<\n\nRelationId\x12\x15\n\x06id_low\x18\x01 \x01(\x06R\x05idLow\x12\x17\n\x07id_high\x18\x02 \x01(\x06R\x06idHigh\"\xd5\x07\n\x04Type\x12Q\n\x10unspecified_type\x18\x01 \x01(\x0b\x32$.relationalai.lqp.v1.UnspecifiedTypeH\x00R\x0funspecifiedType\x12\x42\n\x0bstring_type\x18\x02 \x01(\x0b\x32\x1f.relationalai.lqp.v1.StringTypeH\x00R\nstringType\x12\x39\n\x08int_type\x18\x03 \x01(\x0b\x32\x1c.relationalai.lqp.v1.IntTypeH\x00R\x07intType\x12?\n\nfloat_type\x18\x04 \x01(\x0b\x32\x1e.relationalai.lqp.v1.FloatTypeH\x00R\tfloatType\x12\x45\n\x0cuint128_type\x18\x05 \x01(\x0b\x32 .relationalai.lqp.v1.UInt128TypeH\x00R\x0buint128Type\x12\x42\n\x0bint128_type\x18\x06 \x01(\x0b\x32\x1f.relationalai.lqp.v1.Int128TypeH\x00R\nint128Type\x12<\n\tdate_type\x18\x07 \x01(\x0b\x32\x1d.relationalai.lqp.v1.DateTypeH\x00R\x08\x64\x61teType\x12H\n\rdatetime_type\x18\x08 \x01(\x0b\x32!.relationalai.lqp.v1.DateTimeTypeH\x00R\x0c\x64\x61tetimeType\x12\x45\n\x0cmissing_type\x18\t \x01(\x0b\x32 .relationalai.lqp.v1.MissingTypeH\x00R\x0bmissingType\x12\x45\n\x0c\x64\x65\x63imal_type\x18\n \x01(\x0b\x32 .relationalai.lqp.v1.DecimalTypeH\x00R\x0b\x64\x65\x63imalType\x12\x45\n\x0c\x62oolean_type\x18\x0b \x01(\x0b\x32 .relationalai.lqp.v1.BooleanTypeH\x00R\x0b\x62ooleanType\x12?\n\nint32_type\x18\x0c \x01(\x0b\x32\x1e.relationalai.lqp.v1.Int32TypeH\x00R\tint32Type\x12\x45\n\x0c\x66loat32_type\x18\r \x01(\x0b\x32 .relationalai.lqp.v1.Float32TypeH\x00R\x0b\x66loat32Type\x12\x42\n\x0buint32_type\x18\x0e \x01(\x0b\x32\x1f.relationalai.lqp.v1.UInt32TypeH\x00R\nuint32TypeB\x06\n\x04type\"\x11\n\x0fUnspecifiedType\"\x0c\n\nStringType\"\t\n\x07IntType\"\x0b\n\tFloatType\"\r\n\x0bUInt128Type\"\x0c\n\nInt128Type\"\n\n\x08\x44\x61teType\"\x0e\n\x0c\x44\x61teTimeType\"\r\n\x0bMissingType\"A\n\x0b\x44\x65\x63imalType\x12\x1c\n\tprecision\x18\x01 \x01(\x05R\tprecision\x12\x14\n\x05scale\x18\x02 \x01(\x05R\x05scale\"\r\n\x0b\x42ooleanType\"\x0b\n\tInt32Type\"\r\n\x0b\x46loat32Type\"\x0c\n\nUInt32Type\"\xc0\x05\n\x05Value\x12#\n\x0cstring_value\x18\x01 \x01(\tH\x00R\x0bstringValue\x12\x1d\n\tint_value\x18\x02 \x01(\x03H\x00R\x08intValue\x12!\n\x0b\x66loat_value\x18\x03 \x01(\x01H\x00R\nfloatValue\x12H\n\ruint128_value\x18\x04 \x01(\x0b\x32!.relationalai.lqp.v1.UInt128ValueH\x00R\x0cuint128Value\x12\x45\n\x0cint128_value\x18\x05 \x01(\x0b\x32 .relationalai.lqp.v1.Int128ValueH\x00R\x0bint128Value\x12H\n\rmissing_value\x18\x06 \x01(\x0b\x32!.relationalai.lqp.v1.MissingValueH\x00R\x0cmissingValue\x12?\n\ndate_value\x18\x07 \x01(\x0b\x32\x1e.relationalai.lqp.v1.DateValueH\x00R\tdateValue\x12K\n\x0e\x64\x61tetime_value\x18\x08 \x01(\x0b\x32\".relationalai.lqp.v1.DateTimeValueH\x00R\rdatetimeValue\x12H\n\rdecimal_value\x18\t \x01(\x0b\x32!.relationalai.lqp.v1.DecimalValueH\x00R\x0c\x64\x65\x63imalValue\x12%\n\rboolean_value\x18\n \x01(\x08H\x00R\x0c\x62ooleanValue\x12!\n\x0bint32_value\x18\x0b \x01(\x05H\x00R\nint32Value\x12%\n\rfloat32_value\x18\x0c \x01(\x02H\x00R\x0c\x66loat32Value\x12#\n\x0cuint32_value\x18\r \x01(\rH\x00R\x0buint32ValueB\x07\n\x05value\"4\n\x0cUInt128Value\x12\x10\n\x03low\x18\x01 \x01(\x06R\x03low\x12\x12\n\x04high\x18\x02 \x01(\x06R\x04high\"3\n\x0bInt128Value\x12\x10\n\x03low\x18\x01 \x01(\x06R\x03low\x12\x12\n\x04high\x18\x02 \x01(\x06R\x04high\"\x0e\n\x0cMissingValue\"G\n\tDateValue\x12\x12\n\x04year\x18\x01 \x01(\x05R\x04year\x12\x14\n\x05month\x18\x02 \x01(\x05R\x05month\x12\x10\n\x03\x64\x61y\x18\x03 \x01(\x05R\x03\x64\x61y\"\xb1\x01\n\rDateTimeValue\x12\x12\n\x04year\x18\x01 \x01(\x05R\x04year\x12\x14\n\x05month\x18\x02 \x01(\x05R\x05month\x12\x10\n\x03\x64\x61y\x18\x03 \x01(\x05R\x03\x64\x61y\x12\x12\n\x04hour\x18\x04 \x01(\x05R\x04hour\x12\x16\n\x06minute\x18\x05 \x01(\x05R\x06minute\x12\x16\n\x06second\x18\x06 \x01(\x05R\x06second\x12 \n\x0bmicrosecond\x18\x07 \x01(\x05R\x0bmicrosecond\"z\n\x0c\x44\x65\x63imalValue\x12\x1c\n\tprecision\x18\x01 \x01(\x05R\tprecision\x12\x14\n\x05scale\x18\x02 \x01(\x05R\x05scale\x12\x36\n\x05value\x18\x03 \x01(\x0b\x32 .relationalai.lqp.v1.Int128ValueR\x05valueBCZAgithub.com/RelationalAI/logical-query-protocol/sdks/go/src/lqp/v1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -124,68 +124,78 @@
   _globals['_BETREELOCATOR']._serialized_end=6721
   _globals['_STORAGEINTEGRATION']._serialized_start=6724
   _globals['_STORAGEINTEGRATION']._serialized_end=6931
-  _globals['_CSVDATA']._serialized_start=6934
-  _globals['_CSVDATA']._serialized_end=7136
-  _globals['_CSVLOCATOR']._serialized_start=7138
-  _globals['_CSVLOCATOR']._serialized_end=7205
-  _globals['_CSVCONFIG']._serialized_start=7208
-  _globals['_CSVCONFIG']._serialized_end=7726
-  _globals['_ICEBERGDATA']._serialized_start=7729
-  _globals['_ICEBERGDATA']._serialized_end=8081
-  _globals['_ICEBERGLOCATOR']._serialized_start=8083
-  _globals['_ICEBERGLOCATOR']._serialized_end=8190
-  _globals['_ICEBERGCATALOGCONFIG']._serialized_start=8193
-  _globals['_ICEBERGCATALOGCONFIG']._serialized_end=8610
-  _globals['_ICEBERGCATALOGCONFIG_PROPERTIESENTRY']._serialized_start=8472
-  _globals['_ICEBERGCATALOGCONFIG_PROPERTIESENTRY']._serialized_end=8533
-  _globals['_ICEBERGCATALOGCONFIG_AUTHPROPERTIESENTRY']._serialized_start=8535
-  _globals['_ICEBERGCATALOGCONFIG_AUTHPROPERTIESENTRY']._serialized_end=8600
-  _globals['_GNFCOLUMN']._serialized_start=8613
-  _globals['_GNFCOLUMN']._serialized_end=8787
-  _globals['_RELATIONID']._serialized_start=8789
-  _globals['_RELATIONID']._serialized_end=8849
-  _globals['_TYPE']._serialized_start=8852
-  _globals['_TYPE']._serialized_end=9833
-  _globals['_UNSPECIFIEDTYPE']._serialized_start=9835
-  _globals['_UNSPECIFIEDTYPE']._serialized_end=9852
-  _globals['_STRINGTYPE']._serialized_start=9854
-  _globals['_STRINGTYPE']._serialized_end=9866
-  _globals['_INTTYPE']._serialized_start=9868
-  _globals['_INTTYPE']._serialized_end=9877
-  _globals['_FLOATTYPE']._serialized_start=9879
-  _globals['_FLOATTYPE']._serialized_end=9890
-  _globals['_UINT128TYPE']._serialized_start=9892
-  _globals['_UINT128TYPE']._serialized_end=9905
-  _globals['_INT128TYPE']._serialized_start=9907
-  _globals['_INT128TYPE']._serialized_end=9919
-  _globals['_DATETYPE']._serialized_start=9921
-  _globals['_DATETYPE']._serialized_end=9931
-  _globals['_DATETIMETYPE']._serialized_start=9933
-  _globals['_DATETIMETYPE']._serialized_end=9947
-  _globals['_MISSINGTYPE']._serialized_start=9949
-  _globals['_MISSINGTYPE']._serialized_end=9962
-  _globals['_DECIMALTYPE']._serialized_start=9964
-  _globals['_DECIMALTYPE']._serialized_end=10029
-  _globals['_BOOLEANTYPE']._serialized_start=10031
-  _globals['_BOOLEANTYPE']._serialized_end=10044
-  _globals['_INT32TYPE']._serialized_start=10046
-  _globals['_INT32TYPE']._serialized_end=10057
-  _globals['_FLOAT32TYPE']._serialized_start=10059
-  _globals['_FLOAT32TYPE']._serialized_end=10072
-  _globals['_UINT32TYPE']._serialized_start=10074
-  _globals['_UINT32TYPE']._serialized_end=10086
-  _globals['_VALUE']._serialized_start=10089
-  _globals['_VALUE']._serialized_end=10793
-  _globals['_UINT128VALUE']._serialized_start=10795
-  _globals['_UINT128VALUE']._serialized_end=10847
-  _globals['_INT128VALUE']._serialized_start=10849
-  _globals['_INT128VALUE']._serialized_end=10900
-  _globals['_MISSINGVALUE']._serialized_start=10902
-  _globals['_MISSINGVALUE']._serialized_end=10916
-  _globals['_DATEVALUE']._serialized_start=10918
-  _globals['_DATEVALUE']._serialized_end=10989
-  _globals['_DATETIMEVALUE']._serialized_start=10992
-  _globals['_DATETIMEVALUE']._serialized_end=11169
-  _globals['_DECIMALVALUE']._serialized_start=11171
-  _globals['_DECIMALVALUE']._serialized_end=11293
+  _globals['_NAMEDCOLUMN']._serialized_start=6933
+  _globals['_NAMEDCOLUMN']._serialized_end=7013
+  _globals['_TARGETRELATION']._serialized_start=7016
+  _globals['_TARGETRELATION']._serialized_end=7152
+  _globals['_PLAINTARGETS']._serialized_start=7154
+  _globals['_PLAINTARGETS']._serialized_end=7231
+  _globals['_CDCTARGETS']._serialized_start=7234
+  _globals['_CDCTARGETS']._serialized_end=7372
+  _globals['_TARGETRELATIONS']._serialized_start=7375
+  _globals['_TARGETRELATIONS']._serialized_end=7566
+  _globals['_CSVDATA']._serialized_start=7569
+  _globals['_CSVDATA']._serialized_end=7858
+  _globals['_CSVLOCATOR']._serialized_start=7860
+  _globals['_CSVLOCATOR']._serialized_end=7927
+  _globals['_CSVCONFIG']._serialized_start=7930
+  _globals['_CSVCONFIG']._serialized_end=8448
+  _globals['_ICEBERGDATA']._serialized_start=8451
+  _globals['_ICEBERGDATA']._serialized_end=8803
+  _globals['_ICEBERGLOCATOR']._serialized_start=8805
+  _globals['_ICEBERGLOCATOR']._serialized_end=8912
+  _globals['_ICEBERGCATALOGCONFIG']._serialized_start=8915
+  _globals['_ICEBERGCATALOGCONFIG']._serialized_end=9332
+  _globals['_ICEBERGCATALOGCONFIG_PROPERTIESENTRY']._serialized_start=9194
+  _globals['_ICEBERGCATALOGCONFIG_PROPERTIESENTRY']._serialized_end=9255
+  _globals['_ICEBERGCATALOGCONFIG_AUTHPROPERTIESENTRY']._serialized_start=9257
+  _globals['_ICEBERGCATALOGCONFIG_AUTHPROPERTIESENTRY']._serialized_end=9322
+  _globals['_GNFCOLUMN']._serialized_start=9335
+  _globals['_GNFCOLUMN']._serialized_end=9509
+  _globals['_RELATIONID']._serialized_start=9511
+  _globals['_RELATIONID']._serialized_end=9571
+  _globals['_TYPE']._serialized_start=9574
+  _globals['_TYPE']._serialized_end=10555
+  _globals['_UNSPECIFIEDTYPE']._serialized_start=10557
+  _globals['_UNSPECIFIEDTYPE']._serialized_end=10574
+  _globals['_STRINGTYPE']._serialized_start=10576
+  _globals['_STRINGTYPE']._serialized_end=10588
+  _globals['_INTTYPE']._serialized_start=10590
+  _globals['_INTTYPE']._serialized_end=10599
+  _globals['_FLOATTYPE']._serialized_start=10601
+  _globals['_FLOATTYPE']._serialized_end=10612
+  _globals['_UINT128TYPE']._serialized_start=10614
+  _globals['_UINT128TYPE']._serialized_end=10627
+  _globals['_INT128TYPE']._serialized_start=10629
+  _globals['_INT128TYPE']._serialized_end=10641
+  _globals['_DATETYPE']._serialized_start=10643
+  _globals['_DATETYPE']._serialized_end=10653
+  _globals['_DATETIMETYPE']._serialized_start=10655
+  _globals['_DATETIMETYPE']._serialized_end=10669
+  _globals['_MISSINGTYPE']._serialized_start=10671
+  _globals['_MISSINGTYPE']._serialized_end=10684
+  _globals['_DECIMALTYPE']._serialized_start=10686
+  _globals['_DECIMALTYPE']._serialized_end=10751
+  _globals['_BOOLEANTYPE']._serialized_start=10753
+  _globals['_BOOLEANTYPE']._serialized_end=10766
+  _globals['_INT32TYPE']._serialized_start=10768
+  _globals['_INT32TYPE']._serialized_end=10779
+  _globals['_FLOAT32TYPE']._serialized_start=10781
+  _globals['_FLOAT32TYPE']._serialized_end=10794
+  _globals['_UINT32TYPE']._serialized_start=10796
+  _globals['_UINT32TYPE']._serialized_end=10808
+  _globals['_VALUE']._serialized_start=10811
+  _globals['_VALUE']._serialized_end=11515
+  _globals['_UINT128VALUE']._serialized_start=11517
+  _globals['_UINT128VALUE']._serialized_end=11569
+  _globals['_INT128VALUE']._serialized_start=11571
+  _globals['_INT128VALUE']._serialized_end=11622
+  _globals['_MISSINGVALUE']._serialized_start=11624
+  _globals['_MISSINGVALUE']._serialized_end=11638
+  _globals['_DATEVALUE']._serialized_start=11640
+  _globals['_DATEVALUE']._serialized_end=11711
+  _globals['_DATETIMEVALUE']._serialized_start=11714
+  _globals['_DATETIMEVALUE']._serialized_end=11891
+  _globals['_DECIMALVALUE']._serialized_start=11893
+  _globals['_DECIMALVALUE']._serialized_end=12015
 # @@protoc_insertion_point(module_scope)
diff --git a/sdks/python/src/lqp/proto/v1/logic_pb2.pyi b/sdks/python/src/lqp/proto/v1/logic_pb2.pyi
index eb39bf27..da168f6a 100644
--- a/sdks/python/src/lqp/proto/v1/logic_pb2.pyi
+++ b/sdks/python/src/lqp/proto/v1/logic_pb2.pyi
@@ -420,17 +420,59 @@ class StorageIntegration(_message.Message):
     s3_secret_access_key: str
     def __init__(self, provider: _Optional[str] = ..., azure_sas_token: _Optional[str] = ..., s3_region: _Optional[str] = ..., s3_access_key_id: _Optional[str] = ..., s3_secret_access_key: _Optional[str] = ...) -> None: ...
 
+class NamedColumn(_message.Message):
+    __slots__ = ("name", "type")
+    NAME_FIELD_NUMBER: _ClassVar[int]
+    TYPE_FIELD_NUMBER: _ClassVar[int]
+    name: str
+    type: Type
+    def __init__(self, name: _Optional[str] = ..., type: _Optional[_Union[Type, _Mapping]] = ...) -> None: ...
+
+class TargetRelation(_message.Message):
+    __slots__ = ("target_id", "values")
+    TARGET_ID_FIELD_NUMBER: _ClassVar[int]
+    VALUES_FIELD_NUMBER: _ClassVar[int]
+    target_id: RelationId
+    values: _containers.RepeatedCompositeFieldContainer[NamedColumn]
+    def __init__(self, target_id: _Optional[_Union[RelationId, _Mapping]] = ..., values: _Optional[_Iterable[_Union[NamedColumn, _Mapping]]] = ...) -> None: ...
+
+class PlainTargets(_message.Message):
+    __slots__ = ("targets",)
+    TARGETS_FIELD_NUMBER: _ClassVar[int]
+    targets: _containers.RepeatedCompositeFieldContainer[TargetRelation]
+    def __init__(self, targets: _Optional[_Iterable[_Union[TargetRelation, _Mapping]]] = ...) -> None: ...
+
+class CdcTargets(_message.Message):
+    __slots__ = ("inserts", "deletes")
+    INSERTS_FIELD_NUMBER: _ClassVar[int]
+    DELETES_FIELD_NUMBER: _ClassVar[int]
+    inserts: _containers.RepeatedCompositeFieldContainer[TargetRelation]
+    deletes: _containers.RepeatedCompositeFieldContainer[TargetRelation]
+    def __init__(self, inserts: _Optional[_Iterable[_Union[TargetRelation, _Mapping]]] = ..., deletes: _Optional[_Iterable[_Union[TargetRelation, _Mapping]]] = ...) -> None: ...
+
+class TargetRelations(_message.Message):
+    __slots__ = ("keys", "plain", "cdc")
+    KEYS_FIELD_NUMBER: _ClassVar[int]
+    PLAIN_FIELD_NUMBER: _ClassVar[int]
+    CDC_FIELD_NUMBER: _ClassVar[int]
+    keys: _containers.RepeatedCompositeFieldContainer[NamedColumn]
+    plain: PlainTargets
+    cdc: CdcTargets
+    def __init__(self, keys: _Optional[_Iterable[_Union[NamedColumn, _Mapping]]] = ..., plain: _Optional[_Union[PlainTargets, _Mapping]] = ..., cdc: _Optional[_Union[CdcTargets, _Mapping]] = ...) -> None: ...
+
 class CSVData(_message.Message):
-    __slots__ = ("locator", "config", "columns", "asof")
+    __slots__ = ("locator", "config", "columns", "asof", "relations")
     LOCATOR_FIELD_NUMBER: _ClassVar[int]
     CONFIG_FIELD_NUMBER: _ClassVar[int]
     COLUMNS_FIELD_NUMBER: _ClassVar[int]
     ASOF_FIELD_NUMBER: _ClassVar[int]
+    RELATIONS_FIELD_NUMBER: _ClassVar[int]
     locator: CSVLocator
     config: CSVConfig
     columns: _containers.RepeatedCompositeFieldContainer[GNFColumn]
     asof: str
-    def __init__(self, locator: _Optional[_Union[CSVLocator, _Mapping]] = ..., config: _Optional[_Union[CSVConfig, _Mapping]] = ..., columns: _Optional[_Iterable[_Union[GNFColumn, _Mapping]]] = ..., asof: _Optional[str] = ...) -> None: ...
+    relations: TargetRelations
+    def __init__(self, locator: _Optional[_Union[CSVLocator, _Mapping]] = ..., config: _Optional[_Union[CSVConfig, _Mapping]] = ..., columns: _Optional[_Iterable[_Union[GNFColumn, _Mapping]]] = ..., asof: _Optional[str] = ..., relations: _Optional[_Union[TargetRelations, _Mapping]] = ...) -> None: ...
 
 class CSVLocator(_message.Message):
     __slots__ = ("paths", "inline_data")
diff --git a/tests/bin/relations_cdc.bin b/tests/bin/relations_cdc.bin
new file mode 100644
index 00000000..f234fcce
Binary files /dev/null and b/tests/bin/relations_cdc.bin differ
diff --git a/tests/bin/relations_edge_arity4.bin b/tests/bin/relations_edge_arity4.bin
new file mode 100644
index 00000000..4cda12d9
Binary files /dev/null and b/tests/bin/relations_edge_arity4.bin differ
diff --git a/tests/bin/relations_edge_binary.bin b/tests/bin/relations_edge_binary.bin
new file mode 100644
index 00000000..7946b92b
Binary files /dev/null and b/tests/bin/relations_edge_binary.bin differ
diff --git a/tests/bin/relations_split.bin b/tests/bin/relations_split.bin
new file mode 100644
index 00000000..c8764875
Binary files /dev/null and b/tests/bin/relations_split.bin differ
diff --git a/tests/lqp/relations_cdc.lqp b/tests/lqp/relations_cdc.lqp
new file mode 100644
index 00000000..457050b4
--- /dev/null
+++ b/tests/lqp/relations_cdc.lqp
@@ -0,0 +1,28 @@
+(transaction
+  (epoch
+    (writes
+      (define
+        (fragment :f1
+          ;; Generalized CSV loading with CDC: a single `edge` relation grouped into insert
+          ;; and delete deltas. The shared key is the special METADATA$KEY (a UINT128 hash
+          ;; derived from the CSV's METADATA$ROW_ID column).
+          (csv_data
+            (csv_locator
+              (paths "s3://bucket/edges.csv"))
+            (csv_config {})
+            ;; Insert and delete deltas must target DISTINCT relations (like the legacy
+            ;; columnar loader): a row's METADATA$ACTION routes it to :weight_ins or :weight_del.
+            (relations
+              (keys
+                (column "METADATA$KEY" UINT128))
+              (inserts
+                (relation :weight_ins
+                  (column "weight" FLOAT)))
+              (deletes
+                (relation :weight_del
+                  (column "weight" FLOAT))))
+            (asof "2025-06-01T00:00:00Z")))))
+
+    (reads
+      (output :weight_ins :weight_ins)
+      (output :weight_del :weight_del))))
diff --git a/tests/lqp/relations_edge_arity4.lqp b/tests/lqp/relations_edge_arity4.lqp
new file mode 100644
index 00000000..de99e35b
--- /dev/null
+++ b/tests/lqp/relations_edge_arity4.lqp
@@ -0,0 +1,22 @@
+(transaction
+  (epoch
+    (writes
+      (define
+        (fragment :f1
+          ;; Generalized CSV loading: an arity-4 `edge` relation. Shared keys (src, dst)
+          ;; plus two value columns of mixed type (Float weight, String label).
+          (csv_data
+            (csv_locator
+              (paths "s3://bucket/edges.csv"))
+            (csv_config {})
+            (relations
+              (keys
+                (column "src" INT)
+                (column "dst" INT))
+              (relation :edge
+                (column "weight" FLOAT)
+                (column "label" STRING)))
+            (asof "2025-06-01T00:00:00Z")))))
+
+    (reads
+      (output :edge :edge))))
diff --git a/tests/lqp/relations_edge_binary.lqp b/tests/lqp/relations_edge_binary.lqp
new file mode 100644
index 00000000..1ea52a16
--- /dev/null
+++ b/tests/lqp/relations_edge_binary.lqp
@@ -0,0 +1,20 @@
+(transaction
+  (epoch
+    (writes
+      (define
+        (fragment :f1
+          ;; Generalized CSV loading: a binary `edge` relation whose two columns are both
+          ;; keys (no value columns). Loads (src, dst) pairs into a single relation.
+          (csv_data
+            (csv_locator
+              (paths "s3://bucket/edges.csv"))
+            (csv_config {})
+            (relations
+              (keys
+                (column "src" INT)
+                (column "dst" INT))
+              (relation :edge))
+            (asof "2025-06-01T00:00:00Z")))))
+
+    (reads
+      (output :edge :edge))))
diff --git a/tests/lqp/relations_split.lqp b/tests/lqp/relations_split.lqp
new file mode 100644
index 00000000..360bc692
--- /dev/null
+++ b/tests/lqp/relations_split.lqp
@@ -0,0 +1,23 @@
+(transaction
+  (epoch
+    (writes
+      (define
+        (fragment :f1
+          ;; Generalized CSV loading: two output relations sharing the same key column `id`,
+          ;; each carrying its own value column.
+          (csv_data
+            (csv_locator
+              (paths "s3://bucket/nodes.csv"))
+            (csv_config {})
+            (relations
+              (keys
+                (column "id" INT))
+              (relation :weights
+                (column "weight" FLOAT))
+              (relation :labels
+                (column "label" STRING)))
+            (asof "2025-06-01T00:00:00Z")))))
+
+    (reads
+      (output :weights :weights)
+      (output :labels :labels))))
diff --git a/tests/pretty/relations_cdc.lqp b/tests/pretty/relations_cdc.lqp
new file mode 100644
index 00000000..906d57ff
--- /dev/null
+++ b/tests/pretty/relations_cdc.lqp
@@ -0,0 +1,25 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (csv_data
+            (csv_locator (paths "s3://bucket/edges.csv"))
+            (csv_config
+              {
+               :csv_compression ""
+               :csv_decimal_separator "."
+               :csv_delimiter ","
+               :csv_encoding "utf-8"
+               :csv_escapechar "\""
+               :csv_header_row 1i32
+               :csv_quotechar "\""
+               :csv_skip 0})
+            (relations
+              (keys (column "METADATA$KEY" UINT128))
+              (inserts (relation :weight_ins (column "weight" FLOAT))) (deletes
+                (relation :weight_del (column "weight" FLOAT))))
+            (asof "2025-06-01T00:00:00Z")))))
+    (reads (output :weight_ins :weight_ins) (output :weight_del :weight_del))))
diff --git a/tests/pretty/relations_edge_arity4.lqp b/tests/pretty/relations_edge_arity4.lqp
new file mode 100644
index 00000000..96697991
--- /dev/null
+++ b/tests/pretty/relations_edge_arity4.lqp
@@ -0,0 +1,24 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (csv_data
+            (csv_locator (paths "s3://bucket/edges.csv"))
+            (csv_config
+              {
+               :csv_compression ""
+               :csv_decimal_separator "."
+               :csv_delimiter ","
+               :csv_encoding "utf-8"
+               :csv_escapechar "\""
+               :csv_header_row 1i32
+               :csv_quotechar "\""
+               :csv_skip 0})
+            (relations
+              (keys (column "src" INT) (column "dst" INT))
+              (relation :edge (column "weight" FLOAT) (column "label" STRING)))
+            (asof "2025-06-01T00:00:00Z")))))
+    (reads (output :edge :edge))))
diff --git a/tests/pretty/relations_edge_binary.lqp b/tests/pretty/relations_edge_binary.lqp
new file mode 100644
index 00000000..70590620
--- /dev/null
+++ b/tests/pretty/relations_edge_binary.lqp
@@ -0,0 +1,22 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (csv_data
+            (csv_locator (paths "s3://bucket/edges.csv"))
+            (csv_config
+              {
+               :csv_compression ""
+               :csv_decimal_separator "."
+               :csv_delimiter ","
+               :csv_encoding "utf-8"
+               :csv_escapechar "\""
+               :csv_header_row 1i32
+               :csv_quotechar "\""
+               :csv_skip 0})
+            (relations (keys (column "src" INT) (column "dst" INT)) (relation :edge))
+            (asof "2025-06-01T00:00:00Z")))))
+    (reads (output :edge :edge))))
diff --git a/tests/pretty/relations_split.lqp b/tests/pretty/relations_split.lqp
new file mode 100644
index 00000000..9c5c26d8
--- /dev/null
+++ b/tests/pretty/relations_split.lqp
@@ -0,0 +1,25 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (csv_data
+            (csv_locator (paths "s3://bucket/nodes.csv"))
+            (csv_config
+              {
+               :csv_compression ""
+               :csv_decimal_separator "."
+               :csv_delimiter ","
+               :csv_encoding "utf-8"
+               :csv_escapechar "\""
+               :csv_header_row 1i32
+               :csv_quotechar "\""
+               :csv_skip 0})
+            (relations
+              (keys (column "id" INT))
+              (relation :weights (column "weight" FLOAT))
+              (relation :labels (column "label" STRING)))
+            (asof "2025-06-01T00:00:00Z")))))
+    (reads (output :weights :weights) (output :labels :labels))))
diff --git a/tests/pretty_debug/relations_cdc.lqp b/tests/pretty_debug/relations_cdc.lqp
new file mode 100644
index 00000000..41cc01b5
--- /dev/null
+++ b/tests/pretty_debug/relations_cdc.lqp
@@ -0,0 +1,33 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (csv_data
+            (csv_locator (paths "s3://bucket/edges.csv"))
+            (csv_config
+              {
+               :csv_compression ""
+               :csv_decimal_separator "."
+               :csv_delimiter ","
+               :csv_encoding "utf-8"
+               :csv_escapechar "\""
+               :csv_header_row 1i32
+               :csv_quotechar "\""
+               :csv_skip 0})
+            (relations
+              (keys (column "METADATA$KEY" UINT128))
+              (inserts (relation 0x678037975b01b6389c78bc1cc79abde (column "weight" FLOAT))) (deletes
+                (relation 0xb214f85adaa2e403bed30d3721f4363 (column "weight" FLOAT))))
+            (asof "2025-06-01T00:00:00Z")))))
+    (reads
+      (output :weight_ins 0x678037975b01b6389c78bc1cc79abde)
+      (output :weight_del 0xb214f85adaa2e403bed30d3721f4363))))
+
+;; Debug information
+;; -----------------------
+;; Original names
+;; 	 ID `0xb214f85adaa2e403bed30d3721f4363` -> `weight_del`
+;; 	 ID `0x678037975b01b6389c78bc1cc79abde` -> `weight_ins`
diff --git a/tests/pretty_debug/relations_edge_arity4.lqp b/tests/pretty_debug/relations_edge_arity4.lqp
new file mode 100644
index 00000000..00cc3421
--- /dev/null
+++ b/tests/pretty_debug/relations_edge_arity4.lqp
@@ -0,0 +1,32 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (csv_data
+            (csv_locator (paths "s3://bucket/edges.csv"))
+            (csv_config
+              {
+               :csv_compression ""
+               :csv_decimal_separator "."
+               :csv_delimiter ","
+               :csv_encoding "utf-8"
+               :csv_escapechar "\""
+               :csv_header_row 1i32
+               :csv_quotechar "\""
+               :csv_skip 0})
+            (relations
+              (keys (column "src" INT) (column "dst" INT))
+              (relation
+                0x25a8e9d4bdd35e32df1a80b66b896254
+                (column "weight" FLOAT)
+                (column "label" STRING)))
+            (asof "2025-06-01T00:00:00Z")))))
+    (reads (output :edge 0x25a8e9d4bdd35e32df1a80b66b896254))))
+
+;; Debug information
+;; -----------------------
+;; Original names
+;; 	 ID `0x25a8e9d4bdd35e32df1a80b66b896254` -> `edge`
diff --git a/tests/pretty_debug/relations_edge_binary.lqp b/tests/pretty_debug/relations_edge_binary.lqp
new file mode 100644
index 00000000..aa3d9bdc
--- /dev/null
+++ b/tests/pretty_debug/relations_edge_binary.lqp
@@ -0,0 +1,29 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (csv_data
+            (csv_locator (paths "s3://bucket/edges.csv"))
+            (csv_config
+              {
+               :csv_compression ""
+               :csv_decimal_separator "."
+               :csv_delimiter ","
+               :csv_encoding "utf-8"
+               :csv_escapechar "\""
+               :csv_header_row 1i32
+               :csv_quotechar "\""
+               :csv_skip 0})
+            (relations
+              (keys (column "src" INT) (column "dst" INT))
+              (relation 0x25a8e9d4bdd35e32df1a80b66b896254))
+            (asof "2025-06-01T00:00:00Z")))))
+    (reads (output :edge 0x25a8e9d4bdd35e32df1a80b66b896254))))
+
+;; Debug information
+;; -----------------------
+;; Original names
+;; 	 ID `0x25a8e9d4bdd35e32df1a80b66b896254` -> `edge`
diff --git a/tests/pretty_debug/relations_split.lqp b/tests/pretty_debug/relations_split.lqp
new file mode 100644
index 00000000..4aa3218c
--- /dev/null
+++ b/tests/pretty_debug/relations_split.lqp
@@ -0,0 +1,33 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (csv_data
+            (csv_locator (paths "s3://bucket/nodes.csv"))
+            (csv_config
+              {
+               :csv_compression ""
+               :csv_decimal_separator "."
+               :csv_delimiter ","
+               :csv_encoding "utf-8"
+               :csv_escapechar "\""
+               :csv_header_row 1i32
+               :csv_quotechar "\""
+               :csv_skip 0})
+            (relations
+              (keys (column "id" INT))
+              (relation 0x813449061ab87848cf1a13eafdf33b2c (column "weight" FLOAT))
+              (relation 0x93d866d8479f84a4c0ca36918a3fa75f (column "label" STRING)))
+            (asof "2025-06-01T00:00:00Z")))))
+    (reads
+      (output :weights 0x813449061ab87848cf1a13eafdf33b2c)
+      (output :labels 0x93d866d8479f84a4c0ca36918a3fa75f))))
+
+;; Debug information
+;; -----------------------
+;; Original names
+;; 	 ID `0x93d866d8479f84a4c0ca36918a3fa75f` -> `labels`
+;; 	 ID `0x813449061ab87848cf1a13eafdf33b2c` -> `weights`