diff --git a/meta/src/meta/grammar.y b/meta/src/meta/grammar.y
index 54142e13..d00cbddd 100644
--- a/meta/src/meta/grammar.y
+++ b/meta/src/meta/grammar.y
@@ -891,11 +891,12 @@ attribute
         $4: Sequence[logic.Value] = $$.args
 
 algorithm
-    : "(" "algorithm" relation_id* script ")"
-      construct: $$ = logic.Algorithm(global=$3, body=$4)
+    : "(" "algorithm" relation_id* script attrs? ")"
+      construct: $$ = logic.Algorithm(global=$3, body=$4, attrs=builtin.unwrap_option_or($5, list[logic.Attribute]()))
       deconstruct:
         $3: Sequence[logic.RelationId] = $$.global
         $4: logic.Script = $$.body
+        $5: Optional[Sequence[logic.Attribute]] = $$.attrs if not builtin.is_empty($$.attrs) else None
 
 script
     : "(" "script" construct* ")"
@@ -913,11 +914,12 @@ construct
         $1: logic.Instruction = $$.instruction
 
 loop
-    : "(" "loop" init script ")"
-      construct: $$ = logic.Loop(init=$3, body=$4)
+    : "(" "loop" init script attrs? ")"
+      construct: $$ = logic.Loop(init=$3, body=$4, attrs=builtin.unwrap_option_or($5, list[logic.Attribute]()))
       deconstruct:
         $3: Sequence[logic.Instruction] = $$.init
         $4: logic.Script = $$.body
+        $5: Optional[Sequence[logic.Attribute]] = $$.attrs if not builtin.is_empty($$.attrs) else None
 
 init
     : "(" "init" instruction* ")"
diff --git a/proto/relationalai/lqp/v1/logic.proto b/proto/relationalai/lqp/v1/logic.proto
index 34f7fb5b..918561b1 100644
--- a/proto/relationalai/lqp/v1/logic.proto
+++ b/proto/relationalai/lqp/v1/logic.proto
@@ -35,6 +35,7 @@ message FunctionalDependency {
 message Algorithm {
   repeated RelationId global = 1;
   Script body = 2;
+  repeated Attribute attrs = 3;
 }
 
 message Script {
@@ -51,6 +52,7 @@ message Construct {
 message Loop {
   repeated Instruction init = 1;
   Script body = 2;
+  repeated Attribute attrs = 3;
 }
 
 message Instruction {
diff --git a/sdks/go/src/lqp/v1/logic.pb.go b/sdks/go/src/lqp/v1/logic.pb.go
index 09c34d57..605c57e0 100644
--- a/sdks/go/src/lqp/v1/logic.pb.go
+++ b/sdks/go/src/lqp/v1/logic.pb.go
@@ -333,6 +333,7 @@ type Algorithm struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Global        []*RelationId          `protobuf:"bytes,1,rep,name=global,proto3" json:"global,omitempty"`
 	Body          *Script                `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	Attrs         []*Attribute           `protobuf:"bytes,3,rep,name=attrs,proto3" json:"attrs,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -381,6 +382,13 @@ func (x *Algorithm) GetBody() *Script {
 	return nil
 }
 
+func (x *Algorithm) GetAttrs() []*Attribute {
+	if x != nil {
+		return x.Attrs
+	}
+	return nil
+}
+
 type Script struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Constructs    []*Construct           `protobuf:"bytes,1,rep,name=constructs,proto3" json:"constructs,omitempty"`
@@ -511,6 +519,7 @@ type Loop struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Init          []*Instruction         `protobuf:"bytes,1,rep,name=init,proto3" json:"init,omitempty"`
 	Body          *Script                `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"`
+	Attrs         []*Attribute           `protobuf:"bytes,3,rep,name=attrs,proto3" json:"attrs,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -559,6 +568,13 @@ func (x *Loop) GetBody() *Script {
 	return nil
 }
 
+func (x *Loop) GetAttrs() []*Attribute {
+	if x != nil {
+		return x.Attrs
+	}
+	return nil
+}
+
 type Instruction struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// Types that are valid to be assigned to InstrType:
@@ -4966,637 +4982,644 @@ var file_relationalai_lqp_v1_logic_proto_rawDesc = string([]byte{
 	0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e,
 	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70,
 	0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x72, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22,
-	0x75, 0x0a, 0x09, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x37, 0x0a, 0x06,
-	0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x03, 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, 0x06, 0x67,
-	0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x12, 0x2f, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x48, 0x0a, 0x06, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x12, 0x3e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x18, 0x01,
-	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, 0x43, 0x6f, 0x6e, 0x73, 0x74,
-	0x72, 0x75, 0x63, 0x74, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73,
-	0x22, 0x94, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x2f,
-	0x0a, 0x04, 0x6c, 0x6f, 0x6f, 0x70, 0x18, 0x01, 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, 0x4c, 0x6f, 0x6f, 0x70, 0x48, 0x00, 0x52, 0x04, 0x6c, 0x6f, 0x6f, 0x70, 0x12,
-	0x44, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02,
-	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, 0x73, 0x74, 0x72,
-	0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x72, 0x75,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x10, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75,
-	0x63, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x6d, 0x0a, 0x04, 0x4c, 0x6f, 0x6f, 0x70, 0x12,
-	0x34, 0x0a, 0x04, 0x69, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e,
+	0xab, 0x01, 0x0a, 0x09, 0x41, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x12, 0x37, 0x0a,
+	0x06, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x03, 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, 0x49, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x04, 0x69, 0x6e, 0x69, 0x74, 0x12, 0x2f, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x22, 0xc2, 0x02, 0x0a, 0x0b, 0x49, 0x6e, 0x73, 0x74, 0x72,
-	0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x06, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73,
-	0x69, 0x67, 0x6e, 0x48, 0x00, 0x52, 0x06, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x12, 0x35, 0x0a,
-	0x06, 0x75, 0x70, 0x73, 0x65, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
-	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70,
-	0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x48, 0x00, 0x52, 0x06, 0x75, 0x70,
-	0x73, 0x65, 0x72, 0x74, 0x12, 0x32, 0x0a, 0x05, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-	0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x48,
-	0x00, 0x52, 0x05, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x3f, 0x0a, 0x0a, 0x6d, 0x6f, 0x6e, 0x6f,
-	0x69, 0x64, 0x5f, 0x64, 0x65, 0x66, 0x18, 0x05, 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, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x44, 0x65, 0x66, 0x48, 0x00, 0x52, 0x09,
-	0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x44, 0x65, 0x66, 0x12, 0x3c, 0x0a, 0x09, 0x6d, 0x6f, 0x6e,
-	0x75, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x18, 0x06, 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, 0x4d, 0x6f, 0x6e, 0x75, 0x73, 0x44, 0x65, 0x66, 0x48, 0x00, 0x52, 0x08, 0x6d,
-	0x6f, 0x6e, 0x75, 0x73, 0x44, 0x65, 0x66, 0x42, 0x0c, 0x0a, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x72,
-	0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, 0xa9, 0x01, 0x0a, 0x06,
-	0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62,
-	0x6f, 0x64, 0x79, 0x18, 0x02, 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,
-	0x41, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64,
-	0x79, 0x12, 0x34, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 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, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
-	0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x22, 0xca, 0x01, 0x0a, 0x06, 0x55, 0x70, 0x73, 0x65,
-	0x72, 0x74, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18,
-	0x02, 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, 0x41, 0x62, 0x73, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a,
-	0x05, 0x61, 0x74, 0x74, 0x72, 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, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05, 0x61, 0x74,
-	0x74, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x61, 0x72, 0x69,
-	0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x41,
-	0x72, 0x69, 0x74, 0x79, 0x22, 0xa8, 0x01, 0x0a, 0x05, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x33,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 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, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x61, 0x74, 0x74,
-	0x72, 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, 0x41,
-	0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x22,
-	0x82, 0x02, 0x0a, 0x09, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x44, 0x65, 0x66, 0x12, 0x33, 0x0a,
-	0x06, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
-	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70,
-	0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x52, 0x06, 0x6d, 0x6f, 0x6e, 0x6f,
-	0x69, 0x64, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 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, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
-	0x64, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 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, 0x41, 0x62, 0x73, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a,
-	0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x18, 0x04, 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, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05, 0x61, 0x74,
-	0x74, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x61, 0x72, 0x69,
-	0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x41,
-	0x72, 0x69, 0x74, 0x79, 0x22, 0x81, 0x02, 0x0a, 0x08, 0x4d, 0x6f, 0x6e, 0x75, 0x73, 0x44, 0x65,
-	0x66, 0x12, 0x33, 0x0a, 0x06, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69,
-	0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x52, 0x06,
-	0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 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, 0x52, 0x65, 0x6c, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62,
-	0x6f, 0x64, 0x79, 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,
-	0x41, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64,
-	0x79, 0x12, 0x34, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x18, 0x04, 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, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
-	0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x5f, 0x61, 0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x41, 0x72, 0x69, 0x74, 0x79, 0x22, 0x92, 0x02, 0x0a, 0x06, 0x4d, 0x6f, 0x6e,
-	0x6f, 0x69, 0x64, 0x12, 0x3c, 0x0a, 0x09, 0x6f, 0x72, 0x5f, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64,
-	0x18, 0x01, 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, 0x4f, 0x72, 0x4d,
-	0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x48, 0x00, 0x52, 0x08, 0x6f, 0x72, 0x4d, 0x6f, 0x6e, 0x6f, 0x69,
-	0x64, 0x12, 0x3f, 0x0a, 0x0a, 0x6d, 0x69, 0x6e, 0x5f, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 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, 0x4d, 0x69, 0x6e, 0x4d,
-	0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x48, 0x00, 0x52, 0x09, 0x6d, 0x69, 0x6e, 0x4d, 0x6f, 0x6e, 0x6f,
-	0x69, 0x64, 0x12, 0x3f, 0x0a, 0x0a, 0x6d, 0x61, 0x78, 0x5f, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64,
-	0x18, 0x03, 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, 0x4d, 0x61, 0x78,
-	0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x48, 0x00, 0x52, 0x09, 0x6d, 0x61, 0x78, 0x4d, 0x6f, 0x6e,
-	0x6f, 0x69, 0x64, 0x12, 0x3f, 0x0a, 0x0a, 0x73, 0x75, 0x6d, 0x5f, 0x6d, 0x6f, 0x6e, 0x6f, 0x69,
-	0x64, 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, 0x53, 0x75,
-	0x6d, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x48, 0x00, 0x52, 0x09, 0x73, 0x75, 0x6d, 0x4d, 0x6f,
-	0x6e, 0x6f, 0x69, 0x64, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x0a, 0x0a,
-	0x08, 0x4f, 0x72, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x09, 0x4d, 0x69, 0x6e,
-	0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
-	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, 0x3a, 0x0a, 0x09, 0x4d, 0x61, 0x78, 0x4d, 0x6f, 0x6e, 0x6f,
-	0x69, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 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, 0x3a, 0x0a, 0x09, 0x53, 0x75, 0x6d, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x12, 0x2d,
-	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 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, 0x64, 0x0a,
-	0x07, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x2a, 0x0a, 0x03, 0x76, 0x61, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x72, 0x52,
-	0x03, 0x76, 0x61, 0x72, 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, 0x73, 0x0a, 0x0b, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x04, 0x76, 0x61, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 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, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x04,
-	0x76, 0x61, 0x72, 0x73, 0x12, 0x32, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 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, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c,
-	0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x83, 0x05, 0x0a, 0x07, 0x46, 0x6f, 0x72,
-	0x6d, 0x75, 0x6c, 0x61, 0x12, 0x35, 0x0a, 0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x01,
+	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x52, 0x06,
+	0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x12, 0x2f, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x69, 0x73, 0x74,
-	0x73, 0x48, 0x00, 0x52, 0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72,
-	0x65, 0x64, 0x75, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65,
+	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 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, 0x41, 0x74, 0x74,
+	0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x22, 0x48, 0x0a,
+	0x06, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x3e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x74,
+	0x72, 0x75, 0x63, 0x74, 0x73, 0x18, 0x01, 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, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x64, 0x75,
-	0x63, 0x65, 0x12, 0x44, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 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, 0x43, 0x6f,
-	0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6e,
-	0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6a,
-	0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 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, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48,
-	0x00, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c,
-	0x0a, 0x03, 0x6e, 0x6f, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65,
+	0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0a, 0x63, 0x6f, 0x6e,
+	0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x22, 0x94, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x73,
+	0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x2f, 0x0a, 0x04, 0x6c, 0x6f, 0x6f, 0x70, 0x18, 0x01, 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, 0x4c, 0x6f, 0x6f, 0x70, 0x48, 0x00,
+	0x52, 0x04, 0x6c, 0x6f, 0x6f, 0x70, 0x12, 0x44, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x74, 0x72, 0x75,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 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, 0x4e, 0x6f, 0x74, 0x48, 0x00, 0x52, 0x03, 0x6e, 0x6f, 0x74, 0x12, 0x2c, 0x0a, 0x03,
-	0x66, 0x66, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65, 0x6c, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e,
-	0x46, 0x46, 0x49, 0x48, 0x00, 0x52, 0x03, 0x66, 0x66, 0x69, 0x12, 0x2f, 0x0a, 0x04, 0x61, 0x74,
-	0x6f, 0x6d, 0x18, 0x07, 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, 0x41,
-	0x74, 0x6f, 0x6d, 0x48, 0x00, 0x52, 0x04, 0x61, 0x74, 0x6f, 0x6d, 0x12, 0x35, 0x0a, 0x06, 0x70,
-	0x72, 0x61, 0x67, 0x6d, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65,
+	0x31, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52,
+	0x0b, 0x69, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x10, 0x0a, 0x0e,
+	0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0xa3,
+	0x01, 0x0a, 0x04, 0x4c, 0x6f, 0x6f, 0x70, 0x12, 0x34, 0x0a, 0x04, 0x69, 0x6e, 0x69, 0x74, 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, 0x49, 0x6e, 0x73, 0x74,
+	0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x69, 0x6e, 0x69, 0x74, 0x12, 0x2f, 0x0a,
+	0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65,
 	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x50, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x48, 0x00, 0x52, 0x06, 0x70, 0x72, 0x61, 0x67,
-	0x6d, 0x61, 0x12, 0x3e, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x18,
-	0x09, 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, 0x50, 0x72, 0x69, 0x6d,
-	0x69, 0x74, 0x69, 0x76, 0x65, 0x48, 0x00, 0x52, 0x09, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69,
-	0x76, 0x65, 0x12, 0x39, 0x0a, 0x08, 0x72, 0x65, 0x6c, 0x5f, 0x61, 0x74, 0x6f, 0x6d, 0x18, 0x0a,
-	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, 0x52, 0x65, 0x6c, 0x41, 0x74,
-	0x6f, 0x6d, 0x48, 0x00, 0x52, 0x07, 0x72, 0x65, 0x6c, 0x41, 0x74, 0x6f, 0x6d, 0x12, 0x2f, 0x0a,
-	0x04, 0x63, 0x61, 0x73, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x65,
+	0x31, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x34,
+	0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 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, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05, 0x61,
+	0x74, 0x74, 0x72, 0x73, 0x22, 0xc2, 0x02, 0x0a, 0x0b, 0x49, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x06, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
+	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67,
+	0x6e, 0x48, 0x00, 0x52, 0x06, 0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x12, 0x35, 0x0a, 0x06, 0x75,
+	0x70, 0x73, 0x65, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65,
 	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x43, 0x61, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x63, 0x61, 0x73, 0x74, 0x42, 0x0e,
-	0x0a, 0x0c, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e,
-	0x0a, 0x06, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79,
-	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, 0x41, 0x62, 0x73,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x22, 0xa1,
-	0x01, 0x0a, 0x06, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x02, 0x6f, 0x70, 0x18,
-	0x01, 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, 0x41, 0x62, 0x73, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x02, 0x6f, 0x70, 0x12, 0x34, 0x0a, 0x04, 0x62,
-	0x6f, 0x64, 0x79, 0x18, 0x02, 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,
-	0x41, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64,
-	0x79, 0x12, 0x2f, 0x0a, 0x05, 0x74, 0x65, 0x72, 0x6d, 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, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72,
-	0x6d, 0x73, 0x22, 0x3f, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x30, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 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, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x52, 0x04, 0x61,
-	0x72, 0x67, 0x73, 0x22, 0x3f, 0x0a, 0x0b, 0x44, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 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, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x52, 0x04,
-	0x61, 0x72, 0x67, 0x73, 0x22, 0x35, 0x0a, 0x03, 0x4e, 0x6f, 0x74, 0x12, 0x2e, 0x0a, 0x03, 0x61,
-	0x72, 0x67, 0x18, 0x01, 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, 0x46,
-	0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x52, 0x03, 0x61, 0x72, 0x67, 0x22, 0x80, 0x01, 0x0a, 0x03,
-	0x46, 0x46, 0x49, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x61, 0x72, 0x67, 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, 0x41, 0x62, 0x73, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x61, 0x72, 0x67, 0x73, 0x12, 0x2f, 0x0a,
-	0x05, 0x74, 0x65, 0x72, 0x6d, 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, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x22, 0x6c,
-	0x0a, 0x04, 0x41, 0x74, 0x6f, 0x6d, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x05, 0x74,
-	0x65, 0x72, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x65, 0x6c,
+	0x31, 0x2e, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x48, 0x00, 0x52, 0x06, 0x75, 0x70, 0x73, 0x65,
+	0x72, 0x74, 0x12, 0x32, 0x0a, 0x05, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69,
+	0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x48, 0x00, 0x52,
+	0x05, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x3f, 0x0a, 0x0a, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64,
+	0x5f, 0x64, 0x65, 0x66, 0x18, 0x05, 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, 0x54, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x22, 0x4d, 0x0a, 0x06,
-	0x50, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x05, 0x74, 0x65,
-	0x72, 0x6d, 0x73, 0x18, 0x02, 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, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x22, 0x53, 0x0a, 0x09, 0x50,
-	0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x05,
-	0x74, 0x65, 0x72, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x72, 0x65,
+	0x2e, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x44, 0x65, 0x66, 0x48, 0x00, 0x52, 0x09, 0x6d, 0x6f,
+	0x6e, 0x6f, 0x69, 0x64, 0x44, 0x65, 0x66, 0x12, 0x3c, 0x0a, 0x09, 0x6d, 0x6f, 0x6e, 0x75, 0x73,
+	0x5f, 0x64, 0x65, 0x66, 0x18, 0x06, 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, 0x4d, 0x6f, 0x6e, 0x75, 0x73, 0x44, 0x65, 0x66, 0x48, 0x00, 0x52, 0x08, 0x6d, 0x6f, 0x6e,
+	0x75, 0x73, 0x44, 0x65, 0x66, 0x42, 0x0c, 0x0a, 0x0a, 0x69, 0x6e, 0x73, 0x74, 0x72, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05, 0x22, 0xa9, 0x01, 0x0a, 0x06, 0x41, 0x73,
+	0x73, 0x69, 0x67, 0x6e, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64,
+	0x79, 0x18, 0x02, 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, 0x41, 0x62,
+	0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12,
+	0x34, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 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, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05,
+	0x61, 0x74, 0x74, 0x72, 0x73, 0x22, 0xca, 0x01, 0x0a, 0x06, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74,
+	0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 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, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x61,
+	0x74, 0x74, 0x72, 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, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05, 0x61, 0x74, 0x74, 0x72,
+	0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x61, 0x72, 0x69, 0x74, 0x79,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x41, 0x72, 0x69,
+	0x74, 0x79, 0x22, 0xa8, 0x01, 0x0a, 0x05, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x12, 0x33, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 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, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 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, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 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, 0x41, 0x74, 0x74,
+	0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x22, 0x82, 0x02,
+	0x0a, 0x09, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x44, 0x65, 0x66, 0x12, 0x33, 0x0a, 0x06, 0x6d,
+	0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65,
 	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x52, 0x65, 0x6c, 0x54, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73,
-	0x22, 0x51, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x41, 0x74, 0x6f, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x32, 0x0a, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c,
+	0x31, 0x2e, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x52, 0x06, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64,
+	0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 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, 0x52, 0x65, 0x6c, 0x54, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65,
-	0x72, 0x6d, 0x73, 0x22, 0x6a, 0x0a, 0x04, 0x43, 0x61, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x05, 0x69,
-	0x6e, 0x70, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x65, 0x6c,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 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, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x34, 0x0a, 0x05, 0x61,
+	0x74, 0x74, 0x72, 0x73, 0x18, 0x04, 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, 0x54, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x31, 0x0a, 0x06,
-	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x03, 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, 0x65, 0x72, 0x6d, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22,
-	0x96, 0x01, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x54, 0x65, 0x72, 0x6d, 0x12, 0x49, 0x0a, 0x11, 0x73,
-	0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x48, 0x00, 0x52, 0x10, 0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65,
-	0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x74, 0x65, 0x72, 0x6d, 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, 0x65, 0x72, 0x6d, 0x48,
-	0x00, 0x52, 0x04, 0x74, 0x65, 0x72, 0x6d, 0x42, 0x0f, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x5f, 0x74,
-	0x65, 0x72, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x7b, 0x0a, 0x04, 0x54, 0x65, 0x72, 0x6d,
-	0x12, 0x2c, 0x0a, 0x03, 0x76, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e,
-	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70,
-	0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x72, 0x48, 0x00, 0x52, 0x03, 0x76, 0x61, 0x72, 0x12, 0x38,
-	0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1a, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e,
-	0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x08,
-	0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x74, 0x65, 0x72, 0x6d,
-	0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x19, 0x0a, 0x03, 0x56, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x22, 0x4f, 0x0a, 0x09, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x2e, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c,
-	0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x04, 0x61, 0x72, 0x67,
-	0x73, 0x22, 0x93, 0x02, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x03, 0x65, 0x64,
-	0x62, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x44,
-	0x42, 0x48, 0x00, 0x52, 0x03, 0x65, 0x64, 0x62, 0x12, 0x4e, 0x0a, 0x0f, 0x62, 0x65, 0x74, 0x72,
-	0x65, 0x65, 0x5f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 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, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65,
-	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0e, 0x62, 0x65, 0x74, 0x72, 0x65, 0x65,
-	0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x08, 0x63, 0x73, 0x76, 0x5f,
-	0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x72, 0x65, 0x6c,
+	0x2e, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05, 0x61, 0x74, 0x74, 0x72,
+	0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x61, 0x72, 0x69, 0x74, 0x79,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x41, 0x72, 0x69,
+	0x74, 0x79, 0x22, 0x81, 0x02, 0x0a, 0x08, 0x4d, 0x6f, 0x6e, 0x75, 0x73, 0x44, 0x65, 0x66, 0x12,
+	0x33, 0x0a, 0x06, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c,
+	0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x52, 0x06, 0x6d, 0x6f,
+	0x6e, 0x6f, 0x69, 0x64, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 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, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x64, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64,
+	0x79, 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, 0x41, 0x62,
+	0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12,
+	0x34, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x18, 0x04, 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, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x52, 0x05,
+	0x61, 0x74, 0x74, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x61,
+	0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x41, 0x72, 0x69, 0x74, 0x79, 0x22, 0x92, 0x02, 0x0a, 0x06, 0x4d, 0x6f, 0x6e, 0x6f, 0x69,
+	0x64, 0x12, 0x3c, 0x0a, 0x09, 0x6f, 0x72, 0x5f, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x18, 0x01,
+	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, 0x4f, 0x72, 0x4d, 0x6f, 0x6e,
+	0x6f, 0x69, 0x64, 0x48, 0x00, 0x52, 0x08, 0x6f, 0x72, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x12,
+	0x3f, 0x0a, 0x0a, 0x6d, 0x69, 0x6e, 0x5f, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 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, 0x4d, 0x69, 0x6e, 0x4d, 0x6f, 0x6e,
+	0x6f, 0x69, 0x64, 0x48, 0x00, 0x52, 0x09, 0x6d, 0x69, 0x6e, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64,
+	0x12, 0x3f, 0x0a, 0x0a, 0x6d, 0x61, 0x78, 0x5f, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x18, 0x03,
+	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, 0x4d, 0x61, 0x78, 0x4d, 0x6f,
+	0x6e, 0x6f, 0x69, 0x64, 0x48, 0x00, 0x52, 0x09, 0x6d, 0x61, 0x78, 0x4d, 0x6f, 0x6e, 0x6f, 0x69,
+	0x64, 0x12, 0x3f, 0x0a, 0x0a, 0x73, 0x75, 0x6d, 0x5f, 0x6d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 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, 0x53, 0x75, 0x6d, 0x4d,
+	0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x48, 0x00, 0x52, 0x09, 0x73, 0x75, 0x6d, 0x4d, 0x6f, 0x6e, 0x6f,
+	0x69, 0x64, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x4f,
+	0x72, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x09, 0x4d, 0x69, 0x6e, 0x4d, 0x6f,
+	0x6e, 0x6f, 0x69, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 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, 0x3a, 0x0a, 0x09, 0x4d, 0x61, 0x78, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64,
+	0x12, 0x2d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 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,
+	0x3a, 0x0a, 0x09, 0x53, 0x75, 0x6d, 0x4d, 0x6f, 0x6e, 0x6f, 0x69, 0x64, 0x12, 0x2d, 0x0a, 0x04,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 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, 0x43, 0x53, 0x56, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x07, 0x63, 0x73, 0x76, 0x44,
-	0x61, 0x74, 0x61, 0x12, 0x45, 0x0a, 0x0c, 0x69, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x5f, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65, 0x6c, 0x61,
+	0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x64, 0x0a, 0x07, 0x42,
+	0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x2a, 0x0a, 0x03, 0x76, 0x61, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
+	0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x72, 0x52, 0x03, 0x76,
+	0x61, 0x72, 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, 0x73, 0x0a, 0x0b, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x30, 0x0a, 0x04, 0x76, 0x61, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 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, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x76, 0x61,
+	0x72, 0x73, 0x12, 0x32, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 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, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x83, 0x05, 0x0a, 0x07, 0x46, 0x6f, 0x72, 0x6d, 0x75,
+	0x6c, 0x61, 0x12, 0x35, 0x0a, 0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61,
+	0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x48,
+	0x00, 0x52, 0x06, 0x65, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x35, 0x0a, 0x06, 0x72, 0x65, 0x64,
+	0x75, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x72, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e,
+	0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65,
+	0x12, 0x44, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 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, 0x43, 0x6f, 0x6e, 0x6a,
+	0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x6a, 0x75,
+	0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x6a, 0x75, 0x6e,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 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, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52,
+	0x0b, 0x64, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x0a, 0x03,
+	0x6e, 0x6f, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e,
+	0x4e, 0x6f, 0x74, 0x48, 0x00, 0x52, 0x03, 0x6e, 0x6f, 0x74, 0x12, 0x2c, 0x0a, 0x03, 0x66, 0x66,
+	0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x46, 0x46,
+	0x49, 0x48, 0x00, 0x52, 0x03, 0x66, 0x66, 0x69, 0x12, 0x2f, 0x0a, 0x04, 0x61, 0x74, 0x6f, 0x6d,
+	0x18, 0x07, 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, 0x41, 0x74, 0x6f,
+	0x6d, 0x48, 0x00, 0x52, 0x04, 0x61, 0x74, 0x6f, 0x6d, 0x12, 0x35, 0x0a, 0x06, 0x70, 0x72, 0x61,
+	0x67, 0x6d, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 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, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x0b, 0x69,
-	0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x44, 0x61, 0x74, 0x61, 0x42, 0x0b, 0x0a, 0x09, 0x64, 0x61,
-	0x74, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x88, 0x01, 0x0a, 0x03, 0x45, 0x44, 0x42, 0x12,
-	0x3c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x50, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x48, 0x00, 0x52, 0x06, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61,
+	0x12, 0x3e, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x18, 0x09, 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, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74,
+	0x69, 0x76, 0x65, 0x48, 0x00, 0x52, 0x09, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65,
+	0x12, 0x39, 0x0a, 0x08, 0x72, 0x65, 0x6c, 0x5f, 0x61, 0x74, 0x6f, 0x6d, 0x18, 0x0a, 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, 0x52, 0x65, 0x6c, 0x41, 0x74, 0x6f, 0x6d,
+	0x48, 0x00, 0x52, 0x07, 0x72, 0x65, 0x6c, 0x41, 0x74, 0x6f, 0x6d, 0x12, 0x2f, 0x0a, 0x04, 0x63,
+	0x61, 0x73, 0x74, 0x18, 0x0b, 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,
+	0x43, 0x61, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x63, 0x61, 0x73, 0x74, 0x42, 0x0e, 0x0a, 0x0c,
+	0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x0a, 0x06,
+	0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 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, 0x41, 0x62, 0x73, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x22, 0xa1, 0x01, 0x0a,
+	0x06, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x02, 0x6f, 0x70, 0x18, 0x01, 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, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x02, 0x6f, 0x70, 0x12, 0x34, 0x0a, 0x04, 0x62, 0x6f, 0x64,
+	0x79, 0x18, 0x02, 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, 0x41, 0x62,
+	0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12,
+	0x2f, 0x0a, 0x05, 0x74, 0x65, 0x72, 0x6d, 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, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73,
+	0x22, 0x3f, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x30, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 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, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x52, 0x04, 0x61, 0x72, 0x67,
+	0x73, 0x22, 0x3f, 0x0a, 0x0b, 0x44, 0x69, 0x73, 0x6a, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x30, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 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, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x52, 0x04, 0x61, 0x72,
+	0x67, 0x73, 0x22, 0x35, 0x0a, 0x03, 0x4e, 0x6f, 0x74, 0x12, 0x2e, 0x0a, 0x03, 0x61, 0x72, 0x67,
+	0x18, 0x01, 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, 0x46, 0x6f, 0x72,
+	0x6d, 0x75, 0x6c, 0x61, 0x52, 0x03, 0x61, 0x72, 0x67, 0x22, 0x80, 0x01, 0x0a, 0x03, 0x46, 0x46,
+	0x49, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x04, 0x61, 0x72, 0x67, 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, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x61, 0x72, 0x67, 0x73, 0x12, 0x2f, 0x0a, 0x05, 0x74,
+	0x65, 0x72, 0x6d, 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, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x22, 0x6c, 0x0a, 0x04,
+	0x41, 0x74, 0x6f, 0x6d, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x12, 0x0a,
-	0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74,
-	0x68, 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, 0x22, 0x8b, 0x01, 0x0a, 0x0e, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x6c,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x44, 0x0a, 0x0d, 0x72, 0x65,
-	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 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, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x0c, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f,
-	0x22, 0x9f, 0x02, 0x0a, 0x0a, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-	0x36, 0x0a, 0x09, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x01, 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, 0x08, 0x6b,
-	0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x3a, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72,
+	0x6e, 0x49, 0x64, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x05, 0x74, 0x65, 0x72,
+	0x6d, 0x73, 0x18, 0x02, 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,
+	0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x22, 0x4d, 0x0a, 0x06, 0x50, 0x72,
+	0x61, 0x67, 0x6d, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x05, 0x74, 0x65, 0x72, 0x6d,
+	0x73, 0x18, 0x02, 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, 0x65,
+	0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x22, 0x53, 0x0a, 0x09, 0x50, 0x72, 0x69,
+	0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x05, 0x74, 0x65,
+	0x72, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 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,
+	0x52, 0x65, 0x6c, 0x54, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x22, 0x51,
+	0x0a, 0x07, 0x52, 0x65, 0x6c, 0x41, 0x74, 0x6f, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a,
+	0x05, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 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, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x54, 0x79,
-	0x70, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x0e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x72, 0x65,
+	0x76, 0x31, 0x2e, 0x52, 0x65, 0x6c, 0x54, 0x65, 0x72, 0x6d, 0x52, 0x05, 0x74, 0x65, 0x72, 0x6d,
+	0x73, 0x22, 0x6a, 0x0a, 0x04, 0x43, 0x61, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x05, 0x69, 0x6e, 0x70,
+	0x75, 0x74, 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,
+	0x65, 0x72, 0x6d, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x31, 0x0a, 0x06, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x18, 0x03, 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, 0x65, 0x72, 0x6d, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x96, 0x01,
+	0x0a, 0x07, 0x52, 0x65, 0x6c, 0x54, 0x65, 0x72, 0x6d, 0x12, 0x49, 0x0a, 0x11, 0x73, 0x70, 0x65,
+	0x63, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61,
+	0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x48, 0x00, 0x52, 0x10, 0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x74, 0x65, 0x72, 0x6d, 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, 0x65, 0x72, 0x6d, 0x48, 0x00, 0x52,
+	0x04, 0x74, 0x65, 0x72, 0x6d, 0x42, 0x0f, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x5f, 0x74, 0x65, 0x72,
+	0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x7b, 0x0a, 0x04, 0x54, 0x65, 0x72, 0x6d, 0x12, 0x2c,
+	0x0a, 0x03, 0x76, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65,
 	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d,
-	0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4d, 0x0a,
-	0x10, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f,
-	0x72, 0x18, 0x05, 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, 0x42, 0x65,
-	0x54, 0x72, 0x65, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x0f, 0x72, 0x65, 0x6c,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x4a, 0x04, 0x08, 0x03,
-	0x10, 0x04, 0x22, 0x81, 0x01, 0x0a, 0x0c, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x70, 0x73, 0x69, 0x6c, 0x6f, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x01, 0x52, 0x07, 0x65, 0x70, 0x73, 0x69, 0x6c, 0x6f, 0x6e, 0x12, 0x1d, 0x0a,
-	0x0a, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x69, 0x76, 0x6f, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x09, 0x6d, 0x61, 0x78, 0x50, 0x69, 0x76, 0x6f, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a,
-	0x6d, 0x61, 0x78, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x09, 0x6d, 0x61, 0x78, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x6d,
-	0x61, 0x78, 0x5f, 0x6c, 0x65, 0x61, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d,
-	0x61, 0x78, 0x4c, 0x65, 0x61, 0x66, 0x22, 0xca, 0x01, 0x0a, 0x0d, 0x42, 0x65, 0x54, 0x72, 0x65,
-	0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x44, 0x0a, 0x0b, 0x72, 0x6f, 0x6f, 0x74,
-	0x5f, 0x70, 0x61, 0x67, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
+	0x31, 0x2e, 0x56, 0x61, 0x72, 0x48, 0x00, 0x52, 0x03, 0x76, 0x61, 0x72, 0x12, 0x38, 0x0a, 0x08,
+	0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f,
+	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x74, 0x65, 0x72, 0x6d, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x22, 0x19, 0x0a, 0x03, 0x56, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x4f,
+	0x0a, 0x09, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x2e, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 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, 0x0a, 0x72, 0x6f, 0x6f, 0x74, 0x50, 0x61, 0x67, 0x65, 0x69, 0x64, 0x12, 0x21,
-	0x0a, 0x0b, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74,
-	0x61, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
-	0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x72, 0x65, 0x65, 0x5f, 0x68,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x72, 0x65,
-	0x65, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x0a, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 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,
+	0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x04, 0x61, 0x72, 0x67, 0x73, 0x22,
+	0x93, 0x02, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x03, 0x65, 0x64, 0x62, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x61, 0x6c, 0x61, 0x69, 0x2e, 0x6c, 0x71, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x44, 0x42, 0x48,
+	0x00, 0x52, 0x03, 0x65, 0x64, 0x62, 0x12, 0x4e, 0x0a, 0x0f, 0x62, 0x65, 0x74, 0x72, 0x65, 0x65,
+	0x5f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 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, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0e, 0x62, 0x65, 0x74, 0x72, 0x65, 0x65, 0x52, 0x65,
+	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x08, 0x63, 0x73, 0x76, 0x5f, 0x64, 0x61,
+	0x74, 0x61, 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, 0x43,
+	0x53, 0x56, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x07, 0x63, 0x73, 0x76, 0x44, 0x61, 0x74,
+	0x61, 0x12, 0x45, 0x0a, 0x0c, 0x69, 0x63, 0x65, 0x62, 0x65, 0x72, 0x67, 0x5f, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x04, 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, 0x63,
+	0x65, 0x62, 0x65, 0x72, 0x67, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x0b, 0x69, 0x63, 0x65,
+	0x62, 0x65, 0x72, 0x67, 0x44, 0x61, 0x74, 0x61, 0x42, 0x0b, 0x0a, 0x09, 0x64, 0x61, 0x74, 0x61,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x88, 0x01, 0x0a, 0x03, 0x45, 0x44, 0x42, 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, 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,
+	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, 0x12, 0x0a, 0x04, 0x70,
+	0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 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,
+	0x22, 0x8b, 0x01, 0x0a, 0x0e, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x33, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x44, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 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, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x0c, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x9f,
+	0x02, 0x0a, 0x0a, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x36, 0x0a,
+	0x09, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x01, 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, 0x08, 0x6b, 0x65, 0x79,
+	0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x3a, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 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, 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,
-	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, 0x8f, 0x03, 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, 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,
+	0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65,
+	0x73, 0x12, 0x48, 0x0a, 0x0e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 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,
+	0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x73, 0x74,
+	0x6f, 0x72, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4d, 0x0a, 0x10, 0x72,
+	0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x18,
+	0x05, 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, 0x42, 0x65, 0x54, 0x72,
+	0x65, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x0f, 0x72, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04,
+	0x22, 0x81, 0x01, 0x0a, 0x0c, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x70, 0x73, 0x69, 0x6c, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x01, 0x52, 0x07, 0x65, 0x70, 0x73, 0x69, 0x6c, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x6d,
+	0x61, 0x78, 0x5f, 0x70, 0x69, 0x76, 0x6f, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x09, 0x6d, 0x61, 0x78, 0x50, 0x69, 0x76, 0x6f, 0x74, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6d, 0x61,
+	0x78, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
+	0x6d, 0x61, 0x78, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x6d, 0x61, 0x78,
+	0x5f, 0x6c, 0x65, 0x61, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x61, 0x78,
+	0x4c, 0x65, 0x61, 0x66, 0x22, 0xca, 0x01, 0x0a, 0x0d, 0x42, 0x65, 0x54, 0x72, 0x65, 0x65, 0x4c,
+	0x6f, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x44, 0x0a, 0x0b, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x70,
+	0x61, 0x67, 0x65, 0x69, 0x64, 0x18, 0x01, 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, 0x0a, 0x72, 0x6f, 0x6f, 0x74, 0x50, 0x61, 0x67, 0x65, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0b,
+	0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0c, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12,
+	0x23, 0x0a, 0x0d, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x43,
+	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x72, 0x65, 0x65, 0x5f, 0x68, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x74, 0x72, 0x65, 0x65, 0x48,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x0a, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 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, 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, 0x8f, 0x03, 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, 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, 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,
+	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, 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,
+	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, 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,
+	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,
-	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, 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,
+	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, 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, 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,
-	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, 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,
+	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, 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,
+	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, 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,
+	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, 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, 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,
+	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,
 })
 
 var (
@@ -5704,125 +5727,127 @@ var file_relationalai_lqp_v1_logic_proto_depIdxs = []int32{
 	35,  // 11: relationalai.lqp.v1.FunctionalDependency.values:type_name -> relationalai.lqp.v1.Var
 	50,  // 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
-	6,   // 14: relationalai.lqp.v1.Script.constructs:type_name -> relationalai.lqp.v1.Construct
-	7,   // 15: relationalai.lqp.v1.Construct.loop:type_name -> relationalai.lqp.v1.Loop
-	8,   // 16: relationalai.lqp.v1.Construct.instruction:type_name -> relationalai.lqp.v1.Instruction
-	8,   // 17: relationalai.lqp.v1.Loop.init:type_name -> relationalai.lqp.v1.Instruction
-	5,   // 18: relationalai.lqp.v1.Loop.body:type_name -> relationalai.lqp.v1.Script
-	9,   // 19: relationalai.lqp.v1.Instruction.assign:type_name -> relationalai.lqp.v1.Assign
-	10,  // 20: relationalai.lqp.v1.Instruction.upsert:type_name -> relationalai.lqp.v1.Upsert
-	11,  // 21: relationalai.lqp.v1.Instruction.break:type_name -> relationalai.lqp.v1.Break
-	12,  // 22: relationalai.lqp.v1.Instruction.monoid_def:type_name -> relationalai.lqp.v1.MonoidDef
-	13,  // 23: relationalai.lqp.v1.Instruction.monus_def:type_name -> relationalai.lqp.v1.MonusDef
-	50,  // 24: relationalai.lqp.v1.Assign.name:type_name -> relationalai.lqp.v1.RelationId
-	20,  // 25: relationalai.lqp.v1.Assign.body:type_name -> relationalai.lqp.v1.Abstraction
-	36,  // 26: relationalai.lqp.v1.Assign.attrs:type_name -> relationalai.lqp.v1.Attribute
-	50,  // 27: relationalai.lqp.v1.Upsert.name:type_name -> relationalai.lqp.v1.RelationId
-	20,  // 28: relationalai.lqp.v1.Upsert.body:type_name -> relationalai.lqp.v1.Abstraction
-	36,  // 29: relationalai.lqp.v1.Upsert.attrs:type_name -> relationalai.lqp.v1.Attribute
-	50,  // 30: relationalai.lqp.v1.Break.name:type_name -> relationalai.lqp.v1.RelationId
-	20,  // 31: relationalai.lqp.v1.Break.body:type_name -> relationalai.lqp.v1.Abstraction
-	36,  // 32: relationalai.lqp.v1.Break.attrs:type_name -> relationalai.lqp.v1.Attribute
-	14,  // 33: relationalai.lqp.v1.MonoidDef.monoid:type_name -> relationalai.lqp.v1.Monoid
-	50,  // 34: relationalai.lqp.v1.MonoidDef.name:type_name -> relationalai.lqp.v1.RelationId
-	20,  // 35: relationalai.lqp.v1.MonoidDef.body:type_name -> relationalai.lqp.v1.Abstraction
-	36,  // 36: relationalai.lqp.v1.MonoidDef.attrs:type_name -> relationalai.lqp.v1.Attribute
-	14,  // 37: relationalai.lqp.v1.MonusDef.monoid:type_name -> relationalai.lqp.v1.Monoid
-	50,  // 38: relationalai.lqp.v1.MonusDef.name:type_name -> relationalai.lqp.v1.RelationId
-	20,  // 39: relationalai.lqp.v1.MonusDef.body:type_name -> relationalai.lqp.v1.Abstraction
-	36,  // 40: relationalai.lqp.v1.MonusDef.attrs:type_name -> relationalai.lqp.v1.Attribute
-	15,  // 41: relationalai.lqp.v1.Monoid.or_monoid:type_name -> relationalai.lqp.v1.OrMonoid
-	16,  // 42: relationalai.lqp.v1.Monoid.min_monoid:type_name -> relationalai.lqp.v1.MinMonoid
-	17,  // 43: relationalai.lqp.v1.Monoid.max_monoid:type_name -> relationalai.lqp.v1.MaxMonoid
-	18,  // 44: relationalai.lqp.v1.Monoid.sum_monoid:type_name -> relationalai.lqp.v1.SumMonoid
-	51,  // 45: relationalai.lqp.v1.MinMonoid.type:type_name -> relationalai.lqp.v1.Type
-	51,  // 46: relationalai.lqp.v1.MaxMonoid.type:type_name -> relationalai.lqp.v1.Type
-	51,  // 47: relationalai.lqp.v1.SumMonoid.type:type_name -> relationalai.lqp.v1.Type
-	35,  // 48: relationalai.lqp.v1.Binding.var:type_name -> relationalai.lqp.v1.Var
-	51,  // 49: relationalai.lqp.v1.Binding.type:type_name -> relationalai.lqp.v1.Type
-	19,  // 50: relationalai.lqp.v1.Abstraction.vars:type_name -> relationalai.lqp.v1.Binding
-	21,  // 51: relationalai.lqp.v1.Abstraction.value:type_name -> relationalai.lqp.v1.Formula
-	22,  // 52: relationalai.lqp.v1.Formula.exists:type_name -> relationalai.lqp.v1.Exists
-	23,  // 53: relationalai.lqp.v1.Formula.reduce:type_name -> relationalai.lqp.v1.Reduce
-	24,  // 54: relationalai.lqp.v1.Formula.conjunction:type_name -> relationalai.lqp.v1.Conjunction
-	25,  // 55: relationalai.lqp.v1.Formula.disjunction:type_name -> relationalai.lqp.v1.Disjunction
-	26,  // 56: relationalai.lqp.v1.Formula.not:type_name -> relationalai.lqp.v1.Not
-	27,  // 57: relationalai.lqp.v1.Formula.ffi:type_name -> relationalai.lqp.v1.FFI
-	28,  // 58: relationalai.lqp.v1.Formula.atom:type_name -> relationalai.lqp.v1.Atom
-	29,  // 59: relationalai.lqp.v1.Formula.pragma:type_name -> relationalai.lqp.v1.Pragma
-	30,  // 60: relationalai.lqp.v1.Formula.primitive:type_name -> relationalai.lqp.v1.Primitive
-	31,  // 61: relationalai.lqp.v1.Formula.rel_atom:type_name -> relationalai.lqp.v1.RelAtom
-	32,  // 62: relationalai.lqp.v1.Formula.cast:type_name -> relationalai.lqp.v1.Cast
-	20,  // 63: relationalai.lqp.v1.Exists.body:type_name -> relationalai.lqp.v1.Abstraction
-	20,  // 64: relationalai.lqp.v1.Reduce.op:type_name -> relationalai.lqp.v1.Abstraction
-	20,  // 65: relationalai.lqp.v1.Reduce.body:type_name -> relationalai.lqp.v1.Abstraction
-	34,  // 66: relationalai.lqp.v1.Reduce.terms:type_name -> relationalai.lqp.v1.Term
-	21,  // 67: relationalai.lqp.v1.Conjunction.args:type_name -> relationalai.lqp.v1.Formula
-	21,  // 68: relationalai.lqp.v1.Disjunction.args:type_name -> relationalai.lqp.v1.Formula
-	21,  // 69: relationalai.lqp.v1.Not.arg:type_name -> relationalai.lqp.v1.Formula
-	20,  // 70: relationalai.lqp.v1.FFI.args:type_name -> relationalai.lqp.v1.Abstraction
-	34,  // 71: relationalai.lqp.v1.FFI.terms:type_name -> relationalai.lqp.v1.Term
-	50,  // 72: relationalai.lqp.v1.Atom.name:type_name -> relationalai.lqp.v1.RelationId
-	34,  // 73: relationalai.lqp.v1.Atom.terms:type_name -> relationalai.lqp.v1.Term
-	34,  // 74: relationalai.lqp.v1.Pragma.terms:type_name -> relationalai.lqp.v1.Term
-	33,  // 75: relationalai.lqp.v1.Primitive.terms:type_name -> relationalai.lqp.v1.RelTerm
-	33,  // 76: relationalai.lqp.v1.RelAtom.terms:type_name -> relationalai.lqp.v1.RelTerm
-	34,  // 77: relationalai.lqp.v1.Cast.input:type_name -> relationalai.lqp.v1.Term
-	34,  // 78: relationalai.lqp.v1.Cast.result:type_name -> relationalai.lqp.v1.Term
-	66,  // 79: relationalai.lqp.v1.RelTerm.specialized_value:type_name -> relationalai.lqp.v1.Value
-	34,  // 80: relationalai.lqp.v1.RelTerm.term:type_name -> relationalai.lqp.v1.Term
-	35,  // 81: relationalai.lqp.v1.Term.var:type_name -> relationalai.lqp.v1.Var
-	66,  // 82: relationalai.lqp.v1.Term.constant:type_name -> relationalai.lqp.v1.Value
-	66,  // 83: relationalai.lqp.v1.Attribute.args:type_name -> relationalai.lqp.v1.Value
-	38,  // 84: relationalai.lqp.v1.Data.edb:type_name -> relationalai.lqp.v1.EDB
-	39,  // 85: relationalai.lqp.v1.Data.betree_relation:type_name -> relationalai.lqp.v1.BeTreeRelation
-	43,  // 86: relationalai.lqp.v1.Data.csv_data:type_name -> relationalai.lqp.v1.CSVData
-	46,  // 87: relationalai.lqp.v1.Data.iceberg_data:type_name -> relationalai.lqp.v1.IcebergData
-	50,  // 88: relationalai.lqp.v1.EDB.target_id:type_name -> relationalai.lqp.v1.RelationId
-	51,  // 89: relationalai.lqp.v1.EDB.types:type_name -> relationalai.lqp.v1.Type
-	50,  // 90: relationalai.lqp.v1.BeTreeRelation.name:type_name -> relationalai.lqp.v1.RelationId
-	40,  // 91: relationalai.lqp.v1.BeTreeRelation.relation_info:type_name -> relationalai.lqp.v1.BeTreeInfo
-	51,  // 92: relationalai.lqp.v1.BeTreeInfo.key_types:type_name -> relationalai.lqp.v1.Type
-	51,  // 93: relationalai.lqp.v1.BeTreeInfo.value_types:type_name -> relationalai.lqp.v1.Type
-	41,  // 94: relationalai.lqp.v1.BeTreeInfo.storage_config:type_name -> relationalai.lqp.v1.BeTreeConfig
-	42,  // 95: relationalai.lqp.v1.BeTreeInfo.relation_locator:type_name -> relationalai.lqp.v1.BeTreeLocator
-	67,  // 96: relationalai.lqp.v1.BeTreeLocator.root_pageid:type_name -> relationalai.lqp.v1.UInt128Value
-	44,  // 97: relationalai.lqp.v1.CSVData.locator:type_name -> relationalai.lqp.v1.CSVLocator
-	45,  // 98: relationalai.lqp.v1.CSVData.config:type_name -> relationalai.lqp.v1.CSVConfig
-	49,  // 99: relationalai.lqp.v1.CSVData.columns:type_name -> relationalai.lqp.v1.GNFColumn
-	47,  // 100: relationalai.lqp.v1.IcebergData.locator:type_name -> relationalai.lqp.v1.IcebergLocator
-	48,  // 101: relationalai.lqp.v1.IcebergData.config:type_name -> relationalai.lqp.v1.IcebergCatalogConfig
-	49,  // 102: relationalai.lqp.v1.IcebergData.columns:type_name -> relationalai.lqp.v1.GNFColumn
-	73,  // 103: relationalai.lqp.v1.IcebergCatalogConfig.properties:type_name -> relationalai.lqp.v1.IcebergCatalogConfig.PropertiesEntry
-	74,  // 104: relationalai.lqp.v1.IcebergCatalogConfig.auth_properties:type_name -> relationalai.lqp.v1.IcebergCatalogConfig.AuthPropertiesEntry
-	50,  // 105: relationalai.lqp.v1.GNFColumn.target_id:type_name -> relationalai.lqp.v1.RelationId
-	51,  // 106: relationalai.lqp.v1.GNFColumn.types:type_name -> relationalai.lqp.v1.Type
-	52,  // 107: relationalai.lqp.v1.Type.unspecified_type:type_name -> relationalai.lqp.v1.UnspecifiedType
-	53,  // 108: relationalai.lqp.v1.Type.string_type:type_name -> relationalai.lqp.v1.StringType
-	54,  // 109: relationalai.lqp.v1.Type.int_type:type_name -> relationalai.lqp.v1.IntType
-	55,  // 110: relationalai.lqp.v1.Type.float_type:type_name -> relationalai.lqp.v1.FloatType
-	56,  // 111: relationalai.lqp.v1.Type.uint128_type:type_name -> relationalai.lqp.v1.UInt128Type
-	57,  // 112: relationalai.lqp.v1.Type.int128_type:type_name -> relationalai.lqp.v1.Int128Type
-	58,  // 113: relationalai.lqp.v1.Type.date_type:type_name -> relationalai.lqp.v1.DateType
-	59,  // 114: relationalai.lqp.v1.Type.datetime_type:type_name -> relationalai.lqp.v1.DateTimeType
-	60,  // 115: relationalai.lqp.v1.Type.missing_type:type_name -> relationalai.lqp.v1.MissingType
-	61,  // 116: relationalai.lqp.v1.Type.decimal_type:type_name -> relationalai.lqp.v1.DecimalType
-	62,  // 117: relationalai.lqp.v1.Type.boolean_type:type_name -> relationalai.lqp.v1.BooleanType
-	63,  // 118: relationalai.lqp.v1.Type.int32_type:type_name -> relationalai.lqp.v1.Int32Type
-	64,  // 119: relationalai.lqp.v1.Type.float32_type:type_name -> relationalai.lqp.v1.Float32Type
-	65,  // 120: relationalai.lqp.v1.Type.uint32_type:type_name -> relationalai.lqp.v1.UInt32Type
-	67,  // 121: relationalai.lqp.v1.Value.uint128_value:type_name -> relationalai.lqp.v1.UInt128Value
-	68,  // 122: relationalai.lqp.v1.Value.int128_value:type_name -> relationalai.lqp.v1.Int128Value
-	69,  // 123: relationalai.lqp.v1.Value.missing_value:type_name -> relationalai.lqp.v1.MissingValue
-	70,  // 124: relationalai.lqp.v1.Value.date_value:type_name -> relationalai.lqp.v1.DateValue
-	71,  // 125: relationalai.lqp.v1.Value.datetime_value:type_name -> relationalai.lqp.v1.DateTimeValue
-	72,  // 126: relationalai.lqp.v1.Value.decimal_value:type_name -> relationalai.lqp.v1.DecimalValue
-	68,  // 127: relationalai.lqp.v1.DecimalValue.value:type_name -> relationalai.lqp.v1.Int128Value
-	128, // [128:128] is the sub-list for method output_type
-	128, // [128:128] is the sub-list for method input_type
-	128, // [128:128] is the sub-list for extension type_name
-	128, // [128:128] is the sub-list for extension extendee
-	0,   // [0:128] is the sub-list for field type_name
+	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
+	7,   // 16: relationalai.lqp.v1.Construct.loop:type_name -> relationalai.lqp.v1.Loop
+	8,   // 17: relationalai.lqp.v1.Construct.instruction:type_name -> relationalai.lqp.v1.Instruction
+	8,   // 18: relationalai.lqp.v1.Loop.init:type_name -> relationalai.lqp.v1.Instruction
+	5,   // 19: relationalai.lqp.v1.Loop.body:type_name -> relationalai.lqp.v1.Script
+	36,  // 20: relationalai.lqp.v1.Loop.attrs:type_name -> relationalai.lqp.v1.Attribute
+	9,   // 21: relationalai.lqp.v1.Instruction.assign:type_name -> relationalai.lqp.v1.Assign
+	10,  // 22: relationalai.lqp.v1.Instruction.upsert:type_name -> relationalai.lqp.v1.Upsert
+	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
+	50,  // 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
+	50,  // 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
+	50,  // 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
+	50,  // 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
+	50,  // 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
+	51,  // 47: relationalai.lqp.v1.MinMonoid.type:type_name -> relationalai.lqp.v1.Type
+	51,  // 48: relationalai.lqp.v1.MaxMonoid.type:type_name -> relationalai.lqp.v1.Type
+	51,  // 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
+	51,  // 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
+	23,  // 55: relationalai.lqp.v1.Formula.reduce:type_name -> relationalai.lqp.v1.Reduce
+	24,  // 56: relationalai.lqp.v1.Formula.conjunction:type_name -> relationalai.lqp.v1.Conjunction
+	25,  // 57: relationalai.lqp.v1.Formula.disjunction:type_name -> relationalai.lqp.v1.Disjunction
+	26,  // 58: relationalai.lqp.v1.Formula.not:type_name -> relationalai.lqp.v1.Not
+	27,  // 59: relationalai.lqp.v1.Formula.ffi:type_name -> relationalai.lqp.v1.FFI
+	28,  // 60: relationalai.lqp.v1.Formula.atom:type_name -> relationalai.lqp.v1.Atom
+	29,  // 61: relationalai.lqp.v1.Formula.pragma:type_name -> relationalai.lqp.v1.Pragma
+	30,  // 62: relationalai.lqp.v1.Formula.primitive:type_name -> relationalai.lqp.v1.Primitive
+	31,  // 63: relationalai.lqp.v1.Formula.rel_atom:type_name -> relationalai.lqp.v1.RelAtom
+	32,  // 64: relationalai.lqp.v1.Formula.cast:type_name -> relationalai.lqp.v1.Cast
+	20,  // 65: relationalai.lqp.v1.Exists.body:type_name -> relationalai.lqp.v1.Abstraction
+	20,  // 66: relationalai.lqp.v1.Reduce.op:type_name -> relationalai.lqp.v1.Abstraction
+	20,  // 67: relationalai.lqp.v1.Reduce.body:type_name -> relationalai.lqp.v1.Abstraction
+	34,  // 68: relationalai.lqp.v1.Reduce.terms:type_name -> relationalai.lqp.v1.Term
+	21,  // 69: relationalai.lqp.v1.Conjunction.args:type_name -> relationalai.lqp.v1.Formula
+	21,  // 70: relationalai.lqp.v1.Disjunction.args:type_name -> relationalai.lqp.v1.Formula
+	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
+	50,  // 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
+	66,  // 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
+	66,  // 84: relationalai.lqp.v1.Term.constant:type_name -> relationalai.lqp.v1.Value
+	66,  // 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
+	43,  // 88: relationalai.lqp.v1.Data.csv_data:type_name -> relationalai.lqp.v1.CSVData
+	46,  // 89: relationalai.lqp.v1.Data.iceberg_data:type_name -> relationalai.lqp.v1.IcebergData
+	50,  // 90: relationalai.lqp.v1.EDB.target_id:type_name -> relationalai.lqp.v1.RelationId
+	51,  // 91: relationalai.lqp.v1.EDB.types:type_name -> relationalai.lqp.v1.Type
+	50,  // 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
+	51,  // 94: relationalai.lqp.v1.BeTreeInfo.key_types:type_name -> relationalai.lqp.v1.Type
+	51,  // 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
+	67,  // 98: relationalai.lqp.v1.BeTreeLocator.root_pageid:type_name -> relationalai.lqp.v1.UInt128Value
+	44,  // 99: relationalai.lqp.v1.CSVData.locator:type_name -> relationalai.lqp.v1.CSVLocator
+	45,  // 100: relationalai.lqp.v1.CSVData.config:type_name -> relationalai.lqp.v1.CSVConfig
+	49,  // 101: relationalai.lqp.v1.CSVData.columns:type_name -> relationalai.lqp.v1.GNFColumn
+	47,  // 102: relationalai.lqp.v1.IcebergData.locator:type_name -> relationalai.lqp.v1.IcebergLocator
+	48,  // 103: relationalai.lqp.v1.IcebergData.config:type_name -> relationalai.lqp.v1.IcebergCatalogConfig
+	49,  // 104: relationalai.lqp.v1.IcebergData.columns:type_name -> relationalai.lqp.v1.GNFColumn
+	73,  // 105: relationalai.lqp.v1.IcebergCatalogConfig.properties:type_name -> relationalai.lqp.v1.IcebergCatalogConfig.PropertiesEntry
+	74,  // 106: relationalai.lqp.v1.IcebergCatalogConfig.auth_properties:type_name -> relationalai.lqp.v1.IcebergCatalogConfig.AuthPropertiesEntry
+	50,  // 107: relationalai.lqp.v1.GNFColumn.target_id:type_name -> relationalai.lqp.v1.RelationId
+	51,  // 108: relationalai.lqp.v1.GNFColumn.types:type_name -> relationalai.lqp.v1.Type
+	52,  // 109: relationalai.lqp.v1.Type.unspecified_type:type_name -> relationalai.lqp.v1.UnspecifiedType
+	53,  // 110: relationalai.lqp.v1.Type.string_type:type_name -> relationalai.lqp.v1.StringType
+	54,  // 111: relationalai.lqp.v1.Type.int_type:type_name -> relationalai.lqp.v1.IntType
+	55,  // 112: relationalai.lqp.v1.Type.float_type:type_name -> relationalai.lqp.v1.FloatType
+	56,  // 113: relationalai.lqp.v1.Type.uint128_type:type_name -> relationalai.lqp.v1.UInt128Type
+	57,  // 114: relationalai.lqp.v1.Type.int128_type:type_name -> relationalai.lqp.v1.Int128Type
+	58,  // 115: relationalai.lqp.v1.Type.date_type:type_name -> relationalai.lqp.v1.DateType
+	59,  // 116: relationalai.lqp.v1.Type.datetime_type:type_name -> relationalai.lqp.v1.DateTimeType
+	60,  // 117: relationalai.lqp.v1.Type.missing_type:type_name -> relationalai.lqp.v1.MissingType
+	61,  // 118: relationalai.lqp.v1.Type.decimal_type:type_name -> relationalai.lqp.v1.DecimalType
+	62,  // 119: relationalai.lqp.v1.Type.boolean_type:type_name -> relationalai.lqp.v1.BooleanType
+	63,  // 120: relationalai.lqp.v1.Type.int32_type:type_name -> relationalai.lqp.v1.Int32Type
+	64,  // 121: relationalai.lqp.v1.Type.float32_type:type_name -> relationalai.lqp.v1.Float32Type
+	65,  // 122: relationalai.lqp.v1.Type.uint32_type:type_name -> relationalai.lqp.v1.UInt32Type
+	67,  // 123: relationalai.lqp.v1.Value.uint128_value:type_name -> relationalai.lqp.v1.UInt128Value
+	68,  // 124: relationalai.lqp.v1.Value.int128_value:type_name -> relationalai.lqp.v1.Int128Value
+	69,  // 125: relationalai.lqp.v1.Value.missing_value:type_name -> relationalai.lqp.v1.MissingValue
+	70,  // 126: relationalai.lqp.v1.Value.date_value:type_name -> relationalai.lqp.v1.DateValue
+	71,  // 127: relationalai.lqp.v1.Value.datetime_value:type_name -> relationalai.lqp.v1.DateTimeValue
+	72,  // 128: relationalai.lqp.v1.Value.decimal_value:type_name -> relationalai.lqp.v1.DecimalValue
+	68,  // 129: relationalai.lqp.v1.DecimalValue.value:type_name -> relationalai.lqp.v1.Int128Value
+	130, // [130:130] is the sub-list for method output_type
+	130, // [130:130] is the sub-list for method input_type
+	130, // [130:130] is the sub-list for extension type_name
+	130, // [130:130] is the sub-list for extension extendee
+	0,   // [0:130] is the sub-list for field type_name
 }
 
 func init() { file_relationalai_lqp_v1_logic_proto_init() }
diff --git a/sdks/go/src/parser.go b/sdks/go/src/parser.go
index c252881c..f35d4610 100644
--- a/sdks/go/src/parser.go
+++ b/sdks/go/src/parser.go
@@ -655,152 +655,152 @@ func toPascalCase(s string) string {
 // --- Helper functions ---
 
 func (p *Parser) _extract_value_int32(value *pb.Value, default_ int64) int32 {
-	var _t2106 interface{}
+	var _t2116 interface{}
 	if (value != nil && hasProtoField(value, "int32_value")) {
 		return value.GetInt32Value()
 	}
-	_ = _t2106
+	_ = _t2116
 	return int32(default_)
 }
 
 func (p *Parser) _extract_value_int64(value *pb.Value, default_ int64) int64 {
-	var _t2107 interface{}
+	var _t2117 interface{}
 	if (value != nil && hasProtoField(value, "int_value")) {
 		return value.GetIntValue()
 	}
-	_ = _t2107
+	_ = _t2117
 	return default_
 }
 
 func (p *Parser) _extract_value_string(value *pb.Value, default_ string) string {
-	var _t2108 interface{}
+	var _t2118 interface{}
 	if (value != nil && hasProtoField(value, "string_value")) {
 		return value.GetStringValue()
 	}
-	_ = _t2108
+	_ = _t2118
 	return default_
 }
 
 func (p *Parser) _extract_value_boolean(value *pb.Value, default_ bool) bool {
-	var _t2109 interface{}
+	var _t2119 interface{}
 	if (value != nil && hasProtoField(value, "boolean_value")) {
 		return value.GetBooleanValue()
 	}
-	_ = _t2109
+	_ = _t2119
 	return default_
 }
 
 func (p *Parser) _extract_value_string_list(value *pb.Value, default_ []string) []string {
-	var _t2110 interface{}
+	var _t2120 interface{}
 	if (value != nil && hasProtoField(value, "string_value")) {
 		return []string{value.GetStringValue()}
 	}
-	_ = _t2110
+	_ = _t2120
 	return default_
 }
 
 func (p *Parser) _try_extract_value_int64(value *pb.Value) *int64 {
-	var _t2111 interface{}
+	var _t2121 interface{}
 	if (value != nil && hasProtoField(value, "int_value")) {
 		return ptr(value.GetIntValue())
 	}
-	_ = _t2111
+	_ = _t2121
 	return nil
 }
 
 func (p *Parser) _try_extract_value_float64(value *pb.Value) *float64 {
-	var _t2112 interface{}
+	var _t2122 interface{}
 	if (value != nil && hasProtoField(value, "float_value")) {
 		return ptr(value.GetFloatValue())
 	}
-	_ = _t2112
+	_ = _t2122
 	return nil
 }
 
 func (p *Parser) _try_extract_value_bytes(value *pb.Value) []byte {
-	var _t2113 interface{}
+	var _t2123 interface{}
 	if (value != nil && hasProtoField(value, "string_value")) {
 		return []byte(value.GetStringValue())
 	}
-	_ = _t2113
+	_ = _t2123
 	return nil
 }
 
 func (p *Parser) _try_extract_value_uint128(value *pb.Value) *pb.UInt128Value {
-	var _t2114 interface{}
+	var _t2124 interface{}
 	if (value != nil && hasProtoField(value, "uint128_value")) {
 		return value.GetUint128Value()
 	}
-	_ = _t2114
+	_ = _t2124
 	return nil
 }
 
 func (p *Parser) construct_csv_config(config_dict [][]interface{}) *pb.CSVConfig {
 	config := dictFromList(config_dict)
-	_t2115 := p._extract_value_int32(dictGetValue(config, "csv_header_row"), 1)
-	header_row := _t2115
-	_t2116 := p._extract_value_int64(dictGetValue(config, "csv_skip"), 0)
-	skip := _t2116
-	_t2117 := p._extract_value_string(dictGetValue(config, "csv_new_line"), "")
-	new_line := _t2117
-	_t2118 := p._extract_value_string(dictGetValue(config, "csv_delimiter"), ",")
-	delimiter := _t2118
-	_t2119 := p._extract_value_string(dictGetValue(config, "csv_quotechar"), "\"")
-	quotechar := _t2119
-	_t2120 := p._extract_value_string(dictGetValue(config, "csv_escapechar"), "\"")
-	escapechar := _t2120
-	_t2121 := p._extract_value_string(dictGetValue(config, "csv_comment"), "")
-	comment := _t2121
-	_t2122 := p._extract_value_string_list(dictGetValue(config, "csv_missing_strings"), []string{})
-	missing_strings := _t2122
-	_t2123 := p._extract_value_string(dictGetValue(config, "csv_decimal_separator"), ".")
-	decimal_separator := _t2123
-	_t2124 := p._extract_value_string(dictGetValue(config, "csv_encoding"), "utf-8")
-	encoding := _t2124
-	_t2125 := p._extract_value_string(dictGetValue(config, "csv_compression"), "auto")
-	compression := _t2125
-	_t2126 := p._extract_value_int64(dictGetValue(config, "csv_partition_size_mb"), 0)
-	partition_size_mb := _t2126
-	_t2127 := &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}
-	return _t2127
+	_t2125 := p._extract_value_int32(dictGetValue(config, "csv_header_row"), 1)
+	header_row := _t2125
+	_t2126 := p._extract_value_int64(dictGetValue(config, "csv_skip"), 0)
+	skip := _t2126
+	_t2127 := p._extract_value_string(dictGetValue(config, "csv_new_line"), "")
+	new_line := _t2127
+	_t2128 := p._extract_value_string(dictGetValue(config, "csv_delimiter"), ",")
+	delimiter := _t2128
+	_t2129 := p._extract_value_string(dictGetValue(config, "csv_quotechar"), "\"")
+	quotechar := _t2129
+	_t2130 := p._extract_value_string(dictGetValue(config, "csv_escapechar"), "\"")
+	escapechar := _t2130
+	_t2131 := p._extract_value_string(dictGetValue(config, "csv_comment"), "")
+	comment := _t2131
+	_t2132 := p._extract_value_string_list(dictGetValue(config, "csv_missing_strings"), []string{})
+	missing_strings := _t2132
+	_t2133 := p._extract_value_string(dictGetValue(config, "csv_decimal_separator"), ".")
+	decimal_separator := _t2133
+	_t2134 := p._extract_value_string(dictGetValue(config, "csv_encoding"), "utf-8")
+	encoding := _t2134
+	_t2135 := p._extract_value_string(dictGetValue(config, "csv_compression"), "auto")
+	compression := _t2135
+	_t2136 := p._extract_value_int64(dictGetValue(config, "csv_partition_size_mb"), 0)
+	partition_size_mb := _t2136
+	_t2137 := &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}
+	return _t2137
 }
 
 func (p *Parser) construct_betree_info(key_types []*pb.Type, value_types []*pb.Type, config_dict [][]interface{}) *pb.BeTreeInfo {
 	config := dictFromList(config_dict)
-	_t2128 := p._try_extract_value_float64(dictGetValue(config, "betree_config_epsilon"))
-	epsilon := _t2128
-	_t2129 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_pivots"))
-	max_pivots := _t2129
-	_t2130 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_deltas"))
-	max_deltas := _t2130
-	_t2131 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_leaf"))
-	max_leaf := _t2131
-	_t2132 := &pb.BeTreeConfig{Epsilon: deref(epsilon, 0.0), MaxPivots: deref(max_pivots, 0), MaxDeltas: deref(max_deltas, 0), MaxLeaf: deref(max_leaf, 0)}
-	storage_config := _t2132
-	_t2133 := p._try_extract_value_uint128(dictGetValue(config, "betree_locator_root_pageid"))
-	root_pageid := _t2133
-	_t2134 := p._try_extract_value_bytes(dictGetValue(config, "betree_locator_inline_data"))
-	inline_data := _t2134
-	_t2135 := p._try_extract_value_int64(dictGetValue(config, "betree_locator_element_count"))
-	element_count := _t2135
-	_t2136 := p._try_extract_value_int64(dictGetValue(config, "betree_locator_tree_height"))
-	tree_height := _t2136
-	_t2137 := &pb.BeTreeLocator{ElementCount: deref(element_count, 0), TreeHeight: deref(tree_height, 0)}
+	_t2138 := p._try_extract_value_float64(dictGetValue(config, "betree_config_epsilon"))
+	epsilon := _t2138
+	_t2139 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_pivots"))
+	max_pivots := _t2139
+	_t2140 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_deltas"))
+	max_deltas := _t2140
+	_t2141 := p._try_extract_value_int64(dictGetValue(config, "betree_config_max_leaf"))
+	max_leaf := _t2141
+	_t2142 := &pb.BeTreeConfig{Epsilon: deref(epsilon, 0.0), MaxPivots: deref(max_pivots, 0), MaxDeltas: deref(max_deltas, 0), MaxLeaf: deref(max_leaf, 0)}
+	storage_config := _t2142
+	_t2143 := p._try_extract_value_uint128(dictGetValue(config, "betree_locator_root_pageid"))
+	root_pageid := _t2143
+	_t2144 := p._try_extract_value_bytes(dictGetValue(config, "betree_locator_inline_data"))
+	inline_data := _t2144
+	_t2145 := p._try_extract_value_int64(dictGetValue(config, "betree_locator_element_count"))
+	element_count := _t2145
+	_t2146 := p._try_extract_value_int64(dictGetValue(config, "betree_locator_tree_height"))
+	tree_height := _t2146
+	_t2147 := &pb.BeTreeLocator{ElementCount: deref(element_count, 0), TreeHeight: deref(tree_height, 0)}
 	if root_pageid != nil {
-		_t2137.Location = &pb.BeTreeLocator_RootPageid{RootPageid: root_pageid}
+		_t2147.Location = &pb.BeTreeLocator_RootPageid{RootPageid: root_pageid}
 	} else {
-		_t2137.Location = &pb.BeTreeLocator_InlineData{InlineData: inline_data}
+		_t2147.Location = &pb.BeTreeLocator_InlineData{InlineData: inline_data}
 	}
-	relation_locator := _t2137
-	_t2138 := &pb.BeTreeInfo{KeyTypes: key_types, ValueTypes: value_types, StorageConfig: storage_config, RelationLocator: relation_locator}
-	return _t2138
+	relation_locator := _t2147
+	_t2148 := &pb.BeTreeInfo{KeyTypes: key_types, ValueTypes: value_types, StorageConfig: storage_config, RelationLocator: relation_locator}
+	return _t2148
 }
 
 func (p *Parser) default_configure() *pb.Configure {
-	_t2139 := &pb.IVMConfig{Level: pb.MaintenanceLevel_MAINTENANCE_LEVEL_OFF}
-	ivm_config := _t2139
-	_t2140 := &pb.Configure{SemanticsVersion: 0, IvmConfig: ivm_config}
-	return _t2140
+	_t2149 := &pb.IVMConfig{Level: pb.MaintenanceLevel_MAINTENANCE_LEVEL_OFF}
+	ivm_config := _t2149
+	_t2150 := &pb.Configure{SemanticsVersion: 0, IvmConfig: ivm_config}
+	return _t2150
 }
 
 func (p *Parser) construct_configure(config_dict [][]interface{}) *pb.Configure {
@@ -822,3178 +822,3182 @@ func (p *Parser) construct_configure(config_dict [][]interface{}) *pb.Configure
 			}
 		}
 	}
-	_t2141 := &pb.IVMConfig{Level: maintenance_level}
-	ivm_config := _t2141
-	_t2142 := p._extract_value_int64(dictGetValue(config, "semantics_version"), 0)
-	semantics_version := _t2142
-	_t2143 := &pb.Configure{SemanticsVersion: semantics_version, IvmConfig: ivm_config}
-	return _t2143
+	_t2151 := &pb.IVMConfig{Level: maintenance_level}
+	ivm_config := _t2151
+	_t2152 := p._extract_value_int64(dictGetValue(config, "semantics_version"), 0)
+	semantics_version := _t2152
+	_t2153 := &pb.Configure{SemanticsVersion: semantics_version, IvmConfig: ivm_config}
+	return _t2153
 }
 
 func (p *Parser) construct_export_csv_config(path string, columns []*pb.ExportCSVColumn, config_dict [][]interface{}) *pb.ExportCSVConfig {
 	config := dictFromList(config_dict)
-	_t2144 := p._extract_value_int64(dictGetValue(config, "partition_size"), 0)
-	partition_size := _t2144
-	_t2145 := p._extract_value_string(dictGetValue(config, "compression"), "")
-	compression := _t2145
-	_t2146 := p._extract_value_boolean(dictGetValue(config, "syntax_header_row"), true)
-	syntax_header_row := _t2146
-	_t2147 := p._extract_value_string(dictGetValue(config, "syntax_missing_string"), "")
-	syntax_missing_string := _t2147
-	_t2148 := p._extract_value_string(dictGetValue(config, "syntax_delim"), ",")
-	syntax_delim := _t2148
-	_t2149 := p._extract_value_string(dictGetValue(config, "syntax_quotechar"), "\"")
-	syntax_quotechar := _t2149
-	_t2150 := p._extract_value_string(dictGetValue(config, "syntax_escapechar"), "\\")
-	syntax_escapechar := _t2150
-	_t2151 := &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 _t2151
+	_t2154 := p._extract_value_int64(dictGetValue(config, "partition_size"), 0)
+	partition_size := _t2154
+	_t2155 := p._extract_value_string(dictGetValue(config, "compression"), "")
+	compression := _t2155
+	_t2156 := p._extract_value_boolean(dictGetValue(config, "syntax_header_row"), true)
+	syntax_header_row := _t2156
+	_t2157 := p._extract_value_string(dictGetValue(config, "syntax_missing_string"), "")
+	syntax_missing_string := _t2157
+	_t2158 := p._extract_value_string(dictGetValue(config, "syntax_delim"), ",")
+	syntax_delim := _t2158
+	_t2159 := p._extract_value_string(dictGetValue(config, "syntax_quotechar"), "\"")
+	syntax_quotechar := _t2159
+	_t2160 := p._extract_value_string(dictGetValue(config, "syntax_escapechar"), "\\")
+	syntax_escapechar := _t2160
+	_t2161 := &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 _t2161
 }
 
 func (p *Parser) construct_export_csv_config_with_source(path string, csv_source *pb.ExportCSVSource, csv_config *pb.CSVConfig) *pb.ExportCSVConfig {
-	_t2152 := &pb.ExportCSVConfig{Path: path, CsvSource: csv_source, CsvConfig: csv_config}
-	return _t2152
+	_t2162 := &pb.ExportCSVConfig{Path: path, CsvSource: csv_source, CsvConfig: csv_config}
+	return _t2162
 }
 
 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)
-	_t2153 := &pb.IcebergCatalogConfig{CatalogUri: catalog_uri, Scope: ptr(deref(scope_opt, "")), Properties: props, AuthProperties: auth_props}
-	return _t2153
+	_t2163 := &pb.IcebergCatalogConfig{CatalogUri: catalog_uri, Scope: ptr(deref(scope_opt, "")), Properties: props, AuthProperties: auth_props}
+	return _t2163
 }
 
 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 {
-	_t2154 := &pb.IcebergData{Locator: locator, Config: config, Columns: columns, FromSnapshot: ptr(deref(from_snapshot_opt, "")), ToSnapshot: ptr(deref(to_snapshot_opt, "")), ReturnsDelta: returns_delta}
-	return _t2154
+	_t2164 := &pb.IcebergData{Locator: locator, Config: config, Columns: columns, FromSnapshot: ptr(deref(from_snapshot_opt, "")), ToSnapshot: ptr(deref(to_snapshot_opt, "")), ReturnsDelta: returns_delta}
+	return _t2164
 }
 
 func (p *Parser) construct_export_iceberg_config_full(locator *pb.IcebergLocator, config *pb.IcebergCatalogConfig, table_def *pb.RelationId, columns []*pb.ExportColumn, table_property_pairs [][]interface{}, config_dict [][]interface{}) *pb.ExportIcebergConfig {
-	_t2155 := config_dict
+	_t2165 := config_dict
 	if config_dict == nil {
-		_t2155 = [][]interface{}{}
-	}
-	cfg := dictFromList(_t2155)
-	_t2156 := p._extract_value_string(dictGetValue(cfg, "prefix"), "")
-	prefix := _t2156
-	_t2157 := p._extract_value_int64(dictGetValue(cfg, "target_file_size_bytes"), 0)
-	target_file_size_bytes := _t2157
-	_t2158 := p._extract_value_string(dictGetValue(cfg, "compression"), "")
-	compression := _t2158
+		_t2165 = [][]interface{}{}
+	}
+	cfg := dictFromList(_t2165)
+	_t2166 := p._extract_value_string(dictGetValue(cfg, "prefix"), "")
+	prefix := _t2166
+	_t2167 := p._extract_value_int64(dictGetValue(cfg, "target_file_size_bytes"), 0)
+	target_file_size_bytes := _t2167
+	_t2168 := p._extract_value_string(dictGetValue(cfg, "compression"), "")
+	compression := _t2168
 	table_props := stringMapFromPairs(table_property_pairs)
-	_t2159 := &pb.ExportIcebergConfig{Locator: locator, Config: config, TableDef: table_def, Columns: columns, Prefix: ptr(prefix), TargetFileSizeBytes: ptr(target_file_size_bytes), Compression: compression, TableProperties: table_props}
-	return _t2159
+	_t2169 := &pb.ExportIcebergConfig{Locator: locator, Config: config, TableDef: table_def, Columns: columns, Prefix: ptr(prefix), TargetFileSizeBytes: ptr(target_file_size_bytes), Compression: compression, TableProperties: table_props}
+	return _t2169
 }
 
 // --- Parse functions ---
 
 func (p *Parser) parse_transaction() *pb.Transaction {
-	span_start678 := int64(p.spanStart())
+	span_start680 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("transaction")
-	var _t1344 *pb.Configure
+	var _t1348 *pb.Configure
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("configure", 1)) {
-		_t1345 := p.parse_configure()
-		_t1344 = _t1345
+		_t1349 := p.parse_configure()
+		_t1348 = _t1349
 	}
-	configure672 := _t1344
-	var _t1346 *pb.Sync
+	configure674 := _t1348
+	var _t1350 *pb.Sync
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("sync", 1)) {
-		_t1347 := p.parse_sync()
-		_t1346 = _t1347
-	}
-	sync673 := _t1346
-	xs674 := []*pb.Epoch{}
-	cond675 := p.matchLookaheadLiteral("(", 0)
-	for cond675 {
-		_t1348 := p.parse_epoch()
-		item676 := _t1348
-		xs674 = append(xs674, item676)
-		cond675 = p.matchLookaheadLiteral("(", 0)
-	}
-	epochs677 := xs674
+		_t1351 := p.parse_sync()
+		_t1350 = _t1351
+	}
+	sync675 := _t1350
+	xs676 := []*pb.Epoch{}
+	cond677 := p.matchLookaheadLiteral("(", 0)
+	for cond677 {
+		_t1352 := p.parse_epoch()
+		item678 := _t1352
+		xs676 = append(xs676, item678)
+		cond677 = p.matchLookaheadLiteral("(", 0)
+	}
+	epochs679 := xs676
 	p.consumeLiteral(")")
-	_t1349 := p.default_configure()
-	_t1350 := configure672
-	if configure672 == nil {
-		_t1350 = _t1349
+	_t1353 := p.default_configure()
+	_t1354 := configure674
+	if configure674 == nil {
+		_t1354 = _t1353
 	}
-	_t1351 := &pb.Transaction{Epochs: epochs677, Configure: _t1350, Sync: sync673}
-	result679 := _t1351
-	p.recordSpan(int(span_start678), "Transaction")
-	return result679
+	_t1355 := &pb.Transaction{Epochs: epochs679, Configure: _t1354, Sync: sync675}
+	result681 := _t1355
+	p.recordSpan(int(span_start680), "Transaction")
+	return result681
 }
 
 func (p *Parser) parse_configure() *pb.Configure {
-	span_start681 := int64(p.spanStart())
+	span_start683 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("configure")
-	_t1352 := p.parse_config_dict()
-	config_dict680 := _t1352
+	_t1356 := p.parse_config_dict()
+	config_dict682 := _t1356
 	p.consumeLiteral(")")
-	_t1353 := p.construct_configure(config_dict680)
-	result682 := _t1353
-	p.recordSpan(int(span_start681), "Configure")
-	return result682
+	_t1357 := p.construct_configure(config_dict682)
+	result684 := _t1357
+	p.recordSpan(int(span_start683), "Configure")
+	return result684
 }
 
 func (p *Parser) parse_config_dict() [][]interface{} {
 	p.consumeLiteral("{")
-	xs683 := [][]interface{}{}
-	cond684 := p.matchLookaheadLiteral(":", 0)
-	for cond684 {
-		_t1354 := p.parse_config_key_value()
-		item685 := _t1354
-		xs683 = append(xs683, item685)
-		cond684 = p.matchLookaheadLiteral(":", 0)
-	}
-	config_key_values686 := xs683
+	xs685 := [][]interface{}{}
+	cond686 := p.matchLookaheadLiteral(":", 0)
+	for cond686 {
+		_t1358 := p.parse_config_key_value()
+		item687 := _t1358
+		xs685 = append(xs685, item687)
+		cond686 = p.matchLookaheadLiteral(":", 0)
+	}
+	config_key_values688 := xs685
 	p.consumeLiteral("}")
-	return config_key_values686
+	return config_key_values688
 }
 
 func (p *Parser) parse_config_key_value() []interface{} {
 	p.consumeLiteral(":")
-	symbol687 := p.consumeTerminal("SYMBOL").Value.str
-	_t1355 := p.parse_raw_value()
-	raw_value688 := _t1355
-	return []interface{}{symbol687, raw_value688}
+	symbol689 := p.consumeTerminal("SYMBOL").Value.str
+	_t1359 := p.parse_raw_value()
+	raw_value690 := _t1359
+	return []interface{}{symbol689, raw_value690}
 }
 
 func (p *Parser) parse_raw_value() *pb.Value {
-	span_start702 := int64(p.spanStart())
-	var _t1356 int64
+	span_start704 := int64(p.spanStart())
+	var _t1360 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1356 = 12
+		_t1360 = 12
 	} else {
-		var _t1357 int64
+		var _t1361 int64
 		if p.matchLookaheadLiteral("missing", 0) {
-			_t1357 = 11
+			_t1361 = 11
 		} else {
-			var _t1358 int64
+			var _t1362 int64
 			if p.matchLookaheadLiteral("false", 0) {
-				_t1358 = 12
+				_t1362 = 12
 			} else {
-				var _t1359 int64
+				var _t1363 int64
 				if p.matchLookaheadLiteral("(", 0) {
-					var _t1360 int64
+					var _t1364 int64
 					if p.matchLookaheadLiteral("datetime", 1) {
-						_t1360 = 1
+						_t1364 = 1
 					} else {
-						var _t1361 int64
+						var _t1365 int64
 						if p.matchLookaheadLiteral("date", 1) {
-							_t1361 = 0
+							_t1365 = 0
 						} else {
-							_t1361 = -1
+							_t1365 = -1
 						}
-						_t1360 = _t1361
+						_t1364 = _t1365
 					}
-					_t1359 = _t1360
+					_t1363 = _t1364
 				} else {
-					var _t1362 int64
+					var _t1366 int64
 					if p.matchLookaheadTerminal("UINT32", 0) {
-						_t1362 = 7
+						_t1366 = 7
 					} else {
-						var _t1363 int64
+						var _t1367 int64
 						if p.matchLookaheadTerminal("UINT128", 0) {
-							_t1363 = 8
+							_t1367 = 8
 						} else {
-							var _t1364 int64
+							var _t1368 int64
 							if p.matchLookaheadTerminal("STRING", 0) {
-								_t1364 = 2
+								_t1368 = 2
 							} else {
-								var _t1365 int64
+								var _t1369 int64
 								if p.matchLookaheadTerminal("INT32", 0) {
-									_t1365 = 3
+									_t1369 = 3
 								} else {
-									var _t1366 int64
+									var _t1370 int64
 									if p.matchLookaheadTerminal("INT128", 0) {
-										_t1366 = 9
+										_t1370 = 9
 									} else {
-										var _t1367 int64
+										var _t1371 int64
 										if p.matchLookaheadTerminal("INT", 0) {
-											_t1367 = 4
+											_t1371 = 4
 										} else {
-											var _t1368 int64
+											var _t1372 int64
 											if p.matchLookaheadTerminal("FLOAT32", 0) {
-												_t1368 = 5
+												_t1372 = 5
 											} else {
-												var _t1369 int64
+												var _t1373 int64
 												if p.matchLookaheadTerminal("FLOAT", 0) {
-													_t1369 = 6
+													_t1373 = 6
 												} else {
-													var _t1370 int64
+													var _t1374 int64
 													if p.matchLookaheadTerminal("DECIMAL", 0) {
-														_t1370 = 10
+														_t1374 = 10
 													} else {
-														_t1370 = -1
+														_t1374 = -1
 													}
-													_t1369 = _t1370
+													_t1373 = _t1374
 												}
-												_t1368 = _t1369
+												_t1372 = _t1373
 											}
-											_t1367 = _t1368
+											_t1371 = _t1372
 										}
-										_t1366 = _t1367
+										_t1370 = _t1371
 									}
-									_t1365 = _t1366
+									_t1369 = _t1370
 								}
-								_t1364 = _t1365
+								_t1368 = _t1369
 							}
-							_t1363 = _t1364
+							_t1367 = _t1368
 						}
-						_t1362 = _t1363
+						_t1366 = _t1367
 					}
-					_t1359 = _t1362
+					_t1363 = _t1366
 				}
-				_t1358 = _t1359
+				_t1362 = _t1363
 			}
-			_t1357 = _t1358
+			_t1361 = _t1362
 		}
-		_t1356 = _t1357
-	}
-	prediction689 := _t1356
-	var _t1371 *pb.Value
-	if prediction689 == 12 {
-		_t1372 := p.parse_boolean_value()
-		boolean_value701 := _t1372
-		_t1373 := &pb.Value{}
-		_t1373.Value = &pb.Value_BooleanValue{BooleanValue: boolean_value701}
-		_t1371 = _t1373
+		_t1360 = _t1361
+	}
+	prediction691 := _t1360
+	var _t1375 *pb.Value
+	if prediction691 == 12 {
+		_t1376 := p.parse_boolean_value()
+		boolean_value703 := _t1376
+		_t1377 := &pb.Value{}
+		_t1377.Value = &pb.Value_BooleanValue{BooleanValue: boolean_value703}
+		_t1375 = _t1377
 	} else {
-		var _t1374 *pb.Value
-		if prediction689 == 11 {
+		var _t1378 *pb.Value
+		if prediction691 == 11 {
 			p.consumeLiteral("missing")
-			_t1375 := &pb.MissingValue{}
-			_t1376 := &pb.Value{}
-			_t1376.Value = &pb.Value_MissingValue{MissingValue: _t1375}
-			_t1374 = _t1376
+			_t1379 := &pb.MissingValue{}
+			_t1380 := &pb.Value{}
+			_t1380.Value = &pb.Value_MissingValue{MissingValue: _t1379}
+			_t1378 = _t1380
 		} else {
-			var _t1377 *pb.Value
-			if prediction689 == 10 {
-				decimal700 := p.consumeTerminal("DECIMAL").Value.decimal
-				_t1378 := &pb.Value{}
-				_t1378.Value = &pb.Value_DecimalValue{DecimalValue: decimal700}
-				_t1377 = _t1378
+			var _t1381 *pb.Value
+			if prediction691 == 10 {
+				decimal702 := p.consumeTerminal("DECIMAL").Value.decimal
+				_t1382 := &pb.Value{}
+				_t1382.Value = &pb.Value_DecimalValue{DecimalValue: decimal702}
+				_t1381 = _t1382
 			} else {
-				var _t1379 *pb.Value
-				if prediction689 == 9 {
-					int128699 := p.consumeTerminal("INT128").Value.int128
-					_t1380 := &pb.Value{}
-					_t1380.Value = &pb.Value_Int128Value{Int128Value: int128699}
-					_t1379 = _t1380
+				var _t1383 *pb.Value
+				if prediction691 == 9 {
+					int128701 := p.consumeTerminal("INT128").Value.int128
+					_t1384 := &pb.Value{}
+					_t1384.Value = &pb.Value_Int128Value{Int128Value: int128701}
+					_t1383 = _t1384
 				} else {
-					var _t1381 *pb.Value
-					if prediction689 == 8 {
-						uint128698 := p.consumeTerminal("UINT128").Value.uint128
-						_t1382 := &pb.Value{}
-						_t1382.Value = &pb.Value_Uint128Value{Uint128Value: uint128698}
-						_t1381 = _t1382
+					var _t1385 *pb.Value
+					if prediction691 == 8 {
+						uint128700 := p.consumeTerminal("UINT128").Value.uint128
+						_t1386 := &pb.Value{}
+						_t1386.Value = &pb.Value_Uint128Value{Uint128Value: uint128700}
+						_t1385 = _t1386
 					} else {
-						var _t1383 *pb.Value
-						if prediction689 == 7 {
-							uint32697 := p.consumeTerminal("UINT32").Value.u32
-							_t1384 := &pb.Value{}
-							_t1384.Value = &pb.Value_Uint32Value{Uint32Value: uint32697}
-							_t1383 = _t1384
+						var _t1387 *pb.Value
+						if prediction691 == 7 {
+							uint32699 := p.consumeTerminal("UINT32").Value.u32
+							_t1388 := &pb.Value{}
+							_t1388.Value = &pb.Value_Uint32Value{Uint32Value: uint32699}
+							_t1387 = _t1388
 						} else {
-							var _t1385 *pb.Value
-							if prediction689 == 6 {
-								float696 := p.consumeTerminal("FLOAT").Value.f64
-								_t1386 := &pb.Value{}
-								_t1386.Value = &pb.Value_FloatValue{FloatValue: float696}
-								_t1385 = _t1386
+							var _t1389 *pb.Value
+							if prediction691 == 6 {
+								float698 := p.consumeTerminal("FLOAT").Value.f64
+								_t1390 := &pb.Value{}
+								_t1390.Value = &pb.Value_FloatValue{FloatValue: float698}
+								_t1389 = _t1390
 							} else {
-								var _t1387 *pb.Value
-								if prediction689 == 5 {
-									float32695 := p.consumeTerminal("FLOAT32").Value.f32
-									_t1388 := &pb.Value{}
-									_t1388.Value = &pb.Value_Float32Value{Float32Value: float32695}
-									_t1387 = _t1388
+								var _t1391 *pb.Value
+								if prediction691 == 5 {
+									float32697 := p.consumeTerminal("FLOAT32").Value.f32
+									_t1392 := &pb.Value{}
+									_t1392.Value = &pb.Value_Float32Value{Float32Value: float32697}
+									_t1391 = _t1392
 								} else {
-									var _t1389 *pb.Value
-									if prediction689 == 4 {
-										int694 := p.consumeTerminal("INT").Value.i64
-										_t1390 := &pb.Value{}
-										_t1390.Value = &pb.Value_IntValue{IntValue: int694}
-										_t1389 = _t1390
+									var _t1393 *pb.Value
+									if prediction691 == 4 {
+										int696 := p.consumeTerminal("INT").Value.i64
+										_t1394 := &pb.Value{}
+										_t1394.Value = &pb.Value_IntValue{IntValue: int696}
+										_t1393 = _t1394
 									} else {
-										var _t1391 *pb.Value
-										if prediction689 == 3 {
-											int32693 := p.consumeTerminal("INT32").Value.i32
-											_t1392 := &pb.Value{}
-											_t1392.Value = &pb.Value_Int32Value{Int32Value: int32693}
-											_t1391 = _t1392
+										var _t1395 *pb.Value
+										if prediction691 == 3 {
+											int32695 := p.consumeTerminal("INT32").Value.i32
+											_t1396 := &pb.Value{}
+											_t1396.Value = &pb.Value_Int32Value{Int32Value: int32695}
+											_t1395 = _t1396
 										} else {
-											var _t1393 *pb.Value
-											if prediction689 == 2 {
-												string692 := p.consumeTerminal("STRING").Value.str
-												_t1394 := &pb.Value{}
-												_t1394.Value = &pb.Value_StringValue{StringValue: string692}
-												_t1393 = _t1394
+											var _t1397 *pb.Value
+											if prediction691 == 2 {
+												string694 := p.consumeTerminal("STRING").Value.str
+												_t1398 := &pb.Value{}
+												_t1398.Value = &pb.Value_StringValue{StringValue: string694}
+												_t1397 = _t1398
 											} else {
-												var _t1395 *pb.Value
-												if prediction689 == 1 {
-													_t1396 := p.parse_raw_datetime()
-													raw_datetime691 := _t1396
-													_t1397 := &pb.Value{}
-													_t1397.Value = &pb.Value_DatetimeValue{DatetimeValue: raw_datetime691}
-													_t1395 = _t1397
+												var _t1399 *pb.Value
+												if prediction691 == 1 {
+													_t1400 := p.parse_raw_datetime()
+													raw_datetime693 := _t1400
+													_t1401 := &pb.Value{}
+													_t1401.Value = &pb.Value_DatetimeValue{DatetimeValue: raw_datetime693}
+													_t1399 = _t1401
 												} else {
-													var _t1398 *pb.Value
-													if prediction689 == 0 {
-														_t1399 := p.parse_raw_date()
-														raw_date690 := _t1399
-														_t1400 := &pb.Value{}
-														_t1400.Value = &pb.Value_DateValue{DateValue: raw_date690}
-														_t1398 = _t1400
+													var _t1402 *pb.Value
+													if prediction691 == 0 {
+														_t1403 := p.parse_raw_date()
+														raw_date692 := _t1403
+														_t1404 := &pb.Value{}
+														_t1404.Value = &pb.Value_DateValue{DateValue: raw_date692}
+														_t1402 = _t1404
 													} else {
 														panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in raw_value", p.lookahead(0).Type, p.lookahead(0).Value)})
 													}
-													_t1395 = _t1398
+													_t1399 = _t1402
 												}
-												_t1393 = _t1395
+												_t1397 = _t1399
 											}
-											_t1391 = _t1393
+											_t1395 = _t1397
 										}
-										_t1389 = _t1391
+										_t1393 = _t1395
 									}
-									_t1387 = _t1389
+									_t1391 = _t1393
 								}
-								_t1385 = _t1387
+								_t1389 = _t1391
 							}
-							_t1383 = _t1385
+							_t1387 = _t1389
 						}
-						_t1381 = _t1383
+						_t1385 = _t1387
 					}
-					_t1379 = _t1381
+					_t1383 = _t1385
 				}
-				_t1377 = _t1379
+				_t1381 = _t1383
 			}
-			_t1374 = _t1377
+			_t1378 = _t1381
 		}
-		_t1371 = _t1374
+		_t1375 = _t1378
 	}
-	result703 := _t1371
-	p.recordSpan(int(span_start702), "Value")
-	return result703
+	result705 := _t1375
+	p.recordSpan(int(span_start704), "Value")
+	return result705
 }
 
 func (p *Parser) parse_raw_date() *pb.DateValue {
-	span_start707 := int64(p.spanStart())
+	span_start709 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("date")
-	int704 := p.consumeTerminal("INT").Value.i64
-	int_3705 := p.consumeTerminal("INT").Value.i64
-	int_4706 := p.consumeTerminal("INT").Value.i64
+	int706 := p.consumeTerminal("INT").Value.i64
+	int_3707 := p.consumeTerminal("INT").Value.i64
+	int_4708 := p.consumeTerminal("INT").Value.i64
 	p.consumeLiteral(")")
-	_t1401 := &pb.DateValue{Year: int32(int704), Month: int32(int_3705), Day: int32(int_4706)}
-	result708 := _t1401
-	p.recordSpan(int(span_start707), "DateValue")
-	return result708
+	_t1405 := &pb.DateValue{Year: int32(int706), Month: int32(int_3707), Day: int32(int_4708)}
+	result710 := _t1405
+	p.recordSpan(int(span_start709), "DateValue")
+	return result710
 }
 
 func (p *Parser) parse_raw_datetime() *pb.DateTimeValue {
-	span_start716 := int64(p.spanStart())
+	span_start718 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("datetime")
-	int709 := p.consumeTerminal("INT").Value.i64
-	int_3710 := p.consumeTerminal("INT").Value.i64
-	int_4711 := p.consumeTerminal("INT").Value.i64
-	int_5712 := p.consumeTerminal("INT").Value.i64
-	int_6713 := p.consumeTerminal("INT").Value.i64
-	int_7714 := p.consumeTerminal("INT").Value.i64
-	var _t1402 *int64
+	int711 := p.consumeTerminal("INT").Value.i64
+	int_3712 := p.consumeTerminal("INT").Value.i64
+	int_4713 := p.consumeTerminal("INT").Value.i64
+	int_5714 := p.consumeTerminal("INT").Value.i64
+	int_6715 := p.consumeTerminal("INT").Value.i64
+	int_7716 := p.consumeTerminal("INT").Value.i64
+	var _t1406 *int64
 	if p.matchLookaheadTerminal("INT", 0) {
-		_t1402 = ptr(p.consumeTerminal("INT").Value.i64)
+		_t1406 = ptr(p.consumeTerminal("INT").Value.i64)
 	}
-	int_8715 := _t1402
+	int_8717 := _t1406
 	p.consumeLiteral(")")
-	_t1403 := &pb.DateTimeValue{Year: int32(int709), Month: int32(int_3710), Day: int32(int_4711), Hour: int32(int_5712), Minute: int32(int_6713), Second: int32(int_7714), Microsecond: int32(deref(int_8715, 0))}
-	result717 := _t1403
-	p.recordSpan(int(span_start716), "DateTimeValue")
-	return result717
+	_t1407 := &pb.DateTimeValue{Year: int32(int711), Month: int32(int_3712), Day: int32(int_4713), Hour: int32(int_5714), Minute: int32(int_6715), Second: int32(int_7716), Microsecond: int32(deref(int_8717, 0))}
+	result719 := _t1407
+	p.recordSpan(int(span_start718), "DateTimeValue")
+	return result719
 }
 
 func (p *Parser) parse_boolean_value() bool {
-	var _t1404 int64
+	var _t1408 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1404 = 0
+		_t1408 = 0
 	} else {
-		var _t1405 int64
+		var _t1409 int64
 		if p.matchLookaheadLiteral("false", 0) {
-			_t1405 = 1
+			_t1409 = 1
 		} else {
-			_t1405 = -1
+			_t1409 = -1
 		}
-		_t1404 = _t1405
+		_t1408 = _t1409
 	}
-	prediction718 := _t1404
-	var _t1406 bool
-	if prediction718 == 1 {
+	prediction720 := _t1408
+	var _t1410 bool
+	if prediction720 == 1 {
 		p.consumeLiteral("false")
-		_t1406 = false
+		_t1410 = false
 	} else {
-		var _t1407 bool
-		if prediction718 == 0 {
+		var _t1411 bool
+		if prediction720 == 0 {
 			p.consumeLiteral("true")
-			_t1407 = true
+			_t1411 = true
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in boolean_value", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1406 = _t1407
+		_t1410 = _t1411
 	}
-	return _t1406
+	return _t1410
 }
 
 func (p *Parser) parse_sync() *pb.Sync {
-	span_start723 := int64(p.spanStart())
+	span_start725 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("sync")
-	xs719 := []*pb.FragmentId{}
-	cond720 := p.matchLookaheadLiteral(":", 0)
-	for cond720 {
-		_t1408 := p.parse_fragment_id()
-		item721 := _t1408
-		xs719 = append(xs719, item721)
-		cond720 = p.matchLookaheadLiteral(":", 0)
-	}
-	fragment_ids722 := xs719
+	xs721 := []*pb.FragmentId{}
+	cond722 := p.matchLookaheadLiteral(":", 0)
+	for cond722 {
+		_t1412 := p.parse_fragment_id()
+		item723 := _t1412
+		xs721 = append(xs721, item723)
+		cond722 = p.matchLookaheadLiteral(":", 0)
+	}
+	fragment_ids724 := xs721
 	p.consumeLiteral(")")
-	_t1409 := &pb.Sync{Fragments: fragment_ids722}
-	result724 := _t1409
-	p.recordSpan(int(span_start723), "Sync")
-	return result724
+	_t1413 := &pb.Sync{Fragments: fragment_ids724}
+	result726 := _t1413
+	p.recordSpan(int(span_start725), "Sync")
+	return result726
 }
 
 func (p *Parser) parse_fragment_id() *pb.FragmentId {
-	span_start726 := int64(p.spanStart())
+	span_start728 := int64(p.spanStart())
 	p.consumeLiteral(":")
-	symbol725 := p.consumeTerminal("SYMBOL").Value.str
-	result727 := &pb.FragmentId{Id: []byte(symbol725)}
-	p.recordSpan(int(span_start726), "FragmentId")
-	return result727
+	symbol727 := p.consumeTerminal("SYMBOL").Value.str
+	result729 := &pb.FragmentId{Id: []byte(symbol727)}
+	p.recordSpan(int(span_start728), "FragmentId")
+	return result729
 }
 
 func (p *Parser) parse_epoch() *pb.Epoch {
-	span_start730 := int64(p.spanStart())
+	span_start732 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("epoch")
-	var _t1410 []*pb.Write
+	var _t1414 []*pb.Write
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("writes", 1)) {
-		_t1411 := p.parse_epoch_writes()
-		_t1410 = _t1411
+		_t1415 := p.parse_epoch_writes()
+		_t1414 = _t1415
 	}
-	epoch_writes728 := _t1410
-	var _t1412 []*pb.Read
+	epoch_writes730 := _t1414
+	var _t1416 []*pb.Read
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1413 := p.parse_epoch_reads()
-		_t1412 = _t1413
+		_t1417 := p.parse_epoch_reads()
+		_t1416 = _t1417
 	}
-	epoch_reads729 := _t1412
+	epoch_reads731 := _t1416
 	p.consumeLiteral(")")
-	_t1414 := epoch_writes728
-	if epoch_writes728 == nil {
-		_t1414 = []*pb.Write{}
+	_t1418 := epoch_writes730
+	if epoch_writes730 == nil {
+		_t1418 = []*pb.Write{}
 	}
-	_t1415 := epoch_reads729
-	if epoch_reads729 == nil {
-		_t1415 = []*pb.Read{}
+	_t1419 := epoch_reads731
+	if epoch_reads731 == nil {
+		_t1419 = []*pb.Read{}
 	}
-	_t1416 := &pb.Epoch{Writes: _t1414, Reads: _t1415}
-	result731 := _t1416
-	p.recordSpan(int(span_start730), "Epoch")
-	return result731
+	_t1420 := &pb.Epoch{Writes: _t1418, Reads: _t1419}
+	result733 := _t1420
+	p.recordSpan(int(span_start732), "Epoch")
+	return result733
 }
 
 func (p *Parser) parse_epoch_writes() []*pb.Write {
 	p.consumeLiteral("(")
 	p.consumeLiteral("writes")
-	xs732 := []*pb.Write{}
-	cond733 := p.matchLookaheadLiteral("(", 0)
-	for cond733 {
-		_t1417 := p.parse_write()
-		item734 := _t1417
-		xs732 = append(xs732, item734)
-		cond733 = p.matchLookaheadLiteral("(", 0)
-	}
-	writes735 := xs732
+	xs734 := []*pb.Write{}
+	cond735 := p.matchLookaheadLiteral("(", 0)
+	for cond735 {
+		_t1421 := p.parse_write()
+		item736 := _t1421
+		xs734 = append(xs734, item736)
+		cond735 = p.matchLookaheadLiteral("(", 0)
+	}
+	writes737 := xs734
 	p.consumeLiteral(")")
-	return writes735
+	return writes737
 }
 
 func (p *Parser) parse_write() *pb.Write {
-	span_start741 := int64(p.spanStart())
-	var _t1418 int64
+	span_start743 := int64(p.spanStart())
+	var _t1422 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1419 int64
+		var _t1423 int64
 		if p.matchLookaheadLiteral("undefine", 1) {
-			_t1419 = 1
+			_t1423 = 1
 		} else {
-			var _t1420 int64
+			var _t1424 int64
 			if p.matchLookaheadLiteral("snapshot", 1) {
-				_t1420 = 3
+				_t1424 = 3
 			} else {
-				var _t1421 int64
+				var _t1425 int64
 				if p.matchLookaheadLiteral("define", 1) {
-					_t1421 = 0
+					_t1425 = 0
 				} else {
-					var _t1422 int64
+					var _t1426 int64
 					if p.matchLookaheadLiteral("context", 1) {
-						_t1422 = 2
+						_t1426 = 2
 					} else {
-						_t1422 = -1
+						_t1426 = -1
 					}
-					_t1421 = _t1422
+					_t1425 = _t1426
 				}
-				_t1420 = _t1421
+				_t1424 = _t1425
 			}
-			_t1419 = _t1420
+			_t1423 = _t1424
 		}
-		_t1418 = _t1419
+		_t1422 = _t1423
 	} else {
-		_t1418 = -1
-	}
-	prediction736 := _t1418
-	var _t1423 *pb.Write
-	if prediction736 == 3 {
-		_t1424 := p.parse_snapshot()
-		snapshot740 := _t1424
-		_t1425 := &pb.Write{}
-		_t1425.WriteType = &pb.Write_Snapshot{Snapshot: snapshot740}
-		_t1423 = _t1425
+		_t1422 = -1
+	}
+	prediction738 := _t1422
+	var _t1427 *pb.Write
+	if prediction738 == 3 {
+		_t1428 := p.parse_snapshot()
+		snapshot742 := _t1428
+		_t1429 := &pb.Write{}
+		_t1429.WriteType = &pb.Write_Snapshot{Snapshot: snapshot742}
+		_t1427 = _t1429
 	} else {
-		var _t1426 *pb.Write
-		if prediction736 == 2 {
-			_t1427 := p.parse_context()
-			context739 := _t1427
-			_t1428 := &pb.Write{}
-			_t1428.WriteType = &pb.Write_Context{Context: context739}
-			_t1426 = _t1428
+		var _t1430 *pb.Write
+		if prediction738 == 2 {
+			_t1431 := p.parse_context()
+			context741 := _t1431
+			_t1432 := &pb.Write{}
+			_t1432.WriteType = &pb.Write_Context{Context: context741}
+			_t1430 = _t1432
 		} else {
-			var _t1429 *pb.Write
-			if prediction736 == 1 {
-				_t1430 := p.parse_undefine()
-				undefine738 := _t1430
-				_t1431 := &pb.Write{}
-				_t1431.WriteType = &pb.Write_Undefine{Undefine: undefine738}
-				_t1429 = _t1431
+			var _t1433 *pb.Write
+			if prediction738 == 1 {
+				_t1434 := p.parse_undefine()
+				undefine740 := _t1434
+				_t1435 := &pb.Write{}
+				_t1435.WriteType = &pb.Write_Undefine{Undefine: undefine740}
+				_t1433 = _t1435
 			} else {
-				var _t1432 *pb.Write
-				if prediction736 == 0 {
-					_t1433 := p.parse_define()
-					define737 := _t1433
-					_t1434 := &pb.Write{}
-					_t1434.WriteType = &pb.Write_Define{Define: define737}
-					_t1432 = _t1434
+				var _t1436 *pb.Write
+				if prediction738 == 0 {
+					_t1437 := p.parse_define()
+					define739 := _t1437
+					_t1438 := &pb.Write{}
+					_t1438.WriteType = &pb.Write_Define{Define: define739}
+					_t1436 = _t1438
 				} else {
 					panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in write", p.lookahead(0).Type, p.lookahead(0).Value)})
 				}
-				_t1429 = _t1432
+				_t1433 = _t1436
 			}
-			_t1426 = _t1429
+			_t1430 = _t1433
 		}
-		_t1423 = _t1426
+		_t1427 = _t1430
 	}
-	result742 := _t1423
-	p.recordSpan(int(span_start741), "Write")
-	return result742
+	result744 := _t1427
+	p.recordSpan(int(span_start743), "Write")
+	return result744
 }
 
 func (p *Parser) parse_define() *pb.Define {
-	span_start744 := int64(p.spanStart())
+	span_start746 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("define")
-	_t1435 := p.parse_fragment()
-	fragment743 := _t1435
+	_t1439 := p.parse_fragment()
+	fragment745 := _t1439
 	p.consumeLiteral(")")
-	_t1436 := &pb.Define{Fragment: fragment743}
-	result745 := _t1436
-	p.recordSpan(int(span_start744), "Define")
-	return result745
+	_t1440 := &pb.Define{Fragment: fragment745}
+	result747 := _t1440
+	p.recordSpan(int(span_start746), "Define")
+	return result747
 }
 
 func (p *Parser) parse_fragment() *pb.Fragment {
-	span_start751 := int64(p.spanStart())
+	span_start753 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("fragment")
-	_t1437 := p.parse_new_fragment_id()
-	new_fragment_id746 := _t1437
-	xs747 := []*pb.Declaration{}
-	cond748 := p.matchLookaheadLiteral("(", 0)
-	for cond748 {
-		_t1438 := p.parse_declaration()
-		item749 := _t1438
-		xs747 = append(xs747, item749)
-		cond748 = p.matchLookaheadLiteral("(", 0)
-	}
-	declarations750 := xs747
+	_t1441 := p.parse_new_fragment_id()
+	new_fragment_id748 := _t1441
+	xs749 := []*pb.Declaration{}
+	cond750 := p.matchLookaheadLiteral("(", 0)
+	for cond750 {
+		_t1442 := p.parse_declaration()
+		item751 := _t1442
+		xs749 = append(xs749, item751)
+		cond750 = p.matchLookaheadLiteral("(", 0)
+	}
+	declarations752 := xs749
 	p.consumeLiteral(")")
-	result752 := p.constructFragment(new_fragment_id746, declarations750)
-	p.recordSpan(int(span_start751), "Fragment")
-	return result752
+	result754 := p.constructFragment(new_fragment_id748, declarations752)
+	p.recordSpan(int(span_start753), "Fragment")
+	return result754
 }
 
 func (p *Parser) parse_new_fragment_id() *pb.FragmentId {
-	span_start754 := int64(p.spanStart())
-	_t1439 := p.parse_fragment_id()
-	fragment_id753 := _t1439
-	p.startFragment(fragment_id753)
-	result755 := fragment_id753
-	p.recordSpan(int(span_start754), "FragmentId")
-	return result755
+	span_start756 := int64(p.spanStart())
+	_t1443 := p.parse_fragment_id()
+	fragment_id755 := _t1443
+	p.startFragment(fragment_id755)
+	result757 := fragment_id755
+	p.recordSpan(int(span_start756), "FragmentId")
+	return result757
 }
 
 func (p *Parser) parse_declaration() *pb.Declaration {
-	span_start761 := int64(p.spanStart())
-	var _t1440 int64
+	span_start763 := int64(p.spanStart())
+	var _t1444 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1441 int64
+		var _t1445 int64
 		if p.matchLookaheadLiteral("iceberg_data", 1) {
-			_t1441 = 3
+			_t1445 = 3
 		} else {
-			var _t1442 int64
+			var _t1446 int64
 			if p.matchLookaheadLiteral("functional_dependency", 1) {
-				_t1442 = 2
+				_t1446 = 2
 			} else {
-				var _t1443 int64
+				var _t1447 int64
 				if p.matchLookaheadLiteral("edb", 1) {
-					_t1443 = 3
+					_t1447 = 3
 				} else {
-					var _t1444 int64
+					var _t1448 int64
 					if p.matchLookaheadLiteral("def", 1) {
-						_t1444 = 0
+						_t1448 = 0
 					} else {
-						var _t1445 int64
+						var _t1449 int64
 						if p.matchLookaheadLiteral("csv_data", 1) {
-							_t1445 = 3
+							_t1449 = 3
 						} else {
-							var _t1446 int64
+							var _t1450 int64
 							if p.matchLookaheadLiteral("betree_relation", 1) {
-								_t1446 = 3
+								_t1450 = 3
 							} else {
-								var _t1447 int64
+								var _t1451 int64
 								if p.matchLookaheadLiteral("algorithm", 1) {
-									_t1447 = 1
+									_t1451 = 1
 								} else {
-									_t1447 = -1
+									_t1451 = -1
 								}
-								_t1446 = _t1447
+								_t1450 = _t1451
 							}
-							_t1445 = _t1446
+							_t1449 = _t1450
 						}
-						_t1444 = _t1445
+						_t1448 = _t1449
 					}
-					_t1443 = _t1444
+					_t1447 = _t1448
 				}
-				_t1442 = _t1443
+				_t1446 = _t1447
 			}
-			_t1441 = _t1442
+			_t1445 = _t1446
 		}
-		_t1440 = _t1441
+		_t1444 = _t1445
 	} else {
-		_t1440 = -1
-	}
-	prediction756 := _t1440
-	var _t1448 *pb.Declaration
-	if prediction756 == 3 {
-		_t1449 := p.parse_data()
-		data760 := _t1449
-		_t1450 := &pb.Declaration{}
-		_t1450.DeclarationType = &pb.Declaration_Data{Data: data760}
-		_t1448 = _t1450
+		_t1444 = -1
+	}
+	prediction758 := _t1444
+	var _t1452 *pb.Declaration
+	if prediction758 == 3 {
+		_t1453 := p.parse_data()
+		data762 := _t1453
+		_t1454 := &pb.Declaration{}
+		_t1454.DeclarationType = &pb.Declaration_Data{Data: data762}
+		_t1452 = _t1454
 	} else {
-		var _t1451 *pb.Declaration
-		if prediction756 == 2 {
-			_t1452 := p.parse_constraint()
-			constraint759 := _t1452
-			_t1453 := &pb.Declaration{}
-			_t1453.DeclarationType = &pb.Declaration_Constraint{Constraint: constraint759}
-			_t1451 = _t1453
+		var _t1455 *pb.Declaration
+		if prediction758 == 2 {
+			_t1456 := p.parse_constraint()
+			constraint761 := _t1456
+			_t1457 := &pb.Declaration{}
+			_t1457.DeclarationType = &pb.Declaration_Constraint{Constraint: constraint761}
+			_t1455 = _t1457
 		} else {
-			var _t1454 *pb.Declaration
-			if prediction756 == 1 {
-				_t1455 := p.parse_algorithm()
-				algorithm758 := _t1455
-				_t1456 := &pb.Declaration{}
-				_t1456.DeclarationType = &pb.Declaration_Algorithm{Algorithm: algorithm758}
-				_t1454 = _t1456
+			var _t1458 *pb.Declaration
+			if prediction758 == 1 {
+				_t1459 := p.parse_algorithm()
+				algorithm760 := _t1459
+				_t1460 := &pb.Declaration{}
+				_t1460.DeclarationType = &pb.Declaration_Algorithm{Algorithm: algorithm760}
+				_t1458 = _t1460
 			} else {
-				var _t1457 *pb.Declaration
-				if prediction756 == 0 {
-					_t1458 := p.parse_def()
-					def757 := _t1458
-					_t1459 := &pb.Declaration{}
-					_t1459.DeclarationType = &pb.Declaration_Def{Def: def757}
-					_t1457 = _t1459
+				var _t1461 *pb.Declaration
+				if prediction758 == 0 {
+					_t1462 := p.parse_def()
+					def759 := _t1462
+					_t1463 := &pb.Declaration{}
+					_t1463.DeclarationType = &pb.Declaration_Def{Def: def759}
+					_t1461 = _t1463
 				} else {
 					panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in declaration", p.lookahead(0).Type, p.lookahead(0).Value)})
 				}
-				_t1454 = _t1457
+				_t1458 = _t1461
 			}
-			_t1451 = _t1454
+			_t1455 = _t1458
 		}
-		_t1448 = _t1451
+		_t1452 = _t1455
 	}
-	result762 := _t1448
-	p.recordSpan(int(span_start761), "Declaration")
-	return result762
+	result764 := _t1452
+	p.recordSpan(int(span_start763), "Declaration")
+	return result764
 }
 
 func (p *Parser) parse_def() *pb.Def {
-	span_start766 := int64(p.spanStart())
+	span_start768 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("def")
-	_t1460 := p.parse_relation_id()
-	relation_id763 := _t1460
-	_t1461 := p.parse_abstraction()
-	abstraction764 := _t1461
-	var _t1462 []*pb.Attribute
+	_t1464 := p.parse_relation_id()
+	relation_id765 := _t1464
+	_t1465 := p.parse_abstraction()
+	abstraction766 := _t1465
+	var _t1466 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1463 := p.parse_attrs()
-		_t1462 = _t1463
+		_t1467 := p.parse_attrs()
+		_t1466 = _t1467
 	}
-	attrs765 := _t1462
+	attrs767 := _t1466
 	p.consumeLiteral(")")
-	_t1464 := attrs765
-	if attrs765 == nil {
-		_t1464 = []*pb.Attribute{}
+	_t1468 := attrs767
+	if attrs767 == nil {
+		_t1468 = []*pb.Attribute{}
 	}
-	_t1465 := &pb.Def{Name: relation_id763, Body: abstraction764, Attrs: _t1464}
-	result767 := _t1465
-	p.recordSpan(int(span_start766), "Def")
-	return result767
+	_t1469 := &pb.Def{Name: relation_id765, Body: abstraction766, Attrs: _t1468}
+	result769 := _t1469
+	p.recordSpan(int(span_start768), "Def")
+	return result769
 }
 
 func (p *Parser) parse_relation_id() *pb.RelationId {
-	span_start771 := int64(p.spanStart())
-	var _t1466 int64
+	span_start773 := int64(p.spanStart())
+	var _t1470 int64
 	if p.matchLookaheadLiteral(":", 0) {
-		_t1466 = 0
+		_t1470 = 0
 	} else {
-		var _t1467 int64
+		var _t1471 int64
 		if p.matchLookaheadTerminal("UINT128", 0) {
-			_t1467 = 1
+			_t1471 = 1
 		} else {
-			_t1467 = -1
+			_t1471 = -1
 		}
-		_t1466 = _t1467
-	}
-	prediction768 := _t1466
-	var _t1468 *pb.RelationId
-	if prediction768 == 1 {
-		uint128770 := p.consumeTerminal("UINT128").Value.uint128
-		_ = uint128770
-		_t1468 = &pb.RelationId{IdLow: uint128770.Low, IdHigh: uint128770.High}
+		_t1470 = _t1471
+	}
+	prediction770 := _t1470
+	var _t1472 *pb.RelationId
+	if prediction770 == 1 {
+		uint128772 := p.consumeTerminal("UINT128").Value.uint128
+		_ = uint128772
+		_t1472 = &pb.RelationId{IdLow: uint128772.Low, IdHigh: uint128772.High}
 	} else {
-		var _t1469 *pb.RelationId
-		if prediction768 == 0 {
+		var _t1473 *pb.RelationId
+		if prediction770 == 0 {
 			p.consumeLiteral(":")
-			symbol769 := p.consumeTerminal("SYMBOL").Value.str
-			_t1469 = p.relationIdFromString(symbol769)
+			symbol771 := p.consumeTerminal("SYMBOL").Value.str
+			_t1473 = p.relationIdFromString(symbol771)
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in relation_id", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1468 = _t1469
+		_t1472 = _t1473
 	}
-	result772 := _t1468
-	p.recordSpan(int(span_start771), "RelationId")
-	return result772
+	result774 := _t1472
+	p.recordSpan(int(span_start773), "RelationId")
+	return result774
 }
 
 func (p *Parser) parse_abstraction() *pb.Abstraction {
-	span_start775 := int64(p.spanStart())
+	span_start777 := int64(p.spanStart())
 	p.consumeLiteral("(")
-	_t1470 := p.parse_bindings()
-	bindings773 := _t1470
-	_t1471 := p.parse_formula()
-	formula774 := _t1471
+	_t1474 := p.parse_bindings()
+	bindings775 := _t1474
+	_t1475 := p.parse_formula()
+	formula776 := _t1475
 	p.consumeLiteral(")")
-	_t1472 := &pb.Abstraction{Vars: listConcat(bindings773[0].([]*pb.Binding), bindings773[1].([]*pb.Binding)), Value: formula774}
-	result776 := _t1472
-	p.recordSpan(int(span_start775), "Abstraction")
-	return result776
+	_t1476 := &pb.Abstraction{Vars: listConcat(bindings775[0].([]*pb.Binding), bindings775[1].([]*pb.Binding)), Value: formula776}
+	result778 := _t1476
+	p.recordSpan(int(span_start777), "Abstraction")
+	return result778
 }
 
 func (p *Parser) parse_bindings() []interface{} {
 	p.consumeLiteral("[")
-	xs777 := []*pb.Binding{}
-	cond778 := p.matchLookaheadTerminal("SYMBOL", 0)
-	for cond778 {
-		_t1473 := p.parse_binding()
-		item779 := _t1473
-		xs777 = append(xs777, item779)
-		cond778 = p.matchLookaheadTerminal("SYMBOL", 0)
-	}
-	bindings780 := xs777
-	var _t1474 []*pb.Binding
+	xs779 := []*pb.Binding{}
+	cond780 := p.matchLookaheadTerminal("SYMBOL", 0)
+	for cond780 {
+		_t1477 := p.parse_binding()
+		item781 := _t1477
+		xs779 = append(xs779, item781)
+		cond780 = p.matchLookaheadTerminal("SYMBOL", 0)
+	}
+	bindings782 := xs779
+	var _t1478 []*pb.Binding
 	if p.matchLookaheadLiteral("|", 0) {
-		_t1475 := p.parse_value_bindings()
-		_t1474 = _t1475
+		_t1479 := p.parse_value_bindings()
+		_t1478 = _t1479
 	}
-	value_bindings781 := _t1474
+	value_bindings783 := _t1478
 	p.consumeLiteral("]")
-	_t1476 := value_bindings781
-	if value_bindings781 == nil {
-		_t1476 = []*pb.Binding{}
+	_t1480 := value_bindings783
+	if value_bindings783 == nil {
+		_t1480 = []*pb.Binding{}
 	}
-	return []interface{}{bindings780, _t1476}
+	return []interface{}{bindings782, _t1480}
 }
 
 func (p *Parser) parse_binding() *pb.Binding {
-	span_start784 := int64(p.spanStart())
-	symbol782 := p.consumeTerminal("SYMBOL").Value.str
+	span_start786 := int64(p.spanStart())
+	symbol784 := p.consumeTerminal("SYMBOL").Value.str
 	p.consumeLiteral("::")
-	_t1477 := p.parse_type()
-	type783 := _t1477
-	_t1478 := &pb.Var{Name: symbol782}
-	_t1479 := &pb.Binding{Var: _t1478, Type: type783}
-	result785 := _t1479
-	p.recordSpan(int(span_start784), "Binding")
-	return result785
+	_t1481 := p.parse_type()
+	type785 := _t1481
+	_t1482 := &pb.Var{Name: symbol784}
+	_t1483 := &pb.Binding{Var: _t1482, Type: type785}
+	result787 := _t1483
+	p.recordSpan(int(span_start786), "Binding")
+	return result787
 }
 
 func (p *Parser) parse_type() *pb.Type {
-	span_start801 := int64(p.spanStart())
-	var _t1480 int64
+	span_start803 := int64(p.spanStart())
+	var _t1484 int64
 	if p.matchLookaheadLiteral("UNKNOWN", 0) {
-		_t1480 = 0
+		_t1484 = 0
 	} else {
-		var _t1481 int64
+		var _t1485 int64
 		if p.matchLookaheadLiteral("UINT32", 0) {
-			_t1481 = 13
+			_t1485 = 13
 		} else {
-			var _t1482 int64
+			var _t1486 int64
 			if p.matchLookaheadLiteral("UINT128", 0) {
-				_t1482 = 4
+				_t1486 = 4
 			} else {
-				var _t1483 int64
+				var _t1487 int64
 				if p.matchLookaheadLiteral("STRING", 0) {
-					_t1483 = 1
+					_t1487 = 1
 				} else {
-					var _t1484 int64
+					var _t1488 int64
 					if p.matchLookaheadLiteral("MISSING", 0) {
-						_t1484 = 8
+						_t1488 = 8
 					} else {
-						var _t1485 int64
+						var _t1489 int64
 						if p.matchLookaheadLiteral("INT32", 0) {
-							_t1485 = 11
+							_t1489 = 11
 						} else {
-							var _t1486 int64
+							var _t1490 int64
 							if p.matchLookaheadLiteral("INT128", 0) {
-								_t1486 = 5
+								_t1490 = 5
 							} else {
-								var _t1487 int64
+								var _t1491 int64
 								if p.matchLookaheadLiteral("INT", 0) {
-									_t1487 = 2
+									_t1491 = 2
 								} else {
-									var _t1488 int64
+									var _t1492 int64
 									if p.matchLookaheadLiteral("FLOAT32", 0) {
-										_t1488 = 12
+										_t1492 = 12
 									} else {
-										var _t1489 int64
+										var _t1493 int64
 										if p.matchLookaheadLiteral("FLOAT", 0) {
-											_t1489 = 3
+											_t1493 = 3
 										} else {
-											var _t1490 int64
+											var _t1494 int64
 											if p.matchLookaheadLiteral("DATETIME", 0) {
-												_t1490 = 7
+												_t1494 = 7
 											} else {
-												var _t1491 int64
+												var _t1495 int64
 												if p.matchLookaheadLiteral("DATE", 0) {
-													_t1491 = 6
+													_t1495 = 6
 												} else {
-													var _t1492 int64
+													var _t1496 int64
 													if p.matchLookaheadLiteral("BOOLEAN", 0) {
-														_t1492 = 10
+														_t1496 = 10
 													} else {
-														var _t1493 int64
+														var _t1497 int64
 														if p.matchLookaheadLiteral("(", 0) {
-															_t1493 = 9
+															_t1497 = 9
 														} else {
-															_t1493 = -1
+															_t1497 = -1
 														}
-														_t1492 = _t1493
+														_t1496 = _t1497
 													}
-													_t1491 = _t1492
+													_t1495 = _t1496
 												}
-												_t1490 = _t1491
+												_t1494 = _t1495
 											}
-											_t1489 = _t1490
+											_t1493 = _t1494
 										}
-										_t1488 = _t1489
+										_t1492 = _t1493
 									}
-									_t1487 = _t1488
+									_t1491 = _t1492
 								}
-								_t1486 = _t1487
+								_t1490 = _t1491
 							}
-							_t1485 = _t1486
+							_t1489 = _t1490
 						}
-						_t1484 = _t1485
+						_t1488 = _t1489
 					}
-					_t1483 = _t1484
+					_t1487 = _t1488
 				}
-				_t1482 = _t1483
+				_t1486 = _t1487
 			}
-			_t1481 = _t1482
+			_t1485 = _t1486
 		}
-		_t1480 = _t1481
-	}
-	prediction786 := _t1480
-	var _t1494 *pb.Type
-	if prediction786 == 13 {
-		_t1495 := p.parse_uint32_type()
-		uint32_type800 := _t1495
-		_t1496 := &pb.Type{}
-		_t1496.Type = &pb.Type_Uint32Type{Uint32Type: uint32_type800}
-		_t1494 = _t1496
+		_t1484 = _t1485
+	}
+	prediction788 := _t1484
+	var _t1498 *pb.Type
+	if prediction788 == 13 {
+		_t1499 := p.parse_uint32_type()
+		uint32_type802 := _t1499
+		_t1500 := &pb.Type{}
+		_t1500.Type = &pb.Type_Uint32Type{Uint32Type: uint32_type802}
+		_t1498 = _t1500
 	} else {
-		var _t1497 *pb.Type
-		if prediction786 == 12 {
-			_t1498 := p.parse_float32_type()
-			float32_type799 := _t1498
-			_t1499 := &pb.Type{}
-			_t1499.Type = &pb.Type_Float32Type{Float32Type: float32_type799}
-			_t1497 = _t1499
+		var _t1501 *pb.Type
+		if prediction788 == 12 {
+			_t1502 := p.parse_float32_type()
+			float32_type801 := _t1502
+			_t1503 := &pb.Type{}
+			_t1503.Type = &pb.Type_Float32Type{Float32Type: float32_type801}
+			_t1501 = _t1503
 		} else {
-			var _t1500 *pb.Type
-			if prediction786 == 11 {
-				_t1501 := p.parse_int32_type()
-				int32_type798 := _t1501
-				_t1502 := &pb.Type{}
-				_t1502.Type = &pb.Type_Int32Type{Int32Type: int32_type798}
-				_t1500 = _t1502
+			var _t1504 *pb.Type
+			if prediction788 == 11 {
+				_t1505 := p.parse_int32_type()
+				int32_type800 := _t1505
+				_t1506 := &pb.Type{}
+				_t1506.Type = &pb.Type_Int32Type{Int32Type: int32_type800}
+				_t1504 = _t1506
 			} else {
-				var _t1503 *pb.Type
-				if prediction786 == 10 {
-					_t1504 := p.parse_boolean_type()
-					boolean_type797 := _t1504
-					_t1505 := &pb.Type{}
-					_t1505.Type = &pb.Type_BooleanType{BooleanType: boolean_type797}
-					_t1503 = _t1505
+				var _t1507 *pb.Type
+				if prediction788 == 10 {
+					_t1508 := p.parse_boolean_type()
+					boolean_type799 := _t1508
+					_t1509 := &pb.Type{}
+					_t1509.Type = &pb.Type_BooleanType{BooleanType: boolean_type799}
+					_t1507 = _t1509
 				} else {
-					var _t1506 *pb.Type
-					if prediction786 == 9 {
-						_t1507 := p.parse_decimal_type()
-						decimal_type796 := _t1507
-						_t1508 := &pb.Type{}
-						_t1508.Type = &pb.Type_DecimalType{DecimalType: decimal_type796}
-						_t1506 = _t1508
+					var _t1510 *pb.Type
+					if prediction788 == 9 {
+						_t1511 := p.parse_decimal_type()
+						decimal_type798 := _t1511
+						_t1512 := &pb.Type{}
+						_t1512.Type = &pb.Type_DecimalType{DecimalType: decimal_type798}
+						_t1510 = _t1512
 					} else {
-						var _t1509 *pb.Type
-						if prediction786 == 8 {
-							_t1510 := p.parse_missing_type()
-							missing_type795 := _t1510
-							_t1511 := &pb.Type{}
-							_t1511.Type = &pb.Type_MissingType{MissingType: missing_type795}
-							_t1509 = _t1511
+						var _t1513 *pb.Type
+						if prediction788 == 8 {
+							_t1514 := p.parse_missing_type()
+							missing_type797 := _t1514
+							_t1515 := &pb.Type{}
+							_t1515.Type = &pb.Type_MissingType{MissingType: missing_type797}
+							_t1513 = _t1515
 						} else {
-							var _t1512 *pb.Type
-							if prediction786 == 7 {
-								_t1513 := p.parse_datetime_type()
-								datetime_type794 := _t1513
-								_t1514 := &pb.Type{}
-								_t1514.Type = &pb.Type_DatetimeType{DatetimeType: datetime_type794}
-								_t1512 = _t1514
+							var _t1516 *pb.Type
+							if prediction788 == 7 {
+								_t1517 := p.parse_datetime_type()
+								datetime_type796 := _t1517
+								_t1518 := &pb.Type{}
+								_t1518.Type = &pb.Type_DatetimeType{DatetimeType: datetime_type796}
+								_t1516 = _t1518
 							} else {
-								var _t1515 *pb.Type
-								if prediction786 == 6 {
-									_t1516 := p.parse_date_type()
-									date_type793 := _t1516
-									_t1517 := &pb.Type{}
-									_t1517.Type = &pb.Type_DateType{DateType: date_type793}
-									_t1515 = _t1517
+								var _t1519 *pb.Type
+								if prediction788 == 6 {
+									_t1520 := p.parse_date_type()
+									date_type795 := _t1520
+									_t1521 := &pb.Type{}
+									_t1521.Type = &pb.Type_DateType{DateType: date_type795}
+									_t1519 = _t1521
 								} else {
-									var _t1518 *pb.Type
-									if prediction786 == 5 {
-										_t1519 := p.parse_int128_type()
-										int128_type792 := _t1519
-										_t1520 := &pb.Type{}
-										_t1520.Type = &pb.Type_Int128Type{Int128Type: int128_type792}
-										_t1518 = _t1520
+									var _t1522 *pb.Type
+									if prediction788 == 5 {
+										_t1523 := p.parse_int128_type()
+										int128_type794 := _t1523
+										_t1524 := &pb.Type{}
+										_t1524.Type = &pb.Type_Int128Type{Int128Type: int128_type794}
+										_t1522 = _t1524
 									} else {
-										var _t1521 *pb.Type
-										if prediction786 == 4 {
-											_t1522 := p.parse_uint128_type()
-											uint128_type791 := _t1522
-											_t1523 := &pb.Type{}
-											_t1523.Type = &pb.Type_Uint128Type{Uint128Type: uint128_type791}
-											_t1521 = _t1523
+										var _t1525 *pb.Type
+										if prediction788 == 4 {
+											_t1526 := p.parse_uint128_type()
+											uint128_type793 := _t1526
+											_t1527 := &pb.Type{}
+											_t1527.Type = &pb.Type_Uint128Type{Uint128Type: uint128_type793}
+											_t1525 = _t1527
 										} else {
-											var _t1524 *pb.Type
-											if prediction786 == 3 {
-												_t1525 := p.parse_float_type()
-												float_type790 := _t1525
-												_t1526 := &pb.Type{}
-												_t1526.Type = &pb.Type_FloatType{FloatType: float_type790}
-												_t1524 = _t1526
+											var _t1528 *pb.Type
+											if prediction788 == 3 {
+												_t1529 := p.parse_float_type()
+												float_type792 := _t1529
+												_t1530 := &pb.Type{}
+												_t1530.Type = &pb.Type_FloatType{FloatType: float_type792}
+												_t1528 = _t1530
 											} else {
-												var _t1527 *pb.Type
-												if prediction786 == 2 {
-													_t1528 := p.parse_int_type()
-													int_type789 := _t1528
-													_t1529 := &pb.Type{}
-													_t1529.Type = &pb.Type_IntType{IntType: int_type789}
-													_t1527 = _t1529
+												var _t1531 *pb.Type
+												if prediction788 == 2 {
+													_t1532 := p.parse_int_type()
+													int_type791 := _t1532
+													_t1533 := &pb.Type{}
+													_t1533.Type = &pb.Type_IntType{IntType: int_type791}
+													_t1531 = _t1533
 												} else {
-													var _t1530 *pb.Type
-													if prediction786 == 1 {
-														_t1531 := p.parse_string_type()
-														string_type788 := _t1531
-														_t1532 := &pb.Type{}
-														_t1532.Type = &pb.Type_StringType{StringType: string_type788}
-														_t1530 = _t1532
+													var _t1534 *pb.Type
+													if prediction788 == 1 {
+														_t1535 := p.parse_string_type()
+														string_type790 := _t1535
+														_t1536 := &pb.Type{}
+														_t1536.Type = &pb.Type_StringType{StringType: string_type790}
+														_t1534 = _t1536
 													} else {
-														var _t1533 *pb.Type
-														if prediction786 == 0 {
-															_t1534 := p.parse_unspecified_type()
-															unspecified_type787 := _t1534
-															_t1535 := &pb.Type{}
-															_t1535.Type = &pb.Type_UnspecifiedType{UnspecifiedType: unspecified_type787}
-															_t1533 = _t1535
+														var _t1537 *pb.Type
+														if prediction788 == 0 {
+															_t1538 := p.parse_unspecified_type()
+															unspecified_type789 := _t1538
+															_t1539 := &pb.Type{}
+															_t1539.Type = &pb.Type_UnspecifiedType{UnspecifiedType: unspecified_type789}
+															_t1537 = _t1539
 														} else {
 															panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in type", p.lookahead(0).Type, p.lookahead(0).Value)})
 														}
-														_t1530 = _t1533
+														_t1534 = _t1537
 													}
-													_t1527 = _t1530
+													_t1531 = _t1534
 												}
-												_t1524 = _t1527
+												_t1528 = _t1531
 											}
-											_t1521 = _t1524
+											_t1525 = _t1528
 										}
-										_t1518 = _t1521
+										_t1522 = _t1525
 									}
-									_t1515 = _t1518
+									_t1519 = _t1522
 								}
-								_t1512 = _t1515
+								_t1516 = _t1519
 							}
-							_t1509 = _t1512
+							_t1513 = _t1516
 						}
-						_t1506 = _t1509
+						_t1510 = _t1513
 					}
-					_t1503 = _t1506
+					_t1507 = _t1510
 				}
-				_t1500 = _t1503
+				_t1504 = _t1507
 			}
-			_t1497 = _t1500
+			_t1501 = _t1504
 		}
-		_t1494 = _t1497
+		_t1498 = _t1501
 	}
-	result802 := _t1494
-	p.recordSpan(int(span_start801), "Type")
-	return result802
+	result804 := _t1498
+	p.recordSpan(int(span_start803), "Type")
+	return result804
 }
 
 func (p *Parser) parse_unspecified_type() *pb.UnspecifiedType {
-	span_start803 := int64(p.spanStart())
+	span_start805 := int64(p.spanStart())
 	p.consumeLiteral("UNKNOWN")
-	_t1536 := &pb.UnspecifiedType{}
-	result804 := _t1536
-	p.recordSpan(int(span_start803), "UnspecifiedType")
-	return result804
+	_t1540 := &pb.UnspecifiedType{}
+	result806 := _t1540
+	p.recordSpan(int(span_start805), "UnspecifiedType")
+	return result806
 }
 
 func (p *Parser) parse_string_type() *pb.StringType {
-	span_start805 := int64(p.spanStart())
+	span_start807 := int64(p.spanStart())
 	p.consumeLiteral("STRING")
-	_t1537 := &pb.StringType{}
-	result806 := _t1537
-	p.recordSpan(int(span_start805), "StringType")
-	return result806
+	_t1541 := &pb.StringType{}
+	result808 := _t1541
+	p.recordSpan(int(span_start807), "StringType")
+	return result808
 }
 
 func (p *Parser) parse_int_type() *pb.IntType {
-	span_start807 := int64(p.spanStart())
+	span_start809 := int64(p.spanStart())
 	p.consumeLiteral("INT")
-	_t1538 := &pb.IntType{}
-	result808 := _t1538
-	p.recordSpan(int(span_start807), "IntType")
-	return result808
+	_t1542 := &pb.IntType{}
+	result810 := _t1542
+	p.recordSpan(int(span_start809), "IntType")
+	return result810
 }
 
 func (p *Parser) parse_float_type() *pb.FloatType {
-	span_start809 := int64(p.spanStart())
+	span_start811 := int64(p.spanStart())
 	p.consumeLiteral("FLOAT")
-	_t1539 := &pb.FloatType{}
-	result810 := _t1539
-	p.recordSpan(int(span_start809), "FloatType")
-	return result810
+	_t1543 := &pb.FloatType{}
+	result812 := _t1543
+	p.recordSpan(int(span_start811), "FloatType")
+	return result812
 }
 
 func (p *Parser) parse_uint128_type() *pb.UInt128Type {
-	span_start811 := int64(p.spanStart())
+	span_start813 := int64(p.spanStart())
 	p.consumeLiteral("UINT128")
-	_t1540 := &pb.UInt128Type{}
-	result812 := _t1540
-	p.recordSpan(int(span_start811), "UInt128Type")
-	return result812
+	_t1544 := &pb.UInt128Type{}
+	result814 := _t1544
+	p.recordSpan(int(span_start813), "UInt128Type")
+	return result814
 }
 
 func (p *Parser) parse_int128_type() *pb.Int128Type {
-	span_start813 := int64(p.spanStart())
+	span_start815 := int64(p.spanStart())
 	p.consumeLiteral("INT128")
-	_t1541 := &pb.Int128Type{}
-	result814 := _t1541
-	p.recordSpan(int(span_start813), "Int128Type")
-	return result814
+	_t1545 := &pb.Int128Type{}
+	result816 := _t1545
+	p.recordSpan(int(span_start815), "Int128Type")
+	return result816
 }
 
 func (p *Parser) parse_date_type() *pb.DateType {
-	span_start815 := int64(p.spanStart())
+	span_start817 := int64(p.spanStart())
 	p.consumeLiteral("DATE")
-	_t1542 := &pb.DateType{}
-	result816 := _t1542
-	p.recordSpan(int(span_start815), "DateType")
-	return result816
+	_t1546 := &pb.DateType{}
+	result818 := _t1546
+	p.recordSpan(int(span_start817), "DateType")
+	return result818
 }
 
 func (p *Parser) parse_datetime_type() *pb.DateTimeType {
-	span_start817 := int64(p.spanStart())
+	span_start819 := int64(p.spanStart())
 	p.consumeLiteral("DATETIME")
-	_t1543 := &pb.DateTimeType{}
-	result818 := _t1543
-	p.recordSpan(int(span_start817), "DateTimeType")
-	return result818
+	_t1547 := &pb.DateTimeType{}
+	result820 := _t1547
+	p.recordSpan(int(span_start819), "DateTimeType")
+	return result820
 }
 
 func (p *Parser) parse_missing_type() *pb.MissingType {
-	span_start819 := int64(p.spanStart())
+	span_start821 := int64(p.spanStart())
 	p.consumeLiteral("MISSING")
-	_t1544 := &pb.MissingType{}
-	result820 := _t1544
-	p.recordSpan(int(span_start819), "MissingType")
-	return result820
+	_t1548 := &pb.MissingType{}
+	result822 := _t1548
+	p.recordSpan(int(span_start821), "MissingType")
+	return result822
 }
 
 func (p *Parser) parse_decimal_type() *pb.DecimalType {
-	span_start823 := int64(p.spanStart())
+	span_start825 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("DECIMAL")
-	int821 := p.consumeTerminal("INT").Value.i64
-	int_3822 := p.consumeTerminal("INT").Value.i64
+	int823 := p.consumeTerminal("INT").Value.i64
+	int_3824 := p.consumeTerminal("INT").Value.i64
 	p.consumeLiteral(")")
-	_t1545 := &pb.DecimalType{Precision: int32(int821), Scale: int32(int_3822)}
-	result824 := _t1545
-	p.recordSpan(int(span_start823), "DecimalType")
-	return result824
+	_t1549 := &pb.DecimalType{Precision: int32(int823), Scale: int32(int_3824)}
+	result826 := _t1549
+	p.recordSpan(int(span_start825), "DecimalType")
+	return result826
 }
 
 func (p *Parser) parse_boolean_type() *pb.BooleanType {
-	span_start825 := int64(p.spanStart())
+	span_start827 := int64(p.spanStart())
 	p.consumeLiteral("BOOLEAN")
-	_t1546 := &pb.BooleanType{}
-	result826 := _t1546
-	p.recordSpan(int(span_start825), "BooleanType")
-	return result826
+	_t1550 := &pb.BooleanType{}
+	result828 := _t1550
+	p.recordSpan(int(span_start827), "BooleanType")
+	return result828
 }
 
 func (p *Parser) parse_int32_type() *pb.Int32Type {
-	span_start827 := int64(p.spanStart())
+	span_start829 := int64(p.spanStart())
 	p.consumeLiteral("INT32")
-	_t1547 := &pb.Int32Type{}
-	result828 := _t1547
-	p.recordSpan(int(span_start827), "Int32Type")
-	return result828
+	_t1551 := &pb.Int32Type{}
+	result830 := _t1551
+	p.recordSpan(int(span_start829), "Int32Type")
+	return result830
 }
 
 func (p *Parser) parse_float32_type() *pb.Float32Type {
-	span_start829 := int64(p.spanStart())
+	span_start831 := int64(p.spanStart())
 	p.consumeLiteral("FLOAT32")
-	_t1548 := &pb.Float32Type{}
-	result830 := _t1548
-	p.recordSpan(int(span_start829), "Float32Type")
-	return result830
+	_t1552 := &pb.Float32Type{}
+	result832 := _t1552
+	p.recordSpan(int(span_start831), "Float32Type")
+	return result832
 }
 
 func (p *Parser) parse_uint32_type() *pb.UInt32Type {
-	span_start831 := int64(p.spanStart())
+	span_start833 := int64(p.spanStart())
 	p.consumeLiteral("UINT32")
-	_t1549 := &pb.UInt32Type{}
-	result832 := _t1549
-	p.recordSpan(int(span_start831), "UInt32Type")
-	return result832
+	_t1553 := &pb.UInt32Type{}
+	result834 := _t1553
+	p.recordSpan(int(span_start833), "UInt32Type")
+	return result834
 }
 
 func (p *Parser) parse_value_bindings() []*pb.Binding {
 	p.consumeLiteral("|")
-	xs833 := []*pb.Binding{}
-	cond834 := p.matchLookaheadTerminal("SYMBOL", 0)
-	for cond834 {
-		_t1550 := p.parse_binding()
-		item835 := _t1550
-		xs833 = append(xs833, item835)
-		cond834 = p.matchLookaheadTerminal("SYMBOL", 0)
+	xs835 := []*pb.Binding{}
+	cond836 := p.matchLookaheadTerminal("SYMBOL", 0)
+	for cond836 {
+		_t1554 := p.parse_binding()
+		item837 := _t1554
+		xs835 = append(xs835, item837)
+		cond836 = p.matchLookaheadTerminal("SYMBOL", 0)
 	}
-	bindings836 := xs833
-	return bindings836
+	bindings838 := xs835
+	return bindings838
 }
 
 func (p *Parser) parse_formula() *pb.Formula {
-	span_start851 := int64(p.spanStart())
-	var _t1551 int64
+	span_start853 := int64(p.spanStart())
+	var _t1555 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1552 int64
+		var _t1556 int64
 		if p.matchLookaheadLiteral("true", 1) {
-			_t1552 = 0
+			_t1556 = 0
 		} else {
-			var _t1553 int64
+			var _t1557 int64
 			if p.matchLookaheadLiteral("relatom", 1) {
-				_t1553 = 11
+				_t1557 = 11
 			} else {
-				var _t1554 int64
+				var _t1558 int64
 				if p.matchLookaheadLiteral("reduce", 1) {
-					_t1554 = 3
+					_t1558 = 3
 				} else {
-					var _t1555 int64
+					var _t1559 int64
 					if p.matchLookaheadLiteral("primitive", 1) {
-						_t1555 = 10
+						_t1559 = 10
 					} else {
-						var _t1556 int64
+						var _t1560 int64
 						if p.matchLookaheadLiteral("pragma", 1) {
-							_t1556 = 9
+							_t1560 = 9
 						} else {
-							var _t1557 int64
+							var _t1561 int64
 							if p.matchLookaheadLiteral("or", 1) {
-								_t1557 = 5
+								_t1561 = 5
 							} else {
-								var _t1558 int64
+								var _t1562 int64
 								if p.matchLookaheadLiteral("not", 1) {
-									_t1558 = 6
+									_t1562 = 6
 								} else {
-									var _t1559 int64
+									var _t1563 int64
 									if p.matchLookaheadLiteral("ffi", 1) {
-										_t1559 = 7
+										_t1563 = 7
 									} else {
-										var _t1560 int64
+										var _t1564 int64
 										if p.matchLookaheadLiteral("false", 1) {
-											_t1560 = 1
+											_t1564 = 1
 										} else {
-											var _t1561 int64
+											var _t1565 int64
 											if p.matchLookaheadLiteral("exists", 1) {
-												_t1561 = 2
+												_t1565 = 2
 											} else {
-												var _t1562 int64
+												var _t1566 int64
 												if p.matchLookaheadLiteral("cast", 1) {
-													_t1562 = 12
+													_t1566 = 12
 												} else {
-													var _t1563 int64
+													var _t1567 int64
 													if p.matchLookaheadLiteral("atom", 1) {
-														_t1563 = 8
+														_t1567 = 8
 													} else {
-														var _t1564 int64
+														var _t1568 int64
 														if p.matchLookaheadLiteral("and", 1) {
-															_t1564 = 4
+															_t1568 = 4
 														} else {
-															var _t1565 int64
+															var _t1569 int64
 															if p.matchLookaheadLiteral(">=", 1) {
-																_t1565 = 10
+																_t1569 = 10
 															} else {
-																var _t1566 int64
+																var _t1570 int64
 																if p.matchLookaheadLiteral(">", 1) {
-																	_t1566 = 10
+																	_t1570 = 10
 																} else {
-																	var _t1567 int64
+																	var _t1571 int64
 																	if p.matchLookaheadLiteral("=", 1) {
-																		_t1567 = 10
+																		_t1571 = 10
 																	} else {
-																		var _t1568 int64
+																		var _t1572 int64
 																		if p.matchLookaheadLiteral("<=", 1) {
-																			_t1568 = 10
+																			_t1572 = 10
 																		} else {
-																			var _t1569 int64
+																			var _t1573 int64
 																			if p.matchLookaheadLiteral("<", 1) {
-																				_t1569 = 10
+																				_t1573 = 10
 																			} else {
-																				var _t1570 int64
+																				var _t1574 int64
 																				if p.matchLookaheadLiteral("/", 1) {
-																					_t1570 = 10
+																					_t1574 = 10
 																				} else {
-																					var _t1571 int64
+																					var _t1575 int64
 																					if p.matchLookaheadLiteral("-", 1) {
-																						_t1571 = 10
+																						_t1575 = 10
 																					} else {
-																						var _t1572 int64
+																						var _t1576 int64
 																						if p.matchLookaheadLiteral("+", 1) {
-																							_t1572 = 10
+																							_t1576 = 10
 																						} else {
-																							var _t1573 int64
+																							var _t1577 int64
 																							if p.matchLookaheadLiteral("*", 1) {
-																								_t1573 = 10
+																								_t1577 = 10
 																							} else {
-																								_t1573 = -1
+																								_t1577 = -1
 																							}
-																							_t1572 = _t1573
+																							_t1576 = _t1577
 																						}
-																						_t1571 = _t1572
+																						_t1575 = _t1576
 																					}
-																					_t1570 = _t1571
+																					_t1574 = _t1575
 																				}
-																				_t1569 = _t1570
+																				_t1573 = _t1574
 																			}
-																			_t1568 = _t1569
+																			_t1572 = _t1573
 																		}
-																		_t1567 = _t1568
+																		_t1571 = _t1572
 																	}
-																	_t1566 = _t1567
+																	_t1570 = _t1571
 																}
-																_t1565 = _t1566
+																_t1569 = _t1570
 															}
-															_t1564 = _t1565
+															_t1568 = _t1569
 														}
-														_t1563 = _t1564
+														_t1567 = _t1568
 													}
-													_t1562 = _t1563
+													_t1566 = _t1567
 												}
-												_t1561 = _t1562
+												_t1565 = _t1566
 											}
-											_t1560 = _t1561
+											_t1564 = _t1565
 										}
-										_t1559 = _t1560
+										_t1563 = _t1564
 									}
-									_t1558 = _t1559
+									_t1562 = _t1563
 								}
-								_t1557 = _t1558
+								_t1561 = _t1562
 							}
-							_t1556 = _t1557
+							_t1560 = _t1561
 						}
-						_t1555 = _t1556
+						_t1559 = _t1560
 					}
-					_t1554 = _t1555
+					_t1558 = _t1559
 				}
-				_t1553 = _t1554
+				_t1557 = _t1558
 			}
-			_t1552 = _t1553
+			_t1556 = _t1557
 		}
-		_t1551 = _t1552
+		_t1555 = _t1556
 	} else {
-		_t1551 = -1
-	}
-	prediction837 := _t1551
-	var _t1574 *pb.Formula
-	if prediction837 == 12 {
-		_t1575 := p.parse_cast()
-		cast850 := _t1575
-		_t1576 := &pb.Formula{}
-		_t1576.FormulaType = &pb.Formula_Cast{Cast: cast850}
-		_t1574 = _t1576
+		_t1555 = -1
+	}
+	prediction839 := _t1555
+	var _t1578 *pb.Formula
+	if prediction839 == 12 {
+		_t1579 := p.parse_cast()
+		cast852 := _t1579
+		_t1580 := &pb.Formula{}
+		_t1580.FormulaType = &pb.Formula_Cast{Cast: cast852}
+		_t1578 = _t1580
 	} else {
-		var _t1577 *pb.Formula
-		if prediction837 == 11 {
-			_t1578 := p.parse_rel_atom()
-			rel_atom849 := _t1578
-			_t1579 := &pb.Formula{}
-			_t1579.FormulaType = &pb.Formula_RelAtom{RelAtom: rel_atom849}
-			_t1577 = _t1579
+		var _t1581 *pb.Formula
+		if prediction839 == 11 {
+			_t1582 := p.parse_rel_atom()
+			rel_atom851 := _t1582
+			_t1583 := &pb.Formula{}
+			_t1583.FormulaType = &pb.Formula_RelAtom{RelAtom: rel_atom851}
+			_t1581 = _t1583
 		} else {
-			var _t1580 *pb.Formula
-			if prediction837 == 10 {
-				_t1581 := p.parse_primitive()
-				primitive848 := _t1581
-				_t1582 := &pb.Formula{}
-				_t1582.FormulaType = &pb.Formula_Primitive{Primitive: primitive848}
-				_t1580 = _t1582
+			var _t1584 *pb.Formula
+			if prediction839 == 10 {
+				_t1585 := p.parse_primitive()
+				primitive850 := _t1585
+				_t1586 := &pb.Formula{}
+				_t1586.FormulaType = &pb.Formula_Primitive{Primitive: primitive850}
+				_t1584 = _t1586
 			} else {
-				var _t1583 *pb.Formula
-				if prediction837 == 9 {
-					_t1584 := p.parse_pragma()
-					pragma847 := _t1584
-					_t1585 := &pb.Formula{}
-					_t1585.FormulaType = &pb.Formula_Pragma{Pragma: pragma847}
-					_t1583 = _t1585
+				var _t1587 *pb.Formula
+				if prediction839 == 9 {
+					_t1588 := p.parse_pragma()
+					pragma849 := _t1588
+					_t1589 := &pb.Formula{}
+					_t1589.FormulaType = &pb.Formula_Pragma{Pragma: pragma849}
+					_t1587 = _t1589
 				} else {
-					var _t1586 *pb.Formula
-					if prediction837 == 8 {
-						_t1587 := p.parse_atom()
-						atom846 := _t1587
-						_t1588 := &pb.Formula{}
-						_t1588.FormulaType = &pb.Formula_Atom{Atom: atom846}
-						_t1586 = _t1588
+					var _t1590 *pb.Formula
+					if prediction839 == 8 {
+						_t1591 := p.parse_atom()
+						atom848 := _t1591
+						_t1592 := &pb.Formula{}
+						_t1592.FormulaType = &pb.Formula_Atom{Atom: atom848}
+						_t1590 = _t1592
 					} else {
-						var _t1589 *pb.Formula
-						if prediction837 == 7 {
-							_t1590 := p.parse_ffi()
-							ffi845 := _t1590
-							_t1591 := &pb.Formula{}
-							_t1591.FormulaType = &pb.Formula_Ffi{Ffi: ffi845}
-							_t1589 = _t1591
+						var _t1593 *pb.Formula
+						if prediction839 == 7 {
+							_t1594 := p.parse_ffi()
+							ffi847 := _t1594
+							_t1595 := &pb.Formula{}
+							_t1595.FormulaType = &pb.Formula_Ffi{Ffi: ffi847}
+							_t1593 = _t1595
 						} else {
-							var _t1592 *pb.Formula
-							if prediction837 == 6 {
-								_t1593 := p.parse_not()
-								not844 := _t1593
-								_t1594 := &pb.Formula{}
-								_t1594.FormulaType = &pb.Formula_Not{Not: not844}
-								_t1592 = _t1594
+							var _t1596 *pb.Formula
+							if prediction839 == 6 {
+								_t1597 := p.parse_not()
+								not846 := _t1597
+								_t1598 := &pb.Formula{}
+								_t1598.FormulaType = &pb.Formula_Not{Not: not846}
+								_t1596 = _t1598
 							} else {
-								var _t1595 *pb.Formula
-								if prediction837 == 5 {
-									_t1596 := p.parse_disjunction()
-									disjunction843 := _t1596
-									_t1597 := &pb.Formula{}
-									_t1597.FormulaType = &pb.Formula_Disjunction{Disjunction: disjunction843}
-									_t1595 = _t1597
+								var _t1599 *pb.Formula
+								if prediction839 == 5 {
+									_t1600 := p.parse_disjunction()
+									disjunction845 := _t1600
+									_t1601 := &pb.Formula{}
+									_t1601.FormulaType = &pb.Formula_Disjunction{Disjunction: disjunction845}
+									_t1599 = _t1601
 								} else {
-									var _t1598 *pb.Formula
-									if prediction837 == 4 {
-										_t1599 := p.parse_conjunction()
-										conjunction842 := _t1599
-										_t1600 := &pb.Formula{}
-										_t1600.FormulaType = &pb.Formula_Conjunction{Conjunction: conjunction842}
-										_t1598 = _t1600
+									var _t1602 *pb.Formula
+									if prediction839 == 4 {
+										_t1603 := p.parse_conjunction()
+										conjunction844 := _t1603
+										_t1604 := &pb.Formula{}
+										_t1604.FormulaType = &pb.Formula_Conjunction{Conjunction: conjunction844}
+										_t1602 = _t1604
 									} else {
-										var _t1601 *pb.Formula
-										if prediction837 == 3 {
-											_t1602 := p.parse_reduce()
-											reduce841 := _t1602
-											_t1603 := &pb.Formula{}
-											_t1603.FormulaType = &pb.Formula_Reduce{Reduce: reduce841}
-											_t1601 = _t1603
+										var _t1605 *pb.Formula
+										if prediction839 == 3 {
+											_t1606 := p.parse_reduce()
+											reduce843 := _t1606
+											_t1607 := &pb.Formula{}
+											_t1607.FormulaType = &pb.Formula_Reduce{Reduce: reduce843}
+											_t1605 = _t1607
 										} else {
-											var _t1604 *pb.Formula
-											if prediction837 == 2 {
-												_t1605 := p.parse_exists()
-												exists840 := _t1605
-												_t1606 := &pb.Formula{}
-												_t1606.FormulaType = &pb.Formula_Exists{Exists: exists840}
-												_t1604 = _t1606
+											var _t1608 *pb.Formula
+											if prediction839 == 2 {
+												_t1609 := p.parse_exists()
+												exists842 := _t1609
+												_t1610 := &pb.Formula{}
+												_t1610.FormulaType = &pb.Formula_Exists{Exists: exists842}
+												_t1608 = _t1610
 											} else {
-												var _t1607 *pb.Formula
-												if prediction837 == 1 {
-													_t1608 := p.parse_false()
-													false839 := _t1608
-													_t1609 := &pb.Formula{}
-													_t1609.FormulaType = &pb.Formula_Disjunction{Disjunction: false839}
-													_t1607 = _t1609
+												var _t1611 *pb.Formula
+												if prediction839 == 1 {
+													_t1612 := p.parse_false()
+													false841 := _t1612
+													_t1613 := &pb.Formula{}
+													_t1613.FormulaType = &pb.Formula_Disjunction{Disjunction: false841}
+													_t1611 = _t1613
 												} else {
-													var _t1610 *pb.Formula
-													if prediction837 == 0 {
-														_t1611 := p.parse_true()
-														true838 := _t1611
-														_t1612 := &pb.Formula{}
-														_t1612.FormulaType = &pb.Formula_Conjunction{Conjunction: true838}
-														_t1610 = _t1612
+													var _t1614 *pb.Formula
+													if prediction839 == 0 {
+														_t1615 := p.parse_true()
+														true840 := _t1615
+														_t1616 := &pb.Formula{}
+														_t1616.FormulaType = &pb.Formula_Conjunction{Conjunction: true840}
+														_t1614 = _t1616
 													} else {
 														panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in formula", p.lookahead(0).Type, p.lookahead(0).Value)})
 													}
-													_t1607 = _t1610
+													_t1611 = _t1614
 												}
-												_t1604 = _t1607
+												_t1608 = _t1611
 											}
-											_t1601 = _t1604
+											_t1605 = _t1608
 										}
-										_t1598 = _t1601
+										_t1602 = _t1605
 									}
-									_t1595 = _t1598
+									_t1599 = _t1602
 								}
-								_t1592 = _t1595
+								_t1596 = _t1599
 							}
-							_t1589 = _t1592
+							_t1593 = _t1596
 						}
-						_t1586 = _t1589
+						_t1590 = _t1593
 					}
-					_t1583 = _t1586
+					_t1587 = _t1590
 				}
-				_t1580 = _t1583
+				_t1584 = _t1587
 			}
-			_t1577 = _t1580
+			_t1581 = _t1584
 		}
-		_t1574 = _t1577
+		_t1578 = _t1581
 	}
-	result852 := _t1574
-	p.recordSpan(int(span_start851), "Formula")
-	return result852
+	result854 := _t1578
+	p.recordSpan(int(span_start853), "Formula")
+	return result854
 }
 
 func (p *Parser) parse_true() *pb.Conjunction {
-	span_start853 := int64(p.spanStart())
+	span_start855 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("true")
 	p.consumeLiteral(")")
-	_t1613 := &pb.Conjunction{Args: []*pb.Formula{}}
-	result854 := _t1613
-	p.recordSpan(int(span_start853), "Conjunction")
-	return result854
+	_t1617 := &pb.Conjunction{Args: []*pb.Formula{}}
+	result856 := _t1617
+	p.recordSpan(int(span_start855), "Conjunction")
+	return result856
 }
 
 func (p *Parser) parse_false() *pb.Disjunction {
-	span_start855 := int64(p.spanStart())
+	span_start857 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("false")
 	p.consumeLiteral(")")
-	_t1614 := &pb.Disjunction{Args: []*pb.Formula{}}
-	result856 := _t1614
-	p.recordSpan(int(span_start855), "Disjunction")
-	return result856
+	_t1618 := &pb.Disjunction{Args: []*pb.Formula{}}
+	result858 := _t1618
+	p.recordSpan(int(span_start857), "Disjunction")
+	return result858
 }
 
 func (p *Parser) parse_exists() *pb.Exists {
-	span_start859 := int64(p.spanStart())
+	span_start861 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("exists")
-	_t1615 := p.parse_bindings()
-	bindings857 := _t1615
-	_t1616 := p.parse_formula()
-	formula858 := _t1616
+	_t1619 := p.parse_bindings()
+	bindings859 := _t1619
+	_t1620 := p.parse_formula()
+	formula860 := _t1620
 	p.consumeLiteral(")")
-	_t1617 := &pb.Abstraction{Vars: listConcat(bindings857[0].([]*pb.Binding), bindings857[1].([]*pb.Binding)), Value: formula858}
-	_t1618 := &pb.Exists{Body: _t1617}
-	result860 := _t1618
-	p.recordSpan(int(span_start859), "Exists")
-	return result860
+	_t1621 := &pb.Abstraction{Vars: listConcat(bindings859[0].([]*pb.Binding), bindings859[1].([]*pb.Binding)), Value: formula860}
+	_t1622 := &pb.Exists{Body: _t1621}
+	result862 := _t1622
+	p.recordSpan(int(span_start861), "Exists")
+	return result862
 }
 
 func (p *Parser) parse_reduce() *pb.Reduce {
-	span_start864 := int64(p.spanStart())
+	span_start866 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("reduce")
-	_t1619 := p.parse_abstraction()
-	abstraction861 := _t1619
-	_t1620 := p.parse_abstraction()
-	abstraction_3862 := _t1620
-	_t1621 := p.parse_terms()
-	terms863 := _t1621
+	_t1623 := p.parse_abstraction()
+	abstraction863 := _t1623
+	_t1624 := p.parse_abstraction()
+	abstraction_3864 := _t1624
+	_t1625 := p.parse_terms()
+	terms865 := _t1625
 	p.consumeLiteral(")")
-	_t1622 := &pb.Reduce{Op: abstraction861, Body: abstraction_3862, Terms: terms863}
-	result865 := _t1622
-	p.recordSpan(int(span_start864), "Reduce")
-	return result865
+	_t1626 := &pb.Reduce{Op: abstraction863, Body: abstraction_3864, Terms: terms865}
+	result867 := _t1626
+	p.recordSpan(int(span_start866), "Reduce")
+	return result867
 }
 
 func (p *Parser) parse_terms() []*pb.Term {
 	p.consumeLiteral("(")
 	p.consumeLiteral("terms")
-	xs866 := []*pb.Term{}
-	cond867 := (((((((((((((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 cond867 {
-		_t1623 := p.parse_term()
-		item868 := _t1623
-		xs866 = append(xs866, item868)
-		cond867 = (((((((((((((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))
-	}
-	terms869 := xs866
+	xs868 := []*pb.Term{}
+	cond869 := (((((((((((((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 cond869 {
+		_t1627 := p.parse_term()
+		item870 := _t1627
+		xs868 = append(xs868, item870)
+		cond869 = (((((((((((((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))
+	}
+	terms871 := xs868
 	p.consumeLiteral(")")
-	return terms869
+	return terms871
 }
 
 func (p *Parser) parse_term() *pb.Term {
-	span_start873 := int64(p.spanStart())
-	var _t1624 int64
+	span_start875 := int64(p.spanStart())
+	var _t1628 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1624 = 1
+		_t1628 = 1
 	} else {
-		var _t1625 int64
+		var _t1629 int64
 		if p.matchLookaheadLiteral("missing", 0) {
-			_t1625 = 1
+			_t1629 = 1
 		} else {
-			var _t1626 int64
+			var _t1630 int64
 			if p.matchLookaheadLiteral("false", 0) {
-				_t1626 = 1
+				_t1630 = 1
 			} else {
-				var _t1627 int64
+				var _t1631 int64
 				if p.matchLookaheadLiteral("(", 0) {
-					_t1627 = 1
+					_t1631 = 1
 				} else {
-					var _t1628 int64
+					var _t1632 int64
 					if p.matchLookaheadTerminal("SYMBOL", 0) {
-						_t1628 = 0
+						_t1632 = 0
 					} else {
-						var _t1629 int64
+						var _t1633 int64
 						if p.matchLookaheadTerminal("UINT32", 0) {
-							_t1629 = 1
+							_t1633 = 1
 						} else {
-							var _t1630 int64
+							var _t1634 int64
 							if p.matchLookaheadTerminal("UINT128", 0) {
-								_t1630 = 1
+								_t1634 = 1
 							} else {
-								var _t1631 int64
+								var _t1635 int64
 								if p.matchLookaheadTerminal("STRING", 0) {
-									_t1631 = 1
+									_t1635 = 1
 								} else {
-									var _t1632 int64
+									var _t1636 int64
 									if p.matchLookaheadTerminal("INT32", 0) {
-										_t1632 = 1
+										_t1636 = 1
 									} else {
-										var _t1633 int64
+										var _t1637 int64
 										if p.matchLookaheadTerminal("INT128", 0) {
-											_t1633 = 1
+											_t1637 = 1
 										} else {
-											var _t1634 int64
+											var _t1638 int64
 											if p.matchLookaheadTerminal("INT", 0) {
-												_t1634 = 1
+												_t1638 = 1
 											} else {
-												var _t1635 int64
+												var _t1639 int64
 												if p.matchLookaheadTerminal("FLOAT32", 0) {
-													_t1635 = 1
+													_t1639 = 1
 												} else {
-													var _t1636 int64
+													var _t1640 int64
 													if p.matchLookaheadTerminal("FLOAT", 0) {
-														_t1636 = 1
+														_t1640 = 1
 													} else {
-														var _t1637 int64
+														var _t1641 int64
 														if p.matchLookaheadTerminal("DECIMAL", 0) {
-															_t1637 = 1
+															_t1641 = 1
 														} else {
-															_t1637 = -1
+															_t1641 = -1
 														}
-														_t1636 = _t1637
+														_t1640 = _t1641
 													}
-													_t1635 = _t1636
+													_t1639 = _t1640
 												}
-												_t1634 = _t1635
+												_t1638 = _t1639
 											}
-											_t1633 = _t1634
+											_t1637 = _t1638
 										}
-										_t1632 = _t1633
+										_t1636 = _t1637
 									}
-									_t1631 = _t1632
+									_t1635 = _t1636
 								}
-								_t1630 = _t1631
+								_t1634 = _t1635
 							}
-							_t1629 = _t1630
+							_t1633 = _t1634
 						}
-						_t1628 = _t1629
+						_t1632 = _t1633
 					}
-					_t1627 = _t1628
+					_t1631 = _t1632
 				}
-				_t1626 = _t1627
+				_t1630 = _t1631
 			}
-			_t1625 = _t1626
+			_t1629 = _t1630
 		}
-		_t1624 = _t1625
-	}
-	prediction870 := _t1624
-	var _t1638 *pb.Term
-	if prediction870 == 1 {
-		_t1639 := p.parse_value()
-		value872 := _t1639
-		_t1640 := &pb.Term{}
-		_t1640.TermType = &pb.Term_Constant{Constant: value872}
-		_t1638 = _t1640
+		_t1628 = _t1629
+	}
+	prediction872 := _t1628
+	var _t1642 *pb.Term
+	if prediction872 == 1 {
+		_t1643 := p.parse_value()
+		value874 := _t1643
+		_t1644 := &pb.Term{}
+		_t1644.TermType = &pb.Term_Constant{Constant: value874}
+		_t1642 = _t1644
 	} else {
-		var _t1641 *pb.Term
-		if prediction870 == 0 {
-			_t1642 := p.parse_var()
-			var871 := _t1642
-			_t1643 := &pb.Term{}
-			_t1643.TermType = &pb.Term_Var{Var: var871}
-			_t1641 = _t1643
+		var _t1645 *pb.Term
+		if prediction872 == 0 {
+			_t1646 := p.parse_var()
+			var873 := _t1646
+			_t1647 := &pb.Term{}
+			_t1647.TermType = &pb.Term_Var{Var: var873}
+			_t1645 = _t1647
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in term", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1638 = _t1641
+		_t1642 = _t1645
 	}
-	result874 := _t1638
-	p.recordSpan(int(span_start873), "Term")
-	return result874
+	result876 := _t1642
+	p.recordSpan(int(span_start875), "Term")
+	return result876
 }
 
 func (p *Parser) parse_var() *pb.Var {
-	span_start876 := int64(p.spanStart())
-	symbol875 := p.consumeTerminal("SYMBOL").Value.str
-	_t1644 := &pb.Var{Name: symbol875}
-	result877 := _t1644
-	p.recordSpan(int(span_start876), "Var")
-	return result877
+	span_start878 := int64(p.spanStart())
+	symbol877 := p.consumeTerminal("SYMBOL").Value.str
+	_t1648 := &pb.Var{Name: symbol877}
+	result879 := _t1648
+	p.recordSpan(int(span_start878), "Var")
+	return result879
 }
 
 func (p *Parser) parse_value() *pb.Value {
-	span_start891 := int64(p.spanStart())
-	var _t1645 int64
+	span_start893 := int64(p.spanStart())
+	var _t1649 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1645 = 12
+		_t1649 = 12
 	} else {
-		var _t1646 int64
+		var _t1650 int64
 		if p.matchLookaheadLiteral("missing", 0) {
-			_t1646 = 11
+			_t1650 = 11
 		} else {
-			var _t1647 int64
+			var _t1651 int64
 			if p.matchLookaheadLiteral("false", 0) {
-				_t1647 = 12
+				_t1651 = 12
 			} else {
-				var _t1648 int64
+				var _t1652 int64
 				if p.matchLookaheadLiteral("(", 0) {
-					var _t1649 int64
+					var _t1653 int64
 					if p.matchLookaheadLiteral("datetime", 1) {
-						_t1649 = 1
+						_t1653 = 1
 					} else {
-						var _t1650 int64
+						var _t1654 int64
 						if p.matchLookaheadLiteral("date", 1) {
-							_t1650 = 0
+							_t1654 = 0
 						} else {
-							_t1650 = -1
+							_t1654 = -1
 						}
-						_t1649 = _t1650
+						_t1653 = _t1654
 					}
-					_t1648 = _t1649
+					_t1652 = _t1653
 				} else {
-					var _t1651 int64
+					var _t1655 int64
 					if p.matchLookaheadTerminal("UINT32", 0) {
-						_t1651 = 7
+						_t1655 = 7
 					} else {
-						var _t1652 int64
+						var _t1656 int64
 						if p.matchLookaheadTerminal("UINT128", 0) {
-							_t1652 = 8
+							_t1656 = 8
 						} else {
-							var _t1653 int64
+							var _t1657 int64
 							if p.matchLookaheadTerminal("STRING", 0) {
-								_t1653 = 2
+								_t1657 = 2
 							} else {
-								var _t1654 int64
+								var _t1658 int64
 								if p.matchLookaheadTerminal("INT32", 0) {
-									_t1654 = 3
+									_t1658 = 3
 								} else {
-									var _t1655 int64
+									var _t1659 int64
 									if p.matchLookaheadTerminal("INT128", 0) {
-										_t1655 = 9
+										_t1659 = 9
 									} else {
-										var _t1656 int64
+										var _t1660 int64
 										if p.matchLookaheadTerminal("INT", 0) {
-											_t1656 = 4
+											_t1660 = 4
 										} else {
-											var _t1657 int64
+											var _t1661 int64
 											if p.matchLookaheadTerminal("FLOAT32", 0) {
-												_t1657 = 5
+												_t1661 = 5
 											} else {
-												var _t1658 int64
+												var _t1662 int64
 												if p.matchLookaheadTerminal("FLOAT", 0) {
-													_t1658 = 6
+													_t1662 = 6
 												} else {
-													var _t1659 int64
+													var _t1663 int64
 													if p.matchLookaheadTerminal("DECIMAL", 0) {
-														_t1659 = 10
+														_t1663 = 10
 													} else {
-														_t1659 = -1
+														_t1663 = -1
 													}
-													_t1658 = _t1659
+													_t1662 = _t1663
 												}
-												_t1657 = _t1658
+												_t1661 = _t1662
 											}
-											_t1656 = _t1657
+											_t1660 = _t1661
 										}
-										_t1655 = _t1656
+										_t1659 = _t1660
 									}
-									_t1654 = _t1655
+									_t1658 = _t1659
 								}
-								_t1653 = _t1654
+								_t1657 = _t1658
 							}
-							_t1652 = _t1653
+							_t1656 = _t1657
 						}
-						_t1651 = _t1652
+						_t1655 = _t1656
 					}
-					_t1648 = _t1651
+					_t1652 = _t1655
 				}
-				_t1647 = _t1648
+				_t1651 = _t1652
 			}
-			_t1646 = _t1647
+			_t1650 = _t1651
 		}
-		_t1645 = _t1646
-	}
-	prediction878 := _t1645
-	var _t1660 *pb.Value
-	if prediction878 == 12 {
-		_t1661 := p.parse_boolean_value()
-		boolean_value890 := _t1661
-		_t1662 := &pb.Value{}
-		_t1662.Value = &pb.Value_BooleanValue{BooleanValue: boolean_value890}
-		_t1660 = _t1662
+		_t1649 = _t1650
+	}
+	prediction880 := _t1649
+	var _t1664 *pb.Value
+	if prediction880 == 12 {
+		_t1665 := p.parse_boolean_value()
+		boolean_value892 := _t1665
+		_t1666 := &pb.Value{}
+		_t1666.Value = &pb.Value_BooleanValue{BooleanValue: boolean_value892}
+		_t1664 = _t1666
 	} else {
-		var _t1663 *pb.Value
-		if prediction878 == 11 {
+		var _t1667 *pb.Value
+		if prediction880 == 11 {
 			p.consumeLiteral("missing")
-			_t1664 := &pb.MissingValue{}
-			_t1665 := &pb.Value{}
-			_t1665.Value = &pb.Value_MissingValue{MissingValue: _t1664}
-			_t1663 = _t1665
+			_t1668 := &pb.MissingValue{}
+			_t1669 := &pb.Value{}
+			_t1669.Value = &pb.Value_MissingValue{MissingValue: _t1668}
+			_t1667 = _t1669
 		} else {
-			var _t1666 *pb.Value
-			if prediction878 == 10 {
-				formatted_decimal889 := p.consumeTerminal("DECIMAL").Value.decimal
-				_t1667 := &pb.Value{}
-				_t1667.Value = &pb.Value_DecimalValue{DecimalValue: formatted_decimal889}
-				_t1666 = _t1667
+			var _t1670 *pb.Value
+			if prediction880 == 10 {
+				formatted_decimal891 := p.consumeTerminal("DECIMAL").Value.decimal
+				_t1671 := &pb.Value{}
+				_t1671.Value = &pb.Value_DecimalValue{DecimalValue: formatted_decimal891}
+				_t1670 = _t1671
 			} else {
-				var _t1668 *pb.Value
-				if prediction878 == 9 {
-					formatted_int128888 := p.consumeTerminal("INT128").Value.int128
-					_t1669 := &pb.Value{}
-					_t1669.Value = &pb.Value_Int128Value{Int128Value: formatted_int128888}
-					_t1668 = _t1669
+				var _t1672 *pb.Value
+				if prediction880 == 9 {
+					formatted_int128890 := p.consumeTerminal("INT128").Value.int128
+					_t1673 := &pb.Value{}
+					_t1673.Value = &pb.Value_Int128Value{Int128Value: formatted_int128890}
+					_t1672 = _t1673
 				} else {
-					var _t1670 *pb.Value
-					if prediction878 == 8 {
-						formatted_uint128887 := p.consumeTerminal("UINT128").Value.uint128
-						_t1671 := &pb.Value{}
-						_t1671.Value = &pb.Value_Uint128Value{Uint128Value: formatted_uint128887}
-						_t1670 = _t1671
+					var _t1674 *pb.Value
+					if prediction880 == 8 {
+						formatted_uint128889 := p.consumeTerminal("UINT128").Value.uint128
+						_t1675 := &pb.Value{}
+						_t1675.Value = &pb.Value_Uint128Value{Uint128Value: formatted_uint128889}
+						_t1674 = _t1675
 					} else {
-						var _t1672 *pb.Value
-						if prediction878 == 7 {
-							formatted_uint32886 := p.consumeTerminal("UINT32").Value.u32
-							_t1673 := &pb.Value{}
-							_t1673.Value = &pb.Value_Uint32Value{Uint32Value: formatted_uint32886}
-							_t1672 = _t1673
+						var _t1676 *pb.Value
+						if prediction880 == 7 {
+							formatted_uint32888 := p.consumeTerminal("UINT32").Value.u32
+							_t1677 := &pb.Value{}
+							_t1677.Value = &pb.Value_Uint32Value{Uint32Value: formatted_uint32888}
+							_t1676 = _t1677
 						} else {
-							var _t1674 *pb.Value
-							if prediction878 == 6 {
-								formatted_float885 := p.consumeTerminal("FLOAT").Value.f64
-								_t1675 := &pb.Value{}
-								_t1675.Value = &pb.Value_FloatValue{FloatValue: formatted_float885}
-								_t1674 = _t1675
+							var _t1678 *pb.Value
+							if prediction880 == 6 {
+								formatted_float887 := p.consumeTerminal("FLOAT").Value.f64
+								_t1679 := &pb.Value{}
+								_t1679.Value = &pb.Value_FloatValue{FloatValue: formatted_float887}
+								_t1678 = _t1679
 							} else {
-								var _t1676 *pb.Value
-								if prediction878 == 5 {
-									formatted_float32884 := p.consumeTerminal("FLOAT32").Value.f32
-									_t1677 := &pb.Value{}
-									_t1677.Value = &pb.Value_Float32Value{Float32Value: formatted_float32884}
-									_t1676 = _t1677
+								var _t1680 *pb.Value
+								if prediction880 == 5 {
+									formatted_float32886 := p.consumeTerminal("FLOAT32").Value.f32
+									_t1681 := &pb.Value{}
+									_t1681.Value = &pb.Value_Float32Value{Float32Value: formatted_float32886}
+									_t1680 = _t1681
 								} else {
-									var _t1678 *pb.Value
-									if prediction878 == 4 {
-										formatted_int883 := p.consumeTerminal("INT").Value.i64
-										_t1679 := &pb.Value{}
-										_t1679.Value = &pb.Value_IntValue{IntValue: formatted_int883}
-										_t1678 = _t1679
+									var _t1682 *pb.Value
+									if prediction880 == 4 {
+										formatted_int885 := p.consumeTerminal("INT").Value.i64
+										_t1683 := &pb.Value{}
+										_t1683.Value = &pb.Value_IntValue{IntValue: formatted_int885}
+										_t1682 = _t1683
 									} else {
-										var _t1680 *pb.Value
-										if prediction878 == 3 {
-											formatted_int32882 := p.consumeTerminal("INT32").Value.i32
-											_t1681 := &pb.Value{}
-											_t1681.Value = &pb.Value_Int32Value{Int32Value: formatted_int32882}
-											_t1680 = _t1681
+										var _t1684 *pb.Value
+										if prediction880 == 3 {
+											formatted_int32884 := p.consumeTerminal("INT32").Value.i32
+											_t1685 := &pb.Value{}
+											_t1685.Value = &pb.Value_Int32Value{Int32Value: formatted_int32884}
+											_t1684 = _t1685
 										} else {
-											var _t1682 *pb.Value
-											if prediction878 == 2 {
-												formatted_string881 := p.consumeTerminal("STRING").Value.str
-												_t1683 := &pb.Value{}
-												_t1683.Value = &pb.Value_StringValue{StringValue: formatted_string881}
-												_t1682 = _t1683
+											var _t1686 *pb.Value
+											if prediction880 == 2 {
+												formatted_string883 := p.consumeTerminal("STRING").Value.str
+												_t1687 := &pb.Value{}
+												_t1687.Value = &pb.Value_StringValue{StringValue: formatted_string883}
+												_t1686 = _t1687
 											} else {
-												var _t1684 *pb.Value
-												if prediction878 == 1 {
-													_t1685 := p.parse_datetime()
-													datetime880 := _t1685
-													_t1686 := &pb.Value{}
-													_t1686.Value = &pb.Value_DatetimeValue{DatetimeValue: datetime880}
-													_t1684 = _t1686
+												var _t1688 *pb.Value
+												if prediction880 == 1 {
+													_t1689 := p.parse_datetime()
+													datetime882 := _t1689
+													_t1690 := &pb.Value{}
+													_t1690.Value = &pb.Value_DatetimeValue{DatetimeValue: datetime882}
+													_t1688 = _t1690
 												} else {
-													var _t1687 *pb.Value
-													if prediction878 == 0 {
-														_t1688 := p.parse_date()
-														date879 := _t1688
-														_t1689 := &pb.Value{}
-														_t1689.Value = &pb.Value_DateValue{DateValue: date879}
-														_t1687 = _t1689
+													var _t1691 *pb.Value
+													if prediction880 == 0 {
+														_t1692 := p.parse_date()
+														date881 := _t1692
+														_t1693 := &pb.Value{}
+														_t1693.Value = &pb.Value_DateValue{DateValue: date881}
+														_t1691 = _t1693
 													} else {
 														panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in value", p.lookahead(0).Type, p.lookahead(0).Value)})
 													}
-													_t1684 = _t1687
+													_t1688 = _t1691
 												}
-												_t1682 = _t1684
+												_t1686 = _t1688
 											}
-											_t1680 = _t1682
+											_t1684 = _t1686
 										}
-										_t1678 = _t1680
+										_t1682 = _t1684
 									}
-									_t1676 = _t1678
+									_t1680 = _t1682
 								}
-								_t1674 = _t1676
+								_t1678 = _t1680
 							}
-							_t1672 = _t1674
+							_t1676 = _t1678
 						}
-						_t1670 = _t1672
+						_t1674 = _t1676
 					}
-					_t1668 = _t1670
+					_t1672 = _t1674
 				}
-				_t1666 = _t1668
+				_t1670 = _t1672
 			}
-			_t1663 = _t1666
+			_t1667 = _t1670
 		}
-		_t1660 = _t1663
+		_t1664 = _t1667
 	}
-	result892 := _t1660
-	p.recordSpan(int(span_start891), "Value")
-	return result892
+	result894 := _t1664
+	p.recordSpan(int(span_start893), "Value")
+	return result894
 }
 
 func (p *Parser) parse_date() *pb.DateValue {
-	span_start896 := int64(p.spanStart())
+	span_start898 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("date")
-	formatted_int893 := p.consumeTerminal("INT").Value.i64
-	formatted_int_3894 := p.consumeTerminal("INT").Value.i64
-	formatted_int_4895 := p.consumeTerminal("INT").Value.i64
+	formatted_int895 := p.consumeTerminal("INT").Value.i64
+	formatted_int_3896 := p.consumeTerminal("INT").Value.i64
+	formatted_int_4897 := p.consumeTerminal("INT").Value.i64
 	p.consumeLiteral(")")
-	_t1690 := &pb.DateValue{Year: int32(formatted_int893), Month: int32(formatted_int_3894), Day: int32(formatted_int_4895)}
-	result897 := _t1690
-	p.recordSpan(int(span_start896), "DateValue")
-	return result897
+	_t1694 := &pb.DateValue{Year: int32(formatted_int895), Month: int32(formatted_int_3896), Day: int32(formatted_int_4897)}
+	result899 := _t1694
+	p.recordSpan(int(span_start898), "DateValue")
+	return result899
 }
 
 func (p *Parser) parse_datetime() *pb.DateTimeValue {
-	span_start905 := int64(p.spanStart())
+	span_start907 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("datetime")
-	formatted_int898 := p.consumeTerminal("INT").Value.i64
-	formatted_int_3899 := p.consumeTerminal("INT").Value.i64
-	formatted_int_4900 := p.consumeTerminal("INT").Value.i64
-	formatted_int_5901 := p.consumeTerminal("INT").Value.i64
-	formatted_int_6902 := p.consumeTerminal("INT").Value.i64
-	formatted_int_7903 := p.consumeTerminal("INT").Value.i64
-	var _t1691 *int64
+	formatted_int900 := p.consumeTerminal("INT").Value.i64
+	formatted_int_3901 := p.consumeTerminal("INT").Value.i64
+	formatted_int_4902 := p.consumeTerminal("INT").Value.i64
+	formatted_int_5903 := p.consumeTerminal("INT").Value.i64
+	formatted_int_6904 := p.consumeTerminal("INT").Value.i64
+	formatted_int_7905 := p.consumeTerminal("INT").Value.i64
+	var _t1695 *int64
 	if p.matchLookaheadTerminal("INT", 0) {
-		_t1691 = ptr(p.consumeTerminal("INT").Value.i64)
+		_t1695 = ptr(p.consumeTerminal("INT").Value.i64)
 	}
-	formatted_int_8904 := _t1691
+	formatted_int_8906 := _t1695
 	p.consumeLiteral(")")
-	_t1692 := &pb.DateTimeValue{Year: int32(formatted_int898), Month: int32(formatted_int_3899), Day: int32(formatted_int_4900), Hour: int32(formatted_int_5901), Minute: int32(formatted_int_6902), Second: int32(formatted_int_7903), Microsecond: int32(deref(formatted_int_8904, 0))}
-	result906 := _t1692
-	p.recordSpan(int(span_start905), "DateTimeValue")
-	return result906
+	_t1696 := &pb.DateTimeValue{Year: int32(formatted_int900), Month: int32(formatted_int_3901), Day: int32(formatted_int_4902), Hour: int32(formatted_int_5903), Minute: int32(formatted_int_6904), Second: int32(formatted_int_7905), Microsecond: int32(deref(formatted_int_8906, 0))}
+	result908 := _t1696
+	p.recordSpan(int(span_start907), "DateTimeValue")
+	return result908
 }
 
 func (p *Parser) parse_conjunction() *pb.Conjunction {
-	span_start911 := int64(p.spanStart())
+	span_start913 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("and")
-	xs907 := []*pb.Formula{}
-	cond908 := p.matchLookaheadLiteral("(", 0)
-	for cond908 {
-		_t1693 := p.parse_formula()
-		item909 := _t1693
-		xs907 = append(xs907, item909)
-		cond908 = p.matchLookaheadLiteral("(", 0)
-	}
-	formulas910 := xs907
+	xs909 := []*pb.Formula{}
+	cond910 := p.matchLookaheadLiteral("(", 0)
+	for cond910 {
+		_t1697 := p.parse_formula()
+		item911 := _t1697
+		xs909 = append(xs909, item911)
+		cond910 = p.matchLookaheadLiteral("(", 0)
+	}
+	formulas912 := xs909
 	p.consumeLiteral(")")
-	_t1694 := &pb.Conjunction{Args: formulas910}
-	result912 := _t1694
-	p.recordSpan(int(span_start911), "Conjunction")
-	return result912
+	_t1698 := &pb.Conjunction{Args: formulas912}
+	result914 := _t1698
+	p.recordSpan(int(span_start913), "Conjunction")
+	return result914
 }
 
 func (p *Parser) parse_disjunction() *pb.Disjunction {
-	span_start917 := int64(p.spanStart())
+	span_start919 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("or")
-	xs913 := []*pb.Formula{}
-	cond914 := p.matchLookaheadLiteral("(", 0)
-	for cond914 {
-		_t1695 := p.parse_formula()
-		item915 := _t1695
-		xs913 = append(xs913, item915)
-		cond914 = p.matchLookaheadLiteral("(", 0)
-	}
-	formulas916 := xs913
+	xs915 := []*pb.Formula{}
+	cond916 := p.matchLookaheadLiteral("(", 0)
+	for cond916 {
+		_t1699 := p.parse_formula()
+		item917 := _t1699
+		xs915 = append(xs915, item917)
+		cond916 = p.matchLookaheadLiteral("(", 0)
+	}
+	formulas918 := xs915
 	p.consumeLiteral(")")
-	_t1696 := &pb.Disjunction{Args: formulas916}
-	result918 := _t1696
-	p.recordSpan(int(span_start917), "Disjunction")
-	return result918
+	_t1700 := &pb.Disjunction{Args: formulas918}
+	result920 := _t1700
+	p.recordSpan(int(span_start919), "Disjunction")
+	return result920
 }
 
 func (p *Parser) parse_not() *pb.Not {
-	span_start920 := int64(p.spanStart())
+	span_start922 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("not")
-	_t1697 := p.parse_formula()
-	formula919 := _t1697
+	_t1701 := p.parse_formula()
+	formula921 := _t1701
 	p.consumeLiteral(")")
-	_t1698 := &pb.Not{Arg: formula919}
-	result921 := _t1698
-	p.recordSpan(int(span_start920), "Not")
-	return result921
+	_t1702 := &pb.Not{Arg: formula921}
+	result923 := _t1702
+	p.recordSpan(int(span_start922), "Not")
+	return result923
 }
 
 func (p *Parser) parse_ffi() *pb.FFI {
-	span_start925 := int64(p.spanStart())
+	span_start927 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("ffi")
-	_t1699 := p.parse_name()
-	name922 := _t1699
-	_t1700 := p.parse_ffi_args()
-	ffi_args923 := _t1700
-	_t1701 := p.parse_terms()
-	terms924 := _t1701
+	_t1703 := p.parse_name()
+	name924 := _t1703
+	_t1704 := p.parse_ffi_args()
+	ffi_args925 := _t1704
+	_t1705 := p.parse_terms()
+	terms926 := _t1705
 	p.consumeLiteral(")")
-	_t1702 := &pb.FFI{Name: name922, Args: ffi_args923, Terms: terms924}
-	result926 := _t1702
-	p.recordSpan(int(span_start925), "FFI")
-	return result926
+	_t1706 := &pb.FFI{Name: name924, Args: ffi_args925, Terms: terms926}
+	result928 := _t1706
+	p.recordSpan(int(span_start927), "FFI")
+	return result928
 }
 
 func (p *Parser) parse_name() string {
 	p.consumeLiteral(":")
-	symbol927 := p.consumeTerminal("SYMBOL").Value.str
-	return symbol927
+	symbol929 := p.consumeTerminal("SYMBOL").Value.str
+	return symbol929
 }
 
 func (p *Parser) parse_ffi_args() []*pb.Abstraction {
 	p.consumeLiteral("(")
 	p.consumeLiteral("args")
-	xs928 := []*pb.Abstraction{}
-	cond929 := p.matchLookaheadLiteral("(", 0)
-	for cond929 {
-		_t1703 := p.parse_abstraction()
-		item930 := _t1703
-		xs928 = append(xs928, item930)
-		cond929 = p.matchLookaheadLiteral("(", 0)
-	}
-	abstractions931 := xs928
+	xs930 := []*pb.Abstraction{}
+	cond931 := p.matchLookaheadLiteral("(", 0)
+	for cond931 {
+		_t1707 := p.parse_abstraction()
+		item932 := _t1707
+		xs930 = append(xs930, item932)
+		cond931 = p.matchLookaheadLiteral("(", 0)
+	}
+	abstractions933 := xs930
 	p.consumeLiteral(")")
-	return abstractions931
+	return abstractions933
 }
 
 func (p *Parser) parse_atom() *pb.Atom {
-	span_start937 := int64(p.spanStart())
+	span_start939 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("atom")
-	_t1704 := p.parse_relation_id()
-	relation_id932 := _t1704
-	xs933 := []*pb.Term{}
-	cond934 := (((((((((((((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 cond934 {
-		_t1705 := p.parse_term()
-		item935 := _t1705
-		xs933 = append(xs933, item935)
-		cond934 = (((((((((((((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))
-	}
-	terms936 := xs933
+	_t1708 := p.parse_relation_id()
+	relation_id934 := _t1708
+	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 {
+		_t1709 := p.parse_term()
+		item937 := _t1709
+		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
 	p.consumeLiteral(")")
-	_t1706 := &pb.Atom{Name: relation_id932, Terms: terms936}
-	result938 := _t1706
-	p.recordSpan(int(span_start937), "Atom")
-	return result938
+	_t1710 := &pb.Atom{Name: relation_id934, Terms: terms938}
+	result940 := _t1710
+	p.recordSpan(int(span_start939), "Atom")
+	return result940
 }
 
 func (p *Parser) parse_pragma() *pb.Pragma {
-	span_start944 := int64(p.spanStart())
+	span_start946 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("pragma")
-	_t1707 := p.parse_name()
-	name939 := _t1707
-	xs940 := []*pb.Term{}
-	cond941 := (((((((((((((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 cond941 {
-		_t1708 := p.parse_term()
-		item942 := _t1708
-		xs940 = append(xs940, item942)
-		cond941 = (((((((((((((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))
-	}
-	terms943 := xs940
+	_t1711 := p.parse_name()
+	name941 := _t1711
+	xs942 := []*pb.Term{}
+	cond943 := (((((((((((((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 cond943 {
+		_t1712 := p.parse_term()
+		item944 := _t1712
+		xs942 = append(xs942, item944)
+		cond943 = (((((((((((((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))
+	}
+	terms945 := xs942
 	p.consumeLiteral(")")
-	_t1709 := &pb.Pragma{Name: name939, Terms: terms943}
-	result945 := _t1709
-	p.recordSpan(int(span_start944), "Pragma")
-	return result945
+	_t1713 := &pb.Pragma{Name: name941, Terms: terms945}
+	result947 := _t1713
+	p.recordSpan(int(span_start946), "Pragma")
+	return result947
 }
 
 func (p *Parser) parse_primitive() *pb.Primitive {
-	span_start961 := int64(p.spanStart())
-	var _t1710 int64
+	span_start963 := int64(p.spanStart())
+	var _t1714 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1711 int64
+		var _t1715 int64
 		if p.matchLookaheadLiteral("primitive", 1) {
-			_t1711 = 9
+			_t1715 = 9
 		} else {
-			var _t1712 int64
+			var _t1716 int64
 			if p.matchLookaheadLiteral(">=", 1) {
-				_t1712 = 4
+				_t1716 = 4
 			} else {
-				var _t1713 int64
+				var _t1717 int64
 				if p.matchLookaheadLiteral(">", 1) {
-					_t1713 = 3
+					_t1717 = 3
 				} else {
-					var _t1714 int64
+					var _t1718 int64
 					if p.matchLookaheadLiteral("=", 1) {
-						_t1714 = 0
+						_t1718 = 0
 					} else {
-						var _t1715 int64
+						var _t1719 int64
 						if p.matchLookaheadLiteral("<=", 1) {
-							_t1715 = 2
+							_t1719 = 2
 						} else {
-							var _t1716 int64
+							var _t1720 int64
 							if p.matchLookaheadLiteral("<", 1) {
-								_t1716 = 1
+								_t1720 = 1
 							} else {
-								var _t1717 int64
+								var _t1721 int64
 								if p.matchLookaheadLiteral("/", 1) {
-									_t1717 = 8
+									_t1721 = 8
 								} else {
-									var _t1718 int64
+									var _t1722 int64
 									if p.matchLookaheadLiteral("-", 1) {
-										_t1718 = 6
+										_t1722 = 6
 									} else {
-										var _t1719 int64
+										var _t1723 int64
 										if p.matchLookaheadLiteral("+", 1) {
-											_t1719 = 5
+											_t1723 = 5
 										} else {
-											var _t1720 int64
+											var _t1724 int64
 											if p.matchLookaheadLiteral("*", 1) {
-												_t1720 = 7
+												_t1724 = 7
 											} else {
-												_t1720 = -1
+												_t1724 = -1
 											}
-											_t1719 = _t1720
+											_t1723 = _t1724
 										}
-										_t1718 = _t1719
+										_t1722 = _t1723
 									}
-									_t1717 = _t1718
+									_t1721 = _t1722
 								}
-								_t1716 = _t1717
+								_t1720 = _t1721
 							}
-							_t1715 = _t1716
+							_t1719 = _t1720
 						}
-						_t1714 = _t1715
+						_t1718 = _t1719
 					}
-					_t1713 = _t1714
+					_t1717 = _t1718
 				}
-				_t1712 = _t1713
+				_t1716 = _t1717
 			}
-			_t1711 = _t1712
+			_t1715 = _t1716
 		}
-		_t1710 = _t1711
+		_t1714 = _t1715
 	} else {
-		_t1710 = -1
+		_t1714 = -1
 	}
-	prediction946 := _t1710
-	var _t1721 *pb.Primitive
-	if prediction946 == 9 {
+	prediction948 := _t1714
+	var _t1725 *pb.Primitive
+	if prediction948 == 9 {
 		p.consumeLiteral("(")
 		p.consumeLiteral("primitive")
-		_t1722 := p.parse_name()
-		name956 := _t1722
-		xs957 := []*pb.RelTerm{}
-		cond958 := ((((((((((((((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 cond958 {
-			_t1723 := p.parse_rel_term()
-			item959 := _t1723
-			xs957 = append(xs957, item959)
-			cond958 = ((((((((((((((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))
+		_t1726 := p.parse_name()
+		name958 := _t1726
+		xs959 := []*pb.RelTerm{}
+		cond960 := ((((((((((((((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 cond960 {
+			_t1727 := p.parse_rel_term()
+			item961 := _t1727
+			xs959 = append(xs959, item961)
+			cond960 = ((((((((((((((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_terms960 := xs957
+		rel_terms962 := xs959
 		p.consumeLiteral(")")
-		_t1724 := &pb.Primitive{Name: name956, Terms: rel_terms960}
-		_t1721 = _t1724
+		_t1728 := &pb.Primitive{Name: name958, Terms: rel_terms962}
+		_t1725 = _t1728
 	} else {
-		var _t1725 *pb.Primitive
-		if prediction946 == 8 {
-			_t1726 := p.parse_divide()
-			divide955 := _t1726
-			_t1725 = divide955
+		var _t1729 *pb.Primitive
+		if prediction948 == 8 {
+			_t1730 := p.parse_divide()
+			divide957 := _t1730
+			_t1729 = divide957
 		} else {
-			var _t1727 *pb.Primitive
-			if prediction946 == 7 {
-				_t1728 := p.parse_multiply()
-				multiply954 := _t1728
-				_t1727 = multiply954
+			var _t1731 *pb.Primitive
+			if prediction948 == 7 {
+				_t1732 := p.parse_multiply()
+				multiply956 := _t1732
+				_t1731 = multiply956
 			} else {
-				var _t1729 *pb.Primitive
-				if prediction946 == 6 {
-					_t1730 := p.parse_minus()
-					minus953 := _t1730
-					_t1729 = minus953
+				var _t1733 *pb.Primitive
+				if prediction948 == 6 {
+					_t1734 := p.parse_minus()
+					minus955 := _t1734
+					_t1733 = minus955
 				} else {
-					var _t1731 *pb.Primitive
-					if prediction946 == 5 {
-						_t1732 := p.parse_add()
-						add952 := _t1732
-						_t1731 = add952
+					var _t1735 *pb.Primitive
+					if prediction948 == 5 {
+						_t1736 := p.parse_add()
+						add954 := _t1736
+						_t1735 = add954
 					} else {
-						var _t1733 *pb.Primitive
-						if prediction946 == 4 {
-							_t1734 := p.parse_gt_eq()
-							gt_eq951 := _t1734
-							_t1733 = gt_eq951
+						var _t1737 *pb.Primitive
+						if prediction948 == 4 {
+							_t1738 := p.parse_gt_eq()
+							gt_eq953 := _t1738
+							_t1737 = gt_eq953
 						} else {
-							var _t1735 *pb.Primitive
-							if prediction946 == 3 {
-								_t1736 := p.parse_gt()
-								gt950 := _t1736
-								_t1735 = gt950
+							var _t1739 *pb.Primitive
+							if prediction948 == 3 {
+								_t1740 := p.parse_gt()
+								gt952 := _t1740
+								_t1739 = gt952
 							} else {
-								var _t1737 *pb.Primitive
-								if prediction946 == 2 {
-									_t1738 := p.parse_lt_eq()
-									lt_eq949 := _t1738
-									_t1737 = lt_eq949
+								var _t1741 *pb.Primitive
+								if prediction948 == 2 {
+									_t1742 := p.parse_lt_eq()
+									lt_eq951 := _t1742
+									_t1741 = lt_eq951
 								} else {
-									var _t1739 *pb.Primitive
-									if prediction946 == 1 {
-										_t1740 := p.parse_lt()
-										lt948 := _t1740
-										_t1739 = lt948
+									var _t1743 *pb.Primitive
+									if prediction948 == 1 {
+										_t1744 := p.parse_lt()
+										lt950 := _t1744
+										_t1743 = lt950
 									} else {
-										var _t1741 *pb.Primitive
-										if prediction946 == 0 {
-											_t1742 := p.parse_eq()
-											eq947 := _t1742
-											_t1741 = eq947
+										var _t1745 *pb.Primitive
+										if prediction948 == 0 {
+											_t1746 := p.parse_eq()
+											eq949 := _t1746
+											_t1745 = eq949
 										} else {
 											panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in primitive", p.lookahead(0).Type, p.lookahead(0).Value)})
 										}
-										_t1739 = _t1741
+										_t1743 = _t1745
 									}
-									_t1737 = _t1739
+									_t1741 = _t1743
 								}
-								_t1735 = _t1737
+								_t1739 = _t1741
 							}
-							_t1733 = _t1735
+							_t1737 = _t1739
 						}
-						_t1731 = _t1733
+						_t1735 = _t1737
 					}
-					_t1729 = _t1731
+					_t1733 = _t1735
 				}
-				_t1727 = _t1729
+				_t1731 = _t1733
 			}
-			_t1725 = _t1727
+			_t1729 = _t1731
 		}
-		_t1721 = _t1725
+		_t1725 = _t1729
 	}
-	result962 := _t1721
-	p.recordSpan(int(span_start961), "Primitive")
-	return result962
+	result964 := _t1725
+	p.recordSpan(int(span_start963), "Primitive")
+	return result964
 }
 
 func (p *Parser) parse_eq() *pb.Primitive {
-	span_start965 := int64(p.spanStart())
+	span_start967 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("=")
-	_t1743 := p.parse_term()
-	term963 := _t1743
-	_t1744 := p.parse_term()
-	term_3964 := _t1744
+	_t1747 := p.parse_term()
+	term965 := _t1747
+	_t1748 := p.parse_term()
+	term_3966 := _t1748
 	p.consumeLiteral(")")
-	_t1745 := &pb.RelTerm{}
-	_t1745.RelTermType = &pb.RelTerm_Term{Term: term963}
-	_t1746 := &pb.RelTerm{}
-	_t1746.RelTermType = &pb.RelTerm_Term{Term: term_3964}
-	_t1747 := &pb.Primitive{Name: "rel_primitive_eq", Terms: []*pb.RelTerm{_t1745, _t1746}}
-	result966 := _t1747
-	p.recordSpan(int(span_start965), "Primitive")
-	return result966
+	_t1749 := &pb.RelTerm{}
+	_t1749.RelTermType = &pb.RelTerm_Term{Term: term965}
+	_t1750 := &pb.RelTerm{}
+	_t1750.RelTermType = &pb.RelTerm_Term{Term: term_3966}
+	_t1751 := &pb.Primitive{Name: "rel_primitive_eq", Terms: []*pb.RelTerm{_t1749, _t1750}}
+	result968 := _t1751
+	p.recordSpan(int(span_start967), "Primitive")
+	return result968
 }
 
 func (p *Parser) parse_lt() *pb.Primitive {
-	span_start969 := int64(p.spanStart())
+	span_start971 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("<")
-	_t1748 := p.parse_term()
-	term967 := _t1748
-	_t1749 := p.parse_term()
-	term_3968 := _t1749
+	_t1752 := p.parse_term()
+	term969 := _t1752
+	_t1753 := p.parse_term()
+	term_3970 := _t1753
 	p.consumeLiteral(")")
-	_t1750 := &pb.RelTerm{}
-	_t1750.RelTermType = &pb.RelTerm_Term{Term: term967}
-	_t1751 := &pb.RelTerm{}
-	_t1751.RelTermType = &pb.RelTerm_Term{Term: term_3968}
-	_t1752 := &pb.Primitive{Name: "rel_primitive_lt_monotype", Terms: []*pb.RelTerm{_t1750, _t1751}}
-	result970 := _t1752
-	p.recordSpan(int(span_start969), "Primitive")
-	return result970
+	_t1754 := &pb.RelTerm{}
+	_t1754.RelTermType = &pb.RelTerm_Term{Term: term969}
+	_t1755 := &pb.RelTerm{}
+	_t1755.RelTermType = &pb.RelTerm_Term{Term: term_3970}
+	_t1756 := &pb.Primitive{Name: "rel_primitive_lt_monotype", Terms: []*pb.RelTerm{_t1754, _t1755}}
+	result972 := _t1756
+	p.recordSpan(int(span_start971), "Primitive")
+	return result972
 }
 
 func (p *Parser) parse_lt_eq() *pb.Primitive {
-	span_start973 := int64(p.spanStart())
+	span_start975 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("<=")
-	_t1753 := p.parse_term()
-	term971 := _t1753
-	_t1754 := p.parse_term()
-	term_3972 := _t1754
+	_t1757 := p.parse_term()
+	term973 := _t1757
+	_t1758 := p.parse_term()
+	term_3974 := _t1758
 	p.consumeLiteral(")")
-	_t1755 := &pb.RelTerm{}
-	_t1755.RelTermType = &pb.RelTerm_Term{Term: term971}
-	_t1756 := &pb.RelTerm{}
-	_t1756.RelTermType = &pb.RelTerm_Term{Term: term_3972}
-	_t1757 := &pb.Primitive{Name: "rel_primitive_lt_eq_monotype", Terms: []*pb.RelTerm{_t1755, _t1756}}
-	result974 := _t1757
-	p.recordSpan(int(span_start973), "Primitive")
-	return result974
+	_t1759 := &pb.RelTerm{}
+	_t1759.RelTermType = &pb.RelTerm_Term{Term: term973}
+	_t1760 := &pb.RelTerm{}
+	_t1760.RelTermType = &pb.RelTerm_Term{Term: term_3974}
+	_t1761 := &pb.Primitive{Name: "rel_primitive_lt_eq_monotype", Terms: []*pb.RelTerm{_t1759, _t1760}}
+	result976 := _t1761
+	p.recordSpan(int(span_start975), "Primitive")
+	return result976
 }
 
 func (p *Parser) parse_gt() *pb.Primitive {
-	span_start977 := int64(p.spanStart())
+	span_start979 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral(">")
-	_t1758 := p.parse_term()
-	term975 := _t1758
-	_t1759 := p.parse_term()
-	term_3976 := _t1759
+	_t1762 := p.parse_term()
+	term977 := _t1762
+	_t1763 := p.parse_term()
+	term_3978 := _t1763
 	p.consumeLiteral(")")
-	_t1760 := &pb.RelTerm{}
-	_t1760.RelTermType = &pb.RelTerm_Term{Term: term975}
-	_t1761 := &pb.RelTerm{}
-	_t1761.RelTermType = &pb.RelTerm_Term{Term: term_3976}
-	_t1762 := &pb.Primitive{Name: "rel_primitive_gt_monotype", Terms: []*pb.RelTerm{_t1760, _t1761}}
-	result978 := _t1762
-	p.recordSpan(int(span_start977), "Primitive")
-	return result978
+	_t1764 := &pb.RelTerm{}
+	_t1764.RelTermType = &pb.RelTerm_Term{Term: term977}
+	_t1765 := &pb.RelTerm{}
+	_t1765.RelTermType = &pb.RelTerm_Term{Term: term_3978}
+	_t1766 := &pb.Primitive{Name: "rel_primitive_gt_monotype", Terms: []*pb.RelTerm{_t1764, _t1765}}
+	result980 := _t1766
+	p.recordSpan(int(span_start979), "Primitive")
+	return result980
 }
 
 func (p *Parser) parse_gt_eq() *pb.Primitive {
-	span_start981 := int64(p.spanStart())
+	span_start983 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral(">=")
-	_t1763 := p.parse_term()
-	term979 := _t1763
-	_t1764 := p.parse_term()
-	term_3980 := _t1764
+	_t1767 := p.parse_term()
+	term981 := _t1767
+	_t1768 := p.parse_term()
+	term_3982 := _t1768
 	p.consumeLiteral(")")
-	_t1765 := &pb.RelTerm{}
-	_t1765.RelTermType = &pb.RelTerm_Term{Term: term979}
-	_t1766 := &pb.RelTerm{}
-	_t1766.RelTermType = &pb.RelTerm_Term{Term: term_3980}
-	_t1767 := &pb.Primitive{Name: "rel_primitive_gt_eq_monotype", Terms: []*pb.RelTerm{_t1765, _t1766}}
-	result982 := _t1767
-	p.recordSpan(int(span_start981), "Primitive")
-	return result982
+	_t1769 := &pb.RelTerm{}
+	_t1769.RelTermType = &pb.RelTerm_Term{Term: term981}
+	_t1770 := &pb.RelTerm{}
+	_t1770.RelTermType = &pb.RelTerm_Term{Term: term_3982}
+	_t1771 := &pb.Primitive{Name: "rel_primitive_gt_eq_monotype", Terms: []*pb.RelTerm{_t1769, _t1770}}
+	result984 := _t1771
+	p.recordSpan(int(span_start983), "Primitive")
+	return result984
 }
 
 func (p *Parser) parse_add() *pb.Primitive {
-	span_start986 := int64(p.spanStart())
+	span_start988 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("+")
-	_t1768 := p.parse_term()
-	term983 := _t1768
-	_t1769 := p.parse_term()
-	term_3984 := _t1769
-	_t1770 := p.parse_term()
-	term_4985 := _t1770
+	_t1772 := p.parse_term()
+	term985 := _t1772
+	_t1773 := p.parse_term()
+	term_3986 := _t1773
+	_t1774 := p.parse_term()
+	term_4987 := _t1774
 	p.consumeLiteral(")")
-	_t1771 := &pb.RelTerm{}
-	_t1771.RelTermType = &pb.RelTerm_Term{Term: term983}
-	_t1772 := &pb.RelTerm{}
-	_t1772.RelTermType = &pb.RelTerm_Term{Term: term_3984}
-	_t1773 := &pb.RelTerm{}
-	_t1773.RelTermType = &pb.RelTerm_Term{Term: term_4985}
-	_t1774 := &pb.Primitive{Name: "rel_primitive_add_monotype", Terms: []*pb.RelTerm{_t1771, _t1772, _t1773}}
-	result987 := _t1774
-	p.recordSpan(int(span_start986), "Primitive")
-	return result987
+	_t1775 := &pb.RelTerm{}
+	_t1775.RelTermType = &pb.RelTerm_Term{Term: term985}
+	_t1776 := &pb.RelTerm{}
+	_t1776.RelTermType = &pb.RelTerm_Term{Term: term_3986}
+	_t1777 := &pb.RelTerm{}
+	_t1777.RelTermType = &pb.RelTerm_Term{Term: term_4987}
+	_t1778 := &pb.Primitive{Name: "rel_primitive_add_monotype", Terms: []*pb.RelTerm{_t1775, _t1776, _t1777}}
+	result989 := _t1778
+	p.recordSpan(int(span_start988), "Primitive")
+	return result989
 }
 
 func (p *Parser) parse_minus() *pb.Primitive {
-	span_start991 := int64(p.spanStart())
+	span_start993 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("-")
-	_t1775 := p.parse_term()
-	term988 := _t1775
-	_t1776 := p.parse_term()
-	term_3989 := _t1776
-	_t1777 := p.parse_term()
-	term_4990 := _t1777
+	_t1779 := p.parse_term()
+	term990 := _t1779
+	_t1780 := p.parse_term()
+	term_3991 := _t1780
+	_t1781 := p.parse_term()
+	term_4992 := _t1781
 	p.consumeLiteral(")")
-	_t1778 := &pb.RelTerm{}
-	_t1778.RelTermType = &pb.RelTerm_Term{Term: term988}
-	_t1779 := &pb.RelTerm{}
-	_t1779.RelTermType = &pb.RelTerm_Term{Term: term_3989}
-	_t1780 := &pb.RelTerm{}
-	_t1780.RelTermType = &pb.RelTerm_Term{Term: term_4990}
-	_t1781 := &pb.Primitive{Name: "rel_primitive_subtract_monotype", Terms: []*pb.RelTerm{_t1778, _t1779, _t1780}}
-	result992 := _t1781
-	p.recordSpan(int(span_start991), "Primitive")
-	return result992
+	_t1782 := &pb.RelTerm{}
+	_t1782.RelTermType = &pb.RelTerm_Term{Term: term990}
+	_t1783 := &pb.RelTerm{}
+	_t1783.RelTermType = &pb.RelTerm_Term{Term: term_3991}
+	_t1784 := &pb.RelTerm{}
+	_t1784.RelTermType = &pb.RelTerm_Term{Term: term_4992}
+	_t1785 := &pb.Primitive{Name: "rel_primitive_subtract_monotype", Terms: []*pb.RelTerm{_t1782, _t1783, _t1784}}
+	result994 := _t1785
+	p.recordSpan(int(span_start993), "Primitive")
+	return result994
 }
 
 func (p *Parser) parse_multiply() *pb.Primitive {
-	span_start996 := int64(p.spanStart())
+	span_start998 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("*")
-	_t1782 := p.parse_term()
-	term993 := _t1782
-	_t1783 := p.parse_term()
-	term_3994 := _t1783
-	_t1784 := p.parse_term()
-	term_4995 := _t1784
+	_t1786 := p.parse_term()
+	term995 := _t1786
+	_t1787 := p.parse_term()
+	term_3996 := _t1787
+	_t1788 := p.parse_term()
+	term_4997 := _t1788
 	p.consumeLiteral(")")
-	_t1785 := &pb.RelTerm{}
-	_t1785.RelTermType = &pb.RelTerm_Term{Term: term993}
-	_t1786 := &pb.RelTerm{}
-	_t1786.RelTermType = &pb.RelTerm_Term{Term: term_3994}
-	_t1787 := &pb.RelTerm{}
-	_t1787.RelTermType = &pb.RelTerm_Term{Term: term_4995}
-	_t1788 := &pb.Primitive{Name: "rel_primitive_multiply_monotype", Terms: []*pb.RelTerm{_t1785, _t1786, _t1787}}
-	result997 := _t1788
-	p.recordSpan(int(span_start996), "Primitive")
-	return result997
+	_t1789 := &pb.RelTerm{}
+	_t1789.RelTermType = &pb.RelTerm_Term{Term: term995}
+	_t1790 := &pb.RelTerm{}
+	_t1790.RelTermType = &pb.RelTerm_Term{Term: term_3996}
+	_t1791 := &pb.RelTerm{}
+	_t1791.RelTermType = &pb.RelTerm_Term{Term: term_4997}
+	_t1792 := &pb.Primitive{Name: "rel_primitive_multiply_monotype", Terms: []*pb.RelTerm{_t1789, _t1790, _t1791}}
+	result999 := _t1792
+	p.recordSpan(int(span_start998), "Primitive")
+	return result999
 }
 
 func (p *Parser) parse_divide() *pb.Primitive {
-	span_start1001 := int64(p.spanStart())
+	span_start1003 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("/")
-	_t1789 := p.parse_term()
-	term998 := _t1789
-	_t1790 := p.parse_term()
-	term_3999 := _t1790
-	_t1791 := p.parse_term()
-	term_41000 := _t1791
+	_t1793 := p.parse_term()
+	term1000 := _t1793
+	_t1794 := p.parse_term()
+	term_31001 := _t1794
+	_t1795 := p.parse_term()
+	term_41002 := _t1795
 	p.consumeLiteral(")")
-	_t1792 := &pb.RelTerm{}
-	_t1792.RelTermType = &pb.RelTerm_Term{Term: term998}
-	_t1793 := &pb.RelTerm{}
-	_t1793.RelTermType = &pb.RelTerm_Term{Term: term_3999}
-	_t1794 := &pb.RelTerm{}
-	_t1794.RelTermType = &pb.RelTerm_Term{Term: term_41000}
-	_t1795 := &pb.Primitive{Name: "rel_primitive_divide_monotype", Terms: []*pb.RelTerm{_t1792, _t1793, _t1794}}
-	result1002 := _t1795
-	p.recordSpan(int(span_start1001), "Primitive")
-	return result1002
+	_t1796 := &pb.RelTerm{}
+	_t1796.RelTermType = &pb.RelTerm_Term{Term: term1000}
+	_t1797 := &pb.RelTerm{}
+	_t1797.RelTermType = &pb.RelTerm_Term{Term: term_31001}
+	_t1798 := &pb.RelTerm{}
+	_t1798.RelTermType = &pb.RelTerm_Term{Term: term_41002}
+	_t1799 := &pb.Primitive{Name: "rel_primitive_divide_monotype", Terms: []*pb.RelTerm{_t1796, _t1797, _t1798}}
+	result1004 := _t1799
+	p.recordSpan(int(span_start1003), "Primitive")
+	return result1004
 }
 
 func (p *Parser) parse_rel_term() *pb.RelTerm {
-	span_start1006 := int64(p.spanStart())
-	var _t1796 int64
+	span_start1008 := int64(p.spanStart())
+	var _t1800 int64
 	if p.matchLookaheadLiteral("true", 0) {
-		_t1796 = 1
+		_t1800 = 1
 	} else {
-		var _t1797 int64
+		var _t1801 int64
 		if p.matchLookaheadLiteral("missing", 0) {
-			_t1797 = 1
+			_t1801 = 1
 		} else {
-			var _t1798 int64
+			var _t1802 int64
 			if p.matchLookaheadLiteral("false", 0) {
-				_t1798 = 1
+				_t1802 = 1
 			} else {
-				var _t1799 int64
+				var _t1803 int64
 				if p.matchLookaheadLiteral("(", 0) {
-					_t1799 = 1
+					_t1803 = 1
 				} else {
-					var _t1800 int64
+					var _t1804 int64
 					if p.matchLookaheadLiteral("#", 0) {
-						_t1800 = 0
+						_t1804 = 0
 					} else {
-						var _t1801 int64
+						var _t1805 int64
 						if p.matchLookaheadTerminal("SYMBOL", 0) {
-							_t1801 = 1
+							_t1805 = 1
 						} else {
-							var _t1802 int64
+							var _t1806 int64
 							if p.matchLookaheadTerminal("UINT32", 0) {
-								_t1802 = 1
+								_t1806 = 1
 							} else {
-								var _t1803 int64
+								var _t1807 int64
 								if p.matchLookaheadTerminal("UINT128", 0) {
-									_t1803 = 1
+									_t1807 = 1
 								} else {
-									var _t1804 int64
+									var _t1808 int64
 									if p.matchLookaheadTerminal("STRING", 0) {
-										_t1804 = 1
+										_t1808 = 1
 									} else {
-										var _t1805 int64
+										var _t1809 int64
 										if p.matchLookaheadTerminal("INT32", 0) {
-											_t1805 = 1
+											_t1809 = 1
 										} else {
-											var _t1806 int64
+											var _t1810 int64
 											if p.matchLookaheadTerminal("INT128", 0) {
-												_t1806 = 1
+												_t1810 = 1
 											} else {
-												var _t1807 int64
+												var _t1811 int64
 												if p.matchLookaheadTerminal("INT", 0) {
-													_t1807 = 1
+													_t1811 = 1
 												} else {
-													var _t1808 int64
+													var _t1812 int64
 													if p.matchLookaheadTerminal("FLOAT32", 0) {
-														_t1808 = 1
+														_t1812 = 1
 													} else {
-														var _t1809 int64
+														var _t1813 int64
 														if p.matchLookaheadTerminal("FLOAT", 0) {
-															_t1809 = 1
+															_t1813 = 1
 														} else {
-															var _t1810 int64
+															var _t1814 int64
 															if p.matchLookaheadTerminal("DECIMAL", 0) {
-																_t1810 = 1
+																_t1814 = 1
 															} else {
-																_t1810 = -1
+																_t1814 = -1
 															}
-															_t1809 = _t1810
+															_t1813 = _t1814
 														}
-														_t1808 = _t1809
+														_t1812 = _t1813
 													}
-													_t1807 = _t1808
+													_t1811 = _t1812
 												}
-												_t1806 = _t1807
+												_t1810 = _t1811
 											}
-											_t1805 = _t1806
+											_t1809 = _t1810
 										}
-										_t1804 = _t1805
+										_t1808 = _t1809
 									}
-									_t1803 = _t1804
+									_t1807 = _t1808
 								}
-								_t1802 = _t1803
+								_t1806 = _t1807
 							}
-							_t1801 = _t1802
+							_t1805 = _t1806
 						}
-						_t1800 = _t1801
+						_t1804 = _t1805
 					}
-					_t1799 = _t1800
+					_t1803 = _t1804
 				}
-				_t1798 = _t1799
+				_t1802 = _t1803
 			}
-			_t1797 = _t1798
+			_t1801 = _t1802
 		}
-		_t1796 = _t1797
-	}
-	prediction1003 := _t1796
-	var _t1811 *pb.RelTerm
-	if prediction1003 == 1 {
-		_t1812 := p.parse_term()
-		term1005 := _t1812
-		_t1813 := &pb.RelTerm{}
-		_t1813.RelTermType = &pb.RelTerm_Term{Term: term1005}
-		_t1811 = _t1813
+		_t1800 = _t1801
+	}
+	prediction1005 := _t1800
+	var _t1815 *pb.RelTerm
+	if prediction1005 == 1 {
+		_t1816 := p.parse_term()
+		term1007 := _t1816
+		_t1817 := &pb.RelTerm{}
+		_t1817.RelTermType = &pb.RelTerm_Term{Term: term1007}
+		_t1815 = _t1817
 	} else {
-		var _t1814 *pb.RelTerm
-		if prediction1003 == 0 {
-			_t1815 := p.parse_specialized_value()
-			specialized_value1004 := _t1815
-			_t1816 := &pb.RelTerm{}
-			_t1816.RelTermType = &pb.RelTerm_SpecializedValue{SpecializedValue: specialized_value1004}
-			_t1814 = _t1816
+		var _t1818 *pb.RelTerm
+		if prediction1005 == 0 {
+			_t1819 := p.parse_specialized_value()
+			specialized_value1006 := _t1819
+			_t1820 := &pb.RelTerm{}
+			_t1820.RelTermType = &pb.RelTerm_SpecializedValue{SpecializedValue: specialized_value1006}
+			_t1818 = _t1820
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in rel_term", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1811 = _t1814
+		_t1815 = _t1818
 	}
-	result1007 := _t1811
-	p.recordSpan(int(span_start1006), "RelTerm")
-	return result1007
+	result1009 := _t1815
+	p.recordSpan(int(span_start1008), "RelTerm")
+	return result1009
 }
 
 func (p *Parser) parse_specialized_value() *pb.Value {
-	span_start1009 := int64(p.spanStart())
+	span_start1011 := int64(p.spanStart())
 	p.consumeLiteral("#")
-	_t1817 := p.parse_raw_value()
-	raw_value1008 := _t1817
-	result1010 := raw_value1008
-	p.recordSpan(int(span_start1009), "Value")
-	return result1010
+	_t1821 := p.parse_raw_value()
+	raw_value1010 := _t1821
+	result1012 := raw_value1010
+	p.recordSpan(int(span_start1011), "Value")
+	return result1012
 }
 
 func (p *Parser) parse_rel_atom() *pb.RelAtom {
-	span_start1016 := int64(p.spanStart())
+	span_start1018 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("relatom")
-	_t1818 := p.parse_name()
-	name1011 := _t1818
-	xs1012 := []*pb.RelTerm{}
-	cond1013 := ((((((((((((((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 cond1013 {
-		_t1819 := p.parse_rel_term()
-		item1014 := _t1819
-		xs1012 = append(xs1012, item1014)
-		cond1013 = ((((((((((((((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_terms1015 := xs1012
+	_t1822 := p.parse_name()
+	name1013 := _t1822
+	xs1014 := []*pb.RelTerm{}
+	cond1015 := ((((((((((((((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 cond1015 {
+		_t1823 := p.parse_rel_term()
+		item1016 := _t1823
+		xs1014 = append(xs1014, item1016)
+		cond1015 = ((((((((((((((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_terms1017 := xs1014
 	p.consumeLiteral(")")
-	_t1820 := &pb.RelAtom{Name: name1011, Terms: rel_terms1015}
-	result1017 := _t1820
-	p.recordSpan(int(span_start1016), "RelAtom")
-	return result1017
+	_t1824 := &pb.RelAtom{Name: name1013, Terms: rel_terms1017}
+	result1019 := _t1824
+	p.recordSpan(int(span_start1018), "RelAtom")
+	return result1019
 }
 
 func (p *Parser) parse_cast() *pb.Cast {
-	span_start1020 := int64(p.spanStart())
+	span_start1022 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("cast")
-	_t1821 := p.parse_term()
-	term1018 := _t1821
-	_t1822 := p.parse_term()
-	term_31019 := _t1822
+	_t1825 := p.parse_term()
+	term1020 := _t1825
+	_t1826 := p.parse_term()
+	term_31021 := _t1826
 	p.consumeLiteral(")")
-	_t1823 := &pb.Cast{Input: term1018, Result: term_31019}
-	result1021 := _t1823
-	p.recordSpan(int(span_start1020), "Cast")
-	return result1021
+	_t1827 := &pb.Cast{Input: term1020, Result: term_31021}
+	result1023 := _t1827
+	p.recordSpan(int(span_start1022), "Cast")
+	return result1023
 }
 
 func (p *Parser) parse_attrs() []*pb.Attribute {
 	p.consumeLiteral("(")
 	p.consumeLiteral("attrs")
-	xs1022 := []*pb.Attribute{}
-	cond1023 := p.matchLookaheadLiteral("(", 0)
-	for cond1023 {
-		_t1824 := p.parse_attribute()
-		item1024 := _t1824
-		xs1022 = append(xs1022, item1024)
-		cond1023 = p.matchLookaheadLiteral("(", 0)
-	}
-	attributes1025 := xs1022
+	xs1024 := []*pb.Attribute{}
+	cond1025 := p.matchLookaheadLiteral("(", 0)
+	for cond1025 {
+		_t1828 := p.parse_attribute()
+		item1026 := _t1828
+		xs1024 = append(xs1024, item1026)
+		cond1025 = p.matchLookaheadLiteral("(", 0)
+	}
+	attributes1027 := xs1024
 	p.consumeLiteral(")")
-	return attributes1025
+	return attributes1027
 }
 
 func (p *Parser) parse_attribute() *pb.Attribute {
-	span_start1031 := int64(p.spanStart())
+	span_start1033 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("attribute")
-	_t1825 := p.parse_name()
-	name1026 := _t1825
-	xs1027 := []*pb.Value{}
-	cond1028 := ((((((((((((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 cond1028 {
-		_t1826 := p.parse_raw_value()
-		item1029 := _t1826
-		xs1027 = append(xs1027, item1029)
-		cond1028 = ((((((((((((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_values1030 := xs1027
+	_t1829 := p.parse_name()
+	name1028 := _t1829
+	xs1029 := []*pb.Value{}
+	cond1030 := ((((((((((((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 cond1030 {
+		_t1830 := p.parse_raw_value()
+		item1031 := _t1830
+		xs1029 = append(xs1029, item1031)
+		cond1030 = ((((((((((((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_values1032 := xs1029
 	p.consumeLiteral(")")
-	_t1827 := &pb.Attribute{Name: name1026, Args: raw_values1030}
-	result1032 := _t1827
-	p.recordSpan(int(span_start1031), "Attribute")
-	return result1032
+	_t1831 := &pb.Attribute{Name: name1028, Args: raw_values1032}
+	result1034 := _t1831
+	p.recordSpan(int(span_start1033), "Attribute")
+	return result1034
 }
 
 func (p *Parser) parse_algorithm() *pb.Algorithm {
-	span_start1038 := int64(p.spanStart())
+	span_start1041 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("algorithm")
-	xs1033 := []*pb.RelationId{}
-	cond1034 := (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
-	for cond1034 {
-		_t1828 := p.parse_relation_id()
-		item1035 := _t1828
-		xs1033 = append(xs1033, item1035)
-		cond1034 = (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
-	}
-	relation_ids1036 := xs1033
-	_t1829 := p.parse_script()
-	script1037 := _t1829
+	xs1035 := []*pb.RelationId{}
+	cond1036 := (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
+	for cond1036 {
+		_t1832 := p.parse_relation_id()
+		item1037 := _t1832
+		xs1035 = append(xs1035, item1037)
+		cond1036 = (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
+	}
+	relation_ids1038 := xs1035
+	_t1833 := p.parse_script()
+	script1039 := _t1833
+	var _t1834 []*pb.Attribute
+	if p.matchLookaheadLiteral("(", 0) {
+		_t1835 := p.parse_attrs()
+		_t1834 = _t1835
+	}
+	attrs1040 := _t1834
 	p.consumeLiteral(")")
-	_t1830 := &pb.Algorithm{Global: relation_ids1036, Body: script1037}
-	result1039 := _t1830
-	p.recordSpan(int(span_start1038), "Algorithm")
-	return result1039
+	_t1836 := attrs1040
+	if attrs1040 == nil {
+		_t1836 = []*pb.Attribute{}
+	}
+	_t1837 := &pb.Algorithm{Global: relation_ids1038, Body: script1039, Attrs: _t1836}
+	result1042 := _t1837
+	p.recordSpan(int(span_start1041), "Algorithm")
+	return result1042
 }
 
 func (p *Parser) parse_script() *pb.Script {
-	span_start1044 := int64(p.spanStart())
+	span_start1047 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("script")
-	xs1040 := []*pb.Construct{}
-	cond1041 := p.matchLookaheadLiteral("(", 0)
-	for cond1041 {
-		_t1831 := p.parse_construct()
-		item1042 := _t1831
-		xs1040 = append(xs1040, item1042)
-		cond1041 = p.matchLookaheadLiteral("(", 0)
-	}
-	constructs1043 := xs1040
+	xs1043 := []*pb.Construct{}
+	cond1044 := p.matchLookaheadLiteral("(", 0)
+	for cond1044 {
+		_t1838 := p.parse_construct()
+		item1045 := _t1838
+		xs1043 = append(xs1043, item1045)
+		cond1044 = p.matchLookaheadLiteral("(", 0)
+	}
+	constructs1046 := xs1043
 	p.consumeLiteral(")")
-	_t1832 := &pb.Script{Constructs: constructs1043}
-	result1045 := _t1832
-	p.recordSpan(int(span_start1044), "Script")
-	return result1045
+	_t1839 := &pb.Script{Constructs: constructs1046}
+	result1048 := _t1839
+	p.recordSpan(int(span_start1047), "Script")
+	return result1048
 }
 
 func (p *Parser) parse_construct() *pb.Construct {
-	span_start1049 := int64(p.spanStart())
-	var _t1833 int64
+	span_start1052 := int64(p.spanStart())
+	var _t1840 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1834 int64
+		var _t1841 int64
 		if p.matchLookaheadLiteral("upsert", 1) {
-			_t1834 = 1
+			_t1841 = 1
 		} else {
-			var _t1835 int64
+			var _t1842 int64
 			if p.matchLookaheadLiteral("monus", 1) {
-				_t1835 = 1
+				_t1842 = 1
 			} else {
-				var _t1836 int64
+				var _t1843 int64
 				if p.matchLookaheadLiteral("monoid", 1) {
-					_t1836 = 1
+					_t1843 = 1
 				} else {
-					var _t1837 int64
+					var _t1844 int64
 					if p.matchLookaheadLiteral("loop", 1) {
-						_t1837 = 0
+						_t1844 = 0
 					} else {
-						var _t1838 int64
+						var _t1845 int64
 						if p.matchLookaheadLiteral("break", 1) {
-							_t1838 = 1
+							_t1845 = 1
 						} else {
-							var _t1839 int64
+							var _t1846 int64
 							if p.matchLookaheadLiteral("assign", 1) {
-								_t1839 = 1
+								_t1846 = 1
 							} else {
-								_t1839 = -1
+								_t1846 = -1
 							}
-							_t1838 = _t1839
+							_t1845 = _t1846
 						}
-						_t1837 = _t1838
+						_t1844 = _t1845
 					}
-					_t1836 = _t1837
+					_t1843 = _t1844
 				}
-				_t1835 = _t1836
+				_t1842 = _t1843
 			}
-			_t1834 = _t1835
+			_t1841 = _t1842
 		}
-		_t1833 = _t1834
+		_t1840 = _t1841
 	} else {
-		_t1833 = -1
-	}
-	prediction1046 := _t1833
-	var _t1840 *pb.Construct
-	if prediction1046 == 1 {
-		_t1841 := p.parse_instruction()
-		instruction1048 := _t1841
-		_t1842 := &pb.Construct{}
-		_t1842.ConstructType = &pb.Construct_Instruction{Instruction: instruction1048}
-		_t1840 = _t1842
+		_t1840 = -1
+	}
+	prediction1049 := _t1840
+	var _t1847 *pb.Construct
+	if prediction1049 == 1 {
+		_t1848 := p.parse_instruction()
+		instruction1051 := _t1848
+		_t1849 := &pb.Construct{}
+		_t1849.ConstructType = &pb.Construct_Instruction{Instruction: instruction1051}
+		_t1847 = _t1849
 	} else {
-		var _t1843 *pb.Construct
-		if prediction1046 == 0 {
-			_t1844 := p.parse_loop()
-			loop1047 := _t1844
-			_t1845 := &pb.Construct{}
-			_t1845.ConstructType = &pb.Construct_Loop{Loop: loop1047}
-			_t1843 = _t1845
+		var _t1850 *pb.Construct
+		if prediction1049 == 0 {
+			_t1851 := p.parse_loop()
+			loop1050 := _t1851
+			_t1852 := &pb.Construct{}
+			_t1852.ConstructType = &pb.Construct_Loop{Loop: loop1050}
+			_t1850 = _t1852
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in construct", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1840 = _t1843
+		_t1847 = _t1850
 	}
-	result1050 := _t1840
-	p.recordSpan(int(span_start1049), "Construct")
-	return result1050
+	result1053 := _t1847
+	p.recordSpan(int(span_start1052), "Construct")
+	return result1053
 }
 
 func (p *Parser) parse_loop() *pb.Loop {
-	span_start1053 := int64(p.spanStart())
+	span_start1057 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("loop")
-	_t1846 := p.parse_init()
-	init1051 := _t1846
-	_t1847 := p.parse_script()
-	script1052 := _t1847
+	_t1853 := p.parse_init()
+	init1054 := _t1853
+	_t1854 := p.parse_script()
+	script1055 := _t1854
+	var _t1855 []*pb.Attribute
+	if p.matchLookaheadLiteral("(", 0) {
+		_t1856 := p.parse_attrs()
+		_t1855 = _t1856
+	}
+	attrs1056 := _t1855
 	p.consumeLiteral(")")
-	_t1848 := &pb.Loop{Init: init1051, Body: script1052}
-	result1054 := _t1848
-	p.recordSpan(int(span_start1053), "Loop")
-	return result1054
+	_t1857 := attrs1056
+	if attrs1056 == nil {
+		_t1857 = []*pb.Attribute{}
+	}
+	_t1858 := &pb.Loop{Init: init1054, Body: script1055, Attrs: _t1857}
+	result1058 := _t1858
+	p.recordSpan(int(span_start1057), "Loop")
+	return result1058
 }
 
 func (p *Parser) parse_init() []*pb.Instruction {
 	p.consumeLiteral("(")
 	p.consumeLiteral("init")
-	xs1055 := []*pb.Instruction{}
-	cond1056 := p.matchLookaheadLiteral("(", 0)
-	for cond1056 {
-		_t1849 := p.parse_instruction()
-		item1057 := _t1849
-		xs1055 = append(xs1055, item1057)
-		cond1056 = p.matchLookaheadLiteral("(", 0)
-	}
-	instructions1058 := xs1055
+	xs1059 := []*pb.Instruction{}
+	cond1060 := p.matchLookaheadLiteral("(", 0)
+	for cond1060 {
+		_t1859 := p.parse_instruction()
+		item1061 := _t1859
+		xs1059 = append(xs1059, item1061)
+		cond1060 = p.matchLookaheadLiteral("(", 0)
+	}
+	instructions1062 := xs1059
 	p.consumeLiteral(")")
-	return instructions1058
+	return instructions1062
 }
 
 func (p *Parser) parse_instruction() *pb.Instruction {
-	span_start1065 := int64(p.spanStart())
-	var _t1850 int64
+	span_start1069 := int64(p.spanStart())
+	var _t1860 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1851 int64
+		var _t1861 int64
 		if p.matchLookaheadLiteral("upsert", 1) {
-			_t1851 = 1
+			_t1861 = 1
 		} else {
-			var _t1852 int64
+			var _t1862 int64
 			if p.matchLookaheadLiteral("monus", 1) {
-				_t1852 = 4
+				_t1862 = 4
 			} else {
-				var _t1853 int64
+				var _t1863 int64
 				if p.matchLookaheadLiteral("monoid", 1) {
-					_t1853 = 3
+					_t1863 = 3
 				} else {
-					var _t1854 int64
+					var _t1864 int64
 					if p.matchLookaheadLiteral("break", 1) {
-						_t1854 = 2
+						_t1864 = 2
 					} else {
-						var _t1855 int64
+						var _t1865 int64
 						if p.matchLookaheadLiteral("assign", 1) {
-							_t1855 = 0
+							_t1865 = 0
 						} else {
-							_t1855 = -1
+							_t1865 = -1
 						}
-						_t1854 = _t1855
+						_t1864 = _t1865
 					}
-					_t1853 = _t1854
+					_t1863 = _t1864
 				}
-				_t1852 = _t1853
+				_t1862 = _t1863
 			}
-			_t1851 = _t1852
+			_t1861 = _t1862
 		}
-		_t1850 = _t1851
+		_t1860 = _t1861
 	} else {
-		_t1850 = -1
-	}
-	prediction1059 := _t1850
-	var _t1856 *pb.Instruction
-	if prediction1059 == 4 {
-		_t1857 := p.parse_monus_def()
-		monus_def1064 := _t1857
-		_t1858 := &pb.Instruction{}
-		_t1858.InstrType = &pb.Instruction_MonusDef{MonusDef: monus_def1064}
-		_t1856 = _t1858
+		_t1860 = -1
+	}
+	prediction1063 := _t1860
+	var _t1866 *pb.Instruction
+	if prediction1063 == 4 {
+		_t1867 := p.parse_monus_def()
+		monus_def1068 := _t1867
+		_t1868 := &pb.Instruction{}
+		_t1868.InstrType = &pb.Instruction_MonusDef{MonusDef: monus_def1068}
+		_t1866 = _t1868
 	} else {
-		var _t1859 *pb.Instruction
-		if prediction1059 == 3 {
-			_t1860 := p.parse_monoid_def()
-			monoid_def1063 := _t1860
-			_t1861 := &pb.Instruction{}
-			_t1861.InstrType = &pb.Instruction_MonoidDef{MonoidDef: monoid_def1063}
-			_t1859 = _t1861
+		var _t1869 *pb.Instruction
+		if prediction1063 == 3 {
+			_t1870 := p.parse_monoid_def()
+			monoid_def1067 := _t1870
+			_t1871 := &pb.Instruction{}
+			_t1871.InstrType = &pb.Instruction_MonoidDef{MonoidDef: monoid_def1067}
+			_t1869 = _t1871
 		} else {
-			var _t1862 *pb.Instruction
-			if prediction1059 == 2 {
-				_t1863 := p.parse_break()
-				break1062 := _t1863
-				_t1864 := &pb.Instruction{}
-				_t1864.InstrType = &pb.Instruction_Break{Break: break1062}
-				_t1862 = _t1864
+			var _t1872 *pb.Instruction
+			if prediction1063 == 2 {
+				_t1873 := p.parse_break()
+				break1066 := _t1873
+				_t1874 := &pb.Instruction{}
+				_t1874.InstrType = &pb.Instruction_Break{Break: break1066}
+				_t1872 = _t1874
 			} else {
-				var _t1865 *pb.Instruction
-				if prediction1059 == 1 {
-					_t1866 := p.parse_upsert()
-					upsert1061 := _t1866
-					_t1867 := &pb.Instruction{}
-					_t1867.InstrType = &pb.Instruction_Upsert{Upsert: upsert1061}
-					_t1865 = _t1867
+				var _t1875 *pb.Instruction
+				if prediction1063 == 1 {
+					_t1876 := p.parse_upsert()
+					upsert1065 := _t1876
+					_t1877 := &pb.Instruction{}
+					_t1877.InstrType = &pb.Instruction_Upsert{Upsert: upsert1065}
+					_t1875 = _t1877
 				} else {
-					var _t1868 *pb.Instruction
-					if prediction1059 == 0 {
-						_t1869 := p.parse_assign()
-						assign1060 := _t1869
-						_t1870 := &pb.Instruction{}
-						_t1870.InstrType = &pb.Instruction_Assign{Assign: assign1060}
-						_t1868 = _t1870
+					var _t1878 *pb.Instruction
+					if prediction1063 == 0 {
+						_t1879 := p.parse_assign()
+						assign1064 := _t1879
+						_t1880 := &pb.Instruction{}
+						_t1880.InstrType = &pb.Instruction_Assign{Assign: assign1064}
+						_t1878 = _t1880
 					} else {
 						panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in instruction", p.lookahead(0).Type, p.lookahead(0).Value)})
 					}
-					_t1865 = _t1868
+					_t1875 = _t1878
 				}
-				_t1862 = _t1865
+				_t1872 = _t1875
 			}
-			_t1859 = _t1862
+			_t1869 = _t1872
 		}
-		_t1856 = _t1859
+		_t1866 = _t1869
 	}
-	result1066 := _t1856
-	p.recordSpan(int(span_start1065), "Instruction")
-	return result1066
+	result1070 := _t1866
+	p.recordSpan(int(span_start1069), "Instruction")
+	return result1070
 }
 
 func (p *Parser) parse_assign() *pb.Assign {
-	span_start1070 := int64(p.spanStart())
+	span_start1074 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("assign")
-	_t1871 := p.parse_relation_id()
-	relation_id1067 := _t1871
-	_t1872 := p.parse_abstraction()
-	abstraction1068 := _t1872
-	var _t1873 []*pb.Attribute
+	_t1881 := p.parse_relation_id()
+	relation_id1071 := _t1881
+	_t1882 := p.parse_abstraction()
+	abstraction1072 := _t1882
+	var _t1883 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1874 := p.parse_attrs()
-		_t1873 = _t1874
+		_t1884 := p.parse_attrs()
+		_t1883 = _t1884
 	}
-	attrs1069 := _t1873
+	attrs1073 := _t1883
 	p.consumeLiteral(")")
-	_t1875 := attrs1069
-	if attrs1069 == nil {
-		_t1875 = []*pb.Attribute{}
+	_t1885 := attrs1073
+	if attrs1073 == nil {
+		_t1885 = []*pb.Attribute{}
 	}
-	_t1876 := &pb.Assign{Name: relation_id1067, Body: abstraction1068, Attrs: _t1875}
-	result1071 := _t1876
-	p.recordSpan(int(span_start1070), "Assign")
-	return result1071
+	_t1886 := &pb.Assign{Name: relation_id1071, Body: abstraction1072, Attrs: _t1885}
+	result1075 := _t1886
+	p.recordSpan(int(span_start1074), "Assign")
+	return result1075
 }
 
 func (p *Parser) parse_upsert() *pb.Upsert {
-	span_start1075 := int64(p.spanStart())
+	span_start1079 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("upsert")
-	_t1877 := p.parse_relation_id()
-	relation_id1072 := _t1877
-	_t1878 := p.parse_abstraction_with_arity()
-	abstraction_with_arity1073 := _t1878
-	var _t1879 []*pb.Attribute
+	_t1887 := p.parse_relation_id()
+	relation_id1076 := _t1887
+	_t1888 := p.parse_abstraction_with_arity()
+	abstraction_with_arity1077 := _t1888
+	var _t1889 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1880 := p.parse_attrs()
-		_t1879 = _t1880
+		_t1890 := p.parse_attrs()
+		_t1889 = _t1890
 	}
-	attrs1074 := _t1879
+	attrs1078 := _t1889
 	p.consumeLiteral(")")
-	_t1881 := attrs1074
-	if attrs1074 == nil {
-		_t1881 = []*pb.Attribute{}
+	_t1891 := attrs1078
+	if attrs1078 == nil {
+		_t1891 = []*pb.Attribute{}
 	}
-	_t1882 := &pb.Upsert{Name: relation_id1072, Body: abstraction_with_arity1073[0].(*pb.Abstraction), Attrs: _t1881, ValueArity: abstraction_with_arity1073[1].(int64)}
-	result1076 := _t1882
-	p.recordSpan(int(span_start1075), "Upsert")
-	return result1076
+	_t1892 := &pb.Upsert{Name: relation_id1076, Body: abstraction_with_arity1077[0].(*pb.Abstraction), Attrs: _t1891, ValueArity: abstraction_with_arity1077[1].(int64)}
+	result1080 := _t1892
+	p.recordSpan(int(span_start1079), "Upsert")
+	return result1080
 }
 
 func (p *Parser) parse_abstraction_with_arity() []interface{} {
 	p.consumeLiteral("(")
-	_t1883 := p.parse_bindings()
-	bindings1077 := _t1883
-	_t1884 := p.parse_formula()
-	formula1078 := _t1884
+	_t1893 := p.parse_bindings()
+	bindings1081 := _t1893
+	_t1894 := p.parse_formula()
+	formula1082 := _t1894
 	p.consumeLiteral(")")
-	_t1885 := &pb.Abstraction{Vars: listConcat(bindings1077[0].([]*pb.Binding), bindings1077[1].([]*pb.Binding)), Value: formula1078}
-	return []interface{}{_t1885, int64(len(bindings1077[1].([]*pb.Binding)))}
+	_t1895 := &pb.Abstraction{Vars: listConcat(bindings1081[0].([]*pb.Binding), bindings1081[1].([]*pb.Binding)), Value: formula1082}
+	return []interface{}{_t1895, int64(len(bindings1081[1].([]*pb.Binding)))}
 }
 
 func (p *Parser) parse_break() *pb.Break {
-	span_start1082 := int64(p.spanStart())
+	span_start1086 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("break")
-	_t1886 := p.parse_relation_id()
-	relation_id1079 := _t1886
-	_t1887 := p.parse_abstraction()
-	abstraction1080 := _t1887
-	var _t1888 []*pb.Attribute
+	_t1896 := p.parse_relation_id()
+	relation_id1083 := _t1896
+	_t1897 := p.parse_abstraction()
+	abstraction1084 := _t1897
+	var _t1898 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1889 := p.parse_attrs()
-		_t1888 = _t1889
+		_t1899 := p.parse_attrs()
+		_t1898 = _t1899
 	}
-	attrs1081 := _t1888
+	attrs1085 := _t1898
 	p.consumeLiteral(")")
-	_t1890 := attrs1081
-	if attrs1081 == nil {
-		_t1890 = []*pb.Attribute{}
+	_t1900 := attrs1085
+	if attrs1085 == nil {
+		_t1900 = []*pb.Attribute{}
 	}
-	_t1891 := &pb.Break{Name: relation_id1079, Body: abstraction1080, Attrs: _t1890}
-	result1083 := _t1891
-	p.recordSpan(int(span_start1082), "Break")
-	return result1083
+	_t1901 := &pb.Break{Name: relation_id1083, Body: abstraction1084, Attrs: _t1900}
+	result1087 := _t1901
+	p.recordSpan(int(span_start1086), "Break")
+	return result1087
 }
 
 func (p *Parser) parse_monoid_def() *pb.MonoidDef {
-	span_start1088 := int64(p.spanStart())
+	span_start1092 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("monoid")
-	_t1892 := p.parse_monoid()
-	monoid1084 := _t1892
-	_t1893 := p.parse_relation_id()
-	relation_id1085 := _t1893
-	_t1894 := p.parse_abstraction_with_arity()
-	abstraction_with_arity1086 := _t1894
-	var _t1895 []*pb.Attribute
+	_t1902 := p.parse_monoid()
+	monoid1088 := _t1902
+	_t1903 := p.parse_relation_id()
+	relation_id1089 := _t1903
+	_t1904 := p.parse_abstraction_with_arity()
+	abstraction_with_arity1090 := _t1904
+	var _t1905 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1896 := p.parse_attrs()
-		_t1895 = _t1896
+		_t1906 := p.parse_attrs()
+		_t1905 = _t1906
 	}
-	attrs1087 := _t1895
+	attrs1091 := _t1905
 	p.consumeLiteral(")")
-	_t1897 := attrs1087
-	if attrs1087 == nil {
-		_t1897 = []*pb.Attribute{}
+	_t1907 := attrs1091
+	if attrs1091 == nil {
+		_t1907 = []*pb.Attribute{}
 	}
-	_t1898 := &pb.MonoidDef{Monoid: monoid1084, Name: relation_id1085, Body: abstraction_with_arity1086[0].(*pb.Abstraction), Attrs: _t1897, ValueArity: abstraction_with_arity1086[1].(int64)}
-	result1089 := _t1898
-	p.recordSpan(int(span_start1088), "MonoidDef")
-	return result1089
+	_t1908 := &pb.MonoidDef{Monoid: monoid1088, Name: relation_id1089, Body: abstraction_with_arity1090[0].(*pb.Abstraction), Attrs: _t1907, ValueArity: abstraction_with_arity1090[1].(int64)}
+	result1093 := _t1908
+	p.recordSpan(int(span_start1092), "MonoidDef")
+	return result1093
 }
 
 func (p *Parser) parse_monoid() *pb.Monoid {
-	span_start1095 := int64(p.spanStart())
-	var _t1899 int64
+	span_start1099 := int64(p.spanStart())
+	var _t1909 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1900 int64
+		var _t1910 int64
 		if p.matchLookaheadLiteral("sum", 1) {
-			_t1900 = 3
+			_t1910 = 3
 		} else {
-			var _t1901 int64
+			var _t1911 int64
 			if p.matchLookaheadLiteral("or", 1) {
-				_t1901 = 0
+				_t1911 = 0
 			} else {
-				var _t1902 int64
+				var _t1912 int64
 				if p.matchLookaheadLiteral("min", 1) {
-					_t1902 = 1
+					_t1912 = 1
 				} else {
-					var _t1903 int64
+					var _t1913 int64
 					if p.matchLookaheadLiteral("max", 1) {
-						_t1903 = 2
+						_t1913 = 2
 					} else {
-						_t1903 = -1
+						_t1913 = -1
 					}
-					_t1902 = _t1903
+					_t1912 = _t1913
 				}
-				_t1901 = _t1902
+				_t1911 = _t1912
 			}
-			_t1900 = _t1901
+			_t1910 = _t1911
 		}
-		_t1899 = _t1900
+		_t1909 = _t1910
 	} else {
-		_t1899 = -1
-	}
-	prediction1090 := _t1899
-	var _t1904 *pb.Monoid
-	if prediction1090 == 3 {
-		_t1905 := p.parse_sum_monoid()
-		sum_monoid1094 := _t1905
-		_t1906 := &pb.Monoid{}
-		_t1906.Value = &pb.Monoid_SumMonoid{SumMonoid: sum_monoid1094}
-		_t1904 = _t1906
+		_t1909 = -1
+	}
+	prediction1094 := _t1909
+	var _t1914 *pb.Monoid
+	if prediction1094 == 3 {
+		_t1915 := p.parse_sum_monoid()
+		sum_monoid1098 := _t1915
+		_t1916 := &pb.Monoid{}
+		_t1916.Value = &pb.Monoid_SumMonoid{SumMonoid: sum_monoid1098}
+		_t1914 = _t1916
 	} else {
-		var _t1907 *pb.Monoid
-		if prediction1090 == 2 {
-			_t1908 := p.parse_max_monoid()
-			max_monoid1093 := _t1908
-			_t1909 := &pb.Monoid{}
-			_t1909.Value = &pb.Monoid_MaxMonoid{MaxMonoid: max_monoid1093}
-			_t1907 = _t1909
+		var _t1917 *pb.Monoid
+		if prediction1094 == 2 {
+			_t1918 := p.parse_max_monoid()
+			max_monoid1097 := _t1918
+			_t1919 := &pb.Monoid{}
+			_t1919.Value = &pb.Monoid_MaxMonoid{MaxMonoid: max_monoid1097}
+			_t1917 = _t1919
 		} else {
-			var _t1910 *pb.Monoid
-			if prediction1090 == 1 {
-				_t1911 := p.parse_min_monoid()
-				min_monoid1092 := _t1911
-				_t1912 := &pb.Monoid{}
-				_t1912.Value = &pb.Monoid_MinMonoid{MinMonoid: min_monoid1092}
-				_t1910 = _t1912
+			var _t1920 *pb.Monoid
+			if prediction1094 == 1 {
+				_t1921 := p.parse_min_monoid()
+				min_monoid1096 := _t1921
+				_t1922 := &pb.Monoid{}
+				_t1922.Value = &pb.Monoid_MinMonoid{MinMonoid: min_monoid1096}
+				_t1920 = _t1922
 			} else {
-				var _t1913 *pb.Monoid
-				if prediction1090 == 0 {
-					_t1914 := p.parse_or_monoid()
-					or_monoid1091 := _t1914
-					_t1915 := &pb.Monoid{}
-					_t1915.Value = &pb.Monoid_OrMonoid{OrMonoid: or_monoid1091}
-					_t1913 = _t1915
+				var _t1923 *pb.Monoid
+				if prediction1094 == 0 {
+					_t1924 := p.parse_or_monoid()
+					or_monoid1095 := _t1924
+					_t1925 := &pb.Monoid{}
+					_t1925.Value = &pb.Monoid_OrMonoid{OrMonoid: or_monoid1095}
+					_t1923 = _t1925
 				} else {
 					panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in monoid", p.lookahead(0).Type, p.lookahead(0).Value)})
 				}
-				_t1910 = _t1913
+				_t1920 = _t1923
 			}
-			_t1907 = _t1910
+			_t1917 = _t1920
 		}
-		_t1904 = _t1907
+		_t1914 = _t1917
 	}
-	result1096 := _t1904
-	p.recordSpan(int(span_start1095), "Monoid")
-	return result1096
+	result1100 := _t1914
+	p.recordSpan(int(span_start1099), "Monoid")
+	return result1100
 }
 
 func (p *Parser) parse_or_monoid() *pb.OrMonoid {
-	span_start1097 := int64(p.spanStart())
+	span_start1101 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("or")
 	p.consumeLiteral(")")
-	_t1916 := &pb.OrMonoid{}
-	result1098 := _t1916
-	p.recordSpan(int(span_start1097), "OrMonoid")
-	return result1098
+	_t1926 := &pb.OrMonoid{}
+	result1102 := _t1926
+	p.recordSpan(int(span_start1101), "OrMonoid")
+	return result1102
 }
 
 func (p *Parser) parse_min_monoid() *pb.MinMonoid {
-	span_start1100 := int64(p.spanStart())
+	span_start1104 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("min")
-	_t1917 := p.parse_type()
-	type1099 := _t1917
+	_t1927 := p.parse_type()
+	type1103 := _t1927
 	p.consumeLiteral(")")
-	_t1918 := &pb.MinMonoid{Type: type1099}
-	result1101 := _t1918
-	p.recordSpan(int(span_start1100), "MinMonoid")
-	return result1101
+	_t1928 := &pb.MinMonoid{Type: type1103}
+	result1105 := _t1928
+	p.recordSpan(int(span_start1104), "MinMonoid")
+	return result1105
 }
 
 func (p *Parser) parse_max_monoid() *pb.MaxMonoid {
-	span_start1103 := int64(p.spanStart())
+	span_start1107 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("max")
-	_t1919 := p.parse_type()
-	type1102 := _t1919
+	_t1929 := p.parse_type()
+	type1106 := _t1929
 	p.consumeLiteral(")")
-	_t1920 := &pb.MaxMonoid{Type: type1102}
-	result1104 := _t1920
-	p.recordSpan(int(span_start1103), "MaxMonoid")
-	return result1104
+	_t1930 := &pb.MaxMonoid{Type: type1106}
+	result1108 := _t1930
+	p.recordSpan(int(span_start1107), "MaxMonoid")
+	return result1108
 }
 
 func (p *Parser) parse_sum_monoid() *pb.SumMonoid {
-	span_start1106 := int64(p.spanStart())
+	span_start1110 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("sum")
-	_t1921 := p.parse_type()
-	type1105 := _t1921
+	_t1931 := p.parse_type()
+	type1109 := _t1931
 	p.consumeLiteral(")")
-	_t1922 := &pb.SumMonoid{Type: type1105}
-	result1107 := _t1922
-	p.recordSpan(int(span_start1106), "SumMonoid")
-	return result1107
+	_t1932 := &pb.SumMonoid{Type: type1109}
+	result1111 := _t1932
+	p.recordSpan(int(span_start1110), "SumMonoid")
+	return result1111
 }
 
 func (p *Parser) parse_monus_def() *pb.MonusDef {
-	span_start1112 := int64(p.spanStart())
+	span_start1116 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("monus")
-	_t1923 := p.parse_monoid()
-	monoid1108 := _t1923
-	_t1924 := p.parse_relation_id()
-	relation_id1109 := _t1924
-	_t1925 := p.parse_abstraction_with_arity()
-	abstraction_with_arity1110 := _t1925
-	var _t1926 []*pb.Attribute
+	_t1933 := p.parse_monoid()
+	monoid1112 := _t1933
+	_t1934 := p.parse_relation_id()
+	relation_id1113 := _t1934
+	_t1935 := p.parse_abstraction_with_arity()
+	abstraction_with_arity1114 := _t1935
+	var _t1936 []*pb.Attribute
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1927 := p.parse_attrs()
-		_t1926 = _t1927
+		_t1937 := p.parse_attrs()
+		_t1936 = _t1937
 	}
-	attrs1111 := _t1926
+	attrs1115 := _t1936
 	p.consumeLiteral(")")
-	_t1928 := attrs1111
-	if attrs1111 == nil {
-		_t1928 = []*pb.Attribute{}
+	_t1938 := attrs1115
+	if attrs1115 == nil {
+		_t1938 = []*pb.Attribute{}
 	}
-	_t1929 := &pb.MonusDef{Monoid: monoid1108, Name: relation_id1109, Body: abstraction_with_arity1110[0].(*pb.Abstraction), Attrs: _t1928, ValueArity: abstraction_with_arity1110[1].(int64)}
-	result1113 := _t1929
-	p.recordSpan(int(span_start1112), "MonusDef")
-	return result1113
+	_t1939 := &pb.MonusDef{Monoid: monoid1112, Name: relation_id1113, Body: abstraction_with_arity1114[0].(*pb.Abstraction), Attrs: _t1938, ValueArity: abstraction_with_arity1114[1].(int64)}
+	result1117 := _t1939
+	p.recordSpan(int(span_start1116), "MonusDef")
+	return result1117
 }
 
 func (p *Parser) parse_constraint() *pb.Constraint {
-	span_start1118 := int64(p.spanStart())
+	span_start1122 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("functional_dependency")
-	_t1930 := p.parse_relation_id()
-	relation_id1114 := _t1930
-	_t1931 := p.parse_abstraction()
-	abstraction1115 := _t1931
-	_t1932 := p.parse_functional_dependency_keys()
-	functional_dependency_keys1116 := _t1932
-	_t1933 := p.parse_functional_dependency_values()
-	functional_dependency_values1117 := _t1933
+	_t1940 := p.parse_relation_id()
+	relation_id1118 := _t1940
+	_t1941 := p.parse_abstraction()
+	abstraction1119 := _t1941
+	_t1942 := p.parse_functional_dependency_keys()
+	functional_dependency_keys1120 := _t1942
+	_t1943 := p.parse_functional_dependency_values()
+	functional_dependency_values1121 := _t1943
 	p.consumeLiteral(")")
-	_t1934 := &pb.FunctionalDependency{Guard: abstraction1115, Keys: functional_dependency_keys1116, Values: functional_dependency_values1117}
-	_t1935 := &pb.Constraint{Name: relation_id1114}
-	_t1935.ConstraintType = &pb.Constraint_FunctionalDependency{FunctionalDependency: _t1934}
-	result1119 := _t1935
-	p.recordSpan(int(span_start1118), "Constraint")
-	return result1119
+	_t1944 := &pb.FunctionalDependency{Guard: abstraction1119, Keys: functional_dependency_keys1120, Values: functional_dependency_values1121}
+	_t1945 := &pb.Constraint{Name: relation_id1118}
+	_t1945.ConstraintType = &pb.Constraint_FunctionalDependency{FunctionalDependency: _t1944}
+	result1123 := _t1945
+	p.recordSpan(int(span_start1122), "Constraint")
+	return result1123
 }
 
 func (p *Parser) parse_functional_dependency_keys() []*pb.Var {
 	p.consumeLiteral("(")
 	p.consumeLiteral("keys")
-	xs1120 := []*pb.Var{}
-	cond1121 := p.matchLookaheadTerminal("SYMBOL", 0)
-	for cond1121 {
-		_t1936 := p.parse_var()
-		item1122 := _t1936
-		xs1120 = append(xs1120, item1122)
-		cond1121 = p.matchLookaheadTerminal("SYMBOL", 0)
-	}
-	vars1123 := xs1120
-	p.consumeLiteral(")")
-	return vars1123
-}
-
-func (p *Parser) parse_functional_dependency_values() []*pb.Var {
-	p.consumeLiteral("(")
-	p.consumeLiteral("values")
 	xs1124 := []*pb.Var{}
 	cond1125 := p.matchLookaheadTerminal("SYMBOL", 0)
 	for cond1125 {
-		_t1937 := p.parse_var()
-		item1126 := _t1937
+		_t1946 := p.parse_var()
+		item1126 := _t1946
 		xs1124 = append(xs1124, item1126)
 		cond1125 = p.matchLookaheadTerminal("SYMBOL", 0)
 	}
@@ -4002,186 +4006,186 @@ func (p *Parser) parse_functional_dependency_values() []*pb.Var {
 	return vars1127
 }
 
+func (p *Parser) parse_functional_dependency_values() []*pb.Var {
+	p.consumeLiteral("(")
+	p.consumeLiteral("values")
+	xs1128 := []*pb.Var{}
+	cond1129 := p.matchLookaheadTerminal("SYMBOL", 0)
+	for cond1129 {
+		_t1947 := p.parse_var()
+		item1130 := _t1947
+		xs1128 = append(xs1128, item1130)
+		cond1129 = p.matchLookaheadTerminal("SYMBOL", 0)
+	}
+	vars1131 := xs1128
+	p.consumeLiteral(")")
+	return vars1131
+}
+
 func (p *Parser) parse_data() *pb.Data {
-	span_start1133 := int64(p.spanStart())
-	var _t1938 int64
+	span_start1137 := int64(p.spanStart())
+	var _t1948 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t1939 int64
+		var _t1949 int64
 		if p.matchLookaheadLiteral("iceberg_data", 1) {
-			_t1939 = 3
+			_t1949 = 3
 		} else {
-			var _t1940 int64
+			var _t1950 int64
 			if p.matchLookaheadLiteral("edb", 1) {
-				_t1940 = 0
+				_t1950 = 0
 			} else {
-				var _t1941 int64
+				var _t1951 int64
 				if p.matchLookaheadLiteral("csv_data", 1) {
-					_t1941 = 2
+					_t1951 = 2
 				} else {
-					var _t1942 int64
+					var _t1952 int64
 					if p.matchLookaheadLiteral("betree_relation", 1) {
-						_t1942 = 1
+						_t1952 = 1
 					} else {
-						_t1942 = -1
+						_t1952 = -1
 					}
-					_t1941 = _t1942
+					_t1951 = _t1952
 				}
-				_t1940 = _t1941
+				_t1950 = _t1951
 			}
-			_t1939 = _t1940
+			_t1949 = _t1950
 		}
-		_t1938 = _t1939
+		_t1948 = _t1949
 	} else {
-		_t1938 = -1
-	}
-	prediction1128 := _t1938
-	var _t1943 *pb.Data
-	if prediction1128 == 3 {
-		_t1944 := p.parse_iceberg_data()
-		iceberg_data1132 := _t1944
-		_t1945 := &pb.Data{}
-		_t1945.DataType = &pb.Data_IcebergData{IcebergData: iceberg_data1132}
-		_t1943 = _t1945
+		_t1948 = -1
+	}
+	prediction1132 := _t1948
+	var _t1953 *pb.Data
+	if prediction1132 == 3 {
+		_t1954 := p.parse_iceberg_data()
+		iceberg_data1136 := _t1954
+		_t1955 := &pb.Data{}
+		_t1955.DataType = &pb.Data_IcebergData{IcebergData: iceberg_data1136}
+		_t1953 = _t1955
 	} else {
-		var _t1946 *pb.Data
-		if prediction1128 == 2 {
-			_t1947 := p.parse_csv_data()
-			csv_data1131 := _t1947
-			_t1948 := &pb.Data{}
-			_t1948.DataType = &pb.Data_CsvData{CsvData: csv_data1131}
-			_t1946 = _t1948
+		var _t1956 *pb.Data
+		if prediction1132 == 2 {
+			_t1957 := p.parse_csv_data()
+			csv_data1135 := _t1957
+			_t1958 := &pb.Data{}
+			_t1958.DataType = &pb.Data_CsvData{CsvData: csv_data1135}
+			_t1956 = _t1958
 		} else {
-			var _t1949 *pb.Data
-			if prediction1128 == 1 {
-				_t1950 := p.parse_betree_relation()
-				betree_relation1130 := _t1950
-				_t1951 := &pb.Data{}
-				_t1951.DataType = &pb.Data_BetreeRelation{BetreeRelation: betree_relation1130}
-				_t1949 = _t1951
+			var _t1959 *pb.Data
+			if prediction1132 == 1 {
+				_t1960 := p.parse_betree_relation()
+				betree_relation1134 := _t1960
+				_t1961 := &pb.Data{}
+				_t1961.DataType = &pb.Data_BetreeRelation{BetreeRelation: betree_relation1134}
+				_t1959 = _t1961
 			} else {
-				var _t1952 *pb.Data
-				if prediction1128 == 0 {
-					_t1953 := p.parse_edb()
-					edb1129 := _t1953
-					_t1954 := &pb.Data{}
-					_t1954.DataType = &pb.Data_Edb{Edb: edb1129}
-					_t1952 = _t1954
+				var _t1962 *pb.Data
+				if prediction1132 == 0 {
+					_t1963 := p.parse_edb()
+					edb1133 := _t1963
+					_t1964 := &pb.Data{}
+					_t1964.DataType = &pb.Data_Edb{Edb: edb1133}
+					_t1962 = _t1964
 				} else {
 					panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in data", p.lookahead(0).Type, p.lookahead(0).Value)})
 				}
-				_t1949 = _t1952
+				_t1959 = _t1962
 			}
-			_t1946 = _t1949
+			_t1956 = _t1959
 		}
-		_t1943 = _t1946
+		_t1953 = _t1956
 	}
-	result1134 := _t1943
-	p.recordSpan(int(span_start1133), "Data")
-	return result1134
+	result1138 := _t1953
+	p.recordSpan(int(span_start1137), "Data")
+	return result1138
 }
 
 func (p *Parser) parse_edb() *pb.EDB {
-	span_start1138 := int64(p.spanStart())
+	span_start1142 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("edb")
-	_t1955 := p.parse_relation_id()
-	relation_id1135 := _t1955
-	_t1956 := p.parse_edb_path()
-	edb_path1136 := _t1956
-	_t1957 := p.parse_edb_types()
-	edb_types1137 := _t1957
+	_t1965 := p.parse_relation_id()
+	relation_id1139 := _t1965
+	_t1966 := p.parse_edb_path()
+	edb_path1140 := _t1966
+	_t1967 := p.parse_edb_types()
+	edb_types1141 := _t1967
 	p.consumeLiteral(")")
-	_t1958 := &pb.EDB{TargetId: relation_id1135, Path: edb_path1136, Types: edb_types1137}
-	result1139 := _t1958
-	p.recordSpan(int(span_start1138), "EDB")
-	return result1139
+	_t1968 := &pb.EDB{TargetId: relation_id1139, Path: edb_path1140, Types: edb_types1141}
+	result1143 := _t1968
+	p.recordSpan(int(span_start1142), "EDB")
+	return result1143
 }
 
 func (p *Parser) parse_edb_path() []string {
 	p.consumeLiteral("[")
-	xs1140 := []string{}
-	cond1141 := p.matchLookaheadTerminal("STRING", 0)
-	for cond1141 {
-		item1142 := p.consumeTerminal("STRING").Value.str
-		xs1140 = append(xs1140, item1142)
-		cond1141 = p.matchLookaheadTerminal("STRING", 0)
-	}
-	strings1143 := xs1140
+	xs1144 := []string{}
+	cond1145 := p.matchLookaheadTerminal("STRING", 0)
+	for cond1145 {
+		item1146 := p.consumeTerminal("STRING").Value.str
+		xs1144 = append(xs1144, item1146)
+		cond1145 = p.matchLookaheadTerminal("STRING", 0)
+	}
+	strings1147 := xs1144
 	p.consumeLiteral("]")
-	return strings1143
+	return strings1147
 }
 
 func (p *Parser) parse_edb_types() []*pb.Type {
 	p.consumeLiteral("[")
-	xs1144 := []*pb.Type{}
-	cond1145 := (((((((((((((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 cond1145 {
-		_t1959 := p.parse_type()
-		item1146 := _t1959
-		xs1144 = append(xs1144, item1146)
-		cond1145 = (((((((((((((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))
-	}
-	types1147 := xs1144
+	xs1148 := []*pb.Type{}
+	cond1149 := (((((((((((((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 cond1149 {
+		_t1969 := p.parse_type()
+		item1150 := _t1969
+		xs1148 = append(xs1148, item1150)
+		cond1149 = (((((((((((((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))
+	}
+	types1151 := xs1148
 	p.consumeLiteral("]")
-	return types1147
+	return types1151
 }
 
 func (p *Parser) parse_betree_relation() *pb.BeTreeRelation {
-	span_start1150 := int64(p.spanStart())
+	span_start1154 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("betree_relation")
-	_t1960 := p.parse_relation_id()
-	relation_id1148 := _t1960
-	_t1961 := p.parse_betree_info()
-	betree_info1149 := _t1961
+	_t1970 := p.parse_relation_id()
+	relation_id1152 := _t1970
+	_t1971 := p.parse_betree_info()
+	betree_info1153 := _t1971
 	p.consumeLiteral(")")
-	_t1962 := &pb.BeTreeRelation{Name: relation_id1148, RelationInfo: betree_info1149}
-	result1151 := _t1962
-	p.recordSpan(int(span_start1150), "BeTreeRelation")
-	return result1151
+	_t1972 := &pb.BeTreeRelation{Name: relation_id1152, RelationInfo: betree_info1153}
+	result1155 := _t1972
+	p.recordSpan(int(span_start1154), "BeTreeRelation")
+	return result1155
 }
 
 func (p *Parser) parse_betree_info() *pb.BeTreeInfo {
-	span_start1155 := int64(p.spanStart())
+	span_start1159 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("betree_info")
-	_t1963 := p.parse_betree_info_key_types()
-	betree_info_key_types1152 := _t1963
-	_t1964 := p.parse_betree_info_value_types()
-	betree_info_value_types1153 := _t1964
-	_t1965 := p.parse_config_dict()
-	config_dict1154 := _t1965
+	_t1973 := p.parse_betree_info_key_types()
+	betree_info_key_types1156 := _t1973
+	_t1974 := p.parse_betree_info_value_types()
+	betree_info_value_types1157 := _t1974
+	_t1975 := p.parse_config_dict()
+	config_dict1158 := _t1975
 	p.consumeLiteral(")")
-	_t1966 := p.construct_betree_info(betree_info_key_types1152, betree_info_value_types1153, config_dict1154)
-	result1156 := _t1966
-	p.recordSpan(int(span_start1155), "BeTreeInfo")
-	return result1156
+	_t1976 := p.construct_betree_info(betree_info_key_types1156, betree_info_value_types1157, config_dict1158)
+	result1160 := _t1976
+	p.recordSpan(int(span_start1159), "BeTreeInfo")
+	return result1160
 }
 
 func (p *Parser) parse_betree_info_key_types() []*pb.Type {
 	p.consumeLiteral("(")
 	p.consumeLiteral("key_types")
-	xs1157 := []*pb.Type{}
-	cond1158 := (((((((((((((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 cond1158 {
-		_t1967 := p.parse_type()
-		item1159 := _t1967
-		xs1157 = append(xs1157, item1159)
-		cond1158 = (((((((((((((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))
-	}
-	types1160 := xs1157
-	p.consumeLiteral(")")
-	return types1160
-}
-
-func (p *Parser) parse_betree_info_value_types() []*pb.Type {
-	p.consumeLiteral("(")
-	p.consumeLiteral("value_types")
 	xs1161 := []*pb.Type{}
 	cond1162 := (((((((((((((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 cond1162 {
-		_t1968 := p.parse_type()
-		item1163 := _t1968
+		_t1977 := p.parse_type()
+		item1163 := _t1977
 		xs1161 = append(xs1161, item1163)
 		cond1162 = (((((((((((((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))
 	}
@@ -4190,903 +4194,919 @@ func (p *Parser) parse_betree_info_value_types() []*pb.Type {
 	return types1164
 }
 
+func (p *Parser) parse_betree_info_value_types() []*pb.Type {
+	p.consumeLiteral("(")
+	p.consumeLiteral("value_types")
+	xs1165 := []*pb.Type{}
+	cond1166 := (((((((((((((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 cond1166 {
+		_t1978 := p.parse_type()
+		item1167 := _t1978
+		xs1165 = append(xs1165, item1167)
+		cond1166 = (((((((((((((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))
+	}
+	types1168 := xs1165
+	p.consumeLiteral(")")
+	return types1168
+}
+
 func (p *Parser) parse_csv_data() *pb.CSVData {
-	span_start1169 := int64(p.spanStart())
+	span_start1173 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("csv_data")
-	_t1969 := p.parse_csvlocator()
-	csvlocator1165 := _t1969
-	_t1970 := p.parse_csv_config()
-	csv_config1166 := _t1970
-	_t1971 := p.parse_gnf_columns()
-	gnf_columns1167 := _t1971
-	_t1972 := p.parse_csv_asof()
-	csv_asof1168 := _t1972
+	_t1979 := p.parse_csvlocator()
+	csvlocator1169 := _t1979
+	_t1980 := p.parse_csv_config()
+	csv_config1170 := _t1980
+	_t1981 := p.parse_gnf_columns()
+	gnf_columns1171 := _t1981
+	_t1982 := p.parse_csv_asof()
+	csv_asof1172 := _t1982
 	p.consumeLiteral(")")
-	_t1973 := &pb.CSVData{Locator: csvlocator1165, Config: csv_config1166, Columns: gnf_columns1167, Asof: csv_asof1168}
-	result1170 := _t1973
-	p.recordSpan(int(span_start1169), "CSVData")
-	return result1170
+	_t1983 := &pb.CSVData{Locator: csvlocator1169, Config: csv_config1170, Columns: gnf_columns1171, Asof: csv_asof1172}
+	result1174 := _t1983
+	p.recordSpan(int(span_start1173), "CSVData")
+	return result1174
 }
 
 func (p *Parser) parse_csvlocator() *pb.CSVLocator {
-	span_start1173 := int64(p.spanStart())
+	span_start1177 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("csv_locator")
-	var _t1974 []string
+	var _t1984 []string
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("paths", 1)) {
-		_t1975 := p.parse_csv_locator_paths()
-		_t1974 = _t1975
+		_t1985 := p.parse_csv_locator_paths()
+		_t1984 = _t1985
 	}
-	csv_locator_paths1171 := _t1974
-	var _t1976 *string
+	csv_locator_paths1175 := _t1984
+	var _t1986 *string
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1977 := p.parse_csv_locator_inline_data()
-		_t1976 = ptr(_t1977)
+		_t1987 := p.parse_csv_locator_inline_data()
+		_t1986 = ptr(_t1987)
 	}
-	csv_locator_inline_data1172 := _t1976
+	csv_locator_inline_data1176 := _t1986
 	p.consumeLiteral(")")
-	_t1978 := csv_locator_paths1171
-	if csv_locator_paths1171 == nil {
-		_t1978 = []string{}
+	_t1988 := csv_locator_paths1175
+	if csv_locator_paths1175 == nil {
+		_t1988 = []string{}
 	}
-	_t1979 := &pb.CSVLocator{Paths: _t1978, InlineData: []byte(deref(csv_locator_inline_data1172, ""))}
-	result1174 := _t1979
-	p.recordSpan(int(span_start1173), "CSVLocator")
-	return result1174
+	_t1989 := &pb.CSVLocator{Paths: _t1988, InlineData: []byte(deref(csv_locator_inline_data1176, ""))}
+	result1178 := _t1989
+	p.recordSpan(int(span_start1177), "CSVLocator")
+	return result1178
 }
 
 func (p *Parser) parse_csv_locator_paths() []string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("paths")
-	xs1175 := []string{}
-	cond1176 := p.matchLookaheadTerminal("STRING", 0)
-	for cond1176 {
-		item1177 := p.consumeTerminal("STRING").Value.str
-		xs1175 = append(xs1175, item1177)
-		cond1176 = p.matchLookaheadTerminal("STRING", 0)
-	}
-	strings1178 := xs1175
+	xs1179 := []string{}
+	cond1180 := p.matchLookaheadTerminal("STRING", 0)
+	for cond1180 {
+		item1181 := p.consumeTerminal("STRING").Value.str
+		xs1179 = append(xs1179, item1181)
+		cond1180 = p.matchLookaheadTerminal("STRING", 0)
+	}
+	strings1182 := xs1179
 	p.consumeLiteral(")")
-	return strings1178
+	return strings1182
 }
 
 func (p *Parser) parse_csv_locator_inline_data() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("inline_data")
-	string1179 := p.consumeTerminal("STRING").Value.str
+	string1183 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1179
+	return string1183
 }
 
 func (p *Parser) parse_csv_config() *pb.CSVConfig {
-	span_start1181 := int64(p.spanStart())
+	span_start1185 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("csv_config")
-	_t1980 := p.parse_config_dict()
-	config_dict1180 := _t1980
+	_t1990 := p.parse_config_dict()
+	config_dict1184 := _t1990
 	p.consumeLiteral(")")
-	_t1981 := p.construct_csv_config(config_dict1180)
-	result1182 := _t1981
-	p.recordSpan(int(span_start1181), "CSVConfig")
-	return result1182
+	_t1991 := p.construct_csv_config(config_dict1184)
+	result1186 := _t1991
+	p.recordSpan(int(span_start1185), "CSVConfig")
+	return result1186
 }
 
 func (p *Parser) parse_gnf_columns() []*pb.GNFColumn {
 	p.consumeLiteral("(")
 	p.consumeLiteral("columns")
-	xs1183 := []*pb.GNFColumn{}
-	cond1184 := p.matchLookaheadLiteral("(", 0)
-	for cond1184 {
-		_t1982 := p.parse_gnf_column()
-		item1185 := _t1982
-		xs1183 = append(xs1183, item1185)
-		cond1184 = p.matchLookaheadLiteral("(", 0)
-	}
-	gnf_columns1186 := xs1183
+	xs1187 := []*pb.GNFColumn{}
+	cond1188 := p.matchLookaheadLiteral("(", 0)
+	for cond1188 {
+		_t1992 := p.parse_gnf_column()
+		item1189 := _t1992
+		xs1187 = append(xs1187, item1189)
+		cond1188 = p.matchLookaheadLiteral("(", 0)
+	}
+	gnf_columns1190 := xs1187
 	p.consumeLiteral(")")
-	return gnf_columns1186
+	return gnf_columns1190
 }
 
 func (p *Parser) parse_gnf_column() *pb.GNFColumn {
-	span_start1193 := int64(p.spanStart())
+	span_start1197 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("column")
-	_t1983 := p.parse_gnf_column_path()
-	gnf_column_path1187 := _t1983
-	var _t1984 *pb.RelationId
+	_t1993 := p.parse_gnf_column_path()
+	gnf_column_path1191 := _t1993
+	var _t1994 *pb.RelationId
 	if (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0)) {
-		_t1985 := p.parse_relation_id()
-		_t1984 = _t1985
+		_t1995 := p.parse_relation_id()
+		_t1994 = _t1995
 	}
-	relation_id1188 := _t1984
+	relation_id1192 := _t1994
 	p.consumeLiteral("[")
-	xs1189 := []*pb.Type{}
-	cond1190 := (((((((((((((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 cond1190 {
-		_t1986 := p.parse_type()
-		item1191 := _t1986
-		xs1189 = append(xs1189, item1191)
-		cond1190 = (((((((((((((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))
-	}
-	types1192 := xs1189
+	xs1193 := []*pb.Type{}
+	cond1194 := (((((((((((((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 cond1194 {
+		_t1996 := p.parse_type()
+		item1195 := _t1996
+		xs1193 = append(xs1193, item1195)
+		cond1194 = (((((((((((((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))
+	}
+	types1196 := xs1193
 	p.consumeLiteral("]")
 	p.consumeLiteral(")")
-	_t1987 := &pb.GNFColumn{ColumnPath: gnf_column_path1187, TargetId: relation_id1188, Types: types1192}
-	result1194 := _t1987
-	p.recordSpan(int(span_start1193), "GNFColumn")
-	return result1194
+	_t1997 := &pb.GNFColumn{ColumnPath: gnf_column_path1191, TargetId: relation_id1192, Types: types1196}
+	result1198 := _t1997
+	p.recordSpan(int(span_start1197), "GNFColumn")
+	return result1198
 }
 
 func (p *Parser) parse_gnf_column_path() []string {
-	var _t1988 int64
+	var _t1998 int64
 	if p.matchLookaheadLiteral("[", 0) {
-		_t1988 = 1
+		_t1998 = 1
 	} else {
-		var _t1989 int64
+		var _t1999 int64
 		if p.matchLookaheadTerminal("STRING", 0) {
-			_t1989 = 0
+			_t1999 = 0
 		} else {
-			_t1989 = -1
+			_t1999 = -1
 		}
-		_t1988 = _t1989
+		_t1998 = _t1999
 	}
-	prediction1195 := _t1988
-	var _t1990 []string
-	if prediction1195 == 1 {
+	prediction1199 := _t1998
+	var _t2000 []string
+	if prediction1199 == 1 {
 		p.consumeLiteral("[")
-		xs1197 := []string{}
-		cond1198 := p.matchLookaheadTerminal("STRING", 0)
-		for cond1198 {
-			item1199 := p.consumeTerminal("STRING").Value.str
-			xs1197 = append(xs1197, item1199)
-			cond1198 = p.matchLookaheadTerminal("STRING", 0)
+		xs1201 := []string{}
+		cond1202 := p.matchLookaheadTerminal("STRING", 0)
+		for cond1202 {
+			item1203 := p.consumeTerminal("STRING").Value.str
+			xs1201 = append(xs1201, item1203)
+			cond1202 = p.matchLookaheadTerminal("STRING", 0)
 		}
-		strings1200 := xs1197
+		strings1204 := xs1201
 		p.consumeLiteral("]")
-		_t1990 = strings1200
+		_t2000 = strings1204
 	} else {
-		var _t1991 []string
-		if prediction1195 == 0 {
-			string1196 := p.consumeTerminal("STRING").Value.str
-			_ = string1196
-			_t1991 = []string{string1196}
+		var _t2001 []string
+		if prediction1199 == 0 {
+			string1200 := p.consumeTerminal("STRING").Value.str
+			_ = string1200
+			_t2001 = []string{string1200}
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in gnf_column_path", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t1990 = _t1991
+		_t2000 = _t2001
 	}
-	return _t1990
+	return _t2000
 }
 
 func (p *Parser) parse_csv_asof() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("asof")
-	string1201 := p.consumeTerminal("STRING").Value.str
+	string1205 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1201
+	return string1205
 }
 
 func (p *Parser) parse_iceberg_data() *pb.IcebergData {
-	span_start1208 := int64(p.spanStart())
+	span_start1212 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("iceberg_data")
-	_t1992 := p.parse_iceberg_locator()
-	iceberg_locator1202 := _t1992
-	_t1993 := p.parse_iceberg_catalog_config()
-	iceberg_catalog_config1203 := _t1993
-	_t1994 := p.parse_gnf_columns()
-	gnf_columns1204 := _t1994
-	var _t1995 *string
+	_t2002 := p.parse_iceberg_locator()
+	iceberg_locator1206 := _t2002
+	_t2003 := p.parse_iceberg_catalog_config()
+	iceberg_catalog_config1207 := _t2003
+	_t2004 := p.parse_gnf_columns()
+	gnf_columns1208 := _t2004
+	var _t2005 *string
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("from_snapshot", 1)) {
-		_t1996 := p.parse_iceberg_from_snapshot()
-		_t1995 = ptr(_t1996)
+		_t2006 := p.parse_iceberg_from_snapshot()
+		_t2005 = ptr(_t2006)
 	}
-	iceberg_from_snapshot1205 := _t1995
-	var _t1997 *string
+	iceberg_from_snapshot1209 := _t2005
+	var _t2007 *string
 	if p.matchLookaheadLiteral("(", 0) {
-		_t1998 := p.parse_iceberg_to_snapshot()
-		_t1997 = ptr(_t1998)
+		_t2008 := p.parse_iceberg_to_snapshot()
+		_t2007 = ptr(_t2008)
 	}
-	iceberg_to_snapshot1206 := _t1997
-	_t1999 := p.parse_boolean_value()
-	boolean_value1207 := _t1999
+	iceberg_to_snapshot1210 := _t2007
+	_t2009 := p.parse_boolean_value()
+	boolean_value1211 := _t2009
 	p.consumeLiteral(")")
-	_t2000 := p.construct_iceberg_data(iceberg_locator1202, iceberg_catalog_config1203, gnf_columns1204, iceberg_from_snapshot1205, iceberg_to_snapshot1206, boolean_value1207)
-	result1209 := _t2000
-	p.recordSpan(int(span_start1208), "IcebergData")
-	return result1209
+	_t2010 := p.construct_iceberg_data(iceberg_locator1206, iceberg_catalog_config1207, gnf_columns1208, iceberg_from_snapshot1209, iceberg_to_snapshot1210, boolean_value1211)
+	result1213 := _t2010
+	p.recordSpan(int(span_start1212), "IcebergData")
+	return result1213
 }
 
 func (p *Parser) parse_iceberg_locator() *pb.IcebergLocator {
-	span_start1213 := int64(p.spanStart())
+	span_start1217 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("iceberg_locator")
-	_t2001 := p.parse_iceberg_locator_table_name()
-	iceberg_locator_table_name1210 := _t2001
-	_t2002 := p.parse_iceberg_locator_namespace()
-	iceberg_locator_namespace1211 := _t2002
-	_t2003 := p.parse_iceberg_locator_warehouse()
-	iceberg_locator_warehouse1212 := _t2003
+	_t2011 := p.parse_iceberg_locator_table_name()
+	iceberg_locator_table_name1214 := _t2011
+	_t2012 := p.parse_iceberg_locator_namespace()
+	iceberg_locator_namespace1215 := _t2012
+	_t2013 := p.parse_iceberg_locator_warehouse()
+	iceberg_locator_warehouse1216 := _t2013
 	p.consumeLiteral(")")
-	_t2004 := &pb.IcebergLocator{TableName: iceberg_locator_table_name1210, Namespace: iceberg_locator_namespace1211, Warehouse: iceberg_locator_warehouse1212}
-	result1214 := _t2004
-	p.recordSpan(int(span_start1213), "IcebergLocator")
-	return result1214
+	_t2014 := &pb.IcebergLocator{TableName: iceberg_locator_table_name1214, Namespace: iceberg_locator_namespace1215, Warehouse: iceberg_locator_warehouse1216}
+	result1218 := _t2014
+	p.recordSpan(int(span_start1217), "IcebergLocator")
+	return result1218
 }
 
 func (p *Parser) parse_iceberg_locator_table_name() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("table_name")
-	string1215 := p.consumeTerminal("STRING").Value.str
+	string1219 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1215
+	return string1219
 }
 
 func (p *Parser) parse_iceberg_locator_namespace() []string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("namespace")
-	xs1216 := []string{}
-	cond1217 := p.matchLookaheadTerminal("STRING", 0)
-	for cond1217 {
-		item1218 := p.consumeTerminal("STRING").Value.str
-		xs1216 = append(xs1216, item1218)
-		cond1217 = p.matchLookaheadTerminal("STRING", 0)
-	}
-	strings1219 := xs1216
+	xs1220 := []string{}
+	cond1221 := p.matchLookaheadTerminal("STRING", 0)
+	for cond1221 {
+		item1222 := p.consumeTerminal("STRING").Value.str
+		xs1220 = append(xs1220, item1222)
+		cond1221 = p.matchLookaheadTerminal("STRING", 0)
+	}
+	strings1223 := xs1220
 	p.consumeLiteral(")")
-	return strings1219
+	return strings1223
 }
 
 func (p *Parser) parse_iceberg_locator_warehouse() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("warehouse")
-	string1220 := p.consumeTerminal("STRING").Value.str
+	string1224 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1220
+	return string1224
 }
 
 func (p *Parser) parse_iceberg_catalog_config() *pb.IcebergCatalogConfig {
-	span_start1225 := int64(p.spanStart())
+	span_start1229 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("iceberg_catalog_config")
-	_t2005 := p.parse_iceberg_catalog_uri()
-	iceberg_catalog_uri1221 := _t2005
-	var _t2006 *string
+	_t2015 := p.parse_iceberg_catalog_uri()
+	iceberg_catalog_uri1225 := _t2015
+	var _t2016 *string
 	if (p.matchLookaheadLiteral("(", 0) && p.matchLookaheadLiteral("scope", 1)) {
-		_t2007 := p.parse_iceberg_catalog_config_scope()
-		_t2006 = ptr(_t2007)
-	}
-	iceberg_catalog_config_scope1222 := _t2006
-	_t2008 := p.parse_iceberg_properties()
-	iceberg_properties1223 := _t2008
-	_t2009 := p.parse_iceberg_auth_properties()
-	iceberg_auth_properties1224 := _t2009
+		_t2017 := p.parse_iceberg_catalog_config_scope()
+		_t2016 = ptr(_t2017)
+	}
+	iceberg_catalog_config_scope1226 := _t2016
+	_t2018 := p.parse_iceberg_properties()
+	iceberg_properties1227 := _t2018
+	_t2019 := p.parse_iceberg_auth_properties()
+	iceberg_auth_properties1228 := _t2019
 	p.consumeLiteral(")")
-	_t2010 := p.construct_iceberg_catalog_config(iceberg_catalog_uri1221, iceberg_catalog_config_scope1222, iceberg_properties1223, iceberg_auth_properties1224)
-	result1226 := _t2010
-	p.recordSpan(int(span_start1225), "IcebergCatalogConfig")
-	return result1226
+	_t2020 := p.construct_iceberg_catalog_config(iceberg_catalog_uri1225, iceberg_catalog_config_scope1226, iceberg_properties1227, iceberg_auth_properties1228)
+	result1230 := _t2020
+	p.recordSpan(int(span_start1229), "IcebergCatalogConfig")
+	return result1230
 }
 
 func (p *Parser) parse_iceberg_catalog_uri() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("catalog_uri")
-	string1227 := p.consumeTerminal("STRING").Value.str
+	string1231 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1227
+	return string1231
 }
 
 func (p *Parser) parse_iceberg_catalog_config_scope() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("scope")
-	string1228 := p.consumeTerminal("STRING").Value.str
+	string1232 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1228
+	return string1232
 }
 
 func (p *Parser) parse_iceberg_properties() [][]interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("properties")
-	xs1229 := [][]interface{}{}
-	cond1230 := p.matchLookaheadLiteral("(", 0)
-	for cond1230 {
-		_t2011 := p.parse_iceberg_property_entry()
-		item1231 := _t2011
-		xs1229 = append(xs1229, item1231)
-		cond1230 = p.matchLookaheadLiteral("(", 0)
-	}
-	iceberg_property_entrys1232 := xs1229
+	xs1233 := [][]interface{}{}
+	cond1234 := p.matchLookaheadLiteral("(", 0)
+	for cond1234 {
+		_t2021 := p.parse_iceberg_property_entry()
+		item1235 := _t2021
+		xs1233 = append(xs1233, item1235)
+		cond1234 = p.matchLookaheadLiteral("(", 0)
+	}
+	iceberg_property_entrys1236 := xs1233
 	p.consumeLiteral(")")
-	return iceberg_property_entrys1232
+	return iceberg_property_entrys1236
 }
 
 func (p *Parser) parse_iceberg_property_entry() []interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("prop")
-	string1233 := p.consumeTerminal("STRING").Value.str
-	string_31234 := p.consumeTerminal("STRING").Value.str
+	string1237 := p.consumeTerminal("STRING").Value.str
+	string_31238 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return []interface{}{string1233, string_31234}
+	return []interface{}{string1237, string_31238}
 }
 
 func (p *Parser) parse_iceberg_auth_properties() [][]interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("auth_properties")
-	xs1235 := [][]interface{}{}
-	cond1236 := p.matchLookaheadLiteral("(", 0)
-	for cond1236 {
-		_t2012 := p.parse_iceberg_masked_property_entry()
-		item1237 := _t2012
-		xs1235 = append(xs1235, item1237)
-		cond1236 = p.matchLookaheadLiteral("(", 0)
-	}
-	iceberg_masked_property_entrys1238 := xs1235
+	xs1239 := [][]interface{}{}
+	cond1240 := p.matchLookaheadLiteral("(", 0)
+	for cond1240 {
+		_t2022 := p.parse_iceberg_masked_property_entry()
+		item1241 := _t2022
+		xs1239 = append(xs1239, item1241)
+		cond1240 = p.matchLookaheadLiteral("(", 0)
+	}
+	iceberg_masked_property_entrys1242 := xs1239
 	p.consumeLiteral(")")
-	return iceberg_masked_property_entrys1238
+	return iceberg_masked_property_entrys1242
 }
 
 func (p *Parser) parse_iceberg_masked_property_entry() []interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("prop")
-	string1239 := p.consumeTerminal("STRING").Value.str
-	string_31240 := p.consumeTerminal("STRING").Value.str
+	string1243 := p.consumeTerminal("STRING").Value.str
+	string_31244 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return []interface{}{string1239, string_31240}
+	return []interface{}{string1243, string_31244}
 }
 
 func (p *Parser) parse_iceberg_from_snapshot() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("from_snapshot")
-	string1241 := p.consumeTerminal("STRING").Value.str
+	string1245 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1241
+	return string1245
 }
 
 func (p *Parser) parse_iceberg_to_snapshot() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("to_snapshot")
-	string1242 := p.consumeTerminal("STRING").Value.str
+	string1246 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1242
+	return string1246
 }
 
 func (p *Parser) parse_undefine() *pb.Undefine {
-	span_start1244 := int64(p.spanStart())
+	span_start1248 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("undefine")
-	_t2013 := p.parse_fragment_id()
-	fragment_id1243 := _t2013
+	_t2023 := p.parse_fragment_id()
+	fragment_id1247 := _t2023
 	p.consumeLiteral(")")
-	_t2014 := &pb.Undefine{FragmentId: fragment_id1243}
-	result1245 := _t2014
-	p.recordSpan(int(span_start1244), "Undefine")
-	return result1245
+	_t2024 := &pb.Undefine{FragmentId: fragment_id1247}
+	result1249 := _t2024
+	p.recordSpan(int(span_start1248), "Undefine")
+	return result1249
 }
 
 func (p *Parser) parse_context() *pb.Context {
-	span_start1250 := int64(p.spanStart())
+	span_start1254 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("context")
-	xs1246 := []*pb.RelationId{}
-	cond1247 := (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
-	for cond1247 {
-		_t2015 := p.parse_relation_id()
-		item1248 := _t2015
-		xs1246 = append(xs1246, item1248)
-		cond1247 = (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
-	}
-	relation_ids1249 := xs1246
+	xs1250 := []*pb.RelationId{}
+	cond1251 := (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
+	for cond1251 {
+		_t2025 := p.parse_relation_id()
+		item1252 := _t2025
+		xs1250 = append(xs1250, item1252)
+		cond1251 = (p.matchLookaheadLiteral(":", 0) || p.matchLookaheadTerminal("UINT128", 0))
+	}
+	relation_ids1253 := xs1250
 	p.consumeLiteral(")")
-	_t2016 := &pb.Context{Relations: relation_ids1249}
-	result1251 := _t2016
-	p.recordSpan(int(span_start1250), "Context")
-	return result1251
+	_t2026 := &pb.Context{Relations: relation_ids1253}
+	result1255 := _t2026
+	p.recordSpan(int(span_start1254), "Context")
+	return result1255
 }
 
 func (p *Parser) parse_snapshot() *pb.Snapshot {
-	span_start1257 := int64(p.spanStart())
+	span_start1261 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("snapshot")
-	_t2017 := p.parse_edb_path()
-	edb_path1252 := _t2017
-	xs1253 := []*pb.SnapshotMapping{}
-	cond1254 := p.matchLookaheadLiteral("[", 0)
-	for cond1254 {
-		_t2018 := p.parse_snapshot_mapping()
-		item1255 := _t2018
-		xs1253 = append(xs1253, item1255)
-		cond1254 = p.matchLookaheadLiteral("[", 0)
-	}
-	snapshot_mappings1256 := xs1253
+	_t2027 := p.parse_edb_path()
+	edb_path1256 := _t2027
+	xs1257 := []*pb.SnapshotMapping{}
+	cond1258 := p.matchLookaheadLiteral("[", 0)
+	for cond1258 {
+		_t2028 := p.parse_snapshot_mapping()
+		item1259 := _t2028
+		xs1257 = append(xs1257, item1259)
+		cond1258 = p.matchLookaheadLiteral("[", 0)
+	}
+	snapshot_mappings1260 := xs1257
 	p.consumeLiteral(")")
-	_t2019 := &pb.Snapshot{Prefix: edb_path1252, Mappings: snapshot_mappings1256}
-	result1258 := _t2019
-	p.recordSpan(int(span_start1257), "Snapshot")
-	return result1258
+	_t2029 := &pb.Snapshot{Prefix: edb_path1256, Mappings: snapshot_mappings1260}
+	result1262 := _t2029
+	p.recordSpan(int(span_start1261), "Snapshot")
+	return result1262
 }
 
 func (p *Parser) parse_snapshot_mapping() *pb.SnapshotMapping {
-	span_start1261 := int64(p.spanStart())
-	_t2020 := p.parse_edb_path()
-	edb_path1259 := _t2020
-	_t2021 := p.parse_relation_id()
-	relation_id1260 := _t2021
-	_t2022 := &pb.SnapshotMapping{DestinationPath: edb_path1259, SourceRelation: relation_id1260}
-	result1262 := _t2022
-	p.recordSpan(int(span_start1261), "SnapshotMapping")
-	return result1262
+	span_start1265 := int64(p.spanStart())
+	_t2030 := p.parse_edb_path()
+	edb_path1263 := _t2030
+	_t2031 := p.parse_relation_id()
+	relation_id1264 := _t2031
+	_t2032 := &pb.SnapshotMapping{DestinationPath: edb_path1263, SourceRelation: relation_id1264}
+	result1266 := _t2032
+	p.recordSpan(int(span_start1265), "SnapshotMapping")
+	return result1266
 }
 
 func (p *Parser) parse_epoch_reads() []*pb.Read {
 	p.consumeLiteral("(")
 	p.consumeLiteral("reads")
-	xs1263 := []*pb.Read{}
-	cond1264 := p.matchLookaheadLiteral("(", 0)
-	for cond1264 {
-		_t2023 := p.parse_read()
-		item1265 := _t2023
-		xs1263 = append(xs1263, item1265)
-		cond1264 = p.matchLookaheadLiteral("(", 0)
-	}
-	reads1266 := xs1263
+	xs1267 := []*pb.Read{}
+	cond1268 := p.matchLookaheadLiteral("(", 0)
+	for cond1268 {
+		_t2033 := p.parse_read()
+		item1269 := _t2033
+		xs1267 = append(xs1267, item1269)
+		cond1268 = p.matchLookaheadLiteral("(", 0)
+	}
+	reads1270 := xs1267
 	p.consumeLiteral(")")
-	return reads1266
+	return reads1270
 }
 
 func (p *Parser) parse_read() *pb.Read {
-	span_start1273 := int64(p.spanStart())
-	var _t2024 int64
+	span_start1277 := int64(p.spanStart())
+	var _t2034 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t2025 int64
+		var _t2035 int64
 		if p.matchLookaheadLiteral("what_if", 1) {
-			_t2025 = 2
+			_t2035 = 2
 		} else {
-			var _t2026 int64
+			var _t2036 int64
 			if p.matchLookaheadLiteral("output", 1) {
-				_t2026 = 1
+				_t2036 = 1
 			} else {
-				var _t2027 int64
+				var _t2037 int64
 				if p.matchLookaheadLiteral("export_iceberg", 1) {
-					_t2027 = 4
+					_t2037 = 4
 				} else {
-					var _t2028 int64
+					var _t2038 int64
 					if p.matchLookaheadLiteral("export", 1) {
-						_t2028 = 4
+						_t2038 = 4
 					} else {
-						var _t2029 int64
+						var _t2039 int64
 						if p.matchLookaheadLiteral("demand", 1) {
-							_t2029 = 0
+							_t2039 = 0
 						} else {
-							var _t2030 int64
+							var _t2040 int64
 							if p.matchLookaheadLiteral("abort", 1) {
-								_t2030 = 3
+								_t2040 = 3
 							} else {
-								_t2030 = -1
+								_t2040 = -1
 							}
-							_t2029 = _t2030
+							_t2039 = _t2040
 						}
-						_t2028 = _t2029
+						_t2038 = _t2039
 					}
-					_t2027 = _t2028
+					_t2037 = _t2038
 				}
-				_t2026 = _t2027
+				_t2036 = _t2037
 			}
-			_t2025 = _t2026
+			_t2035 = _t2036
 		}
-		_t2024 = _t2025
+		_t2034 = _t2035
 	} else {
-		_t2024 = -1
-	}
-	prediction1267 := _t2024
-	var _t2031 *pb.Read
-	if prediction1267 == 4 {
-		_t2032 := p.parse_export()
-		export1272 := _t2032
-		_t2033 := &pb.Read{}
-		_t2033.ReadType = &pb.Read_Export{Export: export1272}
-		_t2031 = _t2033
+		_t2034 = -1
+	}
+	prediction1271 := _t2034
+	var _t2041 *pb.Read
+	if prediction1271 == 4 {
+		_t2042 := p.parse_export()
+		export1276 := _t2042
+		_t2043 := &pb.Read{}
+		_t2043.ReadType = &pb.Read_Export{Export: export1276}
+		_t2041 = _t2043
 	} else {
-		var _t2034 *pb.Read
-		if prediction1267 == 3 {
-			_t2035 := p.parse_abort()
-			abort1271 := _t2035
-			_t2036 := &pb.Read{}
-			_t2036.ReadType = &pb.Read_Abort{Abort: abort1271}
-			_t2034 = _t2036
+		var _t2044 *pb.Read
+		if prediction1271 == 3 {
+			_t2045 := p.parse_abort()
+			abort1275 := _t2045
+			_t2046 := &pb.Read{}
+			_t2046.ReadType = &pb.Read_Abort{Abort: abort1275}
+			_t2044 = _t2046
 		} else {
-			var _t2037 *pb.Read
-			if prediction1267 == 2 {
-				_t2038 := p.parse_what_if()
-				what_if1270 := _t2038
-				_t2039 := &pb.Read{}
-				_t2039.ReadType = &pb.Read_WhatIf{WhatIf: what_if1270}
-				_t2037 = _t2039
+			var _t2047 *pb.Read
+			if prediction1271 == 2 {
+				_t2048 := p.parse_what_if()
+				what_if1274 := _t2048
+				_t2049 := &pb.Read{}
+				_t2049.ReadType = &pb.Read_WhatIf{WhatIf: what_if1274}
+				_t2047 = _t2049
 			} else {
-				var _t2040 *pb.Read
-				if prediction1267 == 1 {
-					_t2041 := p.parse_output()
-					output1269 := _t2041
-					_t2042 := &pb.Read{}
-					_t2042.ReadType = &pb.Read_Output{Output: output1269}
-					_t2040 = _t2042
+				var _t2050 *pb.Read
+				if prediction1271 == 1 {
+					_t2051 := p.parse_output()
+					output1273 := _t2051
+					_t2052 := &pb.Read{}
+					_t2052.ReadType = &pb.Read_Output{Output: output1273}
+					_t2050 = _t2052
 				} else {
-					var _t2043 *pb.Read
-					if prediction1267 == 0 {
-						_t2044 := p.parse_demand()
-						demand1268 := _t2044
-						_t2045 := &pb.Read{}
-						_t2045.ReadType = &pb.Read_Demand{Demand: demand1268}
-						_t2043 = _t2045
+					var _t2053 *pb.Read
+					if prediction1271 == 0 {
+						_t2054 := p.parse_demand()
+						demand1272 := _t2054
+						_t2055 := &pb.Read{}
+						_t2055.ReadType = &pb.Read_Demand{Demand: demand1272}
+						_t2053 = _t2055
 					} else {
 						panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in read", p.lookahead(0).Type, p.lookahead(0).Value)})
 					}
-					_t2040 = _t2043
+					_t2050 = _t2053
 				}
-				_t2037 = _t2040
+				_t2047 = _t2050
 			}
-			_t2034 = _t2037
+			_t2044 = _t2047
 		}
-		_t2031 = _t2034
+		_t2041 = _t2044
 	}
-	result1274 := _t2031
-	p.recordSpan(int(span_start1273), "Read")
-	return result1274
+	result1278 := _t2041
+	p.recordSpan(int(span_start1277), "Read")
+	return result1278
 }
 
 func (p *Parser) parse_demand() *pb.Demand {
-	span_start1276 := int64(p.spanStart())
+	span_start1280 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("demand")
-	_t2046 := p.parse_relation_id()
-	relation_id1275 := _t2046
+	_t2056 := p.parse_relation_id()
+	relation_id1279 := _t2056
 	p.consumeLiteral(")")
-	_t2047 := &pb.Demand{RelationId: relation_id1275}
-	result1277 := _t2047
-	p.recordSpan(int(span_start1276), "Demand")
-	return result1277
+	_t2057 := &pb.Demand{RelationId: relation_id1279}
+	result1281 := _t2057
+	p.recordSpan(int(span_start1280), "Demand")
+	return result1281
 }
 
 func (p *Parser) parse_output() *pb.Output {
-	span_start1280 := int64(p.spanStart())
+	span_start1284 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("output")
-	_t2048 := p.parse_name()
-	name1278 := _t2048
-	_t2049 := p.parse_relation_id()
-	relation_id1279 := _t2049
+	_t2058 := p.parse_name()
+	name1282 := _t2058
+	_t2059 := p.parse_relation_id()
+	relation_id1283 := _t2059
 	p.consumeLiteral(")")
-	_t2050 := &pb.Output{Name: name1278, RelationId: relation_id1279}
-	result1281 := _t2050
-	p.recordSpan(int(span_start1280), "Output")
-	return result1281
+	_t2060 := &pb.Output{Name: name1282, RelationId: relation_id1283}
+	result1285 := _t2060
+	p.recordSpan(int(span_start1284), "Output")
+	return result1285
 }
 
 func (p *Parser) parse_what_if() *pb.WhatIf {
-	span_start1284 := int64(p.spanStart())
+	span_start1288 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("what_if")
-	_t2051 := p.parse_name()
-	name1282 := _t2051
-	_t2052 := p.parse_epoch()
-	epoch1283 := _t2052
+	_t2061 := p.parse_name()
+	name1286 := _t2061
+	_t2062 := p.parse_epoch()
+	epoch1287 := _t2062
 	p.consumeLiteral(")")
-	_t2053 := &pb.WhatIf{Branch: name1282, Epoch: epoch1283}
-	result1285 := _t2053
-	p.recordSpan(int(span_start1284), "WhatIf")
-	return result1285
+	_t2063 := &pb.WhatIf{Branch: name1286, Epoch: epoch1287}
+	result1289 := _t2063
+	p.recordSpan(int(span_start1288), "WhatIf")
+	return result1289
 }
 
 func (p *Parser) parse_abort() *pb.Abort {
-	span_start1288 := int64(p.spanStart())
+	span_start1292 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("abort")
-	var _t2054 *string
+	var _t2064 *string
 	if (p.matchLookaheadLiteral(":", 0) && p.matchLookaheadTerminal("SYMBOL", 1)) {
-		_t2055 := p.parse_name()
-		_t2054 = ptr(_t2055)
+		_t2065 := p.parse_name()
+		_t2064 = ptr(_t2065)
 	}
-	name1286 := _t2054
-	_t2056 := p.parse_relation_id()
-	relation_id1287 := _t2056
+	name1290 := _t2064
+	_t2066 := p.parse_relation_id()
+	relation_id1291 := _t2066
 	p.consumeLiteral(")")
-	_t2057 := &pb.Abort{Name: deref(name1286, "abort"), RelationId: relation_id1287}
-	result1289 := _t2057
-	p.recordSpan(int(span_start1288), "Abort")
-	return result1289
+	_t2067 := &pb.Abort{Name: deref(name1290, "abort"), RelationId: relation_id1291}
+	result1293 := _t2067
+	p.recordSpan(int(span_start1292), "Abort")
+	return result1293
 }
 
 func (p *Parser) parse_export() *pb.Export {
-	span_start1293 := int64(p.spanStart())
-	var _t2058 int64
+	span_start1297 := int64(p.spanStart())
+	var _t2068 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t2059 int64
+		var _t2069 int64
 		if p.matchLookaheadLiteral("export_iceberg", 1) {
-			_t2059 = 1
+			_t2069 = 1
 		} else {
-			var _t2060 int64
+			var _t2070 int64
 			if p.matchLookaheadLiteral("export", 1) {
-				_t2060 = 0
+				_t2070 = 0
 			} else {
-				_t2060 = -1
+				_t2070 = -1
 			}
-			_t2059 = _t2060
+			_t2069 = _t2070
 		}
-		_t2058 = _t2059
+		_t2068 = _t2069
 	} else {
-		_t2058 = -1
+		_t2068 = -1
 	}
-	prediction1290 := _t2058
-	var _t2061 *pb.Export
-	if prediction1290 == 1 {
+	prediction1294 := _t2068
+	var _t2071 *pb.Export
+	if prediction1294 == 1 {
 		p.consumeLiteral("(")
 		p.consumeLiteral("export_iceberg")
-		_t2062 := p.parse_export_iceberg_config()
-		export_iceberg_config1292 := _t2062
+		_t2072 := p.parse_export_iceberg_config()
+		export_iceberg_config1296 := _t2072
 		p.consumeLiteral(")")
-		_t2063 := &pb.Export{}
-		_t2063.ExportConfig = &pb.Export_IcebergConfig{IcebergConfig: export_iceberg_config1292}
-		_t2061 = _t2063
+		_t2073 := &pb.Export{}
+		_t2073.ExportConfig = &pb.Export_IcebergConfig{IcebergConfig: export_iceberg_config1296}
+		_t2071 = _t2073
 	} else {
-		var _t2064 *pb.Export
-		if prediction1290 == 0 {
+		var _t2074 *pb.Export
+		if prediction1294 == 0 {
 			p.consumeLiteral("(")
 			p.consumeLiteral("export")
-			_t2065 := p.parse_export_csv_config()
-			export_csv_config1291 := _t2065
+			_t2075 := p.parse_export_csv_config()
+			export_csv_config1295 := _t2075
 			p.consumeLiteral(")")
-			_t2066 := &pb.Export{}
-			_t2066.ExportConfig = &pb.Export_CsvConfig{CsvConfig: export_csv_config1291}
-			_t2064 = _t2066
+			_t2076 := &pb.Export{}
+			_t2076.ExportConfig = &pb.Export_CsvConfig{CsvConfig: export_csv_config1295}
+			_t2074 = _t2076
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in export", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t2061 = _t2064
+		_t2071 = _t2074
 	}
-	result1294 := _t2061
-	p.recordSpan(int(span_start1293), "Export")
-	return result1294
+	result1298 := _t2071
+	p.recordSpan(int(span_start1297), "Export")
+	return result1298
 }
 
 func (p *Parser) parse_export_csv_config() *pb.ExportCSVConfig {
-	span_start1302 := int64(p.spanStart())
-	var _t2067 int64
+	span_start1306 := int64(p.spanStart())
+	var _t2077 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t2068 int64
+		var _t2078 int64
 		if p.matchLookaheadLiteral("export_csv_config_v2", 1) {
-			_t2068 = 0
+			_t2078 = 0
 		} else {
-			var _t2069 int64
+			var _t2079 int64
 			if p.matchLookaheadLiteral("export_csv_config", 1) {
-				_t2069 = 1
+				_t2079 = 1
 			} else {
-				_t2069 = -1
+				_t2079 = -1
 			}
-			_t2068 = _t2069
+			_t2078 = _t2079
 		}
-		_t2067 = _t2068
+		_t2077 = _t2078
 	} else {
-		_t2067 = -1
+		_t2077 = -1
 	}
-	prediction1295 := _t2067
-	var _t2070 *pb.ExportCSVConfig
-	if prediction1295 == 1 {
+	prediction1299 := _t2077
+	var _t2080 *pb.ExportCSVConfig
+	if prediction1299 == 1 {
 		p.consumeLiteral("(")
 		p.consumeLiteral("export_csv_config")
-		_t2071 := p.parse_export_csv_path()
-		export_csv_path1299 := _t2071
-		_t2072 := p.parse_export_csv_columns_list()
-		export_csv_columns_list1300 := _t2072
-		_t2073 := p.parse_config_dict()
-		config_dict1301 := _t2073
+		_t2081 := p.parse_export_csv_path()
+		export_csv_path1303 := _t2081
+		_t2082 := p.parse_export_csv_columns_list()
+		export_csv_columns_list1304 := _t2082
+		_t2083 := p.parse_config_dict()
+		config_dict1305 := _t2083
 		p.consumeLiteral(")")
-		_t2074 := p.construct_export_csv_config(export_csv_path1299, export_csv_columns_list1300, config_dict1301)
-		_t2070 = _t2074
+		_t2084 := p.construct_export_csv_config(export_csv_path1303, export_csv_columns_list1304, config_dict1305)
+		_t2080 = _t2084
 	} else {
-		var _t2075 *pb.ExportCSVConfig
-		if prediction1295 == 0 {
+		var _t2085 *pb.ExportCSVConfig
+		if prediction1299 == 0 {
 			p.consumeLiteral("(")
 			p.consumeLiteral("export_csv_config_v2")
-			_t2076 := p.parse_export_csv_path()
-			export_csv_path1296 := _t2076
-			_t2077 := p.parse_export_csv_source()
-			export_csv_source1297 := _t2077
-			_t2078 := p.parse_csv_config()
-			csv_config1298 := _t2078
+			_t2086 := p.parse_export_csv_path()
+			export_csv_path1300 := _t2086
+			_t2087 := p.parse_export_csv_source()
+			export_csv_source1301 := _t2087
+			_t2088 := p.parse_csv_config()
+			csv_config1302 := _t2088
 			p.consumeLiteral(")")
-			_t2079 := p.construct_export_csv_config_with_source(export_csv_path1296, export_csv_source1297, csv_config1298)
-			_t2075 = _t2079
+			_t2089 := p.construct_export_csv_config_with_source(export_csv_path1300, export_csv_source1301, csv_config1302)
+			_t2085 = _t2089
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in export_csv_config", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t2070 = _t2075
+		_t2080 = _t2085
 	}
-	result1303 := _t2070
-	p.recordSpan(int(span_start1302), "ExportCSVConfig")
-	return result1303
+	result1307 := _t2080
+	p.recordSpan(int(span_start1306), "ExportCSVConfig")
+	return result1307
 }
 
 func (p *Parser) parse_export_csv_path() string {
 	p.consumeLiteral("(")
 	p.consumeLiteral("path")
-	string1304 := p.consumeTerminal("STRING").Value.str
+	string1308 := p.consumeTerminal("STRING").Value.str
 	p.consumeLiteral(")")
-	return string1304
+	return string1308
 }
 
 func (p *Parser) parse_export_csv_source() *pb.ExportCSVSource {
-	span_start1311 := int64(p.spanStart())
-	var _t2080 int64
+	span_start1315 := int64(p.spanStart())
+	var _t2090 int64
 	if p.matchLookaheadLiteral("(", 0) {
-		var _t2081 int64
+		var _t2091 int64
 		if p.matchLookaheadLiteral("table_def", 1) {
-			_t2081 = 1
+			_t2091 = 1
 		} else {
-			var _t2082 int64
+			var _t2092 int64
 			if p.matchLookaheadLiteral("gnf_columns", 1) {
-				_t2082 = 0
+				_t2092 = 0
 			} else {
-				_t2082 = -1
+				_t2092 = -1
 			}
-			_t2081 = _t2082
+			_t2091 = _t2092
 		}
-		_t2080 = _t2081
+		_t2090 = _t2091
 	} else {
-		_t2080 = -1
+		_t2090 = -1
 	}
-	prediction1305 := _t2080
-	var _t2083 *pb.ExportCSVSource
-	if prediction1305 == 1 {
+	prediction1309 := _t2090
+	var _t2093 *pb.ExportCSVSource
+	if prediction1309 == 1 {
 		p.consumeLiteral("(")
 		p.consumeLiteral("table_def")
-		_t2084 := p.parse_relation_id()
-		relation_id1310 := _t2084
+		_t2094 := p.parse_relation_id()
+		relation_id1314 := _t2094
 		p.consumeLiteral(")")
-		_t2085 := &pb.ExportCSVSource{}
-		_t2085.CsvSource = &pb.ExportCSVSource_TableDef{TableDef: relation_id1310}
-		_t2083 = _t2085
+		_t2095 := &pb.ExportCSVSource{}
+		_t2095.CsvSource = &pb.ExportCSVSource_TableDef{TableDef: relation_id1314}
+		_t2093 = _t2095
 	} else {
-		var _t2086 *pb.ExportCSVSource
-		if prediction1305 == 0 {
+		var _t2096 *pb.ExportCSVSource
+		if prediction1309 == 0 {
 			p.consumeLiteral("(")
 			p.consumeLiteral("gnf_columns")
-			xs1306 := []*pb.ExportCSVColumn{}
-			cond1307 := p.matchLookaheadLiteral("(", 0)
-			for cond1307 {
-				_t2087 := p.parse_export_csv_column()
-				item1308 := _t2087
-				xs1306 = append(xs1306, item1308)
-				cond1307 = p.matchLookaheadLiteral("(", 0)
+			xs1310 := []*pb.ExportCSVColumn{}
+			cond1311 := p.matchLookaheadLiteral("(", 0)
+			for cond1311 {
+				_t2097 := p.parse_export_csv_column()
+				item1312 := _t2097
+				xs1310 = append(xs1310, item1312)
+				cond1311 = p.matchLookaheadLiteral("(", 0)
 			}
-			export_csv_columns1309 := xs1306
+			export_csv_columns1313 := xs1310
 			p.consumeLiteral(")")
-			_t2088 := &pb.ExportCSVColumns{Columns: export_csv_columns1309}
-			_t2089 := &pb.ExportCSVSource{}
-			_t2089.CsvSource = &pb.ExportCSVSource_GnfColumns{GnfColumns: _t2088}
-			_t2086 = _t2089
+			_t2098 := &pb.ExportCSVColumns{Columns: export_csv_columns1313}
+			_t2099 := &pb.ExportCSVSource{}
+			_t2099.CsvSource = &pb.ExportCSVSource_GnfColumns{GnfColumns: _t2098}
+			_t2096 = _t2099
 		} else {
 			panic(ParseError{msg: fmt.Sprintf("%s: %s=`%v`", "Unexpected token in export_csv_source", p.lookahead(0).Type, p.lookahead(0).Value)})
 		}
-		_t2083 = _t2086
+		_t2093 = _t2096
 	}
-	result1312 := _t2083
-	p.recordSpan(int(span_start1311), "ExportCSVSource")
-	return result1312
+	result1316 := _t2093
+	p.recordSpan(int(span_start1315), "ExportCSVSource")
+	return result1316
 }
 
 func (p *Parser) parse_export_csv_column() *pb.ExportCSVColumn {
-	span_start1315 := int64(p.spanStart())
+	span_start1319 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("column")
-	string1313 := p.consumeTerminal("STRING").Value.str
-	_t2090 := p.parse_relation_id()
-	relation_id1314 := _t2090
+	string1317 := p.consumeTerminal("STRING").Value.str
+	_t2100 := p.parse_relation_id()
+	relation_id1318 := _t2100
 	p.consumeLiteral(")")
-	_t2091 := &pb.ExportCSVColumn{ColumnName: string1313, ColumnData: relation_id1314}
-	result1316 := _t2091
-	p.recordSpan(int(span_start1315), "ExportCSVColumn")
-	return result1316
+	_t2101 := &pb.ExportCSVColumn{ColumnName: string1317, ColumnData: relation_id1318}
+	result1320 := _t2101
+	p.recordSpan(int(span_start1319), "ExportCSVColumn")
+	return result1320
 }
 
 func (p *Parser) parse_export_csv_columns_list() []*pb.ExportCSVColumn {
 	p.consumeLiteral("(")
 	p.consumeLiteral("columns")
-	xs1317 := []*pb.ExportCSVColumn{}
-	cond1318 := p.matchLookaheadLiteral("(", 0)
-	for cond1318 {
-		_t2092 := p.parse_export_csv_column()
-		item1319 := _t2092
-		xs1317 = append(xs1317, item1319)
-		cond1318 = p.matchLookaheadLiteral("(", 0)
-	}
-	export_csv_columns1320 := xs1317
+	xs1321 := []*pb.ExportCSVColumn{}
+	cond1322 := p.matchLookaheadLiteral("(", 0)
+	for cond1322 {
+		_t2102 := p.parse_export_csv_column()
+		item1323 := _t2102
+		xs1321 = append(xs1321, item1323)
+		cond1322 = p.matchLookaheadLiteral("(", 0)
+	}
+	export_csv_columns1324 := xs1321
 	p.consumeLiteral(")")
-	return export_csv_columns1320
+	return export_csv_columns1324
 }
 
 func (p *Parser) parse_export_iceberg_config() *pb.ExportIcebergConfig {
-	span_start1327 := int64(p.spanStart())
+	span_start1331 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("export_iceberg_config")
-	_t2093 := p.parse_iceberg_locator()
-	iceberg_locator1321 := _t2093
-	_t2094 := p.parse_iceberg_catalog_config()
-	iceberg_catalog_config1322 := _t2094
-	_t2095 := p.parse_export_iceberg_table_def()
-	export_iceberg_table_def1323 := _t2095
-	_t2096 := p.parse_export_iceberg_columns()
-	export_iceberg_columns1324 := _t2096
-	_t2097 := p.parse_iceberg_table_properties()
-	iceberg_table_properties1325 := _t2097
-	var _t2098 [][]interface{}
+	_t2103 := p.parse_iceberg_locator()
+	iceberg_locator1325 := _t2103
+	_t2104 := p.parse_iceberg_catalog_config()
+	iceberg_catalog_config1326 := _t2104
+	_t2105 := p.parse_export_iceberg_table_def()
+	export_iceberg_table_def1327 := _t2105
+	_t2106 := p.parse_export_iceberg_columns()
+	export_iceberg_columns1328 := _t2106
+	_t2107 := p.parse_iceberg_table_properties()
+	iceberg_table_properties1329 := _t2107
+	var _t2108 [][]interface{}
 	if p.matchLookaheadLiteral("{", 0) {
-		_t2099 := p.parse_config_dict()
-		_t2098 = _t2099
+		_t2109 := p.parse_config_dict()
+		_t2108 = _t2109
 	}
-	config_dict1326 := _t2098
+	config_dict1330 := _t2108
 	p.consumeLiteral(")")
-	_t2100 := p.construct_export_iceberg_config_full(iceberg_locator1321, iceberg_catalog_config1322, export_iceberg_table_def1323, export_iceberg_columns1324, iceberg_table_properties1325, config_dict1326)
-	result1328 := _t2100
-	p.recordSpan(int(span_start1327), "ExportIcebergConfig")
-	return result1328
+	_t2110 := p.construct_export_iceberg_config_full(iceberg_locator1325, iceberg_catalog_config1326, export_iceberg_table_def1327, export_iceberg_columns1328, iceberg_table_properties1329, config_dict1330)
+	result1332 := _t2110
+	p.recordSpan(int(span_start1331), "ExportIcebergConfig")
+	return result1332
 }
 
 func (p *Parser) parse_export_iceberg_table_def() *pb.RelationId {
-	span_start1330 := int64(p.spanStart())
+	span_start1334 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("table_def")
-	_t2101 := p.parse_relation_id()
-	relation_id1329 := _t2101
+	_t2111 := p.parse_relation_id()
+	relation_id1333 := _t2111
 	p.consumeLiteral(")")
-	result1331 := relation_id1329
-	p.recordSpan(int(span_start1330), "RelationId")
-	return result1331
+	result1335 := relation_id1333
+	p.recordSpan(int(span_start1334), "RelationId")
+	return result1335
 }
 
 func (p *Parser) parse_export_iceberg_columns() []*pb.ExportColumn {
 	p.consumeLiteral("(")
 	p.consumeLiteral("columns")
-	xs1332 := []*pb.ExportColumn{}
-	cond1333 := p.matchLookaheadLiteral("(", 0)
-	for cond1333 {
-		_t2102 := p.parse_export_iceberg_column()
-		item1334 := _t2102
-		xs1332 = append(xs1332, item1334)
-		cond1333 = p.matchLookaheadLiteral("(", 0)
-	}
-	export_iceberg_columns1335 := xs1332
+	xs1336 := []*pb.ExportColumn{}
+	cond1337 := p.matchLookaheadLiteral("(", 0)
+	for cond1337 {
+		_t2112 := p.parse_export_iceberg_column()
+		item1338 := _t2112
+		xs1336 = append(xs1336, item1338)
+		cond1337 = p.matchLookaheadLiteral("(", 0)
+	}
+	export_iceberg_columns1339 := xs1336
 	p.consumeLiteral(")")
-	return export_iceberg_columns1335
+	return export_iceberg_columns1339
 }
 
 func (p *Parser) parse_export_iceberg_column() *pb.ExportColumn {
-	span_start1338 := int64(p.spanStart())
+	span_start1342 := int64(p.spanStart())
 	p.consumeLiteral("(")
 	p.consumeLiteral("column")
-	string1336 := p.consumeTerminal("STRING").Value.str
-	_t2103 := p.parse_boolean_value()
-	boolean_value1337 := _t2103
+	string1340 := p.consumeTerminal("STRING").Value.str
+	_t2113 := p.parse_boolean_value()
+	boolean_value1341 := _t2113
 	p.consumeLiteral(")")
-	_t2104 := &pb.ExportColumn{Name: string1336, Nullable: boolean_value1337}
-	result1339 := _t2104
-	p.recordSpan(int(span_start1338), "ExportColumn")
-	return result1339
+	_t2114 := &pb.ExportColumn{Name: string1340, Nullable: boolean_value1341}
+	result1343 := _t2114
+	p.recordSpan(int(span_start1342), "ExportColumn")
+	return result1343
 }
 
 func (p *Parser) parse_iceberg_table_properties() [][]interface{} {
 	p.consumeLiteral("(")
 	p.consumeLiteral("table_properties")
-	xs1340 := [][]interface{}{}
-	cond1341 := p.matchLookaheadLiteral("(", 0)
-	for cond1341 {
-		_t2105 := p.parse_iceberg_property_entry()
-		item1342 := _t2105
-		xs1340 = append(xs1340, item1342)
-		cond1341 = p.matchLookaheadLiteral("(", 0)
-	}
-	iceberg_property_entrys1343 := xs1340
+	xs1344 := [][]interface{}{}
+	cond1345 := p.matchLookaheadLiteral("(", 0)
+	for cond1345 {
+		_t2115 := p.parse_iceberg_property_entry()
+		item1346 := _t2115
+		xs1344 = append(xs1344, item1346)
+		cond1345 = p.matchLookaheadLiteral("(", 0)
+	}
+	iceberg_property_entrys1347 := xs1344
 	p.consumeLiteral(")")
-	return iceberg_property_entrys1343
+	return iceberg_property_entrys1347
 }
 
 
diff --git a/sdks/go/src/pretty.go b/sdks/go/src/pretty.go
index 2c048bd2..77b9e8d7 100644
--- a/sdks/go/src/pretty.go
+++ b/sdks/go/src/pretty.go
@@ -343,157 +343,157 @@ func formatBool(b bool) string {
 // --- Helper functions ---
 
 func (p *PrettyPrinter) _make_value_int32(v int32) *pb.Value {
-	_t1741 := &pb.Value{}
-	_t1741.Value = &pb.Value_Int32Value{Int32Value: v}
-	return _t1741
+	_t1751 := &pb.Value{}
+	_t1751.Value = &pb.Value_Int32Value{Int32Value: v}
+	return _t1751
 }
 
 func (p *PrettyPrinter) _make_value_int64(v int64) *pb.Value {
-	_t1742 := &pb.Value{}
-	_t1742.Value = &pb.Value_IntValue{IntValue: v}
-	return _t1742
+	_t1752 := &pb.Value{}
+	_t1752.Value = &pb.Value_IntValue{IntValue: v}
+	return _t1752
 }
 
 func (p *PrettyPrinter) _make_value_float64(v float64) *pb.Value {
-	_t1743 := &pb.Value{}
-	_t1743.Value = &pb.Value_FloatValue{FloatValue: v}
-	return _t1743
+	_t1753 := &pb.Value{}
+	_t1753.Value = &pb.Value_FloatValue{FloatValue: v}
+	return _t1753
 }
 
 func (p *PrettyPrinter) _make_value_string(v string) *pb.Value {
-	_t1744 := &pb.Value{}
-	_t1744.Value = &pb.Value_StringValue{StringValue: v}
-	return _t1744
+	_t1754 := &pb.Value{}
+	_t1754.Value = &pb.Value_StringValue{StringValue: v}
+	return _t1754
 }
 
 func (p *PrettyPrinter) _make_value_boolean(v bool) *pb.Value {
-	_t1745 := &pb.Value{}
-	_t1745.Value = &pb.Value_BooleanValue{BooleanValue: v}
-	return _t1745
+	_t1755 := &pb.Value{}
+	_t1755.Value = &pb.Value_BooleanValue{BooleanValue: v}
+	return _t1755
 }
 
 func (p *PrettyPrinter) _make_value_uint128(v *pb.UInt128Value) *pb.Value {
-	_t1746 := &pb.Value{}
-	_t1746.Value = &pb.Value_Uint128Value{Uint128Value: v}
-	return _t1746
+	_t1756 := &pb.Value{}
+	_t1756.Value = &pb.Value_Uint128Value{Uint128Value: v}
+	return _t1756
 }
 
 func (p *PrettyPrinter) deconstruct_configure(msg *pb.Configure) [][]interface{} {
 	result := [][]interface{}{}
 	if msg.GetIvmConfig().GetLevel() == pb.MaintenanceLevel_MAINTENANCE_LEVEL_AUTO {
-		_t1747 := p._make_value_string("auto")
-		result = append(result, []interface{}{"ivm.maintenance_level", _t1747})
+		_t1757 := p._make_value_string("auto")
+		result = append(result, []interface{}{"ivm.maintenance_level", _t1757})
 	} else {
 		if msg.GetIvmConfig().GetLevel() == pb.MaintenanceLevel_MAINTENANCE_LEVEL_ALL {
-			_t1748 := p._make_value_string("all")
-			result = append(result, []interface{}{"ivm.maintenance_level", _t1748})
+			_t1758 := p._make_value_string("all")
+			result = append(result, []interface{}{"ivm.maintenance_level", _t1758})
 		} else {
 			if msg.GetIvmConfig().GetLevel() == pb.MaintenanceLevel_MAINTENANCE_LEVEL_OFF {
-				_t1749 := p._make_value_string("off")
-				result = append(result, []interface{}{"ivm.maintenance_level", _t1749})
+				_t1759 := p._make_value_string("off")
+				result = append(result, []interface{}{"ivm.maintenance_level", _t1759})
 			}
 		}
 	}
-	_t1750 := p._make_value_int64(msg.GetSemanticsVersion())
-	result = append(result, []interface{}{"semantics_version", _t1750})
+	_t1760 := p._make_value_int64(msg.GetSemanticsVersion())
+	result = append(result, []interface{}{"semantics_version", _t1760})
 	return listSort(result)
 }
 
 func (p *PrettyPrinter) deconstruct_csv_config(msg *pb.CSVConfig) [][]interface{} {
 	result := [][]interface{}{}
-	_t1751 := p._make_value_int32(msg.GetHeaderRow())
-	result = append(result, []interface{}{"csv_header_row", _t1751})
-	_t1752 := p._make_value_int64(msg.GetSkip())
-	result = append(result, []interface{}{"csv_skip", _t1752})
+	_t1761 := p._make_value_int32(msg.GetHeaderRow())
+	result = append(result, []interface{}{"csv_header_row", _t1761})
+	_t1762 := p._make_value_int64(msg.GetSkip())
+	result = append(result, []interface{}{"csv_skip", _t1762})
 	if msg.GetNewLine() != "" {
-		_t1753 := p._make_value_string(msg.GetNewLine())
-		result = append(result, []interface{}{"csv_new_line", _t1753})
-	}
-	_t1754 := p._make_value_string(msg.GetDelimiter())
-	result = append(result, []interface{}{"csv_delimiter", _t1754})
-	_t1755 := p._make_value_string(msg.GetQuotechar())
-	result = append(result, []interface{}{"csv_quotechar", _t1755})
-	_t1756 := p._make_value_string(msg.GetEscapechar())
-	result = append(result, []interface{}{"csv_escapechar", _t1756})
+		_t1763 := p._make_value_string(msg.GetNewLine())
+		result = append(result, []interface{}{"csv_new_line", _t1763})
+	}
+	_t1764 := p._make_value_string(msg.GetDelimiter())
+	result = append(result, []interface{}{"csv_delimiter", _t1764})
+	_t1765 := p._make_value_string(msg.GetQuotechar())
+	result = append(result, []interface{}{"csv_quotechar", _t1765})
+	_t1766 := p._make_value_string(msg.GetEscapechar())
+	result = append(result, []interface{}{"csv_escapechar", _t1766})
 	if msg.GetComment() != "" {
-		_t1757 := p._make_value_string(msg.GetComment())
-		result = append(result, []interface{}{"csv_comment", _t1757})
+		_t1767 := p._make_value_string(msg.GetComment())
+		result = append(result, []interface{}{"csv_comment", _t1767})
 	}
 	for _, missing_string := range msg.GetMissingStrings() {
-		_t1758 := p._make_value_string(missing_string)
-		result = append(result, []interface{}{"csv_missing_strings", _t1758})
-	}
-	_t1759 := p._make_value_string(msg.GetDecimalSeparator())
-	result = append(result, []interface{}{"csv_decimal_separator", _t1759})
-	_t1760 := p._make_value_string(msg.GetEncoding())
-	result = append(result, []interface{}{"csv_encoding", _t1760})
-	_t1761 := p._make_value_string(msg.GetCompression())
-	result = append(result, []interface{}{"csv_compression", _t1761})
+		_t1768 := p._make_value_string(missing_string)
+		result = append(result, []interface{}{"csv_missing_strings", _t1768})
+	}
+	_t1769 := p._make_value_string(msg.GetDecimalSeparator())
+	result = append(result, []interface{}{"csv_decimal_separator", _t1769})
+	_t1770 := p._make_value_string(msg.GetEncoding())
+	result = append(result, []interface{}{"csv_encoding", _t1770})
+	_t1771 := p._make_value_string(msg.GetCompression())
+	result = append(result, []interface{}{"csv_compression", _t1771})
 	if msg.GetPartitionSizeMb() != 0 {
-		_t1762 := p._make_value_int64(msg.GetPartitionSizeMb())
-		result = append(result, []interface{}{"csv_partition_size_mb", _t1762})
+		_t1772 := p._make_value_int64(msg.GetPartitionSizeMb())
+		result = append(result, []interface{}{"csv_partition_size_mb", _t1772})
 	}
 	return listSort(result)
 }
 
 func (p *PrettyPrinter) deconstruct_betree_info_config(msg *pb.BeTreeInfo) [][]interface{} {
 	result := [][]interface{}{}
-	_t1763 := p._make_value_float64(msg.GetStorageConfig().GetEpsilon())
-	result = append(result, []interface{}{"betree_config_epsilon", _t1763})
-	_t1764 := p._make_value_int64(msg.GetStorageConfig().GetMaxPivots())
-	result = append(result, []interface{}{"betree_config_max_pivots", _t1764})
-	_t1765 := p._make_value_int64(msg.GetStorageConfig().GetMaxDeltas())
-	result = append(result, []interface{}{"betree_config_max_deltas", _t1765})
-	_t1766 := p._make_value_int64(msg.GetStorageConfig().GetMaxLeaf())
-	result = append(result, []interface{}{"betree_config_max_leaf", _t1766})
+	_t1773 := p._make_value_float64(msg.GetStorageConfig().GetEpsilon())
+	result = append(result, []interface{}{"betree_config_epsilon", _t1773})
+	_t1774 := p._make_value_int64(msg.GetStorageConfig().GetMaxPivots())
+	result = append(result, []interface{}{"betree_config_max_pivots", _t1774})
+	_t1775 := p._make_value_int64(msg.GetStorageConfig().GetMaxDeltas())
+	result = append(result, []interface{}{"betree_config_max_deltas", _t1775})
+	_t1776 := p._make_value_int64(msg.GetStorageConfig().GetMaxLeaf())
+	result = append(result, []interface{}{"betree_config_max_leaf", _t1776})
 	if hasProtoField(msg.GetRelationLocator(), "root_pageid") {
 		if msg.GetRelationLocator().GetRootPageid() != nil {
-			_t1767 := p._make_value_uint128(msg.GetRelationLocator().GetRootPageid())
-			result = append(result, []interface{}{"betree_locator_root_pageid", _t1767})
+			_t1777 := p._make_value_uint128(msg.GetRelationLocator().GetRootPageid())
+			result = append(result, []interface{}{"betree_locator_root_pageid", _t1777})
 		}
 	}
 	if hasProtoField(msg.GetRelationLocator(), "inline_data") {
 		if msg.GetRelationLocator().GetInlineData() != nil {
-			_t1768 := p._make_value_string(string(msg.GetRelationLocator().GetInlineData()))
-			result = append(result, []interface{}{"betree_locator_inline_data", _t1768})
+			_t1778 := p._make_value_string(string(msg.GetRelationLocator().GetInlineData()))
+			result = append(result, []interface{}{"betree_locator_inline_data", _t1778})
 		}
 	}
-	_t1769 := p._make_value_int64(msg.GetRelationLocator().GetElementCount())
-	result = append(result, []interface{}{"betree_locator_element_count", _t1769})
-	_t1770 := p._make_value_int64(msg.GetRelationLocator().GetTreeHeight())
-	result = append(result, []interface{}{"betree_locator_tree_height", _t1770})
+	_t1779 := p._make_value_int64(msg.GetRelationLocator().GetElementCount())
+	result = append(result, []interface{}{"betree_locator_element_count", _t1779})
+	_t1780 := p._make_value_int64(msg.GetRelationLocator().GetTreeHeight())
+	result = append(result, []interface{}{"betree_locator_tree_height", _t1780})
 	return listSort(result)
 }
 
 func (p *PrettyPrinter) deconstruct_export_csv_config(msg *pb.ExportCSVConfig) [][]interface{} {
 	result := [][]interface{}{}
 	if msg.PartitionSize != nil {
-		_t1771 := p._make_value_int64(*msg.PartitionSize)
-		result = append(result, []interface{}{"partition_size", _t1771})
+		_t1781 := p._make_value_int64(*msg.PartitionSize)
+		result = append(result, []interface{}{"partition_size", _t1781})
 	}
 	if msg.Compression != nil {
-		_t1772 := p._make_value_string(*msg.Compression)
-		result = append(result, []interface{}{"compression", _t1772})
+		_t1782 := p._make_value_string(*msg.Compression)
+		result = append(result, []interface{}{"compression", _t1782})
 	}
 	if msg.SyntaxHeaderRow != nil {
-		_t1773 := p._make_value_boolean(*msg.SyntaxHeaderRow)
-		result = append(result, []interface{}{"syntax_header_row", _t1773})
+		_t1783 := p._make_value_boolean(*msg.SyntaxHeaderRow)
+		result = append(result, []interface{}{"syntax_header_row", _t1783})
 	}
 	if msg.SyntaxMissingString != nil {
-		_t1774 := p._make_value_string(*msg.SyntaxMissingString)
-		result = append(result, []interface{}{"syntax_missing_string", _t1774})
+		_t1784 := p._make_value_string(*msg.SyntaxMissingString)
+		result = append(result, []interface{}{"syntax_missing_string", _t1784})
 	}
 	if msg.SyntaxDelim != nil {
-		_t1775 := p._make_value_string(*msg.SyntaxDelim)
-		result = append(result, []interface{}{"syntax_delim", _t1775})
+		_t1785 := p._make_value_string(*msg.SyntaxDelim)
+		result = append(result, []interface{}{"syntax_delim", _t1785})
 	}
 	if msg.SyntaxQuotechar != nil {
-		_t1776 := p._make_value_string(*msg.SyntaxQuotechar)
-		result = append(result, []interface{}{"syntax_quotechar", _t1776})
+		_t1786 := p._make_value_string(*msg.SyntaxQuotechar)
+		result = append(result, []interface{}{"syntax_quotechar", _t1786})
 	}
 	if msg.SyntaxEscapechar != nil {
-		_t1777 := p._make_value_string(*msg.SyntaxEscapechar)
-		result = append(result, []interface{}{"syntax_escapechar", _t1777})
+		_t1787 := p._make_value_string(*msg.SyntaxEscapechar)
+		result = append(result, []interface{}{"syntax_escapechar", _t1787})
 	}
 	return listSort(result)
 }
@@ -503,51 +503,51 @@ func (p *PrettyPrinter) mask_secret_value(pair []interface{}) string {
 }
 
 func (p *PrettyPrinter) deconstruct_iceberg_catalog_config_scope_optional(msg *pb.IcebergCatalogConfig) *string {
-	var _t1778 interface{}
+	var _t1788 interface{}
 	if *msg.Scope != "" {
 		return ptr(*msg.Scope)
 	}
-	_ = _t1778
+	_ = _t1788
 	return nil
 }
 
 func (p *PrettyPrinter) deconstruct_iceberg_data_from_snapshot_optional(msg *pb.IcebergData) *string {
-	var _t1779 interface{}
+	var _t1789 interface{}
 	if *msg.FromSnapshot != "" {
 		return ptr(*msg.FromSnapshot)
 	}
-	_ = _t1779
+	_ = _t1789
 	return nil
 }
 
 func (p *PrettyPrinter) deconstruct_iceberg_data_to_snapshot_optional(msg *pb.IcebergData) *string {
-	var _t1780 interface{}
+	var _t1790 interface{}
 	if *msg.ToSnapshot != "" {
 		return ptr(*msg.ToSnapshot)
 	}
-	_ = _t1780
+	_ = _t1790
 	return nil
 }
 
 func (p *PrettyPrinter) deconstruct_export_iceberg_config_optional(msg *pb.ExportIcebergConfig) [][]interface{} {
 	result := [][]interface{}{}
 	if *msg.Prefix != "" {
-		_t1781 := p._make_value_string(*msg.Prefix)
-		result = append(result, []interface{}{"prefix", _t1781})
+		_t1791 := p._make_value_string(*msg.Prefix)
+		result = append(result, []interface{}{"prefix", _t1791})
 	}
 	if *msg.TargetFileSizeBytes != 0 {
-		_t1782 := p._make_value_int64(*msg.TargetFileSizeBytes)
-		result = append(result, []interface{}{"target_file_size_bytes", _t1782})
+		_t1792 := p._make_value_int64(*msg.TargetFileSizeBytes)
+		result = append(result, []interface{}{"target_file_size_bytes", _t1792})
 	}
 	if msg.GetCompression() != "" {
-		_t1783 := p._make_value_string(msg.GetCompression())
-		result = append(result, []interface{}{"compression", _t1783})
+		_t1793 := p._make_value_string(msg.GetCompression())
+		result = append(result, []interface{}{"compression", _t1793})
 	}
-	var _t1784 interface{}
+	var _t1794 interface{}
 	if int64(len(result)) == 0 {
 		return nil
 	}
-	_ = _t1784
+	_ = _t1794
 	return listSort(result)
 }
 
@@ -558,11 +558,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 _t1785 interface{}
+	var _t1795 interface{}
 	if name == nil {
 		return p.relationIdToUint128(msg)
 	}
-	_ = _t1785
+	_ = _t1795
 	return nil
 }
 
@@ -580,45 +580,45 @@ func (p *PrettyPrinter) deconstruct_bindings_with_arity(abs *pb.Abstraction, val
 // --- Pretty-print methods ---
 
 func (p *PrettyPrinter) pretty_transaction(msg *pb.Transaction) interface{} {
-	flat809 := p.tryFlat(msg, func() { p.pretty_transaction(msg) })
-	if flat809 != nil {
-		p.write(*flat809)
+	flat813 := p.tryFlat(msg, func() { p.pretty_transaction(msg) })
+	if flat813 != nil {
+		p.write(*flat813)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1600 *pb.Configure
+		var _t1608 *pb.Configure
 		if hasProtoField(_dollar_dollar, "configure") {
-			_t1600 = _dollar_dollar.GetConfigure()
+			_t1608 = _dollar_dollar.GetConfigure()
 		}
-		var _t1601 *pb.Sync
+		var _t1609 *pb.Sync
 		if hasProtoField(_dollar_dollar, "sync") {
-			_t1601 = _dollar_dollar.GetSync()
+			_t1609 = _dollar_dollar.GetSync()
 		}
-		fields800 := []interface{}{_t1600, _t1601, _dollar_dollar.GetEpochs()}
-		unwrapped_fields801 := fields800
+		fields804 := []interface{}{_t1608, _t1609, _dollar_dollar.GetEpochs()}
+		unwrapped_fields805 := fields804
 		p.write("(")
 		p.write("transaction")
 		p.indentSexp()
-		field802 := unwrapped_fields801[0].(*pb.Configure)
-		if field802 != nil {
+		field806 := unwrapped_fields805[0].(*pb.Configure)
+		if field806 != nil {
 			p.newline()
-			opt_val803 := field802
-			p.pretty_configure(opt_val803)
+			opt_val807 := field806
+			p.pretty_configure(opt_val807)
 		}
-		field804 := unwrapped_fields801[1].(*pb.Sync)
-		if field804 != nil {
+		field808 := unwrapped_fields805[1].(*pb.Sync)
+		if field808 != nil {
 			p.newline()
-			opt_val805 := field804
-			p.pretty_sync(opt_val805)
+			opt_val809 := field808
+			p.pretty_sync(opt_val809)
 		}
-		field806 := unwrapped_fields801[2].([]*pb.Epoch)
-		if !(len(field806) == 0) {
+		field810 := unwrapped_fields805[2].([]*pb.Epoch)
+		if !(len(field810) == 0) {
 			p.newline()
-			for i808, elem807 := range field806 {
-				if (i808 > 0) {
+			for i812, elem811 := range field810 {
+				if (i812 > 0) {
 					p.newline()
 				}
-				p.pretty_epoch(elem807)
+				p.pretty_epoch(elem811)
 			}
 		}
 		p.dedent()
@@ -628,20 +628,20 @@ func (p *PrettyPrinter) pretty_transaction(msg *pb.Transaction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_configure(msg *pb.Configure) interface{} {
-	flat812 := p.tryFlat(msg, func() { p.pretty_configure(msg) })
-	if flat812 != nil {
-		p.write(*flat812)
+	flat816 := p.tryFlat(msg, func() { p.pretty_configure(msg) })
+	if flat816 != nil {
+		p.write(*flat816)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1602 := p.deconstruct_configure(_dollar_dollar)
-		fields810 := _t1602
-		unwrapped_fields811 := fields810
+		_t1610 := p.deconstruct_configure(_dollar_dollar)
+		fields814 := _t1610
+		unwrapped_fields815 := fields814
 		p.write("(")
 		p.write("configure")
 		p.indentSexp()
 		p.newline()
-		p.pretty_config_dict(unwrapped_fields811)
+		p.pretty_config_dict(unwrapped_fields815)
 		p.dedent()
 		p.write(")")
 	}
@@ -649,21 +649,21 @@ func (p *PrettyPrinter) pretty_configure(msg *pb.Configure) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_config_dict(msg [][]interface{}) interface{} {
-	flat816 := p.tryFlat(msg, func() { p.pretty_config_dict(msg) })
-	if flat816 != nil {
-		p.write(*flat816)
+	flat820 := p.tryFlat(msg, func() { p.pretty_config_dict(msg) })
+	if flat820 != nil {
+		p.write(*flat820)
 		return nil
 	} else {
-		fields813 := msg
+		fields817 := msg
 		p.write("{")
 		p.indent()
-		if !(len(fields813) == 0) {
+		if !(len(fields817) == 0) {
 			p.newline()
-			for i815, elem814 := range fields813 {
-				if (i815 > 0) {
+			for i819, elem818 := range fields817 {
+				if (i819 > 0) {
 					p.newline()
 				}
-				p.pretty_config_key_value(elem814)
+				p.pretty_config_key_value(elem818)
 			}
 		}
 		p.dedent()
@@ -673,152 +673,152 @@ func (p *PrettyPrinter) pretty_config_dict(msg [][]interface{}) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_config_key_value(msg []interface{}) interface{} {
-	flat821 := p.tryFlat(msg, func() { p.pretty_config_key_value(msg) })
-	if flat821 != nil {
-		p.write(*flat821)
+	flat825 := p.tryFlat(msg, func() { p.pretty_config_key_value(msg) })
+	if flat825 != nil {
+		p.write(*flat825)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields817 := []interface{}{_dollar_dollar[0].(string), _dollar_dollar[1].(*pb.Value)}
-		unwrapped_fields818 := fields817
+		fields821 := []interface{}{_dollar_dollar[0].(string), _dollar_dollar[1].(*pb.Value)}
+		unwrapped_fields822 := fields821
 		p.write(":")
-		field819 := unwrapped_fields818[0].(string)
-		p.write(field819)
+		field823 := unwrapped_fields822[0].(string)
+		p.write(field823)
 		p.write(" ")
-		field820 := unwrapped_fields818[1].(*pb.Value)
-		p.pretty_raw_value(field820)
+		field824 := unwrapped_fields822[1].(*pb.Value)
+		p.pretty_raw_value(field824)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_raw_value(msg *pb.Value) interface{} {
-	flat847 := p.tryFlat(msg, func() { p.pretty_raw_value(msg) })
-	if flat847 != nil {
-		p.write(*flat847)
+	flat851 := p.tryFlat(msg, func() { p.pretty_raw_value(msg) })
+	if flat851 != nil {
+		p.write(*flat851)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1603 *pb.DateValue
+		var _t1611 *pb.DateValue
 		if hasProtoField(_dollar_dollar, "date_value") {
-			_t1603 = _dollar_dollar.GetDateValue()
+			_t1611 = _dollar_dollar.GetDateValue()
 		}
-		deconstruct_result845 := _t1603
-		if deconstruct_result845 != nil {
-			unwrapped846 := deconstruct_result845
-			p.pretty_raw_date(unwrapped846)
+		deconstruct_result849 := _t1611
+		if deconstruct_result849 != nil {
+			unwrapped850 := deconstruct_result849
+			p.pretty_raw_date(unwrapped850)
 		} else {
 			_dollar_dollar := msg
-			var _t1604 *pb.DateTimeValue
+			var _t1612 *pb.DateTimeValue
 			if hasProtoField(_dollar_dollar, "datetime_value") {
-				_t1604 = _dollar_dollar.GetDatetimeValue()
+				_t1612 = _dollar_dollar.GetDatetimeValue()
 			}
-			deconstruct_result843 := _t1604
-			if deconstruct_result843 != nil {
-				unwrapped844 := deconstruct_result843
-				p.pretty_raw_datetime(unwrapped844)
+			deconstruct_result847 := _t1612
+			if deconstruct_result847 != nil {
+				unwrapped848 := deconstruct_result847
+				p.pretty_raw_datetime(unwrapped848)
 			} else {
 				_dollar_dollar := msg
-				var _t1605 *string
+				var _t1613 *string
 				if hasProtoField(_dollar_dollar, "string_value") {
-					_t1605 = ptr(_dollar_dollar.GetStringValue())
+					_t1613 = ptr(_dollar_dollar.GetStringValue())
 				}
-				deconstruct_result841 := _t1605
-				if deconstruct_result841 != nil {
-					unwrapped842 := *deconstruct_result841
-					p.write(p.formatStringValue(unwrapped842))
+				deconstruct_result845 := _t1613
+				if deconstruct_result845 != nil {
+					unwrapped846 := *deconstruct_result845
+					p.write(p.formatStringValue(unwrapped846))
 				} else {
 					_dollar_dollar := msg
-					var _t1606 *int32
+					var _t1614 *int32
 					if hasProtoField(_dollar_dollar, "int32_value") {
-						_t1606 = ptr(_dollar_dollar.GetInt32Value())
+						_t1614 = ptr(_dollar_dollar.GetInt32Value())
 					}
-					deconstruct_result839 := _t1606
-					if deconstruct_result839 != nil {
-						unwrapped840 := *deconstruct_result839
-						p.write(fmt.Sprintf("%di32", unwrapped840))
+					deconstruct_result843 := _t1614
+					if deconstruct_result843 != nil {
+						unwrapped844 := *deconstruct_result843
+						p.write(fmt.Sprintf("%di32", unwrapped844))
 					} else {
 						_dollar_dollar := msg
-						var _t1607 *int64
+						var _t1615 *int64
 						if hasProtoField(_dollar_dollar, "int_value") {
-							_t1607 = ptr(_dollar_dollar.GetIntValue())
+							_t1615 = ptr(_dollar_dollar.GetIntValue())
 						}
-						deconstruct_result837 := _t1607
-						if deconstruct_result837 != nil {
-							unwrapped838 := *deconstruct_result837
-							p.write(fmt.Sprintf("%d", unwrapped838))
+						deconstruct_result841 := _t1615
+						if deconstruct_result841 != nil {
+							unwrapped842 := *deconstruct_result841
+							p.write(fmt.Sprintf("%d", unwrapped842))
 						} else {
 							_dollar_dollar := msg
-							var _t1608 *float32
+							var _t1616 *float32
 							if hasProtoField(_dollar_dollar, "float32_value") {
-								_t1608 = ptr(_dollar_dollar.GetFloat32Value())
+								_t1616 = ptr(_dollar_dollar.GetFloat32Value())
 							}
-							deconstruct_result835 := _t1608
-							if deconstruct_result835 != nil {
-								unwrapped836 := *deconstruct_result835
-								p.write(formatFloat32(unwrapped836))
+							deconstruct_result839 := _t1616
+							if deconstruct_result839 != nil {
+								unwrapped840 := *deconstruct_result839
+								p.write(formatFloat32(unwrapped840))
 							} else {
 								_dollar_dollar := msg
-								var _t1609 *float64
+								var _t1617 *float64
 								if hasProtoField(_dollar_dollar, "float_value") {
-									_t1609 = ptr(_dollar_dollar.GetFloatValue())
+									_t1617 = ptr(_dollar_dollar.GetFloatValue())
 								}
-								deconstruct_result833 := _t1609
-								if deconstruct_result833 != nil {
-									unwrapped834 := *deconstruct_result833
-									p.write(formatFloat64(unwrapped834))
+								deconstruct_result837 := _t1617
+								if deconstruct_result837 != nil {
+									unwrapped838 := *deconstruct_result837
+									p.write(formatFloat64(unwrapped838))
 								} else {
 									_dollar_dollar := msg
-									var _t1610 *uint32
+									var _t1618 *uint32
 									if hasProtoField(_dollar_dollar, "uint32_value") {
-										_t1610 = ptr(_dollar_dollar.GetUint32Value())
+										_t1618 = ptr(_dollar_dollar.GetUint32Value())
 									}
-									deconstruct_result831 := _t1610
-									if deconstruct_result831 != nil {
-										unwrapped832 := *deconstruct_result831
-										p.write(fmt.Sprintf("%du32", unwrapped832))
+									deconstruct_result835 := _t1618
+									if deconstruct_result835 != nil {
+										unwrapped836 := *deconstruct_result835
+										p.write(fmt.Sprintf("%du32", unwrapped836))
 									} else {
 										_dollar_dollar := msg
-										var _t1611 *pb.UInt128Value
+										var _t1619 *pb.UInt128Value
 										if hasProtoField(_dollar_dollar, "uint128_value") {
-											_t1611 = _dollar_dollar.GetUint128Value()
+											_t1619 = _dollar_dollar.GetUint128Value()
 										}
-										deconstruct_result829 := _t1611
-										if deconstruct_result829 != nil {
-											unwrapped830 := deconstruct_result829
-											p.write(p.formatUint128(unwrapped830))
+										deconstruct_result833 := _t1619
+										if deconstruct_result833 != nil {
+											unwrapped834 := deconstruct_result833
+											p.write(p.formatUint128(unwrapped834))
 										} else {
 											_dollar_dollar := msg
-											var _t1612 *pb.Int128Value
+											var _t1620 *pb.Int128Value
 											if hasProtoField(_dollar_dollar, "int128_value") {
-												_t1612 = _dollar_dollar.GetInt128Value()
+												_t1620 = _dollar_dollar.GetInt128Value()
 											}
-											deconstruct_result827 := _t1612
-											if deconstruct_result827 != nil {
-												unwrapped828 := deconstruct_result827
-												p.write(p.formatInt128(unwrapped828))
+											deconstruct_result831 := _t1620
+											if deconstruct_result831 != nil {
+												unwrapped832 := deconstruct_result831
+												p.write(p.formatInt128(unwrapped832))
 											} else {
 												_dollar_dollar := msg
-												var _t1613 *pb.DecimalValue
+												var _t1621 *pb.DecimalValue
 												if hasProtoField(_dollar_dollar, "decimal_value") {
-													_t1613 = _dollar_dollar.GetDecimalValue()
+													_t1621 = _dollar_dollar.GetDecimalValue()
 												}
-												deconstruct_result825 := _t1613
-												if deconstruct_result825 != nil {
-													unwrapped826 := deconstruct_result825
-													p.write(p.formatDecimal(unwrapped826))
+												deconstruct_result829 := _t1621
+												if deconstruct_result829 != nil {
+													unwrapped830 := deconstruct_result829
+													p.write(p.formatDecimal(unwrapped830))
 												} else {
 													_dollar_dollar := msg
-													var _t1614 *bool
+													var _t1622 *bool
 													if hasProtoField(_dollar_dollar, "boolean_value") {
-														_t1614 = ptr(_dollar_dollar.GetBooleanValue())
+														_t1622 = ptr(_dollar_dollar.GetBooleanValue())
 													}
-													deconstruct_result823 := _t1614
-													if deconstruct_result823 != nil {
-														unwrapped824 := *deconstruct_result823
-														p.pretty_boolean_value(unwrapped824)
+													deconstruct_result827 := _t1622
+													if deconstruct_result827 != nil {
+														unwrapped828 := *deconstruct_result827
+														p.pretty_boolean_value(unwrapped828)
 													} else {
-														fields822 := msg
-														_ = fields822
+														fields826 := msg
+														_ = fields826
 														p.write("missing")
 													}
 												}
@@ -837,26 +837,26 @@ func (p *PrettyPrinter) pretty_raw_value(msg *pb.Value) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_raw_date(msg *pb.DateValue) interface{} {
-	flat853 := p.tryFlat(msg, func() { p.pretty_raw_date(msg) })
-	if flat853 != nil {
-		p.write(*flat853)
+	flat857 := p.tryFlat(msg, func() { p.pretty_raw_date(msg) })
+	if flat857 != nil {
+		p.write(*flat857)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields848 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay())}
-		unwrapped_fields849 := fields848
+		fields852 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay())}
+		unwrapped_fields853 := fields852
 		p.write("(")
 		p.write("date")
 		p.indentSexp()
 		p.newline()
-		field850 := unwrapped_fields849[0].(int64)
-		p.write(fmt.Sprintf("%d", field850))
+		field854 := unwrapped_fields853[0].(int64)
+		p.write(fmt.Sprintf("%d", field854))
 		p.newline()
-		field851 := unwrapped_fields849[1].(int64)
-		p.write(fmt.Sprintf("%d", field851))
+		field855 := unwrapped_fields853[1].(int64)
+		p.write(fmt.Sprintf("%d", field855))
 		p.newline()
-		field852 := unwrapped_fields849[2].(int64)
-		p.write(fmt.Sprintf("%d", field852))
+		field856 := unwrapped_fields853[2].(int64)
+		p.write(fmt.Sprintf("%d", field856))
 		p.dedent()
 		p.write(")")
 	}
@@ -864,40 +864,40 @@ func (p *PrettyPrinter) pretty_raw_date(msg *pb.DateValue) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_raw_datetime(msg *pb.DateTimeValue) interface{} {
-	flat864 := p.tryFlat(msg, func() { p.pretty_raw_datetime(msg) })
-	if flat864 != nil {
-		p.write(*flat864)
+	flat868 := p.tryFlat(msg, func() { p.pretty_raw_datetime(msg) })
+	if flat868 != nil {
+		p.write(*flat868)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields854 := []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_fields855 := fields854
+		fields858 := []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_fields859 := fields858
 		p.write("(")
 		p.write("datetime")
 		p.indentSexp()
 		p.newline()
-		field856 := unwrapped_fields855[0].(int64)
-		p.write(fmt.Sprintf("%d", field856))
+		field860 := unwrapped_fields859[0].(int64)
+		p.write(fmt.Sprintf("%d", field860))
 		p.newline()
-		field857 := unwrapped_fields855[1].(int64)
-		p.write(fmt.Sprintf("%d", field857))
+		field861 := unwrapped_fields859[1].(int64)
+		p.write(fmt.Sprintf("%d", field861))
 		p.newline()
-		field858 := unwrapped_fields855[2].(int64)
-		p.write(fmt.Sprintf("%d", field858))
+		field862 := unwrapped_fields859[2].(int64)
+		p.write(fmt.Sprintf("%d", field862))
 		p.newline()
-		field859 := unwrapped_fields855[3].(int64)
-		p.write(fmt.Sprintf("%d", field859))
+		field863 := unwrapped_fields859[3].(int64)
+		p.write(fmt.Sprintf("%d", field863))
 		p.newline()
-		field860 := unwrapped_fields855[4].(int64)
-		p.write(fmt.Sprintf("%d", field860))
+		field864 := unwrapped_fields859[4].(int64)
+		p.write(fmt.Sprintf("%d", field864))
 		p.newline()
-		field861 := unwrapped_fields855[5].(int64)
-		p.write(fmt.Sprintf("%d", field861))
-		field862 := unwrapped_fields855[6].(*int64)
-		if field862 != nil {
+		field865 := unwrapped_fields859[5].(int64)
+		p.write(fmt.Sprintf("%d", field865))
+		field866 := unwrapped_fields859[6].(*int64)
+		if field866 != nil {
 			p.newline()
-			opt_val863 := *field862
-			p.write(fmt.Sprintf("%d", opt_val863))
+			opt_val867 := *field866
+			p.write(fmt.Sprintf("%d", opt_val867))
 		}
 		p.dedent()
 		p.write(")")
@@ -907,25 +907,25 @@ func (p *PrettyPrinter) pretty_raw_datetime(msg *pb.DateTimeValue) interface{} {
 
 func (p *PrettyPrinter) pretty_boolean_value(msg bool) interface{} {
 	_dollar_dollar := msg
-	var _t1615 []interface{}
+	var _t1623 []interface{}
 	if _dollar_dollar {
-		_t1615 = []interface{}{}
+		_t1623 = []interface{}{}
 	}
-	deconstruct_result867 := _t1615
-	if deconstruct_result867 != nil {
-		unwrapped868 := deconstruct_result867
-		_ = unwrapped868
+	deconstruct_result871 := _t1623
+	if deconstruct_result871 != nil {
+		unwrapped872 := deconstruct_result871
+		_ = unwrapped872
 		p.write("true")
 	} else {
 		_dollar_dollar := msg
-		var _t1616 []interface{}
+		var _t1624 []interface{}
 		if !(_dollar_dollar) {
-			_t1616 = []interface{}{}
+			_t1624 = []interface{}{}
 		}
-		deconstruct_result865 := _t1616
-		if deconstruct_result865 != nil {
-			unwrapped866 := deconstruct_result865
-			_ = unwrapped866
+		deconstruct_result869 := _t1624
+		if deconstruct_result869 != nil {
+			unwrapped870 := deconstruct_result869
+			_ = unwrapped870
 			p.write("false")
 		} else {
 			panic(ParseError{msg: "No matching rule for boolean_value"})
@@ -935,24 +935,24 @@ func (p *PrettyPrinter) pretty_boolean_value(msg bool) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_sync(msg *pb.Sync) interface{} {
-	flat873 := p.tryFlat(msg, func() { p.pretty_sync(msg) })
-	if flat873 != nil {
-		p.write(*flat873)
+	flat877 := p.tryFlat(msg, func() { p.pretty_sync(msg) })
+	if flat877 != nil {
+		p.write(*flat877)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields869 := _dollar_dollar.GetFragments()
-		unwrapped_fields870 := fields869
+		fields873 := _dollar_dollar.GetFragments()
+		unwrapped_fields874 := fields873
 		p.write("(")
 		p.write("sync")
 		p.indentSexp()
-		if !(len(unwrapped_fields870) == 0) {
+		if !(len(unwrapped_fields874) == 0) {
 			p.newline()
-			for i872, elem871 := range unwrapped_fields870 {
-				if (i872 > 0) {
+			for i876, elem875 := range unwrapped_fields874 {
+				if (i876 > 0) {
 					p.newline()
 				}
-				p.pretty_fragment_id(elem871)
+				p.pretty_fragment_id(elem875)
 			}
 		}
 		p.dedent()
@@ -962,51 +962,51 @@ func (p *PrettyPrinter) pretty_sync(msg *pb.Sync) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_fragment_id(msg *pb.FragmentId) interface{} {
-	flat876 := p.tryFlat(msg, func() { p.pretty_fragment_id(msg) })
-	if flat876 != nil {
-		p.write(*flat876)
+	flat880 := p.tryFlat(msg, func() { p.pretty_fragment_id(msg) })
+	if flat880 != nil {
+		p.write(*flat880)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields874 := p.fragmentIdToString(_dollar_dollar)
-		unwrapped_fields875 := fields874
+		fields878 := p.fragmentIdToString(_dollar_dollar)
+		unwrapped_fields879 := fields878
 		p.write(":")
-		p.write(unwrapped_fields875)
+		p.write(unwrapped_fields879)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_epoch(msg *pb.Epoch) interface{} {
-	flat883 := p.tryFlat(msg, func() { p.pretty_epoch(msg) })
-	if flat883 != nil {
-		p.write(*flat883)
+	flat887 := p.tryFlat(msg, func() { p.pretty_epoch(msg) })
+	if flat887 != nil {
+		p.write(*flat887)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1617 []*pb.Write
+		var _t1625 []*pb.Write
 		if !(len(_dollar_dollar.GetWrites()) == 0) {
-			_t1617 = _dollar_dollar.GetWrites()
+			_t1625 = _dollar_dollar.GetWrites()
 		}
-		var _t1618 []*pb.Read
+		var _t1626 []*pb.Read
 		if !(len(_dollar_dollar.GetReads()) == 0) {
-			_t1618 = _dollar_dollar.GetReads()
+			_t1626 = _dollar_dollar.GetReads()
 		}
-		fields877 := []interface{}{_t1617, _t1618}
-		unwrapped_fields878 := fields877
+		fields881 := []interface{}{_t1625, _t1626}
+		unwrapped_fields882 := fields881
 		p.write("(")
 		p.write("epoch")
 		p.indentSexp()
-		field879 := unwrapped_fields878[0].([]*pb.Write)
-		if field879 != nil {
+		field883 := unwrapped_fields882[0].([]*pb.Write)
+		if field883 != nil {
 			p.newline()
-			opt_val880 := field879
-			p.pretty_epoch_writes(opt_val880)
+			opt_val884 := field883
+			p.pretty_epoch_writes(opt_val884)
 		}
-		field881 := unwrapped_fields878[1].([]*pb.Read)
-		if field881 != nil {
+		field885 := unwrapped_fields882[1].([]*pb.Read)
+		if field885 != nil {
 			p.newline()
-			opt_val882 := field881
-			p.pretty_epoch_reads(opt_val882)
+			opt_val886 := field885
+			p.pretty_epoch_reads(opt_val886)
 		}
 		p.dedent()
 		p.write(")")
@@ -1015,22 +1015,22 @@ func (p *PrettyPrinter) pretty_epoch(msg *pb.Epoch) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_epoch_writes(msg []*pb.Write) interface{} {
-	flat887 := p.tryFlat(msg, func() { p.pretty_epoch_writes(msg) })
-	if flat887 != nil {
-		p.write(*flat887)
+	flat891 := p.tryFlat(msg, func() { p.pretty_epoch_writes(msg) })
+	if flat891 != nil {
+		p.write(*flat891)
 		return nil
 	} else {
-		fields884 := msg
+		fields888 := msg
 		p.write("(")
 		p.write("writes")
 		p.indentSexp()
-		if !(len(fields884) == 0) {
+		if !(len(fields888) == 0) {
 			p.newline()
-			for i886, elem885 := range fields884 {
-				if (i886 > 0) {
+			for i890, elem889 := range fields888 {
+				if (i890 > 0) {
 					p.newline()
 				}
-				p.pretty_write(elem885)
+				p.pretty_write(elem889)
 			}
 		}
 		p.dedent()
@@ -1040,50 +1040,50 @@ func (p *PrettyPrinter) pretty_epoch_writes(msg []*pb.Write) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_write(msg *pb.Write) interface{} {
-	flat896 := p.tryFlat(msg, func() { p.pretty_write(msg) })
-	if flat896 != nil {
-		p.write(*flat896)
+	flat900 := p.tryFlat(msg, func() { p.pretty_write(msg) })
+	if flat900 != nil {
+		p.write(*flat900)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1619 *pb.Define
+		var _t1627 *pb.Define
 		if hasProtoField(_dollar_dollar, "define") {
-			_t1619 = _dollar_dollar.GetDefine()
+			_t1627 = _dollar_dollar.GetDefine()
 		}
-		deconstruct_result894 := _t1619
-		if deconstruct_result894 != nil {
-			unwrapped895 := deconstruct_result894
-			p.pretty_define(unwrapped895)
+		deconstruct_result898 := _t1627
+		if deconstruct_result898 != nil {
+			unwrapped899 := deconstruct_result898
+			p.pretty_define(unwrapped899)
 		} else {
 			_dollar_dollar := msg
-			var _t1620 *pb.Undefine
+			var _t1628 *pb.Undefine
 			if hasProtoField(_dollar_dollar, "undefine") {
-				_t1620 = _dollar_dollar.GetUndefine()
+				_t1628 = _dollar_dollar.GetUndefine()
 			}
-			deconstruct_result892 := _t1620
-			if deconstruct_result892 != nil {
-				unwrapped893 := deconstruct_result892
-				p.pretty_undefine(unwrapped893)
+			deconstruct_result896 := _t1628
+			if deconstruct_result896 != nil {
+				unwrapped897 := deconstruct_result896
+				p.pretty_undefine(unwrapped897)
 			} else {
 				_dollar_dollar := msg
-				var _t1621 *pb.Context
+				var _t1629 *pb.Context
 				if hasProtoField(_dollar_dollar, "context") {
-					_t1621 = _dollar_dollar.GetContext()
+					_t1629 = _dollar_dollar.GetContext()
 				}
-				deconstruct_result890 := _t1621
-				if deconstruct_result890 != nil {
-					unwrapped891 := deconstruct_result890
-					p.pretty_context(unwrapped891)
+				deconstruct_result894 := _t1629
+				if deconstruct_result894 != nil {
+					unwrapped895 := deconstruct_result894
+					p.pretty_context(unwrapped895)
 				} else {
 					_dollar_dollar := msg
-					var _t1622 *pb.Snapshot
+					var _t1630 *pb.Snapshot
 					if hasProtoField(_dollar_dollar, "snapshot") {
-						_t1622 = _dollar_dollar.GetSnapshot()
+						_t1630 = _dollar_dollar.GetSnapshot()
 					}
-					deconstruct_result888 := _t1622
-					if deconstruct_result888 != nil {
-						unwrapped889 := deconstruct_result888
-						p.pretty_snapshot(unwrapped889)
+					deconstruct_result892 := _t1630
+					if deconstruct_result892 != nil {
+						unwrapped893 := deconstruct_result892
+						p.pretty_snapshot(unwrapped893)
 					} else {
 						panic(ParseError{msg: "No matching rule for write"})
 					}
@@ -1095,19 +1095,19 @@ func (p *PrettyPrinter) pretty_write(msg *pb.Write) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_define(msg *pb.Define) interface{} {
-	flat899 := p.tryFlat(msg, func() { p.pretty_define(msg) })
-	if flat899 != nil {
-		p.write(*flat899)
+	flat903 := p.tryFlat(msg, func() { p.pretty_define(msg) })
+	if flat903 != nil {
+		p.write(*flat903)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields897 := _dollar_dollar.GetFragment()
-		unwrapped_fields898 := fields897
+		fields901 := _dollar_dollar.GetFragment()
+		unwrapped_fields902 := fields901
 		p.write("(")
 		p.write("define")
 		p.indentSexp()
 		p.newline()
-		p.pretty_fragment(unwrapped_fields898)
+		p.pretty_fragment(unwrapped_fields902)
 		p.dedent()
 		p.write(")")
 	}
@@ -1115,29 +1115,29 @@ func (p *PrettyPrinter) pretty_define(msg *pb.Define) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_fragment(msg *pb.Fragment) interface{} {
-	flat906 := p.tryFlat(msg, func() { p.pretty_fragment(msg) })
-	if flat906 != nil {
-		p.write(*flat906)
+	flat910 := p.tryFlat(msg, func() { p.pretty_fragment(msg) })
+	if flat910 != nil {
+		p.write(*flat910)
 		return nil
 	} else {
 		_dollar_dollar := msg
 		p.startPrettyFragment(_dollar_dollar)
-		fields900 := []interface{}{_dollar_dollar.GetId(), _dollar_dollar.GetDeclarations()}
-		unwrapped_fields901 := fields900
+		fields904 := []interface{}{_dollar_dollar.GetId(), _dollar_dollar.GetDeclarations()}
+		unwrapped_fields905 := fields904
 		p.write("(")
 		p.write("fragment")
 		p.indentSexp()
 		p.newline()
-		field902 := unwrapped_fields901[0].(*pb.FragmentId)
-		p.pretty_new_fragment_id(field902)
-		field903 := unwrapped_fields901[1].([]*pb.Declaration)
-		if !(len(field903) == 0) {
+		field906 := unwrapped_fields905[0].(*pb.FragmentId)
+		p.pretty_new_fragment_id(field906)
+		field907 := unwrapped_fields905[1].([]*pb.Declaration)
+		if !(len(field907) == 0) {
 			p.newline()
-			for i905, elem904 := range field903 {
-				if (i905 > 0) {
+			for i909, elem908 := range field907 {
+				if (i909 > 0) {
 					p.newline()
 				}
-				p.pretty_declaration(elem904)
+				p.pretty_declaration(elem908)
 			}
 		}
 		p.dedent()
@@ -1147,62 +1147,62 @@ func (p *PrettyPrinter) pretty_fragment(msg *pb.Fragment) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_new_fragment_id(msg *pb.FragmentId) interface{} {
-	flat908 := p.tryFlat(msg, func() { p.pretty_new_fragment_id(msg) })
-	if flat908 != nil {
-		p.write(*flat908)
+	flat912 := p.tryFlat(msg, func() { p.pretty_new_fragment_id(msg) })
+	if flat912 != nil {
+		p.write(*flat912)
 		return nil
 	} else {
-		fields907 := msg
-		p.pretty_fragment_id(fields907)
+		fields911 := msg
+		p.pretty_fragment_id(fields911)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_declaration(msg *pb.Declaration) interface{} {
-	flat917 := p.tryFlat(msg, func() { p.pretty_declaration(msg) })
-	if flat917 != nil {
-		p.write(*flat917)
+	flat921 := p.tryFlat(msg, func() { p.pretty_declaration(msg) })
+	if flat921 != nil {
+		p.write(*flat921)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1623 *pb.Def
+		var _t1631 *pb.Def
 		if hasProtoField(_dollar_dollar, "def") {
-			_t1623 = _dollar_dollar.GetDef()
+			_t1631 = _dollar_dollar.GetDef()
 		}
-		deconstruct_result915 := _t1623
-		if deconstruct_result915 != nil {
-			unwrapped916 := deconstruct_result915
-			p.pretty_def(unwrapped916)
+		deconstruct_result919 := _t1631
+		if deconstruct_result919 != nil {
+			unwrapped920 := deconstruct_result919
+			p.pretty_def(unwrapped920)
 		} else {
 			_dollar_dollar := msg
-			var _t1624 *pb.Algorithm
+			var _t1632 *pb.Algorithm
 			if hasProtoField(_dollar_dollar, "algorithm") {
-				_t1624 = _dollar_dollar.GetAlgorithm()
+				_t1632 = _dollar_dollar.GetAlgorithm()
 			}
-			deconstruct_result913 := _t1624
-			if deconstruct_result913 != nil {
-				unwrapped914 := deconstruct_result913
-				p.pretty_algorithm(unwrapped914)
+			deconstruct_result917 := _t1632
+			if deconstruct_result917 != nil {
+				unwrapped918 := deconstruct_result917
+				p.pretty_algorithm(unwrapped918)
 			} else {
 				_dollar_dollar := msg
-				var _t1625 *pb.Constraint
+				var _t1633 *pb.Constraint
 				if hasProtoField(_dollar_dollar, "constraint") {
-					_t1625 = _dollar_dollar.GetConstraint()
+					_t1633 = _dollar_dollar.GetConstraint()
 				}
-				deconstruct_result911 := _t1625
-				if deconstruct_result911 != nil {
-					unwrapped912 := deconstruct_result911
-					p.pretty_constraint(unwrapped912)
+				deconstruct_result915 := _t1633
+				if deconstruct_result915 != nil {
+					unwrapped916 := deconstruct_result915
+					p.pretty_constraint(unwrapped916)
 				} else {
 					_dollar_dollar := msg
-					var _t1626 *pb.Data
+					var _t1634 *pb.Data
 					if hasProtoField(_dollar_dollar, "data") {
-						_t1626 = _dollar_dollar.GetData()
+						_t1634 = _dollar_dollar.GetData()
 					}
-					deconstruct_result909 := _t1626
-					if deconstruct_result909 != nil {
-						unwrapped910 := deconstruct_result909
-						p.pretty_data(unwrapped910)
+					deconstruct_result913 := _t1634
+					if deconstruct_result913 != nil {
+						unwrapped914 := deconstruct_result913
+						p.pretty_data(unwrapped914)
 					} else {
 						panic(ParseError{msg: "No matching rule for declaration"})
 					}
@@ -1214,32 +1214,32 @@ func (p *PrettyPrinter) pretty_declaration(msg *pb.Declaration) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_def(msg *pb.Def) interface{} {
-	flat924 := p.tryFlat(msg, func() { p.pretty_def(msg) })
-	if flat924 != nil {
-		p.write(*flat924)
+	flat928 := p.tryFlat(msg, func() { p.pretty_def(msg) })
+	if flat928 != nil {
+		p.write(*flat928)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1627 []*pb.Attribute
+		var _t1635 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1627 = _dollar_dollar.GetAttrs()
+			_t1635 = _dollar_dollar.GetAttrs()
 		}
-		fields918 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1627}
-		unwrapped_fields919 := fields918
+		fields922 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1635}
+		unwrapped_fields923 := fields922
 		p.write("(")
 		p.write("def")
 		p.indentSexp()
 		p.newline()
-		field920 := unwrapped_fields919[0].(*pb.RelationId)
-		p.pretty_relation_id(field920)
+		field924 := unwrapped_fields923[0].(*pb.RelationId)
+		p.pretty_relation_id(field924)
 		p.newline()
-		field921 := unwrapped_fields919[1].(*pb.Abstraction)
-		p.pretty_abstraction(field921)
-		field922 := unwrapped_fields919[2].([]*pb.Attribute)
-		if field922 != nil {
+		field925 := unwrapped_fields923[1].(*pb.Abstraction)
+		p.pretty_abstraction(field925)
+		field926 := unwrapped_fields923[2].([]*pb.Attribute)
+		if field926 != nil {
 			p.newline()
-			opt_val923 := field922
-			p.pretty_attrs(opt_val923)
+			opt_val927 := field926
+			p.pretty_attrs(opt_val927)
 		}
 		p.dedent()
 		p.write(")")
@@ -1248,29 +1248,29 @@ func (p *PrettyPrinter) pretty_def(msg *pb.Def) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_relation_id(msg *pb.RelationId) interface{} {
-	flat929 := p.tryFlat(msg, func() { p.pretty_relation_id(msg) })
-	if flat929 != nil {
-		p.write(*flat929)
+	flat933 := p.tryFlat(msg, func() { p.pretty_relation_id(msg) })
+	if flat933 != nil {
+		p.write(*flat933)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1628 *string
+		var _t1636 *string
 		if p.relationIdToString(_dollar_dollar) != nil {
-			_t1629 := p.deconstruct_relation_id_string(_dollar_dollar)
-			_t1628 = ptr(_t1629)
+			_t1637 := p.deconstruct_relation_id_string(_dollar_dollar)
+			_t1636 = ptr(_t1637)
 		}
-		deconstruct_result927 := _t1628
-		if deconstruct_result927 != nil {
-			unwrapped928 := *deconstruct_result927
+		deconstruct_result931 := _t1636
+		if deconstruct_result931 != nil {
+			unwrapped932 := *deconstruct_result931
 			p.write(":")
-			p.write(unwrapped928)
+			p.write(unwrapped932)
 		} else {
 			_dollar_dollar := msg
-			_t1630 := p.deconstruct_relation_id_uint128(_dollar_dollar)
-			deconstruct_result925 := _t1630
-			if deconstruct_result925 != nil {
-				unwrapped926 := deconstruct_result925
-				p.write(p.formatUint128(unwrapped926))
+			_t1638 := p.deconstruct_relation_id_uint128(_dollar_dollar)
+			deconstruct_result929 := _t1638
+			if deconstruct_result929 != nil {
+				unwrapped930 := deconstruct_result929
+				p.write(p.formatUint128(unwrapped930))
 			} else {
 				panic(ParseError{msg: "No matching rule for relation_id"})
 			}
@@ -1280,22 +1280,22 @@ func (p *PrettyPrinter) pretty_relation_id(msg *pb.RelationId) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_abstraction(msg *pb.Abstraction) interface{} {
-	flat934 := p.tryFlat(msg, func() { p.pretty_abstraction(msg) })
-	if flat934 != nil {
-		p.write(*flat934)
+	flat938 := p.tryFlat(msg, func() { p.pretty_abstraction(msg) })
+	if flat938 != nil {
+		p.write(*flat938)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1631 := p.deconstruct_bindings(_dollar_dollar)
-		fields930 := []interface{}{_t1631, _dollar_dollar.GetValue()}
-		unwrapped_fields931 := fields930
+		_t1639 := p.deconstruct_bindings(_dollar_dollar)
+		fields934 := []interface{}{_t1639, _dollar_dollar.GetValue()}
+		unwrapped_fields935 := fields934
 		p.write("(")
 		p.indent()
-		field932 := unwrapped_fields931[0].([]interface{})
-		p.pretty_bindings(field932)
+		field936 := unwrapped_fields935[0].([]interface{})
+		p.pretty_bindings(field936)
 		p.newline()
-		field933 := unwrapped_fields931[1].(*pb.Formula)
-		p.pretty_formula(field933)
+		field937 := unwrapped_fields935[1].(*pb.Formula)
+		p.pretty_formula(field937)
 		p.dedent()
 		p.write(")")
 	}
@@ -1303,32 +1303,32 @@ func (p *PrettyPrinter) pretty_abstraction(msg *pb.Abstraction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_bindings(msg []interface{}) interface{} {
-	flat942 := p.tryFlat(msg, func() { p.pretty_bindings(msg) })
-	if flat942 != nil {
-		p.write(*flat942)
+	flat946 := p.tryFlat(msg, func() { p.pretty_bindings(msg) })
+	if flat946 != nil {
+		p.write(*flat946)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1632 []*pb.Binding
+		var _t1640 []*pb.Binding
 		if !(len(_dollar_dollar[1].([]*pb.Binding)) == 0) {
-			_t1632 = _dollar_dollar[1].([]*pb.Binding)
+			_t1640 = _dollar_dollar[1].([]*pb.Binding)
 		}
-		fields935 := []interface{}{_dollar_dollar[0].([]*pb.Binding), _t1632}
-		unwrapped_fields936 := fields935
+		fields939 := []interface{}{_dollar_dollar[0].([]*pb.Binding), _t1640}
+		unwrapped_fields940 := fields939
 		p.write("[")
 		p.indent()
-		field937 := unwrapped_fields936[0].([]*pb.Binding)
-		for i939, elem938 := range field937 {
-			if (i939 > 0) {
+		field941 := unwrapped_fields940[0].([]*pb.Binding)
+		for i943, elem942 := range field941 {
+			if (i943 > 0) {
 				p.newline()
 			}
-			p.pretty_binding(elem938)
+			p.pretty_binding(elem942)
 		}
-		field940 := unwrapped_fields936[1].([]*pb.Binding)
-		if field940 != nil {
+		field944 := unwrapped_fields940[1].([]*pb.Binding)
+		if field944 != nil {
 			p.newline()
-			opt_val941 := field940
-			p.pretty_value_bindings(opt_val941)
+			opt_val945 := field944
+			p.pretty_value_bindings(opt_val945)
 		}
 		p.dedent()
 		p.write("]")
@@ -1337,168 +1337,168 @@ func (p *PrettyPrinter) pretty_bindings(msg []interface{}) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_binding(msg *pb.Binding) interface{} {
-	flat947 := p.tryFlat(msg, func() { p.pretty_binding(msg) })
-	if flat947 != nil {
-		p.write(*flat947)
+	flat951 := p.tryFlat(msg, func() { p.pretty_binding(msg) })
+	if flat951 != nil {
+		p.write(*flat951)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields943 := []interface{}{_dollar_dollar.GetVar().GetName(), _dollar_dollar.GetType()}
-		unwrapped_fields944 := fields943
-		field945 := unwrapped_fields944[0].(string)
-		p.write(field945)
+		fields947 := []interface{}{_dollar_dollar.GetVar().GetName(), _dollar_dollar.GetType()}
+		unwrapped_fields948 := fields947
+		field949 := unwrapped_fields948[0].(string)
+		p.write(field949)
 		p.write("::")
-		field946 := unwrapped_fields944[1].(*pb.Type)
-		p.pretty_type(field946)
+		field950 := unwrapped_fields948[1].(*pb.Type)
+		p.pretty_type(field950)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_type(msg *pb.Type) interface{} {
-	flat976 := p.tryFlat(msg, func() { p.pretty_type(msg) })
-	if flat976 != nil {
-		p.write(*flat976)
+	flat980 := p.tryFlat(msg, func() { p.pretty_type(msg) })
+	if flat980 != nil {
+		p.write(*flat980)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1633 *pb.UnspecifiedType
+		var _t1641 *pb.UnspecifiedType
 		if hasProtoField(_dollar_dollar, "unspecified_type") {
-			_t1633 = _dollar_dollar.GetUnspecifiedType()
+			_t1641 = _dollar_dollar.GetUnspecifiedType()
 		}
-		deconstruct_result974 := _t1633
-		if deconstruct_result974 != nil {
-			unwrapped975 := deconstruct_result974
-			p.pretty_unspecified_type(unwrapped975)
+		deconstruct_result978 := _t1641
+		if deconstruct_result978 != nil {
+			unwrapped979 := deconstruct_result978
+			p.pretty_unspecified_type(unwrapped979)
 		} else {
 			_dollar_dollar := msg
-			var _t1634 *pb.StringType
+			var _t1642 *pb.StringType
 			if hasProtoField(_dollar_dollar, "string_type") {
-				_t1634 = _dollar_dollar.GetStringType()
+				_t1642 = _dollar_dollar.GetStringType()
 			}
-			deconstruct_result972 := _t1634
-			if deconstruct_result972 != nil {
-				unwrapped973 := deconstruct_result972
-				p.pretty_string_type(unwrapped973)
+			deconstruct_result976 := _t1642
+			if deconstruct_result976 != nil {
+				unwrapped977 := deconstruct_result976
+				p.pretty_string_type(unwrapped977)
 			} else {
 				_dollar_dollar := msg
-				var _t1635 *pb.IntType
+				var _t1643 *pb.IntType
 				if hasProtoField(_dollar_dollar, "int_type") {
-					_t1635 = _dollar_dollar.GetIntType()
+					_t1643 = _dollar_dollar.GetIntType()
 				}
-				deconstruct_result970 := _t1635
-				if deconstruct_result970 != nil {
-					unwrapped971 := deconstruct_result970
-					p.pretty_int_type(unwrapped971)
+				deconstruct_result974 := _t1643
+				if deconstruct_result974 != nil {
+					unwrapped975 := deconstruct_result974
+					p.pretty_int_type(unwrapped975)
 				} else {
 					_dollar_dollar := msg
-					var _t1636 *pb.FloatType
+					var _t1644 *pb.FloatType
 					if hasProtoField(_dollar_dollar, "float_type") {
-						_t1636 = _dollar_dollar.GetFloatType()
+						_t1644 = _dollar_dollar.GetFloatType()
 					}
-					deconstruct_result968 := _t1636
-					if deconstruct_result968 != nil {
-						unwrapped969 := deconstruct_result968
-						p.pretty_float_type(unwrapped969)
+					deconstruct_result972 := _t1644
+					if deconstruct_result972 != nil {
+						unwrapped973 := deconstruct_result972
+						p.pretty_float_type(unwrapped973)
 					} else {
 						_dollar_dollar := msg
-						var _t1637 *pb.UInt128Type
+						var _t1645 *pb.UInt128Type
 						if hasProtoField(_dollar_dollar, "uint128_type") {
-							_t1637 = _dollar_dollar.GetUint128Type()
+							_t1645 = _dollar_dollar.GetUint128Type()
 						}
-						deconstruct_result966 := _t1637
-						if deconstruct_result966 != nil {
-							unwrapped967 := deconstruct_result966
-							p.pretty_uint128_type(unwrapped967)
+						deconstruct_result970 := _t1645
+						if deconstruct_result970 != nil {
+							unwrapped971 := deconstruct_result970
+							p.pretty_uint128_type(unwrapped971)
 						} else {
 							_dollar_dollar := msg
-							var _t1638 *pb.Int128Type
+							var _t1646 *pb.Int128Type
 							if hasProtoField(_dollar_dollar, "int128_type") {
-								_t1638 = _dollar_dollar.GetInt128Type()
+								_t1646 = _dollar_dollar.GetInt128Type()
 							}
-							deconstruct_result964 := _t1638
-							if deconstruct_result964 != nil {
-								unwrapped965 := deconstruct_result964
-								p.pretty_int128_type(unwrapped965)
+							deconstruct_result968 := _t1646
+							if deconstruct_result968 != nil {
+								unwrapped969 := deconstruct_result968
+								p.pretty_int128_type(unwrapped969)
 							} else {
 								_dollar_dollar := msg
-								var _t1639 *pb.DateType
+								var _t1647 *pb.DateType
 								if hasProtoField(_dollar_dollar, "date_type") {
-									_t1639 = _dollar_dollar.GetDateType()
+									_t1647 = _dollar_dollar.GetDateType()
 								}
-								deconstruct_result962 := _t1639
-								if deconstruct_result962 != nil {
-									unwrapped963 := deconstruct_result962
-									p.pretty_date_type(unwrapped963)
+								deconstruct_result966 := _t1647
+								if deconstruct_result966 != nil {
+									unwrapped967 := deconstruct_result966
+									p.pretty_date_type(unwrapped967)
 								} else {
 									_dollar_dollar := msg
-									var _t1640 *pb.DateTimeType
+									var _t1648 *pb.DateTimeType
 									if hasProtoField(_dollar_dollar, "datetime_type") {
-										_t1640 = _dollar_dollar.GetDatetimeType()
+										_t1648 = _dollar_dollar.GetDatetimeType()
 									}
-									deconstruct_result960 := _t1640
-									if deconstruct_result960 != nil {
-										unwrapped961 := deconstruct_result960
-										p.pretty_datetime_type(unwrapped961)
+									deconstruct_result964 := _t1648
+									if deconstruct_result964 != nil {
+										unwrapped965 := deconstruct_result964
+										p.pretty_datetime_type(unwrapped965)
 									} else {
 										_dollar_dollar := msg
-										var _t1641 *pb.MissingType
+										var _t1649 *pb.MissingType
 										if hasProtoField(_dollar_dollar, "missing_type") {
-											_t1641 = _dollar_dollar.GetMissingType()
+											_t1649 = _dollar_dollar.GetMissingType()
 										}
-										deconstruct_result958 := _t1641
-										if deconstruct_result958 != nil {
-											unwrapped959 := deconstruct_result958
-											p.pretty_missing_type(unwrapped959)
+										deconstruct_result962 := _t1649
+										if deconstruct_result962 != nil {
+											unwrapped963 := deconstruct_result962
+											p.pretty_missing_type(unwrapped963)
 										} else {
 											_dollar_dollar := msg
-											var _t1642 *pb.DecimalType
+											var _t1650 *pb.DecimalType
 											if hasProtoField(_dollar_dollar, "decimal_type") {
-												_t1642 = _dollar_dollar.GetDecimalType()
+												_t1650 = _dollar_dollar.GetDecimalType()
 											}
-											deconstruct_result956 := _t1642
-											if deconstruct_result956 != nil {
-												unwrapped957 := deconstruct_result956
-												p.pretty_decimal_type(unwrapped957)
+											deconstruct_result960 := _t1650
+											if deconstruct_result960 != nil {
+												unwrapped961 := deconstruct_result960
+												p.pretty_decimal_type(unwrapped961)
 											} else {
 												_dollar_dollar := msg
-												var _t1643 *pb.BooleanType
+												var _t1651 *pb.BooleanType
 												if hasProtoField(_dollar_dollar, "boolean_type") {
-													_t1643 = _dollar_dollar.GetBooleanType()
+													_t1651 = _dollar_dollar.GetBooleanType()
 												}
-												deconstruct_result954 := _t1643
-												if deconstruct_result954 != nil {
-													unwrapped955 := deconstruct_result954
-													p.pretty_boolean_type(unwrapped955)
+												deconstruct_result958 := _t1651
+												if deconstruct_result958 != nil {
+													unwrapped959 := deconstruct_result958
+													p.pretty_boolean_type(unwrapped959)
 												} else {
 													_dollar_dollar := msg
-													var _t1644 *pb.Int32Type
+													var _t1652 *pb.Int32Type
 													if hasProtoField(_dollar_dollar, "int32_type") {
-														_t1644 = _dollar_dollar.GetInt32Type()
+														_t1652 = _dollar_dollar.GetInt32Type()
 													}
-													deconstruct_result952 := _t1644
-													if deconstruct_result952 != nil {
-														unwrapped953 := deconstruct_result952
-														p.pretty_int32_type(unwrapped953)
+													deconstruct_result956 := _t1652
+													if deconstruct_result956 != nil {
+														unwrapped957 := deconstruct_result956
+														p.pretty_int32_type(unwrapped957)
 													} else {
 														_dollar_dollar := msg
-														var _t1645 *pb.Float32Type
+														var _t1653 *pb.Float32Type
 														if hasProtoField(_dollar_dollar, "float32_type") {
-															_t1645 = _dollar_dollar.GetFloat32Type()
+															_t1653 = _dollar_dollar.GetFloat32Type()
 														}
-														deconstruct_result950 := _t1645
-														if deconstruct_result950 != nil {
-															unwrapped951 := deconstruct_result950
-															p.pretty_float32_type(unwrapped951)
+														deconstruct_result954 := _t1653
+														if deconstruct_result954 != nil {
+															unwrapped955 := deconstruct_result954
+															p.pretty_float32_type(unwrapped955)
 														} else {
 															_dollar_dollar := msg
-															var _t1646 *pb.UInt32Type
+															var _t1654 *pb.UInt32Type
 															if hasProtoField(_dollar_dollar, "uint32_type") {
-																_t1646 = _dollar_dollar.GetUint32Type()
+																_t1654 = _dollar_dollar.GetUint32Type()
 															}
-															deconstruct_result948 := _t1646
-															if deconstruct_result948 != nil {
-																unwrapped949 := deconstruct_result948
-																p.pretty_uint32_type(unwrapped949)
+															deconstruct_result952 := _t1654
+															if deconstruct_result952 != nil {
+																unwrapped953 := deconstruct_result952
+																p.pretty_uint32_type(unwrapped953)
 															} else {
 																panic(ParseError{msg: "No matching rule for type"})
 															}
@@ -1520,86 +1520,86 @@ func (p *PrettyPrinter) pretty_type(msg *pb.Type) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_unspecified_type(msg *pb.UnspecifiedType) interface{} {
-	fields977 := msg
-	_ = fields977
+	fields981 := msg
+	_ = fields981
 	p.write("UNKNOWN")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_string_type(msg *pb.StringType) interface{} {
-	fields978 := msg
-	_ = fields978
+	fields982 := msg
+	_ = fields982
 	p.write("STRING")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_int_type(msg *pb.IntType) interface{} {
-	fields979 := msg
-	_ = fields979
+	fields983 := msg
+	_ = fields983
 	p.write("INT")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_float_type(msg *pb.FloatType) interface{} {
-	fields980 := msg
-	_ = fields980
+	fields984 := msg
+	_ = fields984
 	p.write("FLOAT")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_uint128_type(msg *pb.UInt128Type) interface{} {
-	fields981 := msg
-	_ = fields981
+	fields985 := msg
+	_ = fields985
 	p.write("UINT128")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_int128_type(msg *pb.Int128Type) interface{} {
-	fields982 := msg
-	_ = fields982
+	fields986 := msg
+	_ = fields986
 	p.write("INT128")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_date_type(msg *pb.DateType) interface{} {
-	fields983 := msg
-	_ = fields983
+	fields987 := msg
+	_ = fields987
 	p.write("DATE")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_datetime_type(msg *pb.DateTimeType) interface{} {
-	fields984 := msg
-	_ = fields984
+	fields988 := msg
+	_ = fields988
 	p.write("DATETIME")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_missing_type(msg *pb.MissingType) interface{} {
-	fields985 := msg
-	_ = fields985
+	fields989 := msg
+	_ = fields989
 	p.write("MISSING")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_decimal_type(msg *pb.DecimalType) interface{} {
-	flat990 := p.tryFlat(msg, func() { p.pretty_decimal_type(msg) })
-	if flat990 != nil {
-		p.write(*flat990)
+	flat994 := p.tryFlat(msg, func() { p.pretty_decimal_type(msg) })
+	if flat994 != nil {
+		p.write(*flat994)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields986 := []interface{}{int64(_dollar_dollar.GetPrecision()), int64(_dollar_dollar.GetScale())}
-		unwrapped_fields987 := fields986
+		fields990 := []interface{}{int64(_dollar_dollar.GetPrecision()), int64(_dollar_dollar.GetScale())}
+		unwrapped_fields991 := fields990
 		p.write("(")
 		p.write("DECIMAL")
 		p.indentSexp()
 		p.newline()
-		field988 := unwrapped_fields987[0].(int64)
-		p.write(fmt.Sprintf("%d", field988))
+		field992 := unwrapped_fields991[0].(int64)
+		p.write(fmt.Sprintf("%d", field992))
 		p.newline()
-		field989 := unwrapped_fields987[1].(int64)
-		p.write(fmt.Sprintf("%d", field989))
+		field993 := unwrapped_fields991[1].(int64)
+		p.write(fmt.Sprintf("%d", field993))
 		p.dedent()
 		p.write(")")
 	}
@@ -1607,48 +1607,48 @@ func (p *PrettyPrinter) pretty_decimal_type(msg *pb.DecimalType) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_boolean_type(msg *pb.BooleanType) interface{} {
-	fields991 := msg
-	_ = fields991
+	fields995 := msg
+	_ = fields995
 	p.write("BOOLEAN")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_int32_type(msg *pb.Int32Type) interface{} {
-	fields992 := msg
-	_ = fields992
+	fields996 := msg
+	_ = fields996
 	p.write("INT32")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_float32_type(msg *pb.Float32Type) interface{} {
-	fields993 := msg
-	_ = fields993
+	fields997 := msg
+	_ = fields997
 	p.write("FLOAT32")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_uint32_type(msg *pb.UInt32Type) interface{} {
-	fields994 := msg
-	_ = fields994
+	fields998 := msg
+	_ = fields998
 	p.write("UINT32")
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_value_bindings(msg []*pb.Binding) interface{} {
-	flat998 := p.tryFlat(msg, func() { p.pretty_value_bindings(msg) })
-	if flat998 != nil {
-		p.write(*flat998)
+	flat1002 := p.tryFlat(msg, func() { p.pretty_value_bindings(msg) })
+	if flat1002 != nil {
+		p.write(*flat1002)
 		return nil
 	} else {
-		fields995 := msg
+		fields999 := msg
 		p.write("|")
-		if !(len(fields995) == 0) {
+		if !(len(fields999) == 0) {
 			p.write(" ")
-			for i997, elem996 := range fields995 {
-				if (i997 > 0) {
+			for i1001, elem1000 := range fields999 {
+				if (i1001 > 0) {
 					p.newline()
 				}
-				p.pretty_binding(elem996)
+				p.pretty_binding(elem1000)
 			}
 		}
 	}
@@ -1656,140 +1656,140 @@ func (p *PrettyPrinter) pretty_value_bindings(msg []*pb.Binding) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_formula(msg *pb.Formula) interface{} {
-	flat1025 := p.tryFlat(msg, func() { p.pretty_formula(msg) })
-	if flat1025 != nil {
-		p.write(*flat1025)
+	flat1029 := p.tryFlat(msg, func() { p.pretty_formula(msg) })
+	if flat1029 != nil {
+		p.write(*flat1029)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1647 *pb.Conjunction
+		var _t1655 *pb.Conjunction
 		if (hasProtoField(_dollar_dollar, "conjunction") && len(_dollar_dollar.GetConjunction().GetArgs()) == 0) {
-			_t1647 = _dollar_dollar.GetConjunction()
+			_t1655 = _dollar_dollar.GetConjunction()
 		}
-		deconstruct_result1023 := _t1647
-		if deconstruct_result1023 != nil {
-			unwrapped1024 := deconstruct_result1023
-			p.pretty_true(unwrapped1024)
+		deconstruct_result1027 := _t1655
+		if deconstruct_result1027 != nil {
+			unwrapped1028 := deconstruct_result1027
+			p.pretty_true(unwrapped1028)
 		} else {
 			_dollar_dollar := msg
-			var _t1648 *pb.Disjunction
+			var _t1656 *pb.Disjunction
 			if (hasProtoField(_dollar_dollar, "disjunction") && len(_dollar_dollar.GetDisjunction().GetArgs()) == 0) {
-				_t1648 = _dollar_dollar.GetDisjunction()
+				_t1656 = _dollar_dollar.GetDisjunction()
 			}
-			deconstruct_result1021 := _t1648
-			if deconstruct_result1021 != nil {
-				unwrapped1022 := deconstruct_result1021
-				p.pretty_false(unwrapped1022)
+			deconstruct_result1025 := _t1656
+			if deconstruct_result1025 != nil {
+				unwrapped1026 := deconstruct_result1025
+				p.pretty_false(unwrapped1026)
 			} else {
 				_dollar_dollar := msg
-				var _t1649 *pb.Exists
+				var _t1657 *pb.Exists
 				if hasProtoField(_dollar_dollar, "exists") {
-					_t1649 = _dollar_dollar.GetExists()
+					_t1657 = _dollar_dollar.GetExists()
 				}
-				deconstruct_result1019 := _t1649
-				if deconstruct_result1019 != nil {
-					unwrapped1020 := deconstruct_result1019
-					p.pretty_exists(unwrapped1020)
+				deconstruct_result1023 := _t1657
+				if deconstruct_result1023 != nil {
+					unwrapped1024 := deconstruct_result1023
+					p.pretty_exists(unwrapped1024)
 				} else {
 					_dollar_dollar := msg
-					var _t1650 *pb.Reduce
+					var _t1658 *pb.Reduce
 					if hasProtoField(_dollar_dollar, "reduce") {
-						_t1650 = _dollar_dollar.GetReduce()
+						_t1658 = _dollar_dollar.GetReduce()
 					}
-					deconstruct_result1017 := _t1650
-					if deconstruct_result1017 != nil {
-						unwrapped1018 := deconstruct_result1017
-						p.pretty_reduce(unwrapped1018)
+					deconstruct_result1021 := _t1658
+					if deconstruct_result1021 != nil {
+						unwrapped1022 := deconstruct_result1021
+						p.pretty_reduce(unwrapped1022)
 					} else {
 						_dollar_dollar := msg
-						var _t1651 *pb.Conjunction
+						var _t1659 *pb.Conjunction
 						if (hasProtoField(_dollar_dollar, "conjunction") && !(len(_dollar_dollar.GetConjunction().GetArgs()) == 0)) {
-							_t1651 = _dollar_dollar.GetConjunction()
+							_t1659 = _dollar_dollar.GetConjunction()
 						}
-						deconstruct_result1015 := _t1651
-						if deconstruct_result1015 != nil {
-							unwrapped1016 := deconstruct_result1015
-							p.pretty_conjunction(unwrapped1016)
+						deconstruct_result1019 := _t1659
+						if deconstruct_result1019 != nil {
+							unwrapped1020 := deconstruct_result1019
+							p.pretty_conjunction(unwrapped1020)
 						} else {
 							_dollar_dollar := msg
-							var _t1652 *pb.Disjunction
+							var _t1660 *pb.Disjunction
 							if (hasProtoField(_dollar_dollar, "disjunction") && !(len(_dollar_dollar.GetDisjunction().GetArgs()) == 0)) {
-								_t1652 = _dollar_dollar.GetDisjunction()
+								_t1660 = _dollar_dollar.GetDisjunction()
 							}
-							deconstruct_result1013 := _t1652
-							if deconstruct_result1013 != nil {
-								unwrapped1014 := deconstruct_result1013
-								p.pretty_disjunction(unwrapped1014)
+							deconstruct_result1017 := _t1660
+							if deconstruct_result1017 != nil {
+								unwrapped1018 := deconstruct_result1017
+								p.pretty_disjunction(unwrapped1018)
 							} else {
 								_dollar_dollar := msg
-								var _t1653 *pb.Not
+								var _t1661 *pb.Not
 								if hasProtoField(_dollar_dollar, "not") {
-									_t1653 = _dollar_dollar.GetNot()
+									_t1661 = _dollar_dollar.GetNot()
 								}
-								deconstruct_result1011 := _t1653
-								if deconstruct_result1011 != nil {
-									unwrapped1012 := deconstruct_result1011
-									p.pretty_not(unwrapped1012)
+								deconstruct_result1015 := _t1661
+								if deconstruct_result1015 != nil {
+									unwrapped1016 := deconstruct_result1015
+									p.pretty_not(unwrapped1016)
 								} else {
 									_dollar_dollar := msg
-									var _t1654 *pb.FFI
+									var _t1662 *pb.FFI
 									if hasProtoField(_dollar_dollar, "ffi") {
-										_t1654 = _dollar_dollar.GetFfi()
+										_t1662 = _dollar_dollar.GetFfi()
 									}
-									deconstruct_result1009 := _t1654
-									if deconstruct_result1009 != nil {
-										unwrapped1010 := deconstruct_result1009
-										p.pretty_ffi(unwrapped1010)
+									deconstruct_result1013 := _t1662
+									if deconstruct_result1013 != nil {
+										unwrapped1014 := deconstruct_result1013
+										p.pretty_ffi(unwrapped1014)
 									} else {
 										_dollar_dollar := msg
-										var _t1655 *pb.Atom
+										var _t1663 *pb.Atom
 										if hasProtoField(_dollar_dollar, "atom") {
-											_t1655 = _dollar_dollar.GetAtom()
+											_t1663 = _dollar_dollar.GetAtom()
 										}
-										deconstruct_result1007 := _t1655
-										if deconstruct_result1007 != nil {
-											unwrapped1008 := deconstruct_result1007
-											p.pretty_atom(unwrapped1008)
+										deconstruct_result1011 := _t1663
+										if deconstruct_result1011 != nil {
+											unwrapped1012 := deconstruct_result1011
+											p.pretty_atom(unwrapped1012)
 										} else {
 											_dollar_dollar := msg
-											var _t1656 *pb.Pragma
+											var _t1664 *pb.Pragma
 											if hasProtoField(_dollar_dollar, "pragma") {
-												_t1656 = _dollar_dollar.GetPragma()
+												_t1664 = _dollar_dollar.GetPragma()
 											}
-											deconstruct_result1005 := _t1656
-											if deconstruct_result1005 != nil {
-												unwrapped1006 := deconstruct_result1005
-												p.pretty_pragma(unwrapped1006)
+											deconstruct_result1009 := _t1664
+											if deconstruct_result1009 != nil {
+												unwrapped1010 := deconstruct_result1009
+												p.pretty_pragma(unwrapped1010)
 											} else {
 												_dollar_dollar := msg
-												var _t1657 *pb.Primitive
+												var _t1665 *pb.Primitive
 												if hasProtoField(_dollar_dollar, "primitive") {
-													_t1657 = _dollar_dollar.GetPrimitive()
+													_t1665 = _dollar_dollar.GetPrimitive()
 												}
-												deconstruct_result1003 := _t1657
-												if deconstruct_result1003 != nil {
-													unwrapped1004 := deconstruct_result1003
-													p.pretty_primitive(unwrapped1004)
+												deconstruct_result1007 := _t1665
+												if deconstruct_result1007 != nil {
+													unwrapped1008 := deconstruct_result1007
+													p.pretty_primitive(unwrapped1008)
 												} else {
 													_dollar_dollar := msg
-													var _t1658 *pb.RelAtom
+													var _t1666 *pb.RelAtom
 													if hasProtoField(_dollar_dollar, "rel_atom") {
-														_t1658 = _dollar_dollar.GetRelAtom()
+														_t1666 = _dollar_dollar.GetRelAtom()
 													}
-													deconstruct_result1001 := _t1658
-													if deconstruct_result1001 != nil {
-														unwrapped1002 := deconstruct_result1001
-														p.pretty_rel_atom(unwrapped1002)
+													deconstruct_result1005 := _t1666
+													if deconstruct_result1005 != nil {
+														unwrapped1006 := deconstruct_result1005
+														p.pretty_rel_atom(unwrapped1006)
 													} else {
 														_dollar_dollar := msg
-														var _t1659 *pb.Cast
+														var _t1667 *pb.Cast
 														if hasProtoField(_dollar_dollar, "cast") {
-															_t1659 = _dollar_dollar.GetCast()
+															_t1667 = _dollar_dollar.GetCast()
 														}
-														deconstruct_result999 := _t1659
-														if deconstruct_result999 != nil {
-															unwrapped1000 := deconstruct_result999
-															p.pretty_cast(unwrapped1000)
+														deconstruct_result1003 := _t1667
+														if deconstruct_result1003 != nil {
+															unwrapped1004 := deconstruct_result1003
+															p.pretty_cast(unwrapped1004)
 														} else {
 															panic(ParseError{msg: "No matching rule for formula"})
 														}
@@ -1810,8 +1810,8 @@ func (p *PrettyPrinter) pretty_formula(msg *pb.Formula) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_true(msg *pb.Conjunction) interface{} {
-	fields1026 := msg
-	_ = fields1026
+	fields1030 := msg
+	_ = fields1030
 	p.write("(")
 	p.write("true")
 	p.write(")")
@@ -1819,8 +1819,8 @@ func (p *PrettyPrinter) pretty_true(msg *pb.Conjunction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_false(msg *pb.Disjunction) interface{} {
-	fields1027 := msg
-	_ = fields1027
+	fields1031 := msg
+	_ = fields1031
 	p.write("(")
 	p.write("false")
 	p.write(")")
@@ -1828,24 +1828,24 @@ func (p *PrettyPrinter) pretty_false(msg *pb.Disjunction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_exists(msg *pb.Exists) interface{} {
-	flat1032 := p.tryFlat(msg, func() { p.pretty_exists(msg) })
-	if flat1032 != nil {
-		p.write(*flat1032)
+	flat1036 := p.tryFlat(msg, func() { p.pretty_exists(msg) })
+	if flat1036 != nil {
+		p.write(*flat1036)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1660 := p.deconstruct_bindings(_dollar_dollar.GetBody())
-		fields1028 := []interface{}{_t1660, _dollar_dollar.GetBody().GetValue()}
-		unwrapped_fields1029 := fields1028
+		_t1668 := p.deconstruct_bindings(_dollar_dollar.GetBody())
+		fields1032 := []interface{}{_t1668, _dollar_dollar.GetBody().GetValue()}
+		unwrapped_fields1033 := fields1032
 		p.write("(")
 		p.write("exists")
 		p.indentSexp()
 		p.newline()
-		field1030 := unwrapped_fields1029[0].([]interface{})
-		p.pretty_bindings(field1030)
+		field1034 := unwrapped_fields1033[0].([]interface{})
+		p.pretty_bindings(field1034)
 		p.newline()
-		field1031 := unwrapped_fields1029[1].(*pb.Formula)
-		p.pretty_formula(field1031)
+		field1035 := unwrapped_fields1033[1].(*pb.Formula)
+		p.pretty_formula(field1035)
 		p.dedent()
 		p.write(")")
 	}
@@ -1853,26 +1853,26 @@ func (p *PrettyPrinter) pretty_exists(msg *pb.Exists) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_reduce(msg *pb.Reduce) interface{} {
-	flat1038 := p.tryFlat(msg, func() { p.pretty_reduce(msg) })
-	if flat1038 != nil {
-		p.write(*flat1038)
+	flat1042 := p.tryFlat(msg, func() { p.pretty_reduce(msg) })
+	if flat1042 != nil {
+		p.write(*flat1042)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1033 := []interface{}{_dollar_dollar.GetOp(), _dollar_dollar.GetBody(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1034 := fields1033
+		fields1037 := []interface{}{_dollar_dollar.GetOp(), _dollar_dollar.GetBody(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1038 := fields1037
 		p.write("(")
 		p.write("reduce")
 		p.indentSexp()
 		p.newline()
-		field1035 := unwrapped_fields1034[0].(*pb.Abstraction)
-		p.pretty_abstraction(field1035)
+		field1039 := unwrapped_fields1038[0].(*pb.Abstraction)
+		p.pretty_abstraction(field1039)
 		p.newline()
-		field1036 := unwrapped_fields1034[1].(*pb.Abstraction)
-		p.pretty_abstraction(field1036)
+		field1040 := unwrapped_fields1038[1].(*pb.Abstraction)
+		p.pretty_abstraction(field1040)
 		p.newline()
-		field1037 := unwrapped_fields1034[2].([]*pb.Term)
-		p.pretty_terms(field1037)
+		field1041 := unwrapped_fields1038[2].([]*pb.Term)
+		p.pretty_terms(field1041)
 		p.dedent()
 		p.write(")")
 	}
@@ -1880,22 +1880,22 @@ func (p *PrettyPrinter) pretty_reduce(msg *pb.Reduce) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_terms(msg []*pb.Term) interface{} {
-	flat1042 := p.tryFlat(msg, func() { p.pretty_terms(msg) })
-	if flat1042 != nil {
-		p.write(*flat1042)
+	flat1046 := p.tryFlat(msg, func() { p.pretty_terms(msg) })
+	if flat1046 != nil {
+		p.write(*flat1046)
 		return nil
 	} else {
-		fields1039 := msg
+		fields1043 := msg
 		p.write("(")
 		p.write("terms")
 		p.indentSexp()
-		if !(len(fields1039) == 0) {
+		if !(len(fields1043) == 0) {
 			p.newline()
-			for i1041, elem1040 := range fields1039 {
-				if (i1041 > 0) {
+			for i1045, elem1044 := range fields1043 {
+				if (i1045 > 0) {
 					p.newline()
 				}
-				p.pretty_term(elem1040)
+				p.pretty_term(elem1044)
 			}
 		}
 		p.dedent()
@@ -1905,30 +1905,30 @@ func (p *PrettyPrinter) pretty_terms(msg []*pb.Term) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_term(msg *pb.Term) interface{} {
-	flat1047 := p.tryFlat(msg, func() { p.pretty_term(msg) })
-	if flat1047 != nil {
-		p.write(*flat1047)
+	flat1051 := p.tryFlat(msg, func() { p.pretty_term(msg) })
+	if flat1051 != nil {
+		p.write(*flat1051)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1661 *pb.Var
+		var _t1669 *pb.Var
 		if hasProtoField(_dollar_dollar, "var") {
-			_t1661 = _dollar_dollar.GetVar()
+			_t1669 = _dollar_dollar.GetVar()
 		}
-		deconstruct_result1045 := _t1661
-		if deconstruct_result1045 != nil {
-			unwrapped1046 := deconstruct_result1045
-			p.pretty_var(unwrapped1046)
+		deconstruct_result1049 := _t1669
+		if deconstruct_result1049 != nil {
+			unwrapped1050 := deconstruct_result1049
+			p.pretty_var(unwrapped1050)
 		} else {
 			_dollar_dollar := msg
-			var _t1662 *pb.Value
+			var _t1670 *pb.Value
 			if hasProtoField(_dollar_dollar, "constant") {
-				_t1662 = _dollar_dollar.GetConstant()
+				_t1670 = _dollar_dollar.GetConstant()
 			}
-			deconstruct_result1043 := _t1662
-			if deconstruct_result1043 != nil {
-				unwrapped1044 := deconstruct_result1043
-				p.pretty_value(unwrapped1044)
+			deconstruct_result1047 := _t1670
+			if deconstruct_result1047 != nil {
+				unwrapped1048 := deconstruct_result1047
+				p.pretty_value(unwrapped1048)
 			} else {
 				panic(ParseError{msg: "No matching rule for term"})
 			}
@@ -1938,147 +1938,147 @@ func (p *PrettyPrinter) pretty_term(msg *pb.Term) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_var(msg *pb.Var) interface{} {
-	flat1050 := p.tryFlat(msg, func() { p.pretty_var(msg) })
-	if flat1050 != nil {
-		p.write(*flat1050)
+	flat1054 := p.tryFlat(msg, func() { p.pretty_var(msg) })
+	if flat1054 != nil {
+		p.write(*flat1054)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1048 := _dollar_dollar.GetName()
-		unwrapped_fields1049 := fields1048
-		p.write(unwrapped_fields1049)
+		fields1052 := _dollar_dollar.GetName()
+		unwrapped_fields1053 := fields1052
+		p.write(unwrapped_fields1053)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_value(msg *pb.Value) interface{} {
-	flat1076 := p.tryFlat(msg, func() { p.pretty_value(msg) })
-	if flat1076 != nil {
-		p.write(*flat1076)
+	flat1080 := p.tryFlat(msg, func() { p.pretty_value(msg) })
+	if flat1080 != nil {
+		p.write(*flat1080)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1663 *pb.DateValue
+		var _t1671 *pb.DateValue
 		if hasProtoField(_dollar_dollar, "date_value") {
-			_t1663 = _dollar_dollar.GetDateValue()
+			_t1671 = _dollar_dollar.GetDateValue()
 		}
-		deconstruct_result1074 := _t1663
-		if deconstruct_result1074 != nil {
-			unwrapped1075 := deconstruct_result1074
-			p.pretty_date(unwrapped1075)
+		deconstruct_result1078 := _t1671
+		if deconstruct_result1078 != nil {
+			unwrapped1079 := deconstruct_result1078
+			p.pretty_date(unwrapped1079)
 		} else {
 			_dollar_dollar := msg
-			var _t1664 *pb.DateTimeValue
+			var _t1672 *pb.DateTimeValue
 			if hasProtoField(_dollar_dollar, "datetime_value") {
-				_t1664 = _dollar_dollar.GetDatetimeValue()
+				_t1672 = _dollar_dollar.GetDatetimeValue()
 			}
-			deconstruct_result1072 := _t1664
-			if deconstruct_result1072 != nil {
-				unwrapped1073 := deconstruct_result1072
-				p.pretty_datetime(unwrapped1073)
+			deconstruct_result1076 := _t1672
+			if deconstruct_result1076 != nil {
+				unwrapped1077 := deconstruct_result1076
+				p.pretty_datetime(unwrapped1077)
 			} else {
 				_dollar_dollar := msg
-				var _t1665 *string
+				var _t1673 *string
 				if hasProtoField(_dollar_dollar, "string_value") {
-					_t1665 = ptr(_dollar_dollar.GetStringValue())
+					_t1673 = ptr(_dollar_dollar.GetStringValue())
 				}
-				deconstruct_result1070 := _t1665
-				if deconstruct_result1070 != nil {
-					unwrapped1071 := *deconstruct_result1070
-					p.write(p.formatStringValue(unwrapped1071))
+				deconstruct_result1074 := _t1673
+				if deconstruct_result1074 != nil {
+					unwrapped1075 := *deconstruct_result1074
+					p.write(p.formatStringValue(unwrapped1075))
 				} else {
 					_dollar_dollar := msg
-					var _t1666 *int32
+					var _t1674 *int32
 					if hasProtoField(_dollar_dollar, "int32_value") {
-						_t1666 = ptr(_dollar_dollar.GetInt32Value())
+						_t1674 = ptr(_dollar_dollar.GetInt32Value())
 					}
-					deconstruct_result1068 := _t1666
-					if deconstruct_result1068 != nil {
-						unwrapped1069 := *deconstruct_result1068
-						p.write(fmt.Sprintf("%di32", unwrapped1069))
+					deconstruct_result1072 := _t1674
+					if deconstruct_result1072 != nil {
+						unwrapped1073 := *deconstruct_result1072
+						p.write(fmt.Sprintf("%di32", unwrapped1073))
 					} else {
 						_dollar_dollar := msg
-						var _t1667 *int64
+						var _t1675 *int64
 						if hasProtoField(_dollar_dollar, "int_value") {
-							_t1667 = ptr(_dollar_dollar.GetIntValue())
+							_t1675 = ptr(_dollar_dollar.GetIntValue())
 						}
-						deconstruct_result1066 := _t1667
-						if deconstruct_result1066 != nil {
-							unwrapped1067 := *deconstruct_result1066
-							p.write(fmt.Sprintf("%d", unwrapped1067))
+						deconstruct_result1070 := _t1675
+						if deconstruct_result1070 != nil {
+							unwrapped1071 := *deconstruct_result1070
+							p.write(fmt.Sprintf("%d", unwrapped1071))
 						} else {
 							_dollar_dollar := msg
-							var _t1668 *float32
+							var _t1676 *float32
 							if hasProtoField(_dollar_dollar, "float32_value") {
-								_t1668 = ptr(_dollar_dollar.GetFloat32Value())
+								_t1676 = ptr(_dollar_dollar.GetFloat32Value())
 							}
-							deconstruct_result1064 := _t1668
-							if deconstruct_result1064 != nil {
-								unwrapped1065 := *deconstruct_result1064
-								p.write(formatFloat32(unwrapped1065))
+							deconstruct_result1068 := _t1676
+							if deconstruct_result1068 != nil {
+								unwrapped1069 := *deconstruct_result1068
+								p.write(formatFloat32(unwrapped1069))
 							} else {
 								_dollar_dollar := msg
-								var _t1669 *float64
+								var _t1677 *float64
 								if hasProtoField(_dollar_dollar, "float_value") {
-									_t1669 = ptr(_dollar_dollar.GetFloatValue())
+									_t1677 = ptr(_dollar_dollar.GetFloatValue())
 								}
-								deconstruct_result1062 := _t1669
-								if deconstruct_result1062 != nil {
-									unwrapped1063 := *deconstruct_result1062
-									p.write(formatFloat64(unwrapped1063))
+								deconstruct_result1066 := _t1677
+								if deconstruct_result1066 != nil {
+									unwrapped1067 := *deconstruct_result1066
+									p.write(formatFloat64(unwrapped1067))
 								} else {
 									_dollar_dollar := msg
-									var _t1670 *uint32
+									var _t1678 *uint32
 									if hasProtoField(_dollar_dollar, "uint32_value") {
-										_t1670 = ptr(_dollar_dollar.GetUint32Value())
+										_t1678 = ptr(_dollar_dollar.GetUint32Value())
 									}
-									deconstruct_result1060 := _t1670
-									if deconstruct_result1060 != nil {
-										unwrapped1061 := *deconstruct_result1060
-										p.write(fmt.Sprintf("%du32", unwrapped1061))
+									deconstruct_result1064 := _t1678
+									if deconstruct_result1064 != nil {
+										unwrapped1065 := *deconstruct_result1064
+										p.write(fmt.Sprintf("%du32", unwrapped1065))
 									} else {
 										_dollar_dollar := msg
-										var _t1671 *pb.UInt128Value
+										var _t1679 *pb.UInt128Value
 										if hasProtoField(_dollar_dollar, "uint128_value") {
-											_t1671 = _dollar_dollar.GetUint128Value()
+											_t1679 = _dollar_dollar.GetUint128Value()
 										}
-										deconstruct_result1058 := _t1671
-										if deconstruct_result1058 != nil {
-											unwrapped1059 := deconstruct_result1058
-											p.write(p.formatUint128(unwrapped1059))
+										deconstruct_result1062 := _t1679
+										if deconstruct_result1062 != nil {
+											unwrapped1063 := deconstruct_result1062
+											p.write(p.formatUint128(unwrapped1063))
 										} else {
 											_dollar_dollar := msg
-											var _t1672 *pb.Int128Value
+											var _t1680 *pb.Int128Value
 											if hasProtoField(_dollar_dollar, "int128_value") {
-												_t1672 = _dollar_dollar.GetInt128Value()
+												_t1680 = _dollar_dollar.GetInt128Value()
 											}
-											deconstruct_result1056 := _t1672
-											if deconstruct_result1056 != nil {
-												unwrapped1057 := deconstruct_result1056
-												p.write(p.formatInt128(unwrapped1057))
+											deconstruct_result1060 := _t1680
+											if deconstruct_result1060 != nil {
+												unwrapped1061 := deconstruct_result1060
+												p.write(p.formatInt128(unwrapped1061))
 											} else {
 												_dollar_dollar := msg
-												var _t1673 *pb.DecimalValue
+												var _t1681 *pb.DecimalValue
 												if hasProtoField(_dollar_dollar, "decimal_value") {
-													_t1673 = _dollar_dollar.GetDecimalValue()
+													_t1681 = _dollar_dollar.GetDecimalValue()
 												}
-												deconstruct_result1054 := _t1673
-												if deconstruct_result1054 != nil {
-													unwrapped1055 := deconstruct_result1054
-													p.write(p.formatDecimal(unwrapped1055))
+												deconstruct_result1058 := _t1681
+												if deconstruct_result1058 != nil {
+													unwrapped1059 := deconstruct_result1058
+													p.write(p.formatDecimal(unwrapped1059))
 												} else {
 													_dollar_dollar := msg
-													var _t1674 *bool
+													var _t1682 *bool
 													if hasProtoField(_dollar_dollar, "boolean_value") {
-														_t1674 = ptr(_dollar_dollar.GetBooleanValue())
+														_t1682 = ptr(_dollar_dollar.GetBooleanValue())
 													}
-													deconstruct_result1052 := _t1674
-													if deconstruct_result1052 != nil {
-														unwrapped1053 := *deconstruct_result1052
-														p.pretty_boolean_value(unwrapped1053)
+													deconstruct_result1056 := _t1682
+													if deconstruct_result1056 != nil {
+														unwrapped1057 := *deconstruct_result1056
+														p.pretty_boolean_value(unwrapped1057)
 													} else {
-														fields1051 := msg
-														_ = fields1051
+														fields1055 := msg
+														_ = fields1055
 														p.write("missing")
 													}
 												}
@@ -2097,26 +2097,26 @@ func (p *PrettyPrinter) pretty_value(msg *pb.Value) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_date(msg *pb.DateValue) interface{} {
-	flat1082 := p.tryFlat(msg, func() { p.pretty_date(msg) })
-	if flat1082 != nil {
-		p.write(*flat1082)
+	flat1086 := p.tryFlat(msg, func() { p.pretty_date(msg) })
+	if flat1086 != nil {
+		p.write(*flat1086)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1077 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay())}
-		unwrapped_fields1078 := fields1077
+		fields1081 := []interface{}{int64(_dollar_dollar.GetYear()), int64(_dollar_dollar.GetMonth()), int64(_dollar_dollar.GetDay())}
+		unwrapped_fields1082 := fields1081
 		p.write("(")
 		p.write("date")
 		p.indentSexp()
 		p.newline()
-		field1079 := unwrapped_fields1078[0].(int64)
-		p.write(fmt.Sprintf("%d", field1079))
+		field1083 := unwrapped_fields1082[0].(int64)
+		p.write(fmt.Sprintf("%d", field1083))
 		p.newline()
-		field1080 := unwrapped_fields1078[1].(int64)
-		p.write(fmt.Sprintf("%d", field1080))
+		field1084 := unwrapped_fields1082[1].(int64)
+		p.write(fmt.Sprintf("%d", field1084))
 		p.newline()
-		field1081 := unwrapped_fields1078[2].(int64)
-		p.write(fmt.Sprintf("%d", field1081))
+		field1085 := unwrapped_fields1082[2].(int64)
+		p.write(fmt.Sprintf("%d", field1085))
 		p.dedent()
 		p.write(")")
 	}
@@ -2124,40 +2124,40 @@ func (p *PrettyPrinter) pretty_date(msg *pb.DateValue) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_datetime(msg *pb.DateTimeValue) interface{} {
-	flat1093 := p.tryFlat(msg, func() { p.pretty_datetime(msg) })
-	if flat1093 != nil {
-		p.write(*flat1093)
+	flat1097 := p.tryFlat(msg, func() { p.pretty_datetime(msg) })
+	if flat1097 != nil {
+		p.write(*flat1097)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1083 := []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_fields1084 := fields1083
+		fields1087 := []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_fields1088 := fields1087
 		p.write("(")
 		p.write("datetime")
 		p.indentSexp()
 		p.newline()
-		field1085 := unwrapped_fields1084[0].(int64)
-		p.write(fmt.Sprintf("%d", field1085))
+		field1089 := unwrapped_fields1088[0].(int64)
+		p.write(fmt.Sprintf("%d", field1089))
 		p.newline()
-		field1086 := unwrapped_fields1084[1].(int64)
-		p.write(fmt.Sprintf("%d", field1086))
+		field1090 := unwrapped_fields1088[1].(int64)
+		p.write(fmt.Sprintf("%d", field1090))
 		p.newline()
-		field1087 := unwrapped_fields1084[2].(int64)
-		p.write(fmt.Sprintf("%d", field1087))
+		field1091 := unwrapped_fields1088[2].(int64)
+		p.write(fmt.Sprintf("%d", field1091))
 		p.newline()
-		field1088 := unwrapped_fields1084[3].(int64)
-		p.write(fmt.Sprintf("%d", field1088))
+		field1092 := unwrapped_fields1088[3].(int64)
+		p.write(fmt.Sprintf("%d", field1092))
 		p.newline()
-		field1089 := unwrapped_fields1084[4].(int64)
-		p.write(fmt.Sprintf("%d", field1089))
+		field1093 := unwrapped_fields1088[4].(int64)
+		p.write(fmt.Sprintf("%d", field1093))
 		p.newline()
-		field1090 := unwrapped_fields1084[5].(int64)
-		p.write(fmt.Sprintf("%d", field1090))
-		field1091 := unwrapped_fields1084[6].(*int64)
-		if field1091 != nil {
+		field1094 := unwrapped_fields1088[5].(int64)
+		p.write(fmt.Sprintf("%d", field1094))
+		field1095 := unwrapped_fields1088[6].(*int64)
+		if field1095 != nil {
 			p.newline()
-			opt_val1092 := *field1091
-			p.write(fmt.Sprintf("%d", opt_val1092))
+			opt_val1096 := *field1095
+			p.write(fmt.Sprintf("%d", opt_val1096))
 		}
 		p.dedent()
 		p.write(")")
@@ -2166,24 +2166,24 @@ func (p *PrettyPrinter) pretty_datetime(msg *pb.DateTimeValue) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_conjunction(msg *pb.Conjunction) interface{} {
-	flat1098 := p.tryFlat(msg, func() { p.pretty_conjunction(msg) })
-	if flat1098 != nil {
-		p.write(*flat1098)
+	flat1102 := p.tryFlat(msg, func() { p.pretty_conjunction(msg) })
+	if flat1102 != nil {
+		p.write(*flat1102)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1094 := _dollar_dollar.GetArgs()
-		unwrapped_fields1095 := fields1094
+		fields1098 := _dollar_dollar.GetArgs()
+		unwrapped_fields1099 := fields1098
 		p.write("(")
 		p.write("and")
 		p.indentSexp()
-		if !(len(unwrapped_fields1095) == 0) {
+		if !(len(unwrapped_fields1099) == 0) {
 			p.newline()
-			for i1097, elem1096 := range unwrapped_fields1095 {
-				if (i1097 > 0) {
+			for i1101, elem1100 := range unwrapped_fields1099 {
+				if (i1101 > 0) {
 					p.newline()
 				}
-				p.pretty_formula(elem1096)
+				p.pretty_formula(elem1100)
 			}
 		}
 		p.dedent()
@@ -2193,24 +2193,24 @@ func (p *PrettyPrinter) pretty_conjunction(msg *pb.Conjunction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_disjunction(msg *pb.Disjunction) interface{} {
-	flat1103 := p.tryFlat(msg, func() { p.pretty_disjunction(msg) })
-	if flat1103 != nil {
-		p.write(*flat1103)
+	flat1107 := p.tryFlat(msg, func() { p.pretty_disjunction(msg) })
+	if flat1107 != nil {
+		p.write(*flat1107)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1099 := _dollar_dollar.GetArgs()
-		unwrapped_fields1100 := fields1099
+		fields1103 := _dollar_dollar.GetArgs()
+		unwrapped_fields1104 := fields1103
 		p.write("(")
 		p.write("or")
 		p.indentSexp()
-		if !(len(unwrapped_fields1100) == 0) {
+		if !(len(unwrapped_fields1104) == 0) {
 			p.newline()
-			for i1102, elem1101 := range unwrapped_fields1100 {
-				if (i1102 > 0) {
+			for i1106, elem1105 := range unwrapped_fields1104 {
+				if (i1106 > 0) {
 					p.newline()
 				}
-				p.pretty_formula(elem1101)
+				p.pretty_formula(elem1105)
 			}
 		}
 		p.dedent()
@@ -2220,19 +2220,19 @@ func (p *PrettyPrinter) pretty_disjunction(msg *pb.Disjunction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_not(msg *pb.Not) interface{} {
-	flat1106 := p.tryFlat(msg, func() { p.pretty_not(msg) })
-	if flat1106 != nil {
-		p.write(*flat1106)
+	flat1110 := p.tryFlat(msg, func() { p.pretty_not(msg) })
+	if flat1110 != nil {
+		p.write(*flat1110)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1104 := _dollar_dollar.GetArg()
-		unwrapped_fields1105 := fields1104
+		fields1108 := _dollar_dollar.GetArg()
+		unwrapped_fields1109 := fields1108
 		p.write("(")
 		p.write("not")
 		p.indentSexp()
 		p.newline()
-		p.pretty_formula(unwrapped_fields1105)
+		p.pretty_formula(unwrapped_fields1109)
 		p.dedent()
 		p.write(")")
 	}
@@ -2240,26 +2240,26 @@ func (p *PrettyPrinter) pretty_not(msg *pb.Not) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_ffi(msg *pb.FFI) interface{} {
-	flat1112 := p.tryFlat(msg, func() { p.pretty_ffi(msg) })
-	if flat1112 != nil {
-		p.write(*flat1112)
+	flat1116 := p.tryFlat(msg, func() { p.pretty_ffi(msg) })
+	if flat1116 != nil {
+		p.write(*flat1116)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1107 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetArgs(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1108 := fields1107
+		fields1111 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetArgs(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1112 := fields1111
 		p.write("(")
 		p.write("ffi")
 		p.indentSexp()
 		p.newline()
-		field1109 := unwrapped_fields1108[0].(string)
-		p.pretty_name(field1109)
+		field1113 := unwrapped_fields1112[0].(string)
+		p.pretty_name(field1113)
 		p.newline()
-		field1110 := unwrapped_fields1108[1].([]*pb.Abstraction)
-		p.pretty_ffi_args(field1110)
+		field1114 := unwrapped_fields1112[1].([]*pb.Abstraction)
+		p.pretty_ffi_args(field1114)
 		p.newline()
-		field1111 := unwrapped_fields1108[2].([]*pb.Term)
-		p.pretty_terms(field1111)
+		field1115 := unwrapped_fields1112[2].([]*pb.Term)
+		p.pretty_terms(field1115)
 		p.dedent()
 		p.write(")")
 	}
@@ -2267,35 +2267,35 @@ func (p *PrettyPrinter) pretty_ffi(msg *pb.FFI) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_name(msg string) interface{} {
-	flat1114 := p.tryFlat(msg, func() { p.pretty_name(msg) })
-	if flat1114 != nil {
-		p.write(*flat1114)
+	flat1118 := p.tryFlat(msg, func() { p.pretty_name(msg) })
+	if flat1118 != nil {
+		p.write(*flat1118)
 		return nil
 	} else {
-		fields1113 := msg
+		fields1117 := msg
 		p.write(":")
-		p.write(fields1113)
+		p.write(fields1117)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_ffi_args(msg []*pb.Abstraction) interface{} {
-	flat1118 := p.tryFlat(msg, func() { p.pretty_ffi_args(msg) })
-	if flat1118 != nil {
-		p.write(*flat1118)
+	flat1122 := p.tryFlat(msg, func() { p.pretty_ffi_args(msg) })
+	if flat1122 != nil {
+		p.write(*flat1122)
 		return nil
 	} else {
-		fields1115 := msg
+		fields1119 := msg
 		p.write("(")
 		p.write("args")
 		p.indentSexp()
-		if !(len(fields1115) == 0) {
+		if !(len(fields1119) == 0) {
 			p.newline()
-			for i1117, elem1116 := range fields1115 {
-				if (i1117 > 0) {
+			for i1121, elem1120 := range fields1119 {
+				if (i1121 > 0) {
 					p.newline()
 				}
-				p.pretty_abstraction(elem1116)
+				p.pretty_abstraction(elem1120)
 			}
 		}
 		p.dedent()
@@ -2305,28 +2305,28 @@ func (p *PrettyPrinter) pretty_ffi_args(msg []*pb.Abstraction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_atom(msg *pb.Atom) interface{} {
-	flat1125 := p.tryFlat(msg, func() { p.pretty_atom(msg) })
-	if flat1125 != nil {
-		p.write(*flat1125)
+	flat1129 := p.tryFlat(msg, func() { p.pretty_atom(msg) })
+	if flat1129 != nil {
+		p.write(*flat1129)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1119 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1120 := fields1119
+		fields1123 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1124 := fields1123
 		p.write("(")
 		p.write("atom")
 		p.indentSexp()
 		p.newline()
-		field1121 := unwrapped_fields1120[0].(*pb.RelationId)
-		p.pretty_relation_id(field1121)
-		field1122 := unwrapped_fields1120[1].([]*pb.Term)
-		if !(len(field1122) == 0) {
+		field1125 := unwrapped_fields1124[0].(*pb.RelationId)
+		p.pretty_relation_id(field1125)
+		field1126 := unwrapped_fields1124[1].([]*pb.Term)
+		if !(len(field1126) == 0) {
 			p.newline()
-			for i1124, elem1123 := range field1122 {
-				if (i1124 > 0) {
+			for i1128, elem1127 := range field1126 {
+				if (i1128 > 0) {
 					p.newline()
 				}
-				p.pretty_term(elem1123)
+				p.pretty_term(elem1127)
 			}
 		}
 		p.dedent()
@@ -2336,28 +2336,28 @@ func (p *PrettyPrinter) pretty_atom(msg *pb.Atom) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_pragma(msg *pb.Pragma) interface{} {
-	flat1132 := p.tryFlat(msg, func() { p.pretty_pragma(msg) })
-	if flat1132 != nil {
-		p.write(*flat1132)
+	flat1136 := p.tryFlat(msg, func() { p.pretty_pragma(msg) })
+	if flat1136 != nil {
+		p.write(*flat1136)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1126 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1127 := fields1126
+		fields1130 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1131 := fields1130
 		p.write("(")
 		p.write("pragma")
 		p.indentSexp()
 		p.newline()
-		field1128 := unwrapped_fields1127[0].(string)
-		p.pretty_name(field1128)
-		field1129 := unwrapped_fields1127[1].([]*pb.Term)
-		if !(len(field1129) == 0) {
+		field1132 := unwrapped_fields1131[0].(string)
+		p.pretty_name(field1132)
+		field1133 := unwrapped_fields1131[1].([]*pb.Term)
+		if !(len(field1133) == 0) {
 			p.newline()
-			for i1131, elem1130 := range field1129 {
-				if (i1131 > 0) {
+			for i1135, elem1134 := range field1133 {
+				if (i1135 > 0) {
 					p.newline()
 				}
-				p.pretty_term(elem1130)
+				p.pretty_term(elem1134)
 			}
 		}
 		p.dedent()
@@ -2367,109 +2367,109 @@ func (p *PrettyPrinter) pretty_pragma(msg *pb.Pragma) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_primitive(msg *pb.Primitive) interface{} {
-	flat1148 := p.tryFlat(msg, func() { p.pretty_primitive(msg) })
-	if flat1148 != nil {
-		p.write(*flat1148)
+	flat1152 := p.tryFlat(msg, func() { p.pretty_primitive(msg) })
+	if flat1152 != nil {
+		p.write(*flat1152)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1675 []interface{}
+		var _t1683 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_eq" {
-			_t1675 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1683 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		guard_result1147 := _t1675
-		if guard_result1147 != nil {
+		guard_result1151 := _t1683
+		if guard_result1151 != nil {
 			p.pretty_eq(msg)
 		} else {
 			_dollar_dollar := msg
-			var _t1676 []interface{}
+			var _t1684 []interface{}
 			if _dollar_dollar.GetName() == "rel_primitive_lt_monotype" {
-				_t1676 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+				_t1684 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 			}
-			guard_result1146 := _t1676
-			if guard_result1146 != nil {
+			guard_result1150 := _t1684
+			if guard_result1150 != nil {
 				p.pretty_lt(msg)
 			} else {
 				_dollar_dollar := msg
-				var _t1677 []interface{}
+				var _t1685 []interface{}
 				if _dollar_dollar.GetName() == "rel_primitive_lt_eq_monotype" {
-					_t1677 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+					_t1685 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 				}
-				guard_result1145 := _t1677
-				if guard_result1145 != nil {
+				guard_result1149 := _t1685
+				if guard_result1149 != nil {
 					p.pretty_lt_eq(msg)
 				} else {
 					_dollar_dollar := msg
-					var _t1678 []interface{}
+					var _t1686 []interface{}
 					if _dollar_dollar.GetName() == "rel_primitive_gt_monotype" {
-						_t1678 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+						_t1686 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 					}
-					guard_result1144 := _t1678
-					if guard_result1144 != nil {
+					guard_result1148 := _t1686
+					if guard_result1148 != nil {
 						p.pretty_gt(msg)
 					} else {
 						_dollar_dollar := msg
-						var _t1679 []interface{}
+						var _t1687 []interface{}
 						if _dollar_dollar.GetName() == "rel_primitive_gt_eq_monotype" {
-							_t1679 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+							_t1687 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 						}
-						guard_result1143 := _t1679
-						if guard_result1143 != nil {
+						guard_result1147 := _t1687
+						if guard_result1147 != nil {
 							p.pretty_gt_eq(msg)
 						} else {
 							_dollar_dollar := msg
-							var _t1680 []interface{}
+							var _t1688 []interface{}
 							if _dollar_dollar.GetName() == "rel_primitive_add_monotype" {
-								_t1680 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+								_t1688 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 							}
-							guard_result1142 := _t1680
-							if guard_result1142 != nil {
+							guard_result1146 := _t1688
+							if guard_result1146 != nil {
 								p.pretty_add(msg)
 							} else {
 								_dollar_dollar := msg
-								var _t1681 []interface{}
+								var _t1689 []interface{}
 								if _dollar_dollar.GetName() == "rel_primitive_subtract_monotype" {
-									_t1681 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+									_t1689 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 								}
-								guard_result1141 := _t1681
-								if guard_result1141 != nil {
+								guard_result1145 := _t1689
+								if guard_result1145 != nil {
 									p.pretty_minus(msg)
 								} else {
 									_dollar_dollar := msg
-									var _t1682 []interface{}
+									var _t1690 []interface{}
 									if _dollar_dollar.GetName() == "rel_primitive_multiply_monotype" {
-										_t1682 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+										_t1690 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 									}
-									guard_result1140 := _t1682
-									if guard_result1140 != nil {
+									guard_result1144 := _t1690
+									if guard_result1144 != nil {
 										p.pretty_multiply(msg)
 									} else {
 										_dollar_dollar := msg
-										var _t1683 []interface{}
+										var _t1691 []interface{}
 										if _dollar_dollar.GetName() == "rel_primitive_divide_monotype" {
-											_t1683 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+											_t1691 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 										}
-										guard_result1139 := _t1683
-										if guard_result1139 != nil {
+										guard_result1143 := _t1691
+										if guard_result1143 != nil {
 											p.pretty_divide(msg)
 										} else {
 											_dollar_dollar := msg
-											fields1133 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
-											unwrapped_fields1134 := fields1133
+											fields1137 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
+											unwrapped_fields1138 := fields1137
 											p.write("(")
 											p.write("primitive")
 											p.indentSexp()
 											p.newline()
-											field1135 := unwrapped_fields1134[0].(string)
-											p.pretty_name(field1135)
-											field1136 := unwrapped_fields1134[1].([]*pb.RelTerm)
-											if !(len(field1136) == 0) {
+											field1139 := unwrapped_fields1138[0].(string)
+											p.pretty_name(field1139)
+											field1140 := unwrapped_fields1138[1].([]*pb.RelTerm)
+											if !(len(field1140) == 0) {
 												p.newline()
-												for i1138, elem1137 := range field1136 {
-													if (i1138 > 0) {
+												for i1142, elem1141 := range field1140 {
+													if (i1142 > 0) {
 														p.newline()
 													}
-													p.pretty_rel_term(elem1137)
+													p.pretty_rel_term(elem1141)
 												}
 											}
 											p.dedent()
@@ -2488,27 +2488,27 @@ func (p *PrettyPrinter) pretty_primitive(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_eq(msg *pb.Primitive) interface{} {
-	flat1153 := p.tryFlat(msg, func() { p.pretty_eq(msg) })
-	if flat1153 != nil {
-		p.write(*flat1153)
+	flat1157 := p.tryFlat(msg, func() { p.pretty_eq(msg) })
+	if flat1157 != nil {
+		p.write(*flat1157)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1684 []interface{}
+		var _t1692 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_eq" {
-			_t1684 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1692 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1149 := _t1684
-		unwrapped_fields1150 := fields1149
+		fields1153 := _t1692
+		unwrapped_fields1154 := fields1153
 		p.write("(")
 		p.write("=")
 		p.indentSexp()
 		p.newline()
-		field1151 := unwrapped_fields1150[0].(*pb.Term)
-		p.pretty_term(field1151)
+		field1155 := unwrapped_fields1154[0].(*pb.Term)
+		p.pretty_term(field1155)
 		p.newline()
-		field1152 := unwrapped_fields1150[1].(*pb.Term)
-		p.pretty_term(field1152)
+		field1156 := unwrapped_fields1154[1].(*pb.Term)
+		p.pretty_term(field1156)
 		p.dedent()
 		p.write(")")
 	}
@@ -2516,27 +2516,27 @@ func (p *PrettyPrinter) pretty_eq(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_lt(msg *pb.Primitive) interface{} {
-	flat1158 := p.tryFlat(msg, func() { p.pretty_lt(msg) })
-	if flat1158 != nil {
-		p.write(*flat1158)
+	flat1162 := p.tryFlat(msg, func() { p.pretty_lt(msg) })
+	if flat1162 != nil {
+		p.write(*flat1162)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1685 []interface{}
+		var _t1693 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_lt_monotype" {
-			_t1685 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1693 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1154 := _t1685
-		unwrapped_fields1155 := fields1154
+		fields1158 := _t1693
+		unwrapped_fields1159 := fields1158
 		p.write("(")
 		p.write("<")
 		p.indentSexp()
 		p.newline()
-		field1156 := unwrapped_fields1155[0].(*pb.Term)
-		p.pretty_term(field1156)
+		field1160 := unwrapped_fields1159[0].(*pb.Term)
+		p.pretty_term(field1160)
 		p.newline()
-		field1157 := unwrapped_fields1155[1].(*pb.Term)
-		p.pretty_term(field1157)
+		field1161 := unwrapped_fields1159[1].(*pb.Term)
+		p.pretty_term(field1161)
 		p.dedent()
 		p.write(")")
 	}
@@ -2544,27 +2544,27 @@ func (p *PrettyPrinter) pretty_lt(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_lt_eq(msg *pb.Primitive) interface{} {
-	flat1163 := p.tryFlat(msg, func() { p.pretty_lt_eq(msg) })
-	if flat1163 != nil {
-		p.write(*flat1163)
+	flat1167 := p.tryFlat(msg, func() { p.pretty_lt_eq(msg) })
+	if flat1167 != nil {
+		p.write(*flat1167)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1686 []interface{}
+		var _t1694 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_lt_eq_monotype" {
-			_t1686 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1694 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1159 := _t1686
-		unwrapped_fields1160 := fields1159
+		fields1163 := _t1694
+		unwrapped_fields1164 := fields1163
 		p.write("(")
 		p.write("<=")
 		p.indentSexp()
 		p.newline()
-		field1161 := unwrapped_fields1160[0].(*pb.Term)
-		p.pretty_term(field1161)
+		field1165 := unwrapped_fields1164[0].(*pb.Term)
+		p.pretty_term(field1165)
 		p.newline()
-		field1162 := unwrapped_fields1160[1].(*pb.Term)
-		p.pretty_term(field1162)
+		field1166 := unwrapped_fields1164[1].(*pb.Term)
+		p.pretty_term(field1166)
 		p.dedent()
 		p.write(")")
 	}
@@ -2572,27 +2572,27 @@ func (p *PrettyPrinter) pretty_lt_eq(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gt(msg *pb.Primitive) interface{} {
-	flat1168 := p.tryFlat(msg, func() { p.pretty_gt(msg) })
-	if flat1168 != nil {
-		p.write(*flat1168)
+	flat1172 := p.tryFlat(msg, func() { p.pretty_gt(msg) })
+	if flat1172 != nil {
+		p.write(*flat1172)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1687 []interface{}
+		var _t1695 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_gt_monotype" {
-			_t1687 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1695 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1164 := _t1687
-		unwrapped_fields1165 := fields1164
+		fields1168 := _t1695
+		unwrapped_fields1169 := fields1168
 		p.write("(")
 		p.write(">")
 		p.indentSexp()
 		p.newline()
-		field1166 := unwrapped_fields1165[0].(*pb.Term)
-		p.pretty_term(field1166)
+		field1170 := unwrapped_fields1169[0].(*pb.Term)
+		p.pretty_term(field1170)
 		p.newline()
-		field1167 := unwrapped_fields1165[1].(*pb.Term)
-		p.pretty_term(field1167)
+		field1171 := unwrapped_fields1169[1].(*pb.Term)
+		p.pretty_term(field1171)
 		p.dedent()
 		p.write(")")
 	}
@@ -2600,27 +2600,27 @@ func (p *PrettyPrinter) pretty_gt(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gt_eq(msg *pb.Primitive) interface{} {
-	flat1173 := p.tryFlat(msg, func() { p.pretty_gt_eq(msg) })
-	if flat1173 != nil {
-		p.write(*flat1173)
+	flat1177 := p.tryFlat(msg, func() { p.pretty_gt_eq(msg) })
+	if flat1177 != nil {
+		p.write(*flat1177)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1688 []interface{}
+		var _t1696 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_gt_eq_monotype" {
-			_t1688 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
+			_t1696 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm()}
 		}
-		fields1169 := _t1688
-		unwrapped_fields1170 := fields1169
+		fields1173 := _t1696
+		unwrapped_fields1174 := fields1173
 		p.write("(")
 		p.write(">=")
 		p.indentSexp()
 		p.newline()
-		field1171 := unwrapped_fields1170[0].(*pb.Term)
-		p.pretty_term(field1171)
+		field1175 := unwrapped_fields1174[0].(*pb.Term)
+		p.pretty_term(field1175)
 		p.newline()
-		field1172 := unwrapped_fields1170[1].(*pb.Term)
-		p.pretty_term(field1172)
+		field1176 := unwrapped_fields1174[1].(*pb.Term)
+		p.pretty_term(field1176)
 		p.dedent()
 		p.write(")")
 	}
@@ -2628,30 +2628,30 @@ func (p *PrettyPrinter) pretty_gt_eq(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_add(msg *pb.Primitive) interface{} {
-	flat1179 := p.tryFlat(msg, func() { p.pretty_add(msg) })
-	if flat1179 != nil {
-		p.write(*flat1179)
+	flat1183 := p.tryFlat(msg, func() { p.pretty_add(msg) })
+	if flat1183 != nil {
+		p.write(*flat1183)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1689 []interface{}
+		var _t1697 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_add_monotype" {
-			_t1689 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+			_t1697 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 		}
-		fields1174 := _t1689
-		unwrapped_fields1175 := fields1174
+		fields1178 := _t1697
+		unwrapped_fields1179 := fields1178
 		p.write("(")
 		p.write("+")
 		p.indentSexp()
 		p.newline()
-		field1176 := unwrapped_fields1175[0].(*pb.Term)
-		p.pretty_term(field1176)
+		field1180 := unwrapped_fields1179[0].(*pb.Term)
+		p.pretty_term(field1180)
 		p.newline()
-		field1177 := unwrapped_fields1175[1].(*pb.Term)
-		p.pretty_term(field1177)
+		field1181 := unwrapped_fields1179[1].(*pb.Term)
+		p.pretty_term(field1181)
 		p.newline()
-		field1178 := unwrapped_fields1175[2].(*pb.Term)
-		p.pretty_term(field1178)
+		field1182 := unwrapped_fields1179[2].(*pb.Term)
+		p.pretty_term(field1182)
 		p.dedent()
 		p.write(")")
 	}
@@ -2659,30 +2659,30 @@ func (p *PrettyPrinter) pretty_add(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_minus(msg *pb.Primitive) interface{} {
-	flat1185 := p.tryFlat(msg, func() { p.pretty_minus(msg) })
-	if flat1185 != nil {
-		p.write(*flat1185)
+	flat1189 := p.tryFlat(msg, func() { p.pretty_minus(msg) })
+	if flat1189 != nil {
+		p.write(*flat1189)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1690 []interface{}
+		var _t1698 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_subtract_monotype" {
-			_t1690 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+			_t1698 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 		}
-		fields1180 := _t1690
-		unwrapped_fields1181 := fields1180
+		fields1184 := _t1698
+		unwrapped_fields1185 := fields1184
 		p.write("(")
 		p.write("-")
 		p.indentSexp()
 		p.newline()
-		field1182 := unwrapped_fields1181[0].(*pb.Term)
-		p.pretty_term(field1182)
+		field1186 := unwrapped_fields1185[0].(*pb.Term)
+		p.pretty_term(field1186)
 		p.newline()
-		field1183 := unwrapped_fields1181[1].(*pb.Term)
-		p.pretty_term(field1183)
+		field1187 := unwrapped_fields1185[1].(*pb.Term)
+		p.pretty_term(field1187)
 		p.newline()
-		field1184 := unwrapped_fields1181[2].(*pb.Term)
-		p.pretty_term(field1184)
+		field1188 := unwrapped_fields1185[2].(*pb.Term)
+		p.pretty_term(field1188)
 		p.dedent()
 		p.write(")")
 	}
@@ -2690,30 +2690,30 @@ func (p *PrettyPrinter) pretty_minus(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_multiply(msg *pb.Primitive) interface{} {
-	flat1191 := p.tryFlat(msg, func() { p.pretty_multiply(msg) })
-	if flat1191 != nil {
-		p.write(*flat1191)
+	flat1195 := p.tryFlat(msg, func() { p.pretty_multiply(msg) })
+	if flat1195 != nil {
+		p.write(*flat1195)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1691 []interface{}
+		var _t1699 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_multiply_monotype" {
-			_t1691 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+			_t1699 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 		}
-		fields1186 := _t1691
-		unwrapped_fields1187 := fields1186
+		fields1190 := _t1699
+		unwrapped_fields1191 := fields1190
 		p.write("(")
 		p.write("*")
 		p.indentSexp()
 		p.newline()
-		field1188 := unwrapped_fields1187[0].(*pb.Term)
-		p.pretty_term(field1188)
+		field1192 := unwrapped_fields1191[0].(*pb.Term)
+		p.pretty_term(field1192)
 		p.newline()
-		field1189 := unwrapped_fields1187[1].(*pb.Term)
-		p.pretty_term(field1189)
+		field1193 := unwrapped_fields1191[1].(*pb.Term)
+		p.pretty_term(field1193)
 		p.newline()
-		field1190 := unwrapped_fields1187[2].(*pb.Term)
-		p.pretty_term(field1190)
+		field1194 := unwrapped_fields1191[2].(*pb.Term)
+		p.pretty_term(field1194)
 		p.dedent()
 		p.write(")")
 	}
@@ -2721,30 +2721,30 @@ func (p *PrettyPrinter) pretty_multiply(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_divide(msg *pb.Primitive) interface{} {
-	flat1197 := p.tryFlat(msg, func() { p.pretty_divide(msg) })
-	if flat1197 != nil {
-		p.write(*flat1197)
+	flat1201 := p.tryFlat(msg, func() { p.pretty_divide(msg) })
+	if flat1201 != nil {
+		p.write(*flat1201)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1692 []interface{}
+		var _t1700 []interface{}
 		if _dollar_dollar.GetName() == "rel_primitive_divide_monotype" {
-			_t1692 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
+			_t1700 = []interface{}{_dollar_dollar.GetTerms()[0].GetTerm(), _dollar_dollar.GetTerms()[1].GetTerm(), _dollar_dollar.GetTerms()[2].GetTerm()}
 		}
-		fields1192 := _t1692
-		unwrapped_fields1193 := fields1192
+		fields1196 := _t1700
+		unwrapped_fields1197 := fields1196
 		p.write("(")
 		p.write("/")
 		p.indentSexp()
 		p.newline()
-		field1194 := unwrapped_fields1193[0].(*pb.Term)
-		p.pretty_term(field1194)
+		field1198 := unwrapped_fields1197[0].(*pb.Term)
+		p.pretty_term(field1198)
 		p.newline()
-		field1195 := unwrapped_fields1193[1].(*pb.Term)
-		p.pretty_term(field1195)
+		field1199 := unwrapped_fields1197[1].(*pb.Term)
+		p.pretty_term(field1199)
 		p.newline()
-		field1196 := unwrapped_fields1193[2].(*pb.Term)
-		p.pretty_term(field1196)
+		field1200 := unwrapped_fields1197[2].(*pb.Term)
+		p.pretty_term(field1200)
 		p.dedent()
 		p.write(")")
 	}
@@ -2752,30 +2752,30 @@ func (p *PrettyPrinter) pretty_divide(msg *pb.Primitive) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_rel_term(msg *pb.RelTerm) interface{} {
-	flat1202 := p.tryFlat(msg, func() { p.pretty_rel_term(msg) })
-	if flat1202 != nil {
-		p.write(*flat1202)
+	flat1206 := p.tryFlat(msg, func() { p.pretty_rel_term(msg) })
+	if flat1206 != nil {
+		p.write(*flat1206)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1693 *pb.Value
+		var _t1701 *pb.Value
 		if hasProtoField(_dollar_dollar, "specialized_value") {
-			_t1693 = _dollar_dollar.GetSpecializedValue()
+			_t1701 = _dollar_dollar.GetSpecializedValue()
 		}
-		deconstruct_result1200 := _t1693
-		if deconstruct_result1200 != nil {
-			unwrapped1201 := deconstruct_result1200
-			p.pretty_specialized_value(unwrapped1201)
+		deconstruct_result1204 := _t1701
+		if deconstruct_result1204 != nil {
+			unwrapped1205 := deconstruct_result1204
+			p.pretty_specialized_value(unwrapped1205)
 		} else {
 			_dollar_dollar := msg
-			var _t1694 *pb.Term
+			var _t1702 *pb.Term
 			if hasProtoField(_dollar_dollar, "term") {
-				_t1694 = _dollar_dollar.GetTerm()
+				_t1702 = _dollar_dollar.GetTerm()
 			}
-			deconstruct_result1198 := _t1694
-			if deconstruct_result1198 != nil {
-				unwrapped1199 := deconstruct_result1198
-				p.pretty_term(unwrapped1199)
+			deconstruct_result1202 := _t1702
+			if deconstruct_result1202 != nil {
+				unwrapped1203 := deconstruct_result1202
+				p.pretty_term(unwrapped1203)
 			} else {
 				panic(ParseError{msg: "No matching rule for rel_term"})
 			}
@@ -2785,41 +2785,41 @@ func (p *PrettyPrinter) pretty_rel_term(msg *pb.RelTerm) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_specialized_value(msg *pb.Value) interface{} {
-	flat1204 := p.tryFlat(msg, func() { p.pretty_specialized_value(msg) })
-	if flat1204 != nil {
-		p.write(*flat1204)
+	flat1208 := p.tryFlat(msg, func() { p.pretty_specialized_value(msg) })
+	if flat1208 != nil {
+		p.write(*flat1208)
 		return nil
 	} else {
-		fields1203 := msg
+		fields1207 := msg
 		p.write("#")
-		p.pretty_raw_value(fields1203)
+		p.pretty_raw_value(fields1207)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_rel_atom(msg *pb.RelAtom) interface{} {
-	flat1211 := p.tryFlat(msg, func() { p.pretty_rel_atom(msg) })
-	if flat1211 != nil {
-		p.write(*flat1211)
+	flat1215 := p.tryFlat(msg, func() { p.pretty_rel_atom(msg) })
+	if flat1215 != nil {
+		p.write(*flat1215)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1205 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
-		unwrapped_fields1206 := fields1205
+		fields1209 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetTerms()}
+		unwrapped_fields1210 := fields1209
 		p.write("(")
 		p.write("relatom")
 		p.indentSexp()
 		p.newline()
-		field1207 := unwrapped_fields1206[0].(string)
-		p.pretty_name(field1207)
-		field1208 := unwrapped_fields1206[1].([]*pb.RelTerm)
-		if !(len(field1208) == 0) {
+		field1211 := unwrapped_fields1210[0].(string)
+		p.pretty_name(field1211)
+		field1212 := unwrapped_fields1210[1].([]*pb.RelTerm)
+		if !(len(field1212) == 0) {
 			p.newline()
-			for i1210, elem1209 := range field1208 {
-				if (i1210 > 0) {
+			for i1214, elem1213 := range field1212 {
+				if (i1214 > 0) {
 					p.newline()
 				}
-				p.pretty_rel_term(elem1209)
+				p.pretty_rel_term(elem1213)
 			}
 		}
 		p.dedent()
@@ -2829,23 +2829,23 @@ func (p *PrettyPrinter) pretty_rel_atom(msg *pb.RelAtom) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_cast(msg *pb.Cast) interface{} {
-	flat1216 := p.tryFlat(msg, func() { p.pretty_cast(msg) })
-	if flat1216 != nil {
-		p.write(*flat1216)
+	flat1220 := p.tryFlat(msg, func() { p.pretty_cast(msg) })
+	if flat1220 != nil {
+		p.write(*flat1220)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1212 := []interface{}{_dollar_dollar.GetInput(), _dollar_dollar.GetResult()}
-		unwrapped_fields1213 := fields1212
+		fields1216 := []interface{}{_dollar_dollar.GetInput(), _dollar_dollar.GetResult()}
+		unwrapped_fields1217 := fields1216
 		p.write("(")
 		p.write("cast")
 		p.indentSexp()
 		p.newline()
-		field1214 := unwrapped_fields1213[0].(*pb.Term)
-		p.pretty_term(field1214)
+		field1218 := unwrapped_fields1217[0].(*pb.Term)
+		p.pretty_term(field1218)
 		p.newline()
-		field1215 := unwrapped_fields1213[1].(*pb.Term)
-		p.pretty_term(field1215)
+		field1219 := unwrapped_fields1217[1].(*pb.Term)
+		p.pretty_term(field1219)
 		p.dedent()
 		p.write(")")
 	}
@@ -2853,22 +2853,22 @@ func (p *PrettyPrinter) pretty_cast(msg *pb.Cast) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_attrs(msg []*pb.Attribute) interface{} {
-	flat1220 := p.tryFlat(msg, func() { p.pretty_attrs(msg) })
-	if flat1220 != nil {
-		p.write(*flat1220)
+	flat1224 := p.tryFlat(msg, func() { p.pretty_attrs(msg) })
+	if flat1224 != nil {
+		p.write(*flat1224)
 		return nil
 	} else {
-		fields1217 := msg
+		fields1221 := msg
 		p.write("(")
 		p.write("attrs")
 		p.indentSexp()
-		if !(len(fields1217) == 0) {
+		if !(len(fields1221) == 0) {
 			p.newline()
-			for i1219, elem1218 := range fields1217 {
-				if (i1219 > 0) {
+			for i1223, elem1222 := range fields1221 {
+				if (i1223 > 0) {
 					p.newline()
 				}
-				p.pretty_attribute(elem1218)
+				p.pretty_attribute(elem1222)
 			}
 		}
 		p.dedent()
@@ -2878,28 +2878,28 @@ func (p *PrettyPrinter) pretty_attrs(msg []*pb.Attribute) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_attribute(msg *pb.Attribute) interface{} {
-	flat1227 := p.tryFlat(msg, func() { p.pretty_attribute(msg) })
-	if flat1227 != nil {
-		p.write(*flat1227)
+	flat1231 := p.tryFlat(msg, func() { p.pretty_attribute(msg) })
+	if flat1231 != nil {
+		p.write(*flat1231)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1221 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetArgs()}
-		unwrapped_fields1222 := fields1221
+		fields1225 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetArgs()}
+		unwrapped_fields1226 := fields1225
 		p.write("(")
 		p.write("attribute")
 		p.indentSexp()
 		p.newline()
-		field1223 := unwrapped_fields1222[0].(string)
-		p.pretty_name(field1223)
-		field1224 := unwrapped_fields1222[1].([]*pb.Value)
-		if !(len(field1224) == 0) {
+		field1227 := unwrapped_fields1226[0].(string)
+		p.pretty_name(field1227)
+		field1228 := unwrapped_fields1226[1].([]*pb.Value)
+		if !(len(field1228) == 0) {
 			p.newline()
-			for i1226, elem1225 := range field1224 {
-				if (i1226 > 0) {
+			for i1230, elem1229 := range field1228 {
+				if (i1230 > 0) {
 					p.newline()
 				}
-				p.pretty_raw_value(elem1225)
+				p.pretty_raw_value(elem1229)
 			}
 		}
 		p.dedent()
@@ -2909,30 +2909,40 @@ func (p *PrettyPrinter) pretty_attribute(msg *pb.Attribute) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_algorithm(msg *pb.Algorithm) interface{} {
-	flat1234 := p.tryFlat(msg, func() { p.pretty_algorithm(msg) })
-	if flat1234 != nil {
-		p.write(*flat1234)
+	flat1240 := p.tryFlat(msg, func() { p.pretty_algorithm(msg) })
+	if flat1240 != nil {
+		p.write(*flat1240)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1228 := []interface{}{_dollar_dollar.GetGlobal(), _dollar_dollar.GetBody()}
-		unwrapped_fields1229 := fields1228
+		var _t1703 []*pb.Attribute
+		if !(len(_dollar_dollar.GetAttrs()) == 0) {
+			_t1703 = _dollar_dollar.GetAttrs()
+		}
+		fields1232 := []interface{}{_dollar_dollar.GetGlobal(), _dollar_dollar.GetBody(), _t1703}
+		unwrapped_fields1233 := fields1232
 		p.write("(")
 		p.write("algorithm")
 		p.indentSexp()
-		field1230 := unwrapped_fields1229[0].([]*pb.RelationId)
-		if !(len(field1230) == 0) {
+		field1234 := unwrapped_fields1233[0].([]*pb.RelationId)
+		if !(len(field1234) == 0) {
 			p.newline()
-			for i1232, elem1231 := range field1230 {
-				if (i1232 > 0) {
+			for i1236, elem1235 := range field1234 {
+				if (i1236 > 0) {
 					p.newline()
 				}
-				p.pretty_relation_id(elem1231)
+				p.pretty_relation_id(elem1235)
 			}
 		}
 		p.newline()
-		field1233 := unwrapped_fields1229[1].(*pb.Script)
-		p.pretty_script(field1233)
+		field1237 := unwrapped_fields1233[1].(*pb.Script)
+		p.pretty_script(field1237)
+		field1238 := unwrapped_fields1233[2].([]*pb.Attribute)
+		if field1238 != nil {
+			p.newline()
+			opt_val1239 := field1238
+			p.pretty_attrs(opt_val1239)
+		}
 		p.dedent()
 		p.write(")")
 	}
@@ -2940,24 +2950,24 @@ func (p *PrettyPrinter) pretty_algorithm(msg *pb.Algorithm) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_script(msg *pb.Script) interface{} {
-	flat1239 := p.tryFlat(msg, func() { p.pretty_script(msg) })
-	if flat1239 != nil {
-		p.write(*flat1239)
+	flat1245 := p.tryFlat(msg, func() { p.pretty_script(msg) })
+	if flat1245 != nil {
+		p.write(*flat1245)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1235 := _dollar_dollar.GetConstructs()
-		unwrapped_fields1236 := fields1235
+		fields1241 := _dollar_dollar.GetConstructs()
+		unwrapped_fields1242 := fields1241
 		p.write("(")
 		p.write("script")
 		p.indentSexp()
-		if !(len(unwrapped_fields1236) == 0) {
+		if !(len(unwrapped_fields1242) == 0) {
 			p.newline()
-			for i1238, elem1237 := range unwrapped_fields1236 {
-				if (i1238 > 0) {
+			for i1244, elem1243 := range unwrapped_fields1242 {
+				if (i1244 > 0) {
 					p.newline()
 				}
-				p.pretty_construct(elem1237)
+				p.pretty_construct(elem1243)
 			}
 		}
 		p.dedent()
@@ -2967,30 +2977,30 @@ func (p *PrettyPrinter) pretty_script(msg *pb.Script) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_construct(msg *pb.Construct) interface{} {
-	flat1244 := p.tryFlat(msg, func() { p.pretty_construct(msg) })
-	if flat1244 != nil {
-		p.write(*flat1244)
+	flat1250 := p.tryFlat(msg, func() { p.pretty_construct(msg) })
+	if flat1250 != nil {
+		p.write(*flat1250)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1695 *pb.Loop
+		var _t1704 *pb.Loop
 		if hasProtoField(_dollar_dollar, "loop") {
-			_t1695 = _dollar_dollar.GetLoop()
+			_t1704 = _dollar_dollar.GetLoop()
 		}
-		deconstruct_result1242 := _t1695
-		if deconstruct_result1242 != nil {
-			unwrapped1243 := deconstruct_result1242
-			p.pretty_loop(unwrapped1243)
+		deconstruct_result1248 := _t1704
+		if deconstruct_result1248 != nil {
+			unwrapped1249 := deconstruct_result1248
+			p.pretty_loop(unwrapped1249)
 		} else {
 			_dollar_dollar := msg
-			var _t1696 *pb.Instruction
+			var _t1705 *pb.Instruction
 			if hasProtoField(_dollar_dollar, "instruction") {
-				_t1696 = _dollar_dollar.GetInstruction()
+				_t1705 = _dollar_dollar.GetInstruction()
 			}
-			deconstruct_result1240 := _t1696
-			if deconstruct_result1240 != nil {
-				unwrapped1241 := deconstruct_result1240
-				p.pretty_instruction(unwrapped1241)
+			deconstruct_result1246 := _t1705
+			if deconstruct_result1246 != nil {
+				unwrapped1247 := deconstruct_result1246
+				p.pretty_instruction(unwrapped1247)
 			} else {
 				panic(ParseError{msg: "No matching rule for construct"})
 			}
@@ -3000,23 +3010,33 @@ func (p *PrettyPrinter) pretty_construct(msg *pb.Construct) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_loop(msg *pb.Loop) interface{} {
-	flat1249 := p.tryFlat(msg, func() { p.pretty_loop(msg) })
-	if flat1249 != nil {
-		p.write(*flat1249)
+	flat1257 := p.tryFlat(msg, func() { p.pretty_loop(msg) })
+	if flat1257 != nil {
+		p.write(*flat1257)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1245 := []interface{}{_dollar_dollar.GetInit(), _dollar_dollar.GetBody()}
-		unwrapped_fields1246 := fields1245
+		var _t1706 []*pb.Attribute
+		if !(len(_dollar_dollar.GetAttrs()) == 0) {
+			_t1706 = _dollar_dollar.GetAttrs()
+		}
+		fields1251 := []interface{}{_dollar_dollar.GetInit(), _dollar_dollar.GetBody(), _t1706}
+		unwrapped_fields1252 := fields1251
 		p.write("(")
 		p.write("loop")
 		p.indentSexp()
 		p.newline()
-		field1247 := unwrapped_fields1246[0].([]*pb.Instruction)
-		p.pretty_init(field1247)
+		field1253 := unwrapped_fields1252[0].([]*pb.Instruction)
+		p.pretty_init(field1253)
 		p.newline()
-		field1248 := unwrapped_fields1246[1].(*pb.Script)
-		p.pretty_script(field1248)
+		field1254 := unwrapped_fields1252[1].(*pb.Script)
+		p.pretty_script(field1254)
+		field1255 := unwrapped_fields1252[2].([]*pb.Attribute)
+		if field1255 != nil {
+			p.newline()
+			opt_val1256 := field1255
+			p.pretty_attrs(opt_val1256)
+		}
 		p.dedent()
 		p.write(")")
 	}
@@ -3024,22 +3044,22 @@ func (p *PrettyPrinter) pretty_loop(msg *pb.Loop) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_init(msg []*pb.Instruction) interface{} {
-	flat1253 := p.tryFlat(msg, func() { p.pretty_init(msg) })
-	if flat1253 != nil {
-		p.write(*flat1253)
+	flat1261 := p.tryFlat(msg, func() { p.pretty_init(msg) })
+	if flat1261 != nil {
+		p.write(*flat1261)
 		return nil
 	} else {
-		fields1250 := msg
+		fields1258 := msg
 		p.write("(")
 		p.write("init")
 		p.indentSexp()
-		if !(len(fields1250) == 0) {
+		if !(len(fields1258) == 0) {
 			p.newline()
-			for i1252, elem1251 := range fields1250 {
-				if (i1252 > 0) {
+			for i1260, elem1259 := range fields1258 {
+				if (i1260 > 0) {
 					p.newline()
 				}
-				p.pretty_instruction(elem1251)
+				p.pretty_instruction(elem1259)
 			}
 		}
 		p.dedent()
@@ -3049,60 +3069,60 @@ func (p *PrettyPrinter) pretty_init(msg []*pb.Instruction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_instruction(msg *pb.Instruction) interface{} {
-	flat1264 := p.tryFlat(msg, func() { p.pretty_instruction(msg) })
-	if flat1264 != nil {
-		p.write(*flat1264)
+	flat1272 := p.tryFlat(msg, func() { p.pretty_instruction(msg) })
+	if flat1272 != nil {
+		p.write(*flat1272)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1697 *pb.Assign
+		var _t1707 *pb.Assign
 		if hasProtoField(_dollar_dollar, "assign") {
-			_t1697 = _dollar_dollar.GetAssign()
+			_t1707 = _dollar_dollar.GetAssign()
 		}
-		deconstruct_result1262 := _t1697
-		if deconstruct_result1262 != nil {
-			unwrapped1263 := deconstruct_result1262
-			p.pretty_assign(unwrapped1263)
+		deconstruct_result1270 := _t1707
+		if deconstruct_result1270 != nil {
+			unwrapped1271 := deconstruct_result1270
+			p.pretty_assign(unwrapped1271)
 		} else {
 			_dollar_dollar := msg
-			var _t1698 *pb.Upsert
+			var _t1708 *pb.Upsert
 			if hasProtoField(_dollar_dollar, "upsert") {
-				_t1698 = _dollar_dollar.GetUpsert()
+				_t1708 = _dollar_dollar.GetUpsert()
 			}
-			deconstruct_result1260 := _t1698
-			if deconstruct_result1260 != nil {
-				unwrapped1261 := deconstruct_result1260
-				p.pretty_upsert(unwrapped1261)
+			deconstruct_result1268 := _t1708
+			if deconstruct_result1268 != nil {
+				unwrapped1269 := deconstruct_result1268
+				p.pretty_upsert(unwrapped1269)
 			} else {
 				_dollar_dollar := msg
-				var _t1699 *pb.Break
+				var _t1709 *pb.Break
 				if hasProtoField(_dollar_dollar, "break") {
-					_t1699 = _dollar_dollar.GetBreak()
+					_t1709 = _dollar_dollar.GetBreak()
 				}
-				deconstruct_result1258 := _t1699
-				if deconstruct_result1258 != nil {
-					unwrapped1259 := deconstruct_result1258
-					p.pretty_break(unwrapped1259)
+				deconstruct_result1266 := _t1709
+				if deconstruct_result1266 != nil {
+					unwrapped1267 := deconstruct_result1266
+					p.pretty_break(unwrapped1267)
 				} else {
 					_dollar_dollar := msg
-					var _t1700 *pb.MonoidDef
+					var _t1710 *pb.MonoidDef
 					if hasProtoField(_dollar_dollar, "monoid_def") {
-						_t1700 = _dollar_dollar.GetMonoidDef()
+						_t1710 = _dollar_dollar.GetMonoidDef()
 					}
-					deconstruct_result1256 := _t1700
-					if deconstruct_result1256 != nil {
-						unwrapped1257 := deconstruct_result1256
-						p.pretty_monoid_def(unwrapped1257)
+					deconstruct_result1264 := _t1710
+					if deconstruct_result1264 != nil {
+						unwrapped1265 := deconstruct_result1264
+						p.pretty_monoid_def(unwrapped1265)
 					} else {
 						_dollar_dollar := msg
-						var _t1701 *pb.MonusDef
+						var _t1711 *pb.MonusDef
 						if hasProtoField(_dollar_dollar, "monus_def") {
-							_t1701 = _dollar_dollar.GetMonusDef()
+							_t1711 = _dollar_dollar.GetMonusDef()
 						}
-						deconstruct_result1254 := _t1701
-						if deconstruct_result1254 != nil {
-							unwrapped1255 := deconstruct_result1254
-							p.pretty_monus_def(unwrapped1255)
+						deconstruct_result1262 := _t1711
+						if deconstruct_result1262 != nil {
+							unwrapped1263 := deconstruct_result1262
+							p.pretty_monus_def(unwrapped1263)
 						} else {
 							panic(ParseError{msg: "No matching rule for instruction"})
 						}
@@ -3115,32 +3135,32 @@ func (p *PrettyPrinter) pretty_instruction(msg *pb.Instruction) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_assign(msg *pb.Assign) interface{} {
-	flat1271 := p.tryFlat(msg, func() { p.pretty_assign(msg) })
-	if flat1271 != nil {
-		p.write(*flat1271)
+	flat1279 := p.tryFlat(msg, func() { p.pretty_assign(msg) })
+	if flat1279 != nil {
+		p.write(*flat1279)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1702 []*pb.Attribute
+		var _t1712 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1702 = _dollar_dollar.GetAttrs()
+			_t1712 = _dollar_dollar.GetAttrs()
 		}
-		fields1265 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1702}
-		unwrapped_fields1266 := fields1265
+		fields1273 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1712}
+		unwrapped_fields1274 := fields1273
 		p.write("(")
 		p.write("assign")
 		p.indentSexp()
 		p.newline()
-		field1267 := unwrapped_fields1266[0].(*pb.RelationId)
-		p.pretty_relation_id(field1267)
+		field1275 := unwrapped_fields1274[0].(*pb.RelationId)
+		p.pretty_relation_id(field1275)
 		p.newline()
-		field1268 := unwrapped_fields1266[1].(*pb.Abstraction)
-		p.pretty_abstraction(field1268)
-		field1269 := unwrapped_fields1266[2].([]*pb.Attribute)
-		if field1269 != nil {
+		field1276 := unwrapped_fields1274[1].(*pb.Abstraction)
+		p.pretty_abstraction(field1276)
+		field1277 := unwrapped_fields1274[2].([]*pb.Attribute)
+		if field1277 != nil {
 			p.newline()
-			opt_val1270 := field1269
-			p.pretty_attrs(opt_val1270)
+			opt_val1278 := field1277
+			p.pretty_attrs(opt_val1278)
 		}
 		p.dedent()
 		p.write(")")
@@ -3149,32 +3169,32 @@ func (p *PrettyPrinter) pretty_assign(msg *pb.Assign) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_upsert(msg *pb.Upsert) interface{} {
-	flat1278 := p.tryFlat(msg, func() { p.pretty_upsert(msg) })
-	if flat1278 != nil {
-		p.write(*flat1278)
+	flat1286 := p.tryFlat(msg, func() { p.pretty_upsert(msg) })
+	if flat1286 != nil {
+		p.write(*flat1286)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1703 []*pb.Attribute
+		var _t1713 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1703 = _dollar_dollar.GetAttrs()
+			_t1713 = _dollar_dollar.GetAttrs()
 		}
-		fields1272 := []interface{}{_dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1703}
-		unwrapped_fields1273 := fields1272
+		fields1280 := []interface{}{_dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1713}
+		unwrapped_fields1281 := fields1280
 		p.write("(")
 		p.write("upsert")
 		p.indentSexp()
 		p.newline()
-		field1274 := unwrapped_fields1273[0].(*pb.RelationId)
-		p.pretty_relation_id(field1274)
+		field1282 := unwrapped_fields1281[0].(*pb.RelationId)
+		p.pretty_relation_id(field1282)
 		p.newline()
-		field1275 := unwrapped_fields1273[1].([]interface{})
-		p.pretty_abstraction_with_arity(field1275)
-		field1276 := unwrapped_fields1273[2].([]*pb.Attribute)
-		if field1276 != nil {
+		field1283 := unwrapped_fields1281[1].([]interface{})
+		p.pretty_abstraction_with_arity(field1283)
+		field1284 := unwrapped_fields1281[2].([]*pb.Attribute)
+		if field1284 != nil {
 			p.newline()
-			opt_val1277 := field1276
-			p.pretty_attrs(opt_val1277)
+			opt_val1285 := field1284
+			p.pretty_attrs(opt_val1285)
 		}
 		p.dedent()
 		p.write(")")
@@ -3183,22 +3203,22 @@ func (p *PrettyPrinter) pretty_upsert(msg *pb.Upsert) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_abstraction_with_arity(msg []interface{}) interface{} {
-	flat1283 := p.tryFlat(msg, func() { p.pretty_abstraction_with_arity(msg) })
-	if flat1283 != nil {
-		p.write(*flat1283)
+	flat1291 := p.tryFlat(msg, func() { p.pretty_abstraction_with_arity(msg) })
+	if flat1291 != nil {
+		p.write(*flat1291)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1704 := p.deconstruct_bindings_with_arity(_dollar_dollar[0].(*pb.Abstraction), _dollar_dollar[1].(int64))
-		fields1279 := []interface{}{_t1704, _dollar_dollar[0].(*pb.Abstraction).GetValue()}
-		unwrapped_fields1280 := fields1279
+		_t1714 := p.deconstruct_bindings_with_arity(_dollar_dollar[0].(*pb.Abstraction), _dollar_dollar[1].(int64))
+		fields1287 := []interface{}{_t1714, _dollar_dollar[0].(*pb.Abstraction).GetValue()}
+		unwrapped_fields1288 := fields1287
 		p.write("(")
 		p.indent()
-		field1281 := unwrapped_fields1280[0].([]interface{})
-		p.pretty_bindings(field1281)
+		field1289 := unwrapped_fields1288[0].([]interface{})
+		p.pretty_bindings(field1289)
 		p.newline()
-		field1282 := unwrapped_fields1280[1].(*pb.Formula)
-		p.pretty_formula(field1282)
+		field1290 := unwrapped_fields1288[1].(*pb.Formula)
+		p.pretty_formula(field1290)
 		p.dedent()
 		p.write(")")
 	}
@@ -3206,32 +3226,32 @@ func (p *PrettyPrinter) pretty_abstraction_with_arity(msg []interface{}) interfa
 }
 
 func (p *PrettyPrinter) pretty_break(msg *pb.Break) interface{} {
-	flat1290 := p.tryFlat(msg, func() { p.pretty_break(msg) })
-	if flat1290 != nil {
-		p.write(*flat1290)
+	flat1298 := p.tryFlat(msg, func() { p.pretty_break(msg) })
+	if flat1298 != nil {
+		p.write(*flat1298)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1705 []*pb.Attribute
+		var _t1715 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1705 = _dollar_dollar.GetAttrs()
+			_t1715 = _dollar_dollar.GetAttrs()
 		}
-		fields1284 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1705}
-		unwrapped_fields1285 := fields1284
+		fields1292 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetBody(), _t1715}
+		unwrapped_fields1293 := fields1292
 		p.write("(")
 		p.write("break")
 		p.indentSexp()
 		p.newline()
-		field1286 := unwrapped_fields1285[0].(*pb.RelationId)
-		p.pretty_relation_id(field1286)
+		field1294 := unwrapped_fields1293[0].(*pb.RelationId)
+		p.pretty_relation_id(field1294)
 		p.newline()
-		field1287 := unwrapped_fields1285[1].(*pb.Abstraction)
-		p.pretty_abstraction(field1287)
-		field1288 := unwrapped_fields1285[2].([]*pb.Attribute)
-		if field1288 != nil {
+		field1295 := unwrapped_fields1293[1].(*pb.Abstraction)
+		p.pretty_abstraction(field1295)
+		field1296 := unwrapped_fields1293[2].([]*pb.Attribute)
+		if field1296 != nil {
 			p.newline()
-			opt_val1289 := field1288
-			p.pretty_attrs(opt_val1289)
+			opt_val1297 := field1296
+			p.pretty_attrs(opt_val1297)
 		}
 		p.dedent()
 		p.write(")")
@@ -3240,35 +3260,35 @@ func (p *PrettyPrinter) pretty_break(msg *pb.Break) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_monoid_def(msg *pb.MonoidDef) interface{} {
-	flat1298 := p.tryFlat(msg, func() { p.pretty_monoid_def(msg) })
-	if flat1298 != nil {
-		p.write(*flat1298)
+	flat1306 := p.tryFlat(msg, func() { p.pretty_monoid_def(msg) })
+	if flat1306 != nil {
+		p.write(*flat1306)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1706 []*pb.Attribute
+		var _t1716 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1706 = _dollar_dollar.GetAttrs()
+			_t1716 = _dollar_dollar.GetAttrs()
 		}
-		fields1291 := []interface{}{_dollar_dollar.GetMonoid(), _dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1706}
-		unwrapped_fields1292 := fields1291
+		fields1299 := []interface{}{_dollar_dollar.GetMonoid(), _dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1716}
+		unwrapped_fields1300 := fields1299
 		p.write("(")
 		p.write("monoid")
 		p.indentSexp()
 		p.newline()
-		field1293 := unwrapped_fields1292[0].(*pb.Monoid)
-		p.pretty_monoid(field1293)
+		field1301 := unwrapped_fields1300[0].(*pb.Monoid)
+		p.pretty_monoid(field1301)
 		p.newline()
-		field1294 := unwrapped_fields1292[1].(*pb.RelationId)
-		p.pretty_relation_id(field1294)
+		field1302 := unwrapped_fields1300[1].(*pb.RelationId)
+		p.pretty_relation_id(field1302)
 		p.newline()
-		field1295 := unwrapped_fields1292[2].([]interface{})
-		p.pretty_abstraction_with_arity(field1295)
-		field1296 := unwrapped_fields1292[3].([]*pb.Attribute)
-		if field1296 != nil {
+		field1303 := unwrapped_fields1300[2].([]interface{})
+		p.pretty_abstraction_with_arity(field1303)
+		field1304 := unwrapped_fields1300[3].([]*pb.Attribute)
+		if field1304 != nil {
 			p.newline()
-			opt_val1297 := field1296
-			p.pretty_attrs(opt_val1297)
+			opt_val1305 := field1304
+			p.pretty_attrs(opt_val1305)
 		}
 		p.dedent()
 		p.write(")")
@@ -3277,50 +3297,50 @@ func (p *PrettyPrinter) pretty_monoid_def(msg *pb.MonoidDef) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_monoid(msg *pb.Monoid) interface{} {
-	flat1307 := p.tryFlat(msg, func() { p.pretty_monoid(msg) })
-	if flat1307 != nil {
-		p.write(*flat1307)
+	flat1315 := p.tryFlat(msg, func() { p.pretty_monoid(msg) })
+	if flat1315 != nil {
+		p.write(*flat1315)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1707 *pb.OrMonoid
+		var _t1717 *pb.OrMonoid
 		if hasProtoField(_dollar_dollar, "or_monoid") {
-			_t1707 = _dollar_dollar.GetOrMonoid()
+			_t1717 = _dollar_dollar.GetOrMonoid()
 		}
-		deconstruct_result1305 := _t1707
-		if deconstruct_result1305 != nil {
-			unwrapped1306 := deconstruct_result1305
-			p.pretty_or_monoid(unwrapped1306)
+		deconstruct_result1313 := _t1717
+		if deconstruct_result1313 != nil {
+			unwrapped1314 := deconstruct_result1313
+			p.pretty_or_monoid(unwrapped1314)
 		} else {
 			_dollar_dollar := msg
-			var _t1708 *pb.MinMonoid
+			var _t1718 *pb.MinMonoid
 			if hasProtoField(_dollar_dollar, "min_monoid") {
-				_t1708 = _dollar_dollar.GetMinMonoid()
+				_t1718 = _dollar_dollar.GetMinMonoid()
 			}
-			deconstruct_result1303 := _t1708
-			if deconstruct_result1303 != nil {
-				unwrapped1304 := deconstruct_result1303
-				p.pretty_min_monoid(unwrapped1304)
+			deconstruct_result1311 := _t1718
+			if deconstruct_result1311 != nil {
+				unwrapped1312 := deconstruct_result1311
+				p.pretty_min_monoid(unwrapped1312)
 			} else {
 				_dollar_dollar := msg
-				var _t1709 *pb.MaxMonoid
+				var _t1719 *pb.MaxMonoid
 				if hasProtoField(_dollar_dollar, "max_monoid") {
-					_t1709 = _dollar_dollar.GetMaxMonoid()
+					_t1719 = _dollar_dollar.GetMaxMonoid()
 				}
-				deconstruct_result1301 := _t1709
-				if deconstruct_result1301 != nil {
-					unwrapped1302 := deconstruct_result1301
-					p.pretty_max_monoid(unwrapped1302)
+				deconstruct_result1309 := _t1719
+				if deconstruct_result1309 != nil {
+					unwrapped1310 := deconstruct_result1309
+					p.pretty_max_monoid(unwrapped1310)
 				} else {
 					_dollar_dollar := msg
-					var _t1710 *pb.SumMonoid
+					var _t1720 *pb.SumMonoid
 					if hasProtoField(_dollar_dollar, "sum_monoid") {
-						_t1710 = _dollar_dollar.GetSumMonoid()
+						_t1720 = _dollar_dollar.GetSumMonoid()
 					}
-					deconstruct_result1299 := _t1710
-					if deconstruct_result1299 != nil {
-						unwrapped1300 := deconstruct_result1299
-						p.pretty_sum_monoid(unwrapped1300)
+					deconstruct_result1307 := _t1720
+					if deconstruct_result1307 != nil {
+						unwrapped1308 := deconstruct_result1307
+						p.pretty_sum_monoid(unwrapped1308)
 					} else {
 						panic(ParseError{msg: "No matching rule for monoid"})
 					}
@@ -3332,8 +3352,8 @@ func (p *PrettyPrinter) pretty_monoid(msg *pb.Monoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_or_monoid(msg *pb.OrMonoid) interface{} {
-	fields1308 := msg
-	_ = fields1308
+	fields1316 := msg
+	_ = fields1316
 	p.write("(")
 	p.write("or")
 	p.write(")")
@@ -3341,19 +3361,19 @@ func (p *PrettyPrinter) pretty_or_monoid(msg *pb.OrMonoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_min_monoid(msg *pb.MinMonoid) interface{} {
-	flat1311 := p.tryFlat(msg, func() { p.pretty_min_monoid(msg) })
-	if flat1311 != nil {
-		p.write(*flat1311)
+	flat1319 := p.tryFlat(msg, func() { p.pretty_min_monoid(msg) })
+	if flat1319 != nil {
+		p.write(*flat1319)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1309 := _dollar_dollar.GetType()
-		unwrapped_fields1310 := fields1309
+		fields1317 := _dollar_dollar.GetType()
+		unwrapped_fields1318 := fields1317
 		p.write("(")
 		p.write("min")
 		p.indentSexp()
 		p.newline()
-		p.pretty_type(unwrapped_fields1310)
+		p.pretty_type(unwrapped_fields1318)
 		p.dedent()
 		p.write(")")
 	}
@@ -3361,19 +3381,19 @@ func (p *PrettyPrinter) pretty_min_monoid(msg *pb.MinMonoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_max_monoid(msg *pb.MaxMonoid) interface{} {
-	flat1314 := p.tryFlat(msg, func() { p.pretty_max_monoid(msg) })
-	if flat1314 != nil {
-		p.write(*flat1314)
+	flat1322 := p.tryFlat(msg, func() { p.pretty_max_monoid(msg) })
+	if flat1322 != nil {
+		p.write(*flat1322)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1312 := _dollar_dollar.GetType()
-		unwrapped_fields1313 := fields1312
+		fields1320 := _dollar_dollar.GetType()
+		unwrapped_fields1321 := fields1320
 		p.write("(")
 		p.write("max")
 		p.indentSexp()
 		p.newline()
-		p.pretty_type(unwrapped_fields1313)
+		p.pretty_type(unwrapped_fields1321)
 		p.dedent()
 		p.write(")")
 	}
@@ -3381,19 +3401,19 @@ func (p *PrettyPrinter) pretty_max_monoid(msg *pb.MaxMonoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_sum_monoid(msg *pb.SumMonoid) interface{} {
-	flat1317 := p.tryFlat(msg, func() { p.pretty_sum_monoid(msg) })
-	if flat1317 != nil {
-		p.write(*flat1317)
+	flat1325 := p.tryFlat(msg, func() { p.pretty_sum_monoid(msg) })
+	if flat1325 != nil {
+		p.write(*flat1325)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1315 := _dollar_dollar.GetType()
-		unwrapped_fields1316 := fields1315
+		fields1323 := _dollar_dollar.GetType()
+		unwrapped_fields1324 := fields1323
 		p.write("(")
 		p.write("sum")
 		p.indentSexp()
 		p.newline()
-		p.pretty_type(unwrapped_fields1316)
+		p.pretty_type(unwrapped_fields1324)
 		p.dedent()
 		p.write(")")
 	}
@@ -3401,35 +3421,35 @@ func (p *PrettyPrinter) pretty_sum_monoid(msg *pb.SumMonoid) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_monus_def(msg *pb.MonusDef) interface{} {
-	flat1325 := p.tryFlat(msg, func() { p.pretty_monus_def(msg) })
-	if flat1325 != nil {
-		p.write(*flat1325)
+	flat1333 := p.tryFlat(msg, func() { p.pretty_monus_def(msg) })
+	if flat1333 != nil {
+		p.write(*flat1333)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1711 []*pb.Attribute
+		var _t1721 []*pb.Attribute
 		if !(len(_dollar_dollar.GetAttrs()) == 0) {
-			_t1711 = _dollar_dollar.GetAttrs()
+			_t1721 = _dollar_dollar.GetAttrs()
 		}
-		fields1318 := []interface{}{_dollar_dollar.GetMonoid(), _dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1711}
-		unwrapped_fields1319 := fields1318
+		fields1326 := []interface{}{_dollar_dollar.GetMonoid(), _dollar_dollar.GetName(), []interface{}{_dollar_dollar.GetBody(), _dollar_dollar.GetValueArity()}, _t1721}
+		unwrapped_fields1327 := fields1326
 		p.write("(")
 		p.write("monus")
 		p.indentSexp()
 		p.newline()
-		field1320 := unwrapped_fields1319[0].(*pb.Monoid)
-		p.pretty_monoid(field1320)
+		field1328 := unwrapped_fields1327[0].(*pb.Monoid)
+		p.pretty_monoid(field1328)
 		p.newline()
-		field1321 := unwrapped_fields1319[1].(*pb.RelationId)
-		p.pretty_relation_id(field1321)
+		field1329 := unwrapped_fields1327[1].(*pb.RelationId)
+		p.pretty_relation_id(field1329)
 		p.newline()
-		field1322 := unwrapped_fields1319[2].([]interface{})
-		p.pretty_abstraction_with_arity(field1322)
-		field1323 := unwrapped_fields1319[3].([]*pb.Attribute)
-		if field1323 != nil {
+		field1330 := unwrapped_fields1327[2].([]interface{})
+		p.pretty_abstraction_with_arity(field1330)
+		field1331 := unwrapped_fields1327[3].([]*pb.Attribute)
+		if field1331 != nil {
 			p.newline()
-			opt_val1324 := field1323
-			p.pretty_attrs(opt_val1324)
+			opt_val1332 := field1331
+			p.pretty_attrs(opt_val1332)
 		}
 		p.dedent()
 		p.write(")")
@@ -3438,29 +3458,29 @@ func (p *PrettyPrinter) pretty_monus_def(msg *pb.MonusDef) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_constraint(msg *pb.Constraint) interface{} {
-	flat1332 := p.tryFlat(msg, func() { p.pretty_constraint(msg) })
-	if flat1332 != nil {
-		p.write(*flat1332)
+	flat1340 := p.tryFlat(msg, func() { p.pretty_constraint(msg) })
+	if flat1340 != nil {
+		p.write(*flat1340)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1326 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetFunctionalDependency().GetGuard(), _dollar_dollar.GetFunctionalDependency().GetKeys(), _dollar_dollar.GetFunctionalDependency().GetValues()}
-		unwrapped_fields1327 := fields1326
+		fields1334 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetFunctionalDependency().GetGuard(), _dollar_dollar.GetFunctionalDependency().GetKeys(), _dollar_dollar.GetFunctionalDependency().GetValues()}
+		unwrapped_fields1335 := fields1334
 		p.write("(")
 		p.write("functional_dependency")
 		p.indentSexp()
 		p.newline()
-		field1328 := unwrapped_fields1327[0].(*pb.RelationId)
-		p.pretty_relation_id(field1328)
+		field1336 := unwrapped_fields1335[0].(*pb.RelationId)
+		p.pretty_relation_id(field1336)
 		p.newline()
-		field1329 := unwrapped_fields1327[1].(*pb.Abstraction)
-		p.pretty_abstraction(field1329)
+		field1337 := unwrapped_fields1335[1].(*pb.Abstraction)
+		p.pretty_abstraction(field1337)
 		p.newline()
-		field1330 := unwrapped_fields1327[2].([]*pb.Var)
-		p.pretty_functional_dependency_keys(field1330)
+		field1338 := unwrapped_fields1335[2].([]*pb.Var)
+		p.pretty_functional_dependency_keys(field1338)
 		p.newline()
-		field1331 := unwrapped_fields1327[3].([]*pb.Var)
-		p.pretty_functional_dependency_values(field1331)
+		field1339 := unwrapped_fields1335[3].([]*pb.Var)
+		p.pretty_functional_dependency_values(field1339)
 		p.dedent()
 		p.write(")")
 	}
@@ -3468,22 +3488,22 @@ func (p *PrettyPrinter) pretty_constraint(msg *pb.Constraint) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_functional_dependency_keys(msg []*pb.Var) interface{} {
-	flat1336 := p.tryFlat(msg, func() { p.pretty_functional_dependency_keys(msg) })
-	if flat1336 != nil {
-		p.write(*flat1336)
+	flat1344 := p.tryFlat(msg, func() { p.pretty_functional_dependency_keys(msg) })
+	if flat1344 != nil {
+		p.write(*flat1344)
 		return nil
 	} else {
-		fields1333 := msg
+		fields1341 := msg
 		p.write("(")
 		p.write("keys")
 		p.indentSexp()
-		if !(len(fields1333) == 0) {
+		if !(len(fields1341) == 0) {
 			p.newline()
-			for i1335, elem1334 := range fields1333 {
-				if (i1335 > 0) {
+			for i1343, elem1342 := range fields1341 {
+				if (i1343 > 0) {
 					p.newline()
 				}
-				p.pretty_var(elem1334)
+				p.pretty_var(elem1342)
 			}
 		}
 		p.dedent()
@@ -3493,22 +3513,22 @@ func (p *PrettyPrinter) pretty_functional_dependency_keys(msg []*pb.Var) interfa
 }
 
 func (p *PrettyPrinter) pretty_functional_dependency_values(msg []*pb.Var) interface{} {
-	flat1340 := p.tryFlat(msg, func() { p.pretty_functional_dependency_values(msg) })
-	if flat1340 != nil {
-		p.write(*flat1340)
+	flat1348 := p.tryFlat(msg, func() { p.pretty_functional_dependency_values(msg) })
+	if flat1348 != nil {
+		p.write(*flat1348)
 		return nil
 	} else {
-		fields1337 := msg
+		fields1345 := msg
 		p.write("(")
 		p.write("values")
 		p.indentSexp()
-		if !(len(fields1337) == 0) {
+		if !(len(fields1345) == 0) {
 			p.newline()
-			for i1339, elem1338 := range fields1337 {
-				if (i1339 > 0) {
+			for i1347, elem1346 := range fields1345 {
+				if (i1347 > 0) {
 					p.newline()
 				}
-				p.pretty_var(elem1338)
+				p.pretty_var(elem1346)
 			}
 		}
 		p.dedent()
@@ -3518,50 +3538,50 @@ func (p *PrettyPrinter) pretty_functional_dependency_values(msg []*pb.Var) inter
 }
 
 func (p *PrettyPrinter) pretty_data(msg *pb.Data) interface{} {
-	flat1349 := p.tryFlat(msg, func() { p.pretty_data(msg) })
-	if flat1349 != nil {
-		p.write(*flat1349)
+	flat1357 := p.tryFlat(msg, func() { p.pretty_data(msg) })
+	if flat1357 != nil {
+		p.write(*flat1357)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1712 *pb.EDB
+		var _t1722 *pb.EDB
 		if hasProtoField(_dollar_dollar, "edb") {
-			_t1712 = _dollar_dollar.GetEdb()
+			_t1722 = _dollar_dollar.GetEdb()
 		}
-		deconstruct_result1347 := _t1712
-		if deconstruct_result1347 != nil {
-			unwrapped1348 := deconstruct_result1347
-			p.pretty_edb(unwrapped1348)
+		deconstruct_result1355 := _t1722
+		if deconstruct_result1355 != nil {
+			unwrapped1356 := deconstruct_result1355
+			p.pretty_edb(unwrapped1356)
 		} else {
 			_dollar_dollar := msg
-			var _t1713 *pb.BeTreeRelation
+			var _t1723 *pb.BeTreeRelation
 			if hasProtoField(_dollar_dollar, "betree_relation") {
-				_t1713 = _dollar_dollar.GetBetreeRelation()
+				_t1723 = _dollar_dollar.GetBetreeRelation()
 			}
-			deconstruct_result1345 := _t1713
-			if deconstruct_result1345 != nil {
-				unwrapped1346 := deconstruct_result1345
-				p.pretty_betree_relation(unwrapped1346)
+			deconstruct_result1353 := _t1723
+			if deconstruct_result1353 != nil {
+				unwrapped1354 := deconstruct_result1353
+				p.pretty_betree_relation(unwrapped1354)
 			} else {
 				_dollar_dollar := msg
-				var _t1714 *pb.CSVData
+				var _t1724 *pb.CSVData
 				if hasProtoField(_dollar_dollar, "csv_data") {
-					_t1714 = _dollar_dollar.GetCsvData()
+					_t1724 = _dollar_dollar.GetCsvData()
 				}
-				deconstruct_result1343 := _t1714
-				if deconstruct_result1343 != nil {
-					unwrapped1344 := deconstruct_result1343
-					p.pretty_csv_data(unwrapped1344)
+				deconstruct_result1351 := _t1724
+				if deconstruct_result1351 != nil {
+					unwrapped1352 := deconstruct_result1351
+					p.pretty_csv_data(unwrapped1352)
 				} else {
 					_dollar_dollar := msg
-					var _t1715 *pb.IcebergData
+					var _t1725 *pb.IcebergData
 					if hasProtoField(_dollar_dollar, "iceberg_data") {
-						_t1715 = _dollar_dollar.GetIcebergData()
+						_t1725 = _dollar_dollar.GetIcebergData()
 					}
-					deconstruct_result1341 := _t1715
-					if deconstruct_result1341 != nil {
-						unwrapped1342 := deconstruct_result1341
-						p.pretty_iceberg_data(unwrapped1342)
+					deconstruct_result1349 := _t1725
+					if deconstruct_result1349 != nil {
+						unwrapped1350 := deconstruct_result1349
+						p.pretty_iceberg_data(unwrapped1350)
 					} else {
 						panic(ParseError{msg: "No matching rule for data"})
 					}
@@ -3573,26 +3593,26 @@ func (p *PrettyPrinter) pretty_data(msg *pb.Data) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_edb(msg *pb.EDB) interface{} {
-	flat1355 := p.tryFlat(msg, func() { p.pretty_edb(msg) })
-	if flat1355 != nil {
-		p.write(*flat1355)
+	flat1363 := p.tryFlat(msg, func() { p.pretty_edb(msg) })
+	if flat1363 != nil {
+		p.write(*flat1363)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1350 := []interface{}{_dollar_dollar.GetTargetId(), _dollar_dollar.GetPath(), _dollar_dollar.GetTypes()}
-		unwrapped_fields1351 := fields1350
+		fields1358 := []interface{}{_dollar_dollar.GetTargetId(), _dollar_dollar.GetPath(), _dollar_dollar.GetTypes()}
+		unwrapped_fields1359 := fields1358
 		p.write("(")
 		p.write("edb")
 		p.indentSexp()
 		p.newline()
-		field1352 := unwrapped_fields1351[0].(*pb.RelationId)
-		p.pretty_relation_id(field1352)
+		field1360 := unwrapped_fields1359[0].(*pb.RelationId)
+		p.pretty_relation_id(field1360)
 		p.newline()
-		field1353 := unwrapped_fields1351[1].([]string)
-		p.pretty_edb_path(field1353)
+		field1361 := unwrapped_fields1359[1].([]string)
+		p.pretty_edb_path(field1361)
 		p.newline()
-		field1354 := unwrapped_fields1351[2].([]*pb.Type)
-		p.pretty_edb_types(field1354)
+		field1362 := unwrapped_fields1359[2].([]*pb.Type)
+		p.pretty_edb_types(field1362)
 		p.dedent()
 		p.write(")")
 	}
@@ -3600,19 +3620,19 @@ func (p *PrettyPrinter) pretty_edb(msg *pb.EDB) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_edb_path(msg []string) interface{} {
-	flat1359 := p.tryFlat(msg, func() { p.pretty_edb_path(msg) })
-	if flat1359 != nil {
-		p.write(*flat1359)
+	flat1367 := p.tryFlat(msg, func() { p.pretty_edb_path(msg) })
+	if flat1367 != nil {
+		p.write(*flat1367)
 		return nil
 	} else {
-		fields1356 := msg
+		fields1364 := msg
 		p.write("[")
 		p.indent()
-		for i1358, elem1357 := range fields1356 {
-			if (i1358 > 0) {
+		for i1366, elem1365 := range fields1364 {
+			if (i1366 > 0) {
 				p.newline()
 			}
-			p.write(p.formatStringValue(elem1357))
+			p.write(p.formatStringValue(elem1365))
 		}
 		p.dedent()
 		p.write("]")
@@ -3621,19 +3641,19 @@ func (p *PrettyPrinter) pretty_edb_path(msg []string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_edb_types(msg []*pb.Type) interface{} {
-	flat1363 := p.tryFlat(msg, func() { p.pretty_edb_types(msg) })
-	if flat1363 != nil {
-		p.write(*flat1363)
+	flat1371 := p.tryFlat(msg, func() { p.pretty_edb_types(msg) })
+	if flat1371 != nil {
+		p.write(*flat1371)
 		return nil
 	} else {
-		fields1360 := msg
+		fields1368 := msg
 		p.write("[")
 		p.indent()
-		for i1362, elem1361 := range fields1360 {
-			if (i1362 > 0) {
+		for i1370, elem1369 := range fields1368 {
+			if (i1370 > 0) {
 				p.newline()
 			}
-			p.pretty_type(elem1361)
+			p.pretty_type(elem1369)
 		}
 		p.dedent()
 		p.write("]")
@@ -3642,23 +3662,23 @@ func (p *PrettyPrinter) pretty_edb_types(msg []*pb.Type) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_betree_relation(msg *pb.BeTreeRelation) interface{} {
-	flat1368 := p.tryFlat(msg, func() { p.pretty_betree_relation(msg) })
-	if flat1368 != nil {
-		p.write(*flat1368)
+	flat1376 := p.tryFlat(msg, func() { p.pretty_betree_relation(msg) })
+	if flat1376 != nil {
+		p.write(*flat1376)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1364 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetRelationInfo()}
-		unwrapped_fields1365 := fields1364
+		fields1372 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetRelationInfo()}
+		unwrapped_fields1373 := fields1372
 		p.write("(")
 		p.write("betree_relation")
 		p.indentSexp()
 		p.newline()
-		field1366 := unwrapped_fields1365[0].(*pb.RelationId)
-		p.pretty_relation_id(field1366)
+		field1374 := unwrapped_fields1373[0].(*pb.RelationId)
+		p.pretty_relation_id(field1374)
 		p.newline()
-		field1367 := unwrapped_fields1365[1].(*pb.BeTreeInfo)
-		p.pretty_betree_info(field1367)
+		field1375 := unwrapped_fields1373[1].(*pb.BeTreeInfo)
+		p.pretty_betree_info(field1375)
 		p.dedent()
 		p.write(")")
 	}
@@ -3666,27 +3686,27 @@ func (p *PrettyPrinter) pretty_betree_relation(msg *pb.BeTreeRelation) interface
 }
 
 func (p *PrettyPrinter) pretty_betree_info(msg *pb.BeTreeInfo) interface{} {
-	flat1374 := p.tryFlat(msg, func() { p.pretty_betree_info(msg) })
-	if flat1374 != nil {
-		p.write(*flat1374)
+	flat1382 := p.tryFlat(msg, func() { p.pretty_betree_info(msg) })
+	if flat1382 != nil {
+		p.write(*flat1382)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1716 := p.deconstruct_betree_info_config(_dollar_dollar)
-		fields1369 := []interface{}{_dollar_dollar.GetKeyTypes(), _dollar_dollar.GetValueTypes(), _t1716}
-		unwrapped_fields1370 := fields1369
+		_t1726 := p.deconstruct_betree_info_config(_dollar_dollar)
+		fields1377 := []interface{}{_dollar_dollar.GetKeyTypes(), _dollar_dollar.GetValueTypes(), _t1726}
+		unwrapped_fields1378 := fields1377
 		p.write("(")
 		p.write("betree_info")
 		p.indentSexp()
 		p.newline()
-		field1371 := unwrapped_fields1370[0].([]*pb.Type)
-		p.pretty_betree_info_key_types(field1371)
+		field1379 := unwrapped_fields1378[0].([]*pb.Type)
+		p.pretty_betree_info_key_types(field1379)
 		p.newline()
-		field1372 := unwrapped_fields1370[1].([]*pb.Type)
-		p.pretty_betree_info_value_types(field1372)
+		field1380 := unwrapped_fields1378[1].([]*pb.Type)
+		p.pretty_betree_info_value_types(field1380)
 		p.newline()
-		field1373 := unwrapped_fields1370[2].([][]interface{})
-		p.pretty_config_dict(field1373)
+		field1381 := unwrapped_fields1378[2].([][]interface{})
+		p.pretty_config_dict(field1381)
 		p.dedent()
 		p.write(")")
 	}
@@ -3694,22 +3714,22 @@ func (p *PrettyPrinter) pretty_betree_info(msg *pb.BeTreeInfo) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_betree_info_key_types(msg []*pb.Type) interface{} {
-	flat1378 := p.tryFlat(msg, func() { p.pretty_betree_info_key_types(msg) })
-	if flat1378 != nil {
-		p.write(*flat1378)
+	flat1386 := p.tryFlat(msg, func() { p.pretty_betree_info_key_types(msg) })
+	if flat1386 != nil {
+		p.write(*flat1386)
 		return nil
 	} else {
-		fields1375 := msg
+		fields1383 := msg
 		p.write("(")
 		p.write("key_types")
 		p.indentSexp()
-		if !(len(fields1375) == 0) {
+		if !(len(fields1383) == 0) {
 			p.newline()
-			for i1377, elem1376 := range fields1375 {
-				if (i1377 > 0) {
+			for i1385, elem1384 := range fields1383 {
+				if (i1385 > 0) {
 					p.newline()
 				}
-				p.pretty_type(elem1376)
+				p.pretty_type(elem1384)
 			}
 		}
 		p.dedent()
@@ -3719,22 +3739,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{} {
-	flat1382 := p.tryFlat(msg, func() { p.pretty_betree_info_value_types(msg) })
-	if flat1382 != nil {
-		p.write(*flat1382)
+	flat1390 := p.tryFlat(msg, func() { p.pretty_betree_info_value_types(msg) })
+	if flat1390 != nil {
+		p.write(*flat1390)
 		return nil
 	} else {
-		fields1379 := msg
+		fields1387 := msg
 		p.write("(")
 		p.write("value_types")
 		p.indentSexp()
-		if !(len(fields1379) == 0) {
+		if !(len(fields1387) == 0) {
 			p.newline()
-			for i1381, elem1380 := range fields1379 {
-				if (i1381 > 0) {
+			for i1389, elem1388 := range fields1387 {
+				if (i1389 > 0) {
 					p.newline()
 				}
-				p.pretty_type(elem1380)
+				p.pretty_type(elem1388)
 			}
 		}
 		p.dedent()
@@ -3744,29 +3764,29 @@ func (p *PrettyPrinter) pretty_betree_info_value_types(msg []*pb.Type) interface
 }
 
 func (p *PrettyPrinter) pretty_csv_data(msg *pb.CSVData) interface{} {
-	flat1389 := p.tryFlat(msg, func() { p.pretty_csv_data(msg) })
-	if flat1389 != nil {
-		p.write(*flat1389)
+	flat1397 := p.tryFlat(msg, func() { p.pretty_csv_data(msg) })
+	if flat1397 != nil {
+		p.write(*flat1397)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1383 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetColumns(), _dollar_dollar.GetAsof()}
-		unwrapped_fields1384 := fields1383
+		fields1391 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetColumns(), _dollar_dollar.GetAsof()}
+		unwrapped_fields1392 := fields1391
 		p.write("(")
 		p.write("csv_data")
 		p.indentSexp()
 		p.newline()
-		field1385 := unwrapped_fields1384[0].(*pb.CSVLocator)
-		p.pretty_csvlocator(field1385)
+		field1393 := unwrapped_fields1392[0].(*pb.CSVLocator)
+		p.pretty_csvlocator(field1393)
 		p.newline()
-		field1386 := unwrapped_fields1384[1].(*pb.CSVConfig)
-		p.pretty_csv_config(field1386)
+		field1394 := unwrapped_fields1392[1].(*pb.CSVConfig)
+		p.pretty_csv_config(field1394)
 		p.newline()
-		field1387 := unwrapped_fields1384[2].([]*pb.GNFColumn)
-		p.pretty_gnf_columns(field1387)
+		field1395 := unwrapped_fields1392[2].([]*pb.GNFColumn)
+		p.pretty_gnf_columns(field1395)
 		p.newline()
-		field1388 := unwrapped_fields1384[3].(string)
-		p.pretty_csv_asof(field1388)
+		field1396 := unwrapped_fields1392[3].(string)
+		p.pretty_csv_asof(field1396)
 		p.dedent()
 		p.write(")")
 	}
@@ -3774,36 +3794,36 @@ func (p *PrettyPrinter) pretty_csv_data(msg *pb.CSVData) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csvlocator(msg *pb.CSVLocator) interface{} {
-	flat1396 := p.tryFlat(msg, func() { p.pretty_csvlocator(msg) })
-	if flat1396 != nil {
-		p.write(*flat1396)
+	flat1404 := p.tryFlat(msg, func() { p.pretty_csvlocator(msg) })
+	if flat1404 != nil {
+		p.write(*flat1404)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1717 []string
+		var _t1727 []string
 		if !(len(_dollar_dollar.GetPaths()) == 0) {
-			_t1717 = _dollar_dollar.GetPaths()
+			_t1727 = _dollar_dollar.GetPaths()
 		}
-		var _t1718 *string
+		var _t1728 *string
 		if string(_dollar_dollar.GetInlineData()) != "" {
-			_t1718 = ptr(string(_dollar_dollar.GetInlineData()))
+			_t1728 = ptr(string(_dollar_dollar.GetInlineData()))
 		}
-		fields1390 := []interface{}{_t1717, _t1718}
-		unwrapped_fields1391 := fields1390
+		fields1398 := []interface{}{_t1727, _t1728}
+		unwrapped_fields1399 := fields1398
 		p.write("(")
 		p.write("csv_locator")
 		p.indentSexp()
-		field1392 := unwrapped_fields1391[0].([]string)
-		if field1392 != nil {
+		field1400 := unwrapped_fields1399[0].([]string)
+		if field1400 != nil {
 			p.newline()
-			opt_val1393 := field1392
-			p.pretty_csv_locator_paths(opt_val1393)
+			opt_val1401 := field1400
+			p.pretty_csv_locator_paths(opt_val1401)
 		}
-		field1394 := unwrapped_fields1391[1].(*string)
-		if field1394 != nil {
+		field1402 := unwrapped_fields1399[1].(*string)
+		if field1402 != nil {
 			p.newline()
-			opt_val1395 := *field1394
-			p.pretty_csv_locator_inline_data(opt_val1395)
+			opt_val1403 := *field1402
+			p.pretty_csv_locator_inline_data(opt_val1403)
 		}
 		p.dedent()
 		p.write(")")
@@ -3812,22 +3832,22 @@ func (p *PrettyPrinter) pretty_csvlocator(msg *pb.CSVLocator) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csv_locator_paths(msg []string) interface{} {
-	flat1400 := p.tryFlat(msg, func() { p.pretty_csv_locator_paths(msg) })
-	if flat1400 != nil {
-		p.write(*flat1400)
+	flat1408 := p.tryFlat(msg, func() { p.pretty_csv_locator_paths(msg) })
+	if flat1408 != nil {
+		p.write(*flat1408)
 		return nil
 	} else {
-		fields1397 := msg
+		fields1405 := msg
 		p.write("(")
 		p.write("paths")
 		p.indentSexp()
-		if !(len(fields1397) == 0) {
+		if !(len(fields1405) == 0) {
 			p.newline()
-			for i1399, elem1398 := range fields1397 {
-				if (i1399 > 0) {
+			for i1407, elem1406 := range fields1405 {
+				if (i1407 > 0) {
 					p.newline()
 				}
-				p.write(p.formatStringValue(elem1398))
+				p.write(p.formatStringValue(elem1406))
 			}
 		}
 		p.dedent()
@@ -3837,17 +3857,17 @@ func (p *PrettyPrinter) pretty_csv_locator_paths(msg []string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csv_locator_inline_data(msg string) interface{} {
-	flat1402 := p.tryFlat(msg, func() { p.pretty_csv_locator_inline_data(msg) })
-	if flat1402 != nil {
-		p.write(*flat1402)
+	flat1410 := p.tryFlat(msg, func() { p.pretty_csv_locator_inline_data(msg) })
+	if flat1410 != nil {
+		p.write(*flat1410)
 		return nil
 	} else {
-		fields1401 := msg
+		fields1409 := msg
 		p.write("(")
 		p.write("inline_data")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1401))
+		p.write(p.formatStringValue(fields1409))
 		p.dedent()
 		p.write(")")
 	}
@@ -3855,20 +3875,20 @@ func (p *PrettyPrinter) pretty_csv_locator_inline_data(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csv_config(msg *pb.CSVConfig) interface{} {
-	flat1405 := p.tryFlat(msg, func() { p.pretty_csv_config(msg) })
-	if flat1405 != nil {
-		p.write(*flat1405)
+	flat1413 := p.tryFlat(msg, func() { p.pretty_csv_config(msg) })
+	if flat1413 != nil {
+		p.write(*flat1413)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1719 := p.deconstruct_csv_config(_dollar_dollar)
-		fields1403 := _t1719
-		unwrapped_fields1404 := fields1403
+		_t1729 := p.deconstruct_csv_config(_dollar_dollar)
+		fields1411 := _t1729
+		unwrapped_fields1412 := fields1411
 		p.write("(")
 		p.write("csv_config")
 		p.indentSexp()
 		p.newline()
-		p.pretty_config_dict(unwrapped_fields1404)
+		p.pretty_config_dict(unwrapped_fields1412)
 		p.dedent()
 		p.write(")")
 	}
@@ -3876,22 +3896,22 @@ func (p *PrettyPrinter) pretty_csv_config(msg *pb.CSVConfig) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gnf_columns(msg []*pb.GNFColumn) interface{} {
-	flat1409 := p.tryFlat(msg, func() { p.pretty_gnf_columns(msg) })
-	if flat1409 != nil {
-		p.write(*flat1409)
+	flat1417 := p.tryFlat(msg, func() { p.pretty_gnf_columns(msg) })
+	if flat1417 != nil {
+		p.write(*flat1417)
 		return nil
 	} else {
-		fields1406 := msg
+		fields1414 := msg
 		p.write("(")
 		p.write("columns")
 		p.indentSexp()
-		if !(len(fields1406) == 0) {
+		if !(len(fields1414) == 0) {
 			p.newline()
-			for i1408, elem1407 := range fields1406 {
-				if (i1408 > 0) {
+			for i1416, elem1415 := range fields1414 {
+				if (i1416 > 0) {
 					p.newline()
 				}
-				p.pretty_gnf_column(elem1407)
+				p.pretty_gnf_column(elem1415)
 			}
 		}
 		p.dedent()
@@ -3901,38 +3921,38 @@ func (p *PrettyPrinter) pretty_gnf_columns(msg []*pb.GNFColumn) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gnf_column(msg *pb.GNFColumn) interface{} {
-	flat1418 := p.tryFlat(msg, func() { p.pretty_gnf_column(msg) })
-	if flat1418 != nil {
-		p.write(*flat1418)
+	flat1426 := p.tryFlat(msg, func() { p.pretty_gnf_column(msg) })
+	if flat1426 != nil {
+		p.write(*flat1426)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1720 *pb.RelationId
+		var _t1730 *pb.RelationId
 		if hasProtoField(_dollar_dollar, "target_id") {
-			_t1720 = _dollar_dollar.GetTargetId()
+			_t1730 = _dollar_dollar.GetTargetId()
 		}
-		fields1410 := []interface{}{_dollar_dollar.GetColumnPath(), _t1720, _dollar_dollar.GetTypes()}
-		unwrapped_fields1411 := fields1410
+		fields1418 := []interface{}{_dollar_dollar.GetColumnPath(), _t1730, _dollar_dollar.GetTypes()}
+		unwrapped_fields1419 := fields1418
 		p.write("(")
 		p.write("column")
 		p.indentSexp()
 		p.newline()
-		field1412 := unwrapped_fields1411[0].([]string)
-		p.pretty_gnf_column_path(field1412)
-		field1413 := unwrapped_fields1411[1].(*pb.RelationId)
-		if field1413 != nil {
+		field1420 := unwrapped_fields1419[0].([]string)
+		p.pretty_gnf_column_path(field1420)
+		field1421 := unwrapped_fields1419[1].(*pb.RelationId)
+		if field1421 != nil {
 			p.newline()
-			opt_val1414 := field1413
-			p.pretty_relation_id(opt_val1414)
+			opt_val1422 := field1421
+			p.pretty_relation_id(opt_val1422)
 		}
 		p.newline()
 		p.write("[")
-		field1415 := unwrapped_fields1411[2].([]*pb.Type)
-		for i1417, elem1416 := range field1415 {
-			if (i1417 > 0) {
+		field1423 := unwrapped_fields1419[2].([]*pb.Type)
+		for i1425, elem1424 := range field1423 {
+			if (i1425 > 0) {
 				p.newline()
 			}
-			p.pretty_type(elem1416)
+			p.pretty_type(elem1424)
 		}
 		p.write("]")
 		p.dedent()
@@ -3942,36 +3962,36 @@ func (p *PrettyPrinter) pretty_gnf_column(msg *pb.GNFColumn) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_gnf_column_path(msg []string) interface{} {
-	flat1425 := p.tryFlat(msg, func() { p.pretty_gnf_column_path(msg) })
-	if flat1425 != nil {
-		p.write(*flat1425)
+	flat1433 := p.tryFlat(msg, func() { p.pretty_gnf_column_path(msg) })
+	if flat1433 != nil {
+		p.write(*flat1433)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1721 *string
+		var _t1731 *string
 		if int64(len(_dollar_dollar)) == 1 {
-			_t1721 = ptr(_dollar_dollar[0])
+			_t1731 = ptr(_dollar_dollar[0])
 		}
-		deconstruct_result1423 := _t1721
-		if deconstruct_result1423 != nil {
-			unwrapped1424 := *deconstruct_result1423
-			p.write(p.formatStringValue(unwrapped1424))
+		deconstruct_result1431 := _t1731
+		if deconstruct_result1431 != nil {
+			unwrapped1432 := *deconstruct_result1431
+			p.write(p.formatStringValue(unwrapped1432))
 		} else {
 			_dollar_dollar := msg
-			var _t1722 []string
+			var _t1732 []string
 			if int64(len(_dollar_dollar)) != 1 {
-				_t1722 = _dollar_dollar
+				_t1732 = _dollar_dollar
 			}
-			deconstruct_result1419 := _t1722
-			if deconstruct_result1419 != nil {
-				unwrapped1420 := deconstruct_result1419
+			deconstruct_result1427 := _t1732
+			if deconstruct_result1427 != nil {
+				unwrapped1428 := deconstruct_result1427
 				p.write("[")
 				p.indent()
-				for i1422, elem1421 := range unwrapped1420 {
-					if (i1422 > 0) {
+				for i1430, elem1429 := range unwrapped1428 {
+					if (i1430 > 0) {
 						p.newline()
 					}
-					p.write(p.formatStringValue(elem1421))
+					p.write(p.formatStringValue(elem1429))
 				}
 				p.dedent()
 				p.write("]")
@@ -3984,17 +4004,17 @@ func (p *PrettyPrinter) pretty_gnf_column_path(msg []string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_csv_asof(msg string) interface{} {
-	flat1427 := p.tryFlat(msg, func() { p.pretty_csv_asof(msg) })
-	if flat1427 != nil {
-		p.write(*flat1427)
+	flat1435 := p.tryFlat(msg, func() { p.pretty_csv_asof(msg) })
+	if flat1435 != nil {
+		p.write(*flat1435)
 		return nil
 	} else {
-		fields1426 := msg
+		fields1434 := msg
 		p.write("(")
 		p.write("asof")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1426))
+		p.write(p.formatStringValue(fields1434))
 		p.dedent()
 		p.write(")")
 	}
@@ -4002,43 +4022,43 @@ func (p *PrettyPrinter) pretty_csv_asof(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_iceberg_data(msg *pb.IcebergData) interface{} {
-	flat1438 := p.tryFlat(msg, func() { p.pretty_iceberg_data(msg) })
-	if flat1438 != nil {
-		p.write(*flat1438)
+	flat1446 := p.tryFlat(msg, func() { p.pretty_iceberg_data(msg) })
+	if flat1446 != nil {
+		p.write(*flat1446)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1723 := p.deconstruct_iceberg_data_from_snapshot_optional(_dollar_dollar)
-		_t1724 := p.deconstruct_iceberg_data_to_snapshot_optional(_dollar_dollar)
-		fields1428 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetColumns(), _t1723, _t1724, _dollar_dollar.GetReturnsDelta()}
-		unwrapped_fields1429 := fields1428
+		_t1733 := p.deconstruct_iceberg_data_from_snapshot_optional(_dollar_dollar)
+		_t1734 := p.deconstruct_iceberg_data_to_snapshot_optional(_dollar_dollar)
+		fields1436 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetColumns(), _t1733, _t1734, _dollar_dollar.GetReturnsDelta()}
+		unwrapped_fields1437 := fields1436
 		p.write("(")
 		p.write("iceberg_data")
 		p.indentSexp()
 		p.newline()
-		field1430 := unwrapped_fields1429[0].(*pb.IcebergLocator)
-		p.pretty_iceberg_locator(field1430)
+		field1438 := unwrapped_fields1437[0].(*pb.IcebergLocator)
+		p.pretty_iceberg_locator(field1438)
 		p.newline()
-		field1431 := unwrapped_fields1429[1].(*pb.IcebergCatalogConfig)
-		p.pretty_iceberg_catalog_config(field1431)
+		field1439 := unwrapped_fields1437[1].(*pb.IcebergCatalogConfig)
+		p.pretty_iceberg_catalog_config(field1439)
 		p.newline()
-		field1432 := unwrapped_fields1429[2].([]*pb.GNFColumn)
-		p.pretty_gnf_columns(field1432)
-		field1433 := unwrapped_fields1429[3].(*string)
-		if field1433 != nil {
+		field1440 := unwrapped_fields1437[2].([]*pb.GNFColumn)
+		p.pretty_gnf_columns(field1440)
+		field1441 := unwrapped_fields1437[3].(*string)
+		if field1441 != nil {
 			p.newline()
-			opt_val1434 := *field1433
-			p.pretty_iceberg_from_snapshot(opt_val1434)
+			opt_val1442 := *field1441
+			p.pretty_iceberg_from_snapshot(opt_val1442)
 		}
-		field1435 := unwrapped_fields1429[4].(*string)
-		if field1435 != nil {
+		field1443 := unwrapped_fields1437[4].(*string)
+		if field1443 != nil {
 			p.newline()
-			opt_val1436 := *field1435
-			p.pretty_iceberg_to_snapshot(opt_val1436)
+			opt_val1444 := *field1443
+			p.pretty_iceberg_to_snapshot(opt_val1444)
 		}
 		p.newline()
-		field1437 := unwrapped_fields1429[5].(bool)
-		p.pretty_boolean_value(field1437)
+		field1445 := unwrapped_fields1437[5].(bool)
+		p.pretty_boolean_value(field1445)
 		p.dedent()
 		p.write(")")
 	}
@@ -4046,26 +4066,26 @@ func (p *PrettyPrinter) pretty_iceberg_data(msg *pb.IcebergData) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_iceberg_locator(msg *pb.IcebergLocator) interface{} {
-	flat1444 := p.tryFlat(msg, func() { p.pretty_iceberg_locator(msg) })
-	if flat1444 != nil {
-		p.write(*flat1444)
+	flat1452 := p.tryFlat(msg, func() { p.pretty_iceberg_locator(msg) })
+	if flat1452 != nil {
+		p.write(*flat1452)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1439 := []interface{}{_dollar_dollar.GetTableName(), _dollar_dollar.GetNamespace(), _dollar_dollar.GetWarehouse()}
-		unwrapped_fields1440 := fields1439
+		fields1447 := []interface{}{_dollar_dollar.GetTableName(), _dollar_dollar.GetNamespace(), _dollar_dollar.GetWarehouse()}
+		unwrapped_fields1448 := fields1447
 		p.write("(")
 		p.write("iceberg_locator")
 		p.indentSexp()
 		p.newline()
-		field1441 := unwrapped_fields1440[0].(string)
-		p.pretty_iceberg_locator_table_name(field1441)
+		field1449 := unwrapped_fields1448[0].(string)
+		p.pretty_iceberg_locator_table_name(field1449)
 		p.newline()
-		field1442 := unwrapped_fields1440[1].([]string)
-		p.pretty_iceberg_locator_namespace(field1442)
+		field1450 := unwrapped_fields1448[1].([]string)
+		p.pretty_iceberg_locator_namespace(field1450)
 		p.newline()
-		field1443 := unwrapped_fields1440[2].(string)
-		p.pretty_iceberg_locator_warehouse(field1443)
+		field1451 := unwrapped_fields1448[2].(string)
+		p.pretty_iceberg_locator_warehouse(field1451)
 		p.dedent()
 		p.write(")")
 	}
@@ -4073,17 +4093,17 @@ func (p *PrettyPrinter) pretty_iceberg_locator(msg *pb.IcebergLocator) interface
 }
 
 func (p *PrettyPrinter) pretty_iceberg_locator_table_name(msg string) interface{} {
-	flat1446 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_table_name(msg) })
-	if flat1446 != nil {
-		p.write(*flat1446)
+	flat1454 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_table_name(msg) })
+	if flat1454 != nil {
+		p.write(*flat1454)
 		return nil
 	} else {
-		fields1445 := msg
+		fields1453 := msg
 		p.write("(")
 		p.write("table_name")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1445))
+		p.write(p.formatStringValue(fields1453))
 		p.dedent()
 		p.write(")")
 	}
@@ -4091,22 +4111,22 @@ func (p *PrettyPrinter) pretty_iceberg_locator_table_name(msg string) interface{
 }
 
 func (p *PrettyPrinter) pretty_iceberg_locator_namespace(msg []string) interface{} {
-	flat1450 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_namespace(msg) })
-	if flat1450 != nil {
-		p.write(*flat1450)
+	flat1458 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_namespace(msg) })
+	if flat1458 != nil {
+		p.write(*flat1458)
 		return nil
 	} else {
-		fields1447 := msg
+		fields1455 := msg
 		p.write("(")
 		p.write("namespace")
 		p.indentSexp()
-		if !(len(fields1447) == 0) {
+		if !(len(fields1455) == 0) {
 			p.newline()
-			for i1449, elem1448 := range fields1447 {
-				if (i1449 > 0) {
+			for i1457, elem1456 := range fields1455 {
+				if (i1457 > 0) {
 					p.newline()
 				}
-				p.write(p.formatStringValue(elem1448))
+				p.write(p.formatStringValue(elem1456))
 			}
 		}
 		p.dedent()
@@ -4116,17 +4136,17 @@ func (p *PrettyPrinter) pretty_iceberg_locator_namespace(msg []string) interface
 }
 
 func (p *PrettyPrinter) pretty_iceberg_locator_warehouse(msg string) interface{} {
-	flat1452 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_warehouse(msg) })
-	if flat1452 != nil {
-		p.write(*flat1452)
+	flat1460 := p.tryFlat(msg, func() { p.pretty_iceberg_locator_warehouse(msg) })
+	if flat1460 != nil {
+		p.write(*flat1460)
 		return nil
 	} else {
-		fields1451 := msg
+		fields1459 := msg
 		p.write("(")
 		p.write("warehouse")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1451))
+		p.write(p.formatStringValue(fields1459))
 		p.dedent()
 		p.write(")")
 	}
@@ -4134,33 +4154,33 @@ func (p *PrettyPrinter) pretty_iceberg_locator_warehouse(msg string) interface{}
 }
 
 func (p *PrettyPrinter) pretty_iceberg_catalog_config(msg *pb.IcebergCatalogConfig) interface{} {
-	flat1460 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config(msg) })
-	if flat1460 != nil {
-		p.write(*flat1460)
+	flat1468 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config(msg) })
+	if flat1468 != nil {
+		p.write(*flat1468)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1725 := p.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
-		fields1453 := []interface{}{_dollar_dollar.GetCatalogUri(), _t1725, dictToPairs(_dollar_dollar.GetProperties()), dictToPairs(_dollar_dollar.GetAuthProperties())}
-		unwrapped_fields1454 := fields1453
+		_t1735 := p.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
+		fields1461 := []interface{}{_dollar_dollar.GetCatalogUri(), _t1735, dictToPairs(_dollar_dollar.GetProperties()), dictToPairs(_dollar_dollar.GetAuthProperties())}
+		unwrapped_fields1462 := fields1461
 		p.write("(")
 		p.write("iceberg_catalog_config")
 		p.indentSexp()
 		p.newline()
-		field1455 := unwrapped_fields1454[0].(string)
-		p.pretty_iceberg_catalog_uri(field1455)
-		field1456 := unwrapped_fields1454[1].(*string)
-		if field1456 != nil {
+		field1463 := unwrapped_fields1462[0].(string)
+		p.pretty_iceberg_catalog_uri(field1463)
+		field1464 := unwrapped_fields1462[1].(*string)
+		if field1464 != nil {
 			p.newline()
-			opt_val1457 := *field1456
-			p.pretty_iceberg_catalog_config_scope(opt_val1457)
+			opt_val1465 := *field1464
+			p.pretty_iceberg_catalog_config_scope(opt_val1465)
 		}
 		p.newline()
-		field1458 := unwrapped_fields1454[2].([][]interface{})
-		p.pretty_iceberg_properties(field1458)
+		field1466 := unwrapped_fields1462[2].([][]interface{})
+		p.pretty_iceberg_properties(field1466)
 		p.newline()
-		field1459 := unwrapped_fields1454[3].([][]interface{})
-		p.pretty_iceberg_auth_properties(field1459)
+		field1467 := unwrapped_fields1462[3].([][]interface{})
+		p.pretty_iceberg_auth_properties(field1467)
 		p.dedent()
 		p.write(")")
 	}
@@ -4168,17 +4188,17 @@ func (p *PrettyPrinter) pretty_iceberg_catalog_config(msg *pb.IcebergCatalogConf
 }
 
 func (p *PrettyPrinter) pretty_iceberg_catalog_uri(msg string) interface{} {
-	flat1462 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_uri(msg) })
-	if flat1462 != nil {
-		p.write(*flat1462)
+	flat1470 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_uri(msg) })
+	if flat1470 != nil {
+		p.write(*flat1470)
 		return nil
 	} else {
-		fields1461 := msg
+		fields1469 := msg
 		p.write("(")
 		p.write("catalog_uri")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1461))
+		p.write(p.formatStringValue(fields1469))
 		p.dedent()
 		p.write(")")
 	}
@@ -4186,17 +4206,17 @@ func (p *PrettyPrinter) pretty_iceberg_catalog_uri(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_iceberg_catalog_config_scope(msg string) interface{} {
-	flat1464 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config_scope(msg) })
-	if flat1464 != nil {
-		p.write(*flat1464)
+	flat1472 := p.tryFlat(msg, func() { p.pretty_iceberg_catalog_config_scope(msg) })
+	if flat1472 != nil {
+		p.write(*flat1472)
 		return nil
 	} else {
-		fields1463 := msg
+		fields1471 := msg
 		p.write("(")
 		p.write("scope")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1463))
+		p.write(p.formatStringValue(fields1471))
 		p.dedent()
 		p.write(")")
 	}
@@ -4204,22 +4224,22 @@ func (p *PrettyPrinter) pretty_iceberg_catalog_config_scope(msg string) interfac
 }
 
 func (p *PrettyPrinter) pretty_iceberg_properties(msg [][]interface{}) interface{} {
-	flat1468 := p.tryFlat(msg, func() { p.pretty_iceberg_properties(msg) })
-	if flat1468 != nil {
-		p.write(*flat1468)
+	flat1476 := p.tryFlat(msg, func() { p.pretty_iceberg_properties(msg) })
+	if flat1476 != nil {
+		p.write(*flat1476)
 		return nil
 	} else {
-		fields1465 := msg
+		fields1473 := msg
 		p.write("(")
 		p.write("properties")
 		p.indentSexp()
-		if !(len(fields1465) == 0) {
+		if !(len(fields1473) == 0) {
 			p.newline()
-			for i1467, elem1466 := range fields1465 {
-				if (i1467 > 0) {
+			for i1475, elem1474 := range fields1473 {
+				if (i1475 > 0) {
 					p.newline()
 				}
-				p.pretty_iceberg_property_entry(elem1466)
+				p.pretty_iceberg_property_entry(elem1474)
 			}
 		}
 		p.dedent()
@@ -4229,23 +4249,23 @@ func (p *PrettyPrinter) pretty_iceberg_properties(msg [][]interface{}) interface
 }
 
 func (p *PrettyPrinter) pretty_iceberg_property_entry(msg []interface{}) interface{} {
-	flat1473 := p.tryFlat(msg, func() { p.pretty_iceberg_property_entry(msg) })
-	if flat1473 != nil {
-		p.write(*flat1473)
+	flat1481 := p.tryFlat(msg, func() { p.pretty_iceberg_property_entry(msg) })
+	if flat1481 != nil {
+		p.write(*flat1481)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1469 := []interface{}{_dollar_dollar[0].(string), _dollar_dollar[1].(string)}
-		unwrapped_fields1470 := fields1469
+		fields1477 := []interface{}{_dollar_dollar[0].(string), _dollar_dollar[1].(string)}
+		unwrapped_fields1478 := fields1477
 		p.write("(")
 		p.write("prop")
 		p.indentSexp()
 		p.newline()
-		field1471 := unwrapped_fields1470[0].(string)
-		p.write(p.formatStringValue(field1471))
+		field1479 := unwrapped_fields1478[0].(string)
+		p.write(p.formatStringValue(field1479))
 		p.newline()
-		field1472 := unwrapped_fields1470[1].(string)
-		p.write(p.formatStringValue(field1472))
+		field1480 := unwrapped_fields1478[1].(string)
+		p.write(p.formatStringValue(field1480))
 		p.dedent()
 		p.write(")")
 	}
@@ -4253,22 +4273,22 @@ func (p *PrettyPrinter) pretty_iceberg_property_entry(msg []interface{}) interfa
 }
 
 func (p *PrettyPrinter) pretty_iceberg_auth_properties(msg [][]interface{}) interface{} {
-	flat1477 := p.tryFlat(msg, func() { p.pretty_iceberg_auth_properties(msg) })
-	if flat1477 != nil {
-		p.write(*flat1477)
+	flat1485 := p.tryFlat(msg, func() { p.pretty_iceberg_auth_properties(msg) })
+	if flat1485 != nil {
+		p.write(*flat1485)
 		return nil
 	} else {
-		fields1474 := msg
+		fields1482 := msg
 		p.write("(")
 		p.write("auth_properties")
 		p.indentSexp()
-		if !(len(fields1474) == 0) {
+		if !(len(fields1482) == 0) {
 			p.newline()
-			for i1476, elem1475 := range fields1474 {
-				if (i1476 > 0) {
+			for i1484, elem1483 := range fields1482 {
+				if (i1484 > 0) {
 					p.newline()
 				}
-				p.pretty_iceberg_masked_property_entry(elem1475)
+				p.pretty_iceberg_masked_property_entry(elem1483)
 			}
 		}
 		p.dedent()
@@ -4278,24 +4298,24 @@ func (p *PrettyPrinter) pretty_iceberg_auth_properties(msg [][]interface{}) inte
 }
 
 func (p *PrettyPrinter) pretty_iceberg_masked_property_entry(msg []interface{}) interface{} {
-	flat1482 := p.tryFlat(msg, func() { p.pretty_iceberg_masked_property_entry(msg) })
-	if flat1482 != nil {
-		p.write(*flat1482)
+	flat1490 := p.tryFlat(msg, func() { p.pretty_iceberg_masked_property_entry(msg) })
+	if flat1490 != nil {
+		p.write(*flat1490)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1726 := p.mask_secret_value(_dollar_dollar)
-		fields1478 := []interface{}{_dollar_dollar[0].(string), _t1726}
-		unwrapped_fields1479 := fields1478
+		_t1736 := p.mask_secret_value(_dollar_dollar)
+		fields1486 := []interface{}{_dollar_dollar[0].(string), _t1736}
+		unwrapped_fields1487 := fields1486
 		p.write("(")
 		p.write("prop")
 		p.indentSexp()
 		p.newline()
-		field1480 := unwrapped_fields1479[0].(string)
-		p.write(p.formatStringValue(field1480))
+		field1488 := unwrapped_fields1487[0].(string)
+		p.write(p.formatStringValue(field1488))
 		p.newline()
-		field1481 := unwrapped_fields1479[1].(string)
-		p.write(p.formatStringValue(field1481))
+		field1489 := unwrapped_fields1487[1].(string)
+		p.write(p.formatStringValue(field1489))
 		p.dedent()
 		p.write(")")
 	}
@@ -4303,17 +4323,17 @@ func (p *PrettyPrinter) pretty_iceberg_masked_property_entry(msg []interface{})
 }
 
 func (p *PrettyPrinter) pretty_iceberg_from_snapshot(msg string) interface{} {
-	flat1484 := p.tryFlat(msg, func() { p.pretty_iceberg_from_snapshot(msg) })
-	if flat1484 != nil {
-		p.write(*flat1484)
+	flat1492 := p.tryFlat(msg, func() { p.pretty_iceberg_from_snapshot(msg) })
+	if flat1492 != nil {
+		p.write(*flat1492)
 		return nil
 	} else {
-		fields1483 := msg
+		fields1491 := msg
 		p.write("(")
 		p.write("from_snapshot")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1483))
+		p.write(p.formatStringValue(fields1491))
 		p.dedent()
 		p.write(")")
 	}
@@ -4321,17 +4341,17 @@ func (p *PrettyPrinter) pretty_iceberg_from_snapshot(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_iceberg_to_snapshot(msg string) interface{} {
-	flat1486 := p.tryFlat(msg, func() { p.pretty_iceberg_to_snapshot(msg) })
-	if flat1486 != nil {
-		p.write(*flat1486)
+	flat1494 := p.tryFlat(msg, func() { p.pretty_iceberg_to_snapshot(msg) })
+	if flat1494 != nil {
+		p.write(*flat1494)
 		return nil
 	} else {
-		fields1485 := msg
+		fields1493 := msg
 		p.write("(")
 		p.write("to_snapshot")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1485))
+		p.write(p.formatStringValue(fields1493))
 		p.dedent()
 		p.write(")")
 	}
@@ -4339,19 +4359,19 @@ func (p *PrettyPrinter) pretty_iceberg_to_snapshot(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_undefine(msg *pb.Undefine) interface{} {
-	flat1489 := p.tryFlat(msg, func() { p.pretty_undefine(msg) })
-	if flat1489 != nil {
-		p.write(*flat1489)
+	flat1497 := p.tryFlat(msg, func() { p.pretty_undefine(msg) })
+	if flat1497 != nil {
+		p.write(*flat1497)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1487 := _dollar_dollar.GetFragmentId()
-		unwrapped_fields1488 := fields1487
+		fields1495 := _dollar_dollar.GetFragmentId()
+		unwrapped_fields1496 := fields1495
 		p.write("(")
 		p.write("undefine")
 		p.indentSexp()
 		p.newline()
-		p.pretty_fragment_id(unwrapped_fields1488)
+		p.pretty_fragment_id(unwrapped_fields1496)
 		p.dedent()
 		p.write(")")
 	}
@@ -4359,24 +4379,24 @@ func (p *PrettyPrinter) pretty_undefine(msg *pb.Undefine) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_context(msg *pb.Context) interface{} {
-	flat1494 := p.tryFlat(msg, func() { p.pretty_context(msg) })
-	if flat1494 != nil {
-		p.write(*flat1494)
+	flat1502 := p.tryFlat(msg, func() { p.pretty_context(msg) })
+	if flat1502 != nil {
+		p.write(*flat1502)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1490 := _dollar_dollar.GetRelations()
-		unwrapped_fields1491 := fields1490
+		fields1498 := _dollar_dollar.GetRelations()
+		unwrapped_fields1499 := fields1498
 		p.write("(")
 		p.write("context")
 		p.indentSexp()
-		if !(len(unwrapped_fields1491) == 0) {
+		if !(len(unwrapped_fields1499) == 0) {
 			p.newline()
-			for i1493, elem1492 := range unwrapped_fields1491 {
-				if (i1493 > 0) {
+			for i1501, elem1500 := range unwrapped_fields1499 {
+				if (i1501 > 0) {
 					p.newline()
 				}
-				p.pretty_relation_id(elem1492)
+				p.pretty_relation_id(elem1500)
 			}
 		}
 		p.dedent()
@@ -4386,28 +4406,28 @@ func (p *PrettyPrinter) pretty_context(msg *pb.Context) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_snapshot(msg *pb.Snapshot) interface{} {
-	flat1501 := p.tryFlat(msg, func() { p.pretty_snapshot(msg) })
-	if flat1501 != nil {
-		p.write(*flat1501)
+	flat1509 := p.tryFlat(msg, func() { p.pretty_snapshot(msg) })
+	if flat1509 != nil {
+		p.write(*flat1509)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1495 := []interface{}{_dollar_dollar.GetPrefix(), _dollar_dollar.GetMappings()}
-		unwrapped_fields1496 := fields1495
+		fields1503 := []interface{}{_dollar_dollar.GetPrefix(), _dollar_dollar.GetMappings()}
+		unwrapped_fields1504 := fields1503
 		p.write("(")
 		p.write("snapshot")
 		p.indentSexp()
 		p.newline()
-		field1497 := unwrapped_fields1496[0].([]string)
-		p.pretty_edb_path(field1497)
-		field1498 := unwrapped_fields1496[1].([]*pb.SnapshotMapping)
-		if !(len(field1498) == 0) {
+		field1505 := unwrapped_fields1504[0].([]string)
+		p.pretty_edb_path(field1505)
+		field1506 := unwrapped_fields1504[1].([]*pb.SnapshotMapping)
+		if !(len(field1506) == 0) {
 			p.newline()
-			for i1500, elem1499 := range field1498 {
-				if (i1500 > 0) {
+			for i1508, elem1507 := range field1506 {
+				if (i1508 > 0) {
 					p.newline()
 				}
-				p.pretty_snapshot_mapping(elem1499)
+				p.pretty_snapshot_mapping(elem1507)
 			}
 		}
 		p.dedent()
@@ -4417,40 +4437,40 @@ func (p *PrettyPrinter) pretty_snapshot(msg *pb.Snapshot) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_snapshot_mapping(msg *pb.SnapshotMapping) interface{} {
-	flat1506 := p.tryFlat(msg, func() { p.pretty_snapshot_mapping(msg) })
-	if flat1506 != nil {
-		p.write(*flat1506)
+	flat1514 := p.tryFlat(msg, func() { p.pretty_snapshot_mapping(msg) })
+	if flat1514 != nil {
+		p.write(*flat1514)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1502 := []interface{}{_dollar_dollar.GetDestinationPath(), _dollar_dollar.GetSourceRelation()}
-		unwrapped_fields1503 := fields1502
-		field1504 := unwrapped_fields1503[0].([]string)
-		p.pretty_edb_path(field1504)
+		fields1510 := []interface{}{_dollar_dollar.GetDestinationPath(), _dollar_dollar.GetSourceRelation()}
+		unwrapped_fields1511 := fields1510
+		field1512 := unwrapped_fields1511[0].([]string)
+		p.pretty_edb_path(field1512)
 		p.write(" ")
-		field1505 := unwrapped_fields1503[1].(*pb.RelationId)
-		p.pretty_relation_id(field1505)
+		field1513 := unwrapped_fields1511[1].(*pb.RelationId)
+		p.pretty_relation_id(field1513)
 	}
 	return nil
 }
 
 func (p *PrettyPrinter) pretty_epoch_reads(msg []*pb.Read) interface{} {
-	flat1510 := p.tryFlat(msg, func() { p.pretty_epoch_reads(msg) })
-	if flat1510 != nil {
-		p.write(*flat1510)
+	flat1518 := p.tryFlat(msg, func() { p.pretty_epoch_reads(msg) })
+	if flat1518 != nil {
+		p.write(*flat1518)
 		return nil
 	} else {
-		fields1507 := msg
+		fields1515 := msg
 		p.write("(")
 		p.write("reads")
 		p.indentSexp()
-		if !(len(fields1507) == 0) {
+		if !(len(fields1515) == 0) {
 			p.newline()
-			for i1509, elem1508 := range fields1507 {
-				if (i1509 > 0) {
+			for i1517, elem1516 := range fields1515 {
+				if (i1517 > 0) {
 					p.newline()
 				}
-				p.pretty_read(elem1508)
+				p.pretty_read(elem1516)
 			}
 		}
 		p.dedent()
@@ -4460,60 +4480,60 @@ func (p *PrettyPrinter) pretty_epoch_reads(msg []*pb.Read) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_read(msg *pb.Read) interface{} {
-	flat1521 := p.tryFlat(msg, func() { p.pretty_read(msg) })
-	if flat1521 != nil {
-		p.write(*flat1521)
+	flat1529 := p.tryFlat(msg, func() { p.pretty_read(msg) })
+	if flat1529 != nil {
+		p.write(*flat1529)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1727 *pb.Demand
+		var _t1737 *pb.Demand
 		if hasProtoField(_dollar_dollar, "demand") {
-			_t1727 = _dollar_dollar.GetDemand()
+			_t1737 = _dollar_dollar.GetDemand()
 		}
-		deconstruct_result1519 := _t1727
-		if deconstruct_result1519 != nil {
-			unwrapped1520 := deconstruct_result1519
-			p.pretty_demand(unwrapped1520)
+		deconstruct_result1527 := _t1737
+		if deconstruct_result1527 != nil {
+			unwrapped1528 := deconstruct_result1527
+			p.pretty_demand(unwrapped1528)
 		} else {
 			_dollar_dollar := msg
-			var _t1728 *pb.Output
+			var _t1738 *pb.Output
 			if hasProtoField(_dollar_dollar, "output") {
-				_t1728 = _dollar_dollar.GetOutput()
+				_t1738 = _dollar_dollar.GetOutput()
 			}
-			deconstruct_result1517 := _t1728
-			if deconstruct_result1517 != nil {
-				unwrapped1518 := deconstruct_result1517
-				p.pretty_output(unwrapped1518)
+			deconstruct_result1525 := _t1738
+			if deconstruct_result1525 != nil {
+				unwrapped1526 := deconstruct_result1525
+				p.pretty_output(unwrapped1526)
 			} else {
 				_dollar_dollar := msg
-				var _t1729 *pb.WhatIf
+				var _t1739 *pb.WhatIf
 				if hasProtoField(_dollar_dollar, "what_if") {
-					_t1729 = _dollar_dollar.GetWhatIf()
+					_t1739 = _dollar_dollar.GetWhatIf()
 				}
-				deconstruct_result1515 := _t1729
-				if deconstruct_result1515 != nil {
-					unwrapped1516 := deconstruct_result1515
-					p.pretty_what_if(unwrapped1516)
+				deconstruct_result1523 := _t1739
+				if deconstruct_result1523 != nil {
+					unwrapped1524 := deconstruct_result1523
+					p.pretty_what_if(unwrapped1524)
 				} else {
 					_dollar_dollar := msg
-					var _t1730 *pb.Abort
+					var _t1740 *pb.Abort
 					if hasProtoField(_dollar_dollar, "abort") {
-						_t1730 = _dollar_dollar.GetAbort()
+						_t1740 = _dollar_dollar.GetAbort()
 					}
-					deconstruct_result1513 := _t1730
-					if deconstruct_result1513 != nil {
-						unwrapped1514 := deconstruct_result1513
-						p.pretty_abort(unwrapped1514)
+					deconstruct_result1521 := _t1740
+					if deconstruct_result1521 != nil {
+						unwrapped1522 := deconstruct_result1521
+						p.pretty_abort(unwrapped1522)
 					} else {
 						_dollar_dollar := msg
-						var _t1731 *pb.Export
+						var _t1741 *pb.Export
 						if hasProtoField(_dollar_dollar, "export") {
-							_t1731 = _dollar_dollar.GetExport()
+							_t1741 = _dollar_dollar.GetExport()
 						}
-						deconstruct_result1511 := _t1731
-						if deconstruct_result1511 != nil {
-							unwrapped1512 := deconstruct_result1511
-							p.pretty_export(unwrapped1512)
+						deconstruct_result1519 := _t1741
+						if deconstruct_result1519 != nil {
+							unwrapped1520 := deconstruct_result1519
+							p.pretty_export(unwrapped1520)
 						} else {
 							panic(ParseError{msg: "No matching rule for read"})
 						}
@@ -4526,19 +4546,19 @@ func (p *PrettyPrinter) pretty_read(msg *pb.Read) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_demand(msg *pb.Demand) interface{} {
-	flat1524 := p.tryFlat(msg, func() { p.pretty_demand(msg) })
-	if flat1524 != nil {
-		p.write(*flat1524)
+	flat1532 := p.tryFlat(msg, func() { p.pretty_demand(msg) })
+	if flat1532 != nil {
+		p.write(*flat1532)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1522 := _dollar_dollar.GetRelationId()
-		unwrapped_fields1523 := fields1522
+		fields1530 := _dollar_dollar.GetRelationId()
+		unwrapped_fields1531 := fields1530
 		p.write("(")
 		p.write("demand")
 		p.indentSexp()
 		p.newline()
-		p.pretty_relation_id(unwrapped_fields1523)
+		p.pretty_relation_id(unwrapped_fields1531)
 		p.dedent()
 		p.write(")")
 	}
@@ -4546,23 +4566,23 @@ func (p *PrettyPrinter) pretty_demand(msg *pb.Demand) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_output(msg *pb.Output) interface{} {
-	flat1529 := p.tryFlat(msg, func() { p.pretty_output(msg) })
-	if flat1529 != nil {
-		p.write(*flat1529)
+	flat1537 := p.tryFlat(msg, func() { p.pretty_output(msg) })
+	if flat1537 != nil {
+		p.write(*flat1537)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1525 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetRelationId()}
-		unwrapped_fields1526 := fields1525
+		fields1533 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetRelationId()}
+		unwrapped_fields1534 := fields1533
 		p.write("(")
 		p.write("output")
 		p.indentSexp()
 		p.newline()
-		field1527 := unwrapped_fields1526[0].(string)
-		p.pretty_name(field1527)
+		field1535 := unwrapped_fields1534[0].(string)
+		p.pretty_name(field1535)
 		p.newline()
-		field1528 := unwrapped_fields1526[1].(*pb.RelationId)
-		p.pretty_relation_id(field1528)
+		field1536 := unwrapped_fields1534[1].(*pb.RelationId)
+		p.pretty_relation_id(field1536)
 		p.dedent()
 		p.write(")")
 	}
@@ -4570,23 +4590,23 @@ func (p *PrettyPrinter) pretty_output(msg *pb.Output) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_what_if(msg *pb.WhatIf) interface{} {
-	flat1534 := p.tryFlat(msg, func() { p.pretty_what_if(msg) })
-	if flat1534 != nil {
-		p.write(*flat1534)
+	flat1542 := p.tryFlat(msg, func() { p.pretty_what_if(msg) })
+	if flat1542 != nil {
+		p.write(*flat1542)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1530 := []interface{}{_dollar_dollar.GetBranch(), _dollar_dollar.GetEpoch()}
-		unwrapped_fields1531 := fields1530
+		fields1538 := []interface{}{_dollar_dollar.GetBranch(), _dollar_dollar.GetEpoch()}
+		unwrapped_fields1539 := fields1538
 		p.write("(")
 		p.write("what_if")
 		p.indentSexp()
 		p.newline()
-		field1532 := unwrapped_fields1531[0].(string)
-		p.pretty_name(field1532)
+		field1540 := unwrapped_fields1539[0].(string)
+		p.pretty_name(field1540)
 		p.newline()
-		field1533 := unwrapped_fields1531[1].(*pb.Epoch)
-		p.pretty_epoch(field1533)
+		field1541 := unwrapped_fields1539[1].(*pb.Epoch)
+		p.pretty_epoch(field1541)
 		p.dedent()
 		p.write(")")
 	}
@@ -4594,30 +4614,30 @@ func (p *PrettyPrinter) pretty_what_if(msg *pb.WhatIf) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_abort(msg *pb.Abort) interface{} {
-	flat1540 := p.tryFlat(msg, func() { p.pretty_abort(msg) })
-	if flat1540 != nil {
-		p.write(*flat1540)
+	flat1548 := p.tryFlat(msg, func() { p.pretty_abort(msg) })
+	if flat1548 != nil {
+		p.write(*flat1548)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1732 *string
+		var _t1742 *string
 		if _dollar_dollar.GetName() != "abort" {
-			_t1732 = ptr(_dollar_dollar.GetName())
+			_t1742 = ptr(_dollar_dollar.GetName())
 		}
-		fields1535 := []interface{}{_t1732, _dollar_dollar.GetRelationId()}
-		unwrapped_fields1536 := fields1535
+		fields1543 := []interface{}{_t1742, _dollar_dollar.GetRelationId()}
+		unwrapped_fields1544 := fields1543
 		p.write("(")
 		p.write("abort")
 		p.indentSexp()
-		field1537 := unwrapped_fields1536[0].(*string)
-		if field1537 != nil {
+		field1545 := unwrapped_fields1544[0].(*string)
+		if field1545 != nil {
 			p.newline()
-			opt_val1538 := *field1537
-			p.pretty_name(opt_val1538)
+			opt_val1546 := *field1545
+			p.pretty_name(opt_val1546)
 		}
 		p.newline()
-		field1539 := unwrapped_fields1536[1].(*pb.RelationId)
-		p.pretty_relation_id(field1539)
+		field1547 := unwrapped_fields1544[1].(*pb.RelationId)
+		p.pretty_relation_id(field1547)
 		p.dedent()
 		p.write(")")
 	}
@@ -4625,40 +4645,40 @@ func (p *PrettyPrinter) pretty_abort(msg *pb.Abort) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_export(msg *pb.Export) interface{} {
-	flat1545 := p.tryFlat(msg, func() { p.pretty_export(msg) })
-	if flat1545 != nil {
-		p.write(*flat1545)
+	flat1553 := p.tryFlat(msg, func() { p.pretty_export(msg) })
+	if flat1553 != nil {
+		p.write(*flat1553)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1733 *pb.ExportCSVConfig
+		var _t1743 *pb.ExportCSVConfig
 		if hasProtoField(_dollar_dollar, "csv_config") {
-			_t1733 = _dollar_dollar.GetCsvConfig()
+			_t1743 = _dollar_dollar.GetCsvConfig()
 		}
-		deconstruct_result1543 := _t1733
-		if deconstruct_result1543 != nil {
-			unwrapped1544 := deconstruct_result1543
+		deconstruct_result1551 := _t1743
+		if deconstruct_result1551 != nil {
+			unwrapped1552 := deconstruct_result1551
 			p.write("(")
 			p.write("export")
 			p.indentSexp()
 			p.newline()
-			p.pretty_export_csv_config(unwrapped1544)
+			p.pretty_export_csv_config(unwrapped1552)
 			p.dedent()
 			p.write(")")
 		} else {
 			_dollar_dollar := msg
-			var _t1734 *pb.ExportIcebergConfig
+			var _t1744 *pb.ExportIcebergConfig
 			if hasProtoField(_dollar_dollar, "iceberg_config") {
-				_t1734 = _dollar_dollar.GetIcebergConfig()
+				_t1744 = _dollar_dollar.GetIcebergConfig()
 			}
-			deconstruct_result1541 := _t1734
-			if deconstruct_result1541 != nil {
-				unwrapped1542 := deconstruct_result1541
+			deconstruct_result1549 := _t1744
+			if deconstruct_result1549 != nil {
+				unwrapped1550 := deconstruct_result1549
 				p.write("(")
 				p.write("export_iceberg")
 				p.indentSexp()
 				p.newline()
-				p.pretty_export_iceberg_config(unwrapped1542)
+				p.pretty_export_iceberg_config(unwrapped1550)
 				p.dedent()
 				p.write(")")
 			} else {
@@ -4670,55 +4690,55 @@ func (p *PrettyPrinter) pretty_export(msg *pb.Export) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_export_csv_config(msg *pb.ExportCSVConfig) interface{} {
-	flat1556 := p.tryFlat(msg, func() { p.pretty_export_csv_config(msg) })
-	if flat1556 != nil {
-		p.write(*flat1556)
+	flat1564 := p.tryFlat(msg, func() { p.pretty_export_csv_config(msg) })
+	if flat1564 != nil {
+		p.write(*flat1564)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1735 []interface{}
+		var _t1745 []interface{}
 		if int64(len(_dollar_dollar.GetDataColumns())) == 0 {
-			_t1735 = []interface{}{_dollar_dollar.GetPath(), _dollar_dollar.GetCsvSource(), _dollar_dollar.GetCsvConfig()}
+			_t1745 = []interface{}{_dollar_dollar.GetPath(), _dollar_dollar.GetCsvSource(), _dollar_dollar.GetCsvConfig()}
 		}
-		deconstruct_result1551 := _t1735
-		if deconstruct_result1551 != nil {
-			unwrapped1552 := deconstruct_result1551
+		deconstruct_result1559 := _t1745
+		if deconstruct_result1559 != nil {
+			unwrapped1560 := deconstruct_result1559
 			p.write("(")
 			p.write("export_csv_config_v2")
 			p.indentSexp()
 			p.newline()
-			field1553 := unwrapped1552[0].(string)
-			p.pretty_export_csv_path(field1553)
+			field1561 := unwrapped1560[0].(string)
+			p.pretty_export_csv_path(field1561)
 			p.newline()
-			field1554 := unwrapped1552[1].(*pb.ExportCSVSource)
-			p.pretty_export_csv_source(field1554)
+			field1562 := unwrapped1560[1].(*pb.ExportCSVSource)
+			p.pretty_export_csv_source(field1562)
 			p.newline()
-			field1555 := unwrapped1552[2].(*pb.CSVConfig)
-			p.pretty_csv_config(field1555)
+			field1563 := unwrapped1560[2].(*pb.CSVConfig)
+			p.pretty_csv_config(field1563)
 			p.dedent()
 			p.write(")")
 		} else {
 			_dollar_dollar := msg
-			var _t1736 []interface{}
+			var _t1746 []interface{}
 			if int64(len(_dollar_dollar.GetDataColumns())) != 0 {
-				_t1737 := p.deconstruct_export_csv_config(_dollar_dollar)
-				_t1736 = []interface{}{_dollar_dollar.GetPath(), _dollar_dollar.GetDataColumns(), _t1737}
+				_t1747 := p.deconstruct_export_csv_config(_dollar_dollar)
+				_t1746 = []interface{}{_dollar_dollar.GetPath(), _dollar_dollar.GetDataColumns(), _t1747}
 			}
-			deconstruct_result1546 := _t1736
-			if deconstruct_result1546 != nil {
-				unwrapped1547 := deconstruct_result1546
+			deconstruct_result1554 := _t1746
+			if deconstruct_result1554 != nil {
+				unwrapped1555 := deconstruct_result1554
 				p.write("(")
 				p.write("export_csv_config")
 				p.indentSexp()
 				p.newline()
-				field1548 := unwrapped1547[0].(string)
-				p.pretty_export_csv_path(field1548)
+				field1556 := unwrapped1555[0].(string)
+				p.pretty_export_csv_path(field1556)
 				p.newline()
-				field1549 := unwrapped1547[1].([]*pb.ExportCSVColumn)
-				p.pretty_export_csv_columns_list(field1549)
+				field1557 := unwrapped1555[1].([]*pb.ExportCSVColumn)
+				p.pretty_export_csv_columns_list(field1557)
 				p.newline()
-				field1550 := unwrapped1547[2].([][]interface{})
-				p.pretty_config_dict(field1550)
+				field1558 := unwrapped1555[2].([][]interface{})
+				p.pretty_config_dict(field1558)
 				p.dedent()
 				p.write(")")
 			} else {
@@ -4730,17 +4750,17 @@ func (p *PrettyPrinter) pretty_export_csv_config(msg *pb.ExportCSVConfig) interf
 }
 
 func (p *PrettyPrinter) pretty_export_csv_path(msg string) interface{} {
-	flat1558 := p.tryFlat(msg, func() { p.pretty_export_csv_path(msg) })
-	if flat1558 != nil {
-		p.write(*flat1558)
+	flat1566 := p.tryFlat(msg, func() { p.pretty_export_csv_path(msg) })
+	if flat1566 != nil {
+		p.write(*flat1566)
 		return nil
 	} else {
-		fields1557 := msg
+		fields1565 := msg
 		p.write("(")
 		p.write("path")
 		p.indentSexp()
 		p.newline()
-		p.write(p.formatStringValue(fields1557))
+		p.write(p.formatStringValue(fields1565))
 		p.dedent()
 		p.write(")")
 	}
@@ -4748,47 +4768,47 @@ func (p *PrettyPrinter) pretty_export_csv_path(msg string) interface{} {
 }
 
 func (p *PrettyPrinter) pretty_export_csv_source(msg *pb.ExportCSVSource) interface{} {
-	flat1565 := p.tryFlat(msg, func() { p.pretty_export_csv_source(msg) })
-	if flat1565 != nil {
-		p.write(*flat1565)
+	flat1573 := p.tryFlat(msg, func() { p.pretty_export_csv_source(msg) })
+	if flat1573 != nil {
+		p.write(*flat1573)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		var _t1738 []*pb.ExportCSVColumn
+		var _t1748 []*pb.ExportCSVColumn
 		if hasProtoField(_dollar_dollar, "gnf_columns") {
-			_t1738 = _dollar_dollar.GetGnfColumns().GetColumns()
+			_t1748 = _dollar_dollar.GetGnfColumns().GetColumns()
 		}
-		deconstruct_result1561 := _t1738
-		if deconstruct_result1561 != nil {
-			unwrapped1562 := deconstruct_result1561
+		deconstruct_result1569 := _t1748
+		if deconstruct_result1569 != nil {
+			unwrapped1570 := deconstruct_result1569
 			p.write("(")
 			p.write("gnf_columns")
 			p.indentSexp()
-			if !(len(unwrapped1562) == 0) {
+			if !(len(unwrapped1570) == 0) {
 				p.newline()
-				for i1564, elem1563 := range unwrapped1562 {
-					if (i1564 > 0) {
+				for i1572, elem1571 := range unwrapped1570 {
+					if (i1572 > 0) {
 						p.newline()
 					}
-					p.pretty_export_csv_column(elem1563)
+					p.pretty_export_csv_column(elem1571)
 				}
 			}
 			p.dedent()
 			p.write(")")
 		} else {
 			_dollar_dollar := msg
-			var _t1739 *pb.RelationId
+			var _t1749 *pb.RelationId
 			if hasProtoField(_dollar_dollar, "table_def") {
-				_t1739 = _dollar_dollar.GetTableDef()
+				_t1749 = _dollar_dollar.GetTableDef()
 			}
-			deconstruct_result1559 := _t1739
-			if deconstruct_result1559 != nil {
-				unwrapped1560 := deconstruct_result1559
+			deconstruct_result1567 := _t1749
+			if deconstruct_result1567 != nil {
+				unwrapped1568 := deconstruct_result1567
 				p.write("(")
 				p.write("table_def")
 				p.indentSexp()
 				p.newline()
-				p.pretty_relation_id(unwrapped1560)
+				p.pretty_relation_id(unwrapped1568)
 				p.dedent()
 				p.write(")")
 			} else {
@@ -4800,23 +4820,23 @@ func (p *PrettyPrinter) pretty_export_csv_source(msg *pb.ExportCSVSource) interf
 }
 
 func (p *PrettyPrinter) pretty_export_csv_column(msg *pb.ExportCSVColumn) interface{} {
-	flat1570 := p.tryFlat(msg, func() { p.pretty_export_csv_column(msg) })
-	if flat1570 != nil {
-		p.write(*flat1570)
+	flat1578 := p.tryFlat(msg, func() { p.pretty_export_csv_column(msg) })
+	if flat1578 != nil {
+		p.write(*flat1578)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1566 := []interface{}{_dollar_dollar.GetColumnName(), _dollar_dollar.GetColumnData()}
-		unwrapped_fields1567 := fields1566
+		fields1574 := []interface{}{_dollar_dollar.GetColumnName(), _dollar_dollar.GetColumnData()}
+		unwrapped_fields1575 := fields1574
 		p.write("(")
 		p.write("column")
 		p.indentSexp()
 		p.newline()
-		field1568 := unwrapped_fields1567[0].(string)
-		p.write(p.formatStringValue(field1568))
+		field1576 := unwrapped_fields1575[0].(string)
+		p.write(p.formatStringValue(field1576))
 		p.newline()
-		field1569 := unwrapped_fields1567[1].(*pb.RelationId)
-		p.pretty_relation_id(field1569)
+		field1577 := unwrapped_fields1575[1].(*pb.RelationId)
+		p.pretty_relation_id(field1577)
 		p.dedent()
 		p.write(")")
 	}
@@ -4824,22 +4844,22 @@ func (p *PrettyPrinter) pretty_export_csv_column(msg *pb.ExportCSVColumn) interf
 }
 
 func (p *PrettyPrinter) pretty_export_csv_columns_list(msg []*pb.ExportCSVColumn) interface{} {
-	flat1574 := p.tryFlat(msg, func() { p.pretty_export_csv_columns_list(msg) })
-	if flat1574 != nil {
-		p.write(*flat1574)
+	flat1582 := p.tryFlat(msg, func() { p.pretty_export_csv_columns_list(msg) })
+	if flat1582 != nil {
+		p.write(*flat1582)
 		return nil
 	} else {
-		fields1571 := msg
+		fields1579 := msg
 		p.write("(")
 		p.write("columns")
 		p.indentSexp()
-		if !(len(fields1571) == 0) {
+		if !(len(fields1579) == 0) {
 			p.newline()
-			for i1573, elem1572 := range fields1571 {
-				if (i1573 > 0) {
+			for i1581, elem1580 := range fields1579 {
+				if (i1581 > 0) {
 					p.newline()
 				}
-				p.pretty_export_csv_column(elem1572)
+				p.pretty_export_csv_column(elem1580)
 			}
 		}
 		p.dedent()
@@ -4849,38 +4869,38 @@ func (p *PrettyPrinter) pretty_export_csv_columns_list(msg []*pb.ExportCSVColumn
 }
 
 func (p *PrettyPrinter) pretty_export_iceberg_config(msg *pb.ExportIcebergConfig) interface{} {
-	flat1584 := p.tryFlat(msg, func() { p.pretty_export_iceberg_config(msg) })
-	if flat1584 != nil {
-		p.write(*flat1584)
+	flat1592 := p.tryFlat(msg, func() { p.pretty_export_iceberg_config(msg) })
+	if flat1592 != nil {
+		p.write(*flat1592)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		_t1740 := p.deconstruct_export_iceberg_config_optional(_dollar_dollar)
-		fields1575 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetTableDef(), _dollar_dollar.GetColumns(), dictToPairs(_dollar_dollar.GetTableProperties()), _t1740}
-		unwrapped_fields1576 := fields1575
+		_t1750 := p.deconstruct_export_iceberg_config_optional(_dollar_dollar)
+		fields1583 := []interface{}{_dollar_dollar.GetLocator(), _dollar_dollar.GetConfig(), _dollar_dollar.GetTableDef(), _dollar_dollar.GetColumns(), dictToPairs(_dollar_dollar.GetTableProperties()), _t1750}
+		unwrapped_fields1584 := fields1583
 		p.write("(")
 		p.write("export_iceberg_config")
 		p.indentSexp()
 		p.newline()
-		field1577 := unwrapped_fields1576[0].(*pb.IcebergLocator)
-		p.pretty_iceberg_locator(field1577)
+		field1585 := unwrapped_fields1584[0].(*pb.IcebergLocator)
+		p.pretty_iceberg_locator(field1585)
 		p.newline()
-		field1578 := unwrapped_fields1576[1].(*pb.IcebergCatalogConfig)
-		p.pretty_iceberg_catalog_config(field1578)
+		field1586 := unwrapped_fields1584[1].(*pb.IcebergCatalogConfig)
+		p.pretty_iceberg_catalog_config(field1586)
 		p.newline()
-		field1579 := unwrapped_fields1576[2].(*pb.RelationId)
-		p.pretty_export_iceberg_table_def(field1579)
+		field1587 := unwrapped_fields1584[2].(*pb.RelationId)
+		p.pretty_export_iceberg_table_def(field1587)
 		p.newline()
-		field1580 := unwrapped_fields1576[3].([]*pb.ExportColumn)
-		p.pretty_export_iceberg_columns(field1580)
+		field1588 := unwrapped_fields1584[3].([]*pb.ExportColumn)
+		p.pretty_export_iceberg_columns(field1588)
 		p.newline()
-		field1581 := unwrapped_fields1576[4].([][]interface{})
-		p.pretty_iceberg_table_properties(field1581)
-		field1582 := unwrapped_fields1576[5].([][]interface{})
-		if field1582 != nil {
+		field1589 := unwrapped_fields1584[4].([][]interface{})
+		p.pretty_iceberg_table_properties(field1589)
+		field1590 := unwrapped_fields1584[5].([][]interface{})
+		if field1590 != nil {
 			p.newline()
-			opt_val1583 := field1582
-			p.pretty_config_dict(opt_val1583)
+			opt_val1591 := field1590
+			p.pretty_config_dict(opt_val1591)
 		}
 		p.dedent()
 		p.write(")")
@@ -4889,17 +4909,17 @@ func (p *PrettyPrinter) pretty_export_iceberg_config(msg *pb.ExportIcebergConfig
 }
 
 func (p *PrettyPrinter) pretty_export_iceberg_table_def(msg *pb.RelationId) interface{} {
-	flat1586 := p.tryFlat(msg, func() { p.pretty_export_iceberg_table_def(msg) })
-	if flat1586 != nil {
-		p.write(*flat1586)
+	flat1594 := p.tryFlat(msg, func() { p.pretty_export_iceberg_table_def(msg) })
+	if flat1594 != nil {
+		p.write(*flat1594)
 		return nil
 	} else {
-		fields1585 := msg
+		fields1593 := msg
 		p.write("(")
 		p.write("table_def")
 		p.indentSexp()
 		p.newline()
-		p.pretty_relation_id(fields1585)
+		p.pretty_relation_id(fields1593)
 		p.dedent()
 		p.write(")")
 	}
@@ -4907,22 +4927,22 @@ func (p *PrettyPrinter) pretty_export_iceberg_table_def(msg *pb.RelationId) inte
 }
 
 func (p *PrettyPrinter) pretty_export_iceberg_columns(msg []*pb.ExportColumn) interface{} {
-	flat1590 := p.tryFlat(msg, func() { p.pretty_export_iceberg_columns(msg) })
-	if flat1590 != nil {
-		p.write(*flat1590)
+	flat1598 := p.tryFlat(msg, func() { p.pretty_export_iceberg_columns(msg) })
+	if flat1598 != nil {
+		p.write(*flat1598)
 		return nil
 	} else {
-		fields1587 := msg
+		fields1595 := msg
 		p.write("(")
 		p.write("columns")
 		p.indentSexp()
-		if !(len(fields1587) == 0) {
+		if !(len(fields1595) == 0) {
 			p.newline()
-			for i1589, elem1588 := range fields1587 {
-				if (i1589 > 0) {
+			for i1597, elem1596 := range fields1595 {
+				if (i1597 > 0) {
 					p.newline()
 				}
-				p.pretty_export_iceberg_column(elem1588)
+				p.pretty_export_iceberg_column(elem1596)
 			}
 		}
 		p.dedent()
@@ -4932,23 +4952,23 @@ func (p *PrettyPrinter) pretty_export_iceberg_columns(msg []*pb.ExportColumn) in
 }
 
 func (p *PrettyPrinter) pretty_export_iceberg_column(msg *pb.ExportColumn) interface{} {
-	flat1595 := p.tryFlat(msg, func() { p.pretty_export_iceberg_column(msg) })
-	if flat1595 != nil {
-		p.write(*flat1595)
+	flat1603 := p.tryFlat(msg, func() { p.pretty_export_iceberg_column(msg) })
+	if flat1603 != nil {
+		p.write(*flat1603)
 		return nil
 	} else {
 		_dollar_dollar := msg
-		fields1591 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetNullable()}
-		unwrapped_fields1592 := fields1591
+		fields1599 := []interface{}{_dollar_dollar.GetName(), _dollar_dollar.GetNullable()}
+		unwrapped_fields1600 := fields1599
 		p.write("(")
 		p.write("column")
 		p.indentSexp()
 		p.newline()
-		field1593 := unwrapped_fields1592[0].(string)
-		p.write(p.formatStringValue(field1593))
+		field1601 := unwrapped_fields1600[0].(string)
+		p.write(p.formatStringValue(field1601))
 		p.newline()
-		field1594 := unwrapped_fields1592[1].(bool)
-		p.pretty_boolean_value(field1594)
+		field1602 := unwrapped_fields1600[1].(bool)
+		p.pretty_boolean_value(field1602)
 		p.dedent()
 		p.write(")")
 	}
@@ -4956,22 +4976,22 @@ func (p *PrettyPrinter) pretty_export_iceberg_column(msg *pb.ExportColumn) inter
 }
 
 func (p *PrettyPrinter) pretty_iceberg_table_properties(msg [][]interface{}) interface{} {
-	flat1599 := p.tryFlat(msg, func() { p.pretty_iceberg_table_properties(msg) })
-	if flat1599 != nil {
-		p.write(*flat1599)
+	flat1607 := p.tryFlat(msg, func() { p.pretty_iceberg_table_properties(msg) })
+	if flat1607 != nil {
+		p.write(*flat1607)
 		return nil
 	} else {
-		fields1596 := msg
+		fields1604 := msg
 		p.write("(")
 		p.write("table_properties")
 		p.indentSexp()
-		if !(len(fields1596) == 0) {
+		if !(len(fields1604) == 0) {
 			p.newline()
-			for i1598, elem1597 := range fields1596 {
-				if (i1598 > 0) {
+			for i1606, elem1605 := range fields1604 {
+				if (i1606 > 0) {
 					p.newline()
 				}
-				p.pretty_iceberg_property_entry(elem1597)
+				p.pretty_iceberg_property_entry(elem1605)
 			}
 		}
 		p.dedent()
@@ -4989,8 +5009,8 @@ func (p *PrettyPrinter) pretty_debug_info(msg *pb.DebugInfo) interface{} {
 	for _idx, _rid := range msg.GetIds() {
 		p.newline()
 		p.write("(")
-		_t1786 := &pb.UInt128Value{Low: _rid.GetIdLow(), High: _rid.GetIdHigh()}
-		p.pprintDispatch(_t1786)
+		_t1796 := &pb.UInt128Value{Low: _rid.GetIdLow(), High: _rid.GetIdHigh()}
+		p.pprintDispatch(_t1796)
 		p.write(" ")
 		p.write(p.formatStringValue(msg.GetOrigNames()[_idx]))
 		p.write(")")
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 aa3eccb4..eaa480d8 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
@@ -2071,6 +2071,7 @@ end
 struct var"##Stub#Algorithm"{T1<:var"##Abstract#Script"} <: var"##Abstract#Algorithm"
     var"#global"::Vector{RelationId}
     body::Union{Nothing,T1}
+    attrs::Vector{Attribute}
 end
 
 struct var"##Stub#Assign"{T1<:var"##Abstract#Formula"} <: var"##Abstract#Assign"
@@ -2164,6 +2165,7 @@ end
 struct var"##Stub#Loop"{T1<:var"##Abstract#Instruction"} <: var"##Abstract#Loop"
     init::Vector{T1}
     body::Union{Nothing,var"##Stub#Script"{var"##Stub#Construct"{var"##Stub#Loop"{T1},T1}}}
+    attrs::Vector{Attribute}
 end
 
 struct var"##Stub#Declaration"{T1<:var"##Abstract#Formula",T2<:var"##Abstract#Instruction"} <: var"##Abstract#Declaration"
@@ -2213,36 +2215,41 @@ function PB._encoded_size(x::Abstraction)
 end
 
 const Algorithm = var"##Stub#Algorithm"{var"##Stub#Script"{var"##Stub#Construct"{var"##Stub#Loop"{var"##Stub#Instruction"{var"##Stub#Formula"}},var"##Stub#Instruction"{var"##Stub#Formula"}}}}
-Algorithm(;var"#global" = Vector{RelationId}(), body = nothing) = Algorithm(var"#global", body)
-PB.default_values(::Type{Algorithm}) = (;var"#global" = Vector{RelationId}(), body = nothing)
-PB.field_numbers(::Type{Algorithm}) = (;var"#global" = 1, body = 2)
+Algorithm(;var"#global" = Vector{RelationId}(), body = nothing, attrs = Vector{Attribute}()) = Algorithm(var"#global", body, attrs)
+PB.default_values(::Type{Algorithm}) = (;var"#global" = Vector{RelationId}(), body = nothing, attrs = Vector{Attribute}())
+PB.field_numbers(::Type{Algorithm}) = (;var"#global" = 1, body = 2, attrs = 3)
 
 function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:Algorithm}, _endpos::Int=0, _group::Bool=false)
     var"#global" = PB.BufferedVector{RelationId}()
     body = Ref{Union{Nothing,Script}}(nothing)
+    attrs = PB.BufferedVector{Attribute}()
     while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             PB.decode!(d, var"#global")
         elseif field_number == 2
             PB.decode!(d, body)
+        elseif field_number == 3
+            PB.decode!(d, attrs)
         else
             Base.skip(d, wire_type)
         end
     end
-    return Algorithm(var"#global"[], body[])
+    return Algorithm(var"#global"[], body[], attrs[])
 end
 
 function PB.encode(e::PB.AbstractProtoEncoder, x::Algorithm)
     initpos = position(e.io)
     !isempty(x.var"#global") && PB.encode(e, 1, x.var"#global")
     !isnothing(x.body) && PB.encode(e, 2, x.body)
+    !isempty(x.attrs) && PB.encode(e, 3, x.attrs)
     return position(e.io) - initpos
 end
 function PB._encoded_size(x::Algorithm)
     encoded_size = 0
     !isempty(x.var"#global") && (encoded_size += PB._encoded_size(x.var"#global", 1))
     !isnothing(x.body) && (encoded_size += PB._encoded_size(x.body, 2))
+    !isempty(x.attrs) && (encoded_size += PB._encoded_size(x.attrs, 3))
     return encoded_size
 end
 
@@ -2855,36 +2862,41 @@ function PB._encoded_size(x::Construct)
 end
 
 const Loop = var"##Stub#Loop"{var"##Stub#Instruction"{var"##Stub#Formula"}}
-Loop(;init = Vector{Instruction}(), body = nothing) = Loop(init, body)
-PB.default_values(::Type{Loop}) = (;init = Vector{Instruction}(), body = nothing)
-PB.field_numbers(::Type{Loop}) = (;init = 1, body = 2)
+Loop(;init = Vector{Instruction}(), body = nothing, attrs = Vector{Attribute}()) = Loop(init, body, attrs)
+PB.default_values(::Type{Loop}) = (;init = Vector{Instruction}(), body = nothing, attrs = Vector{Attribute}())
+PB.field_numbers(::Type{Loop}) = (;init = 1, body = 2, attrs = 3)
 
 function PB.decode(d::PB.AbstractProtoDecoder, ::Type{<:Loop}, _endpos::Int=0, _group::Bool=false)
     init = PB.BufferedVector{Instruction}()
     body = Ref{Union{Nothing,Script}}(nothing)
+    attrs = PB.BufferedVector{Attribute}()
     while !PB.message_done(d, _endpos, _group)
         field_number, wire_type = PB.decode_tag(d)
         if field_number == 1
             PB.decode!(d, init)
         elseif field_number == 2
             PB.decode!(d, body)
+        elseif field_number == 3
+            PB.decode!(d, attrs)
         else
             Base.skip(d, wire_type)
         end
     end
-    return Loop(init[], body[])
+    return Loop(init[], body[], attrs[])
 end
 
 function PB.encode(e::PB.AbstractProtoEncoder, x::Loop)
     initpos = position(e.io)
     !isempty(x.init) && PB.encode(e, 1, x.init)
     !isnothing(x.body) && PB.encode(e, 2, x.body)
+    !isempty(x.attrs) && PB.encode(e, 3, x.attrs)
     return position(e.io) - initpos
 end
 function PB._encoded_size(x::Loop)
     encoded_size = 0
     !isempty(x.init) && (encoded_size += PB._encoded_size(x.init, 1))
     !isnothing(x.body) && (encoded_size += PB._encoded_size(x.body, 2))
+    !isempty(x.attrs) && (encoded_size += PB._encoded_size(x.attrs, 3))
     return encoded_size
 end
 
diff --git a/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl b/sdks/julia/LogicalQueryProtocol.jl/src/parser.jl
index 3d70549e..614e800e 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
-        _t2095 = nothing
+        _t2103 = 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
-        _t2096 = nothing
+        _t2104 = 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
-        _t2097 = nothing
+        _t2105 = 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
-        _t2098 = nothing
+        _t2106 = 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
-        _t2099 = nothing
+        _t2107 = 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
-        _t2100 = nothing
+        _t2108 = 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
-        _t2101 = nothing
+        _t2109 = 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
-        _t2102 = nothing
+        _t2110 = nothing
     end
     return nothing
 end
@@ -444,72 +444,72 @@ 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
-        _t2103 = nothing
+        _t2111 = nothing
     end
     return nothing
 end
 
 function construct_csv_config(parser::ParserState, config_dict::Vector{Tuple{String, Proto.Value}})::Proto.CSVConfig
     config = Dict(config_dict)
-    _t2104 = _extract_value_int32(parser, get(config, "csv_header_row", nothing), 1)
-    header_row = _t2104
-    _t2105 = _extract_value_int64(parser, get(config, "csv_skip", nothing), 0)
-    skip = _t2105
-    _t2106 = _extract_value_string(parser, get(config, "csv_new_line", nothing), "")
-    new_line = _t2106
-    _t2107 = _extract_value_string(parser, get(config, "csv_delimiter", nothing), ",")
-    delimiter = _t2107
-    _t2108 = _extract_value_string(parser, get(config, "csv_quotechar", nothing), "\"")
-    quotechar = _t2108
-    _t2109 = _extract_value_string(parser, get(config, "csv_escapechar", nothing), "\"")
-    escapechar = _t2109
-    _t2110 = _extract_value_string(parser, get(config, "csv_comment", nothing), "")
-    comment = _t2110
-    _t2111 = _extract_value_string_list(parser, get(config, "csv_missing_strings", nothing), String[])
-    missing_strings = _t2111
-    _t2112 = _extract_value_string(parser, get(config, "csv_decimal_separator", nothing), ".")
-    decimal_separator = _t2112
-    _t2113 = _extract_value_string(parser, get(config, "csv_encoding", nothing), "utf-8")
-    encoding = _t2113
-    _t2114 = _extract_value_string(parser, get(config, "csv_compression", nothing), "auto")
-    compression = _t2114
-    _t2115 = _extract_value_int64(parser, get(config, "csv_partition_size_mb", nothing), 0)
-    partition_size_mb = _t2115
-    _t2116 = 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)
-    return _t2116
+    _t2112 = _extract_value_int32(parser, get(config, "csv_header_row", nothing), 1)
+    header_row = _t2112
+    _t2113 = _extract_value_int64(parser, get(config, "csv_skip", nothing), 0)
+    skip = _t2113
+    _t2114 = _extract_value_string(parser, get(config, "csv_new_line", nothing), "")
+    new_line = _t2114
+    _t2115 = _extract_value_string(parser, get(config, "csv_delimiter", nothing), ",")
+    delimiter = _t2115
+    _t2116 = _extract_value_string(parser, get(config, "csv_quotechar", nothing), "\"")
+    quotechar = _t2116
+    _t2117 = _extract_value_string(parser, get(config, "csv_escapechar", nothing), "\"")
+    escapechar = _t2117
+    _t2118 = _extract_value_string(parser, get(config, "csv_comment", nothing), "")
+    comment = _t2118
+    _t2119 = _extract_value_string_list(parser, get(config, "csv_missing_strings", nothing), String[])
+    missing_strings = _t2119
+    _t2120 = _extract_value_string(parser, get(config, "csv_decimal_separator", nothing), ".")
+    decimal_separator = _t2120
+    _t2121 = _extract_value_string(parser, get(config, "csv_encoding", nothing), "utf-8")
+    encoding = _t2121
+    _t2122 = _extract_value_string(parser, get(config, "csv_compression", nothing), "auto")
+    compression = _t2122
+    _t2123 = _extract_value_int64(parser, get(config, "csv_partition_size_mb", nothing), 0)
+    partition_size_mb = _t2123
+    _t2124 = 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)
+    return _t2124
 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)
-    _t2117 = _try_extract_value_float64(parser, get(config, "betree_config_epsilon", nothing))
-    epsilon = _t2117
-    _t2118 = _try_extract_value_int64(parser, get(config, "betree_config_max_pivots", nothing))
-    max_pivots = _t2118
-    _t2119 = _try_extract_value_int64(parser, get(config, "betree_config_max_deltas", nothing))
-    max_deltas = _t2119
-    _t2120 = _try_extract_value_int64(parser, get(config, "betree_config_max_leaf", nothing))
-    max_leaf = _t2120
-    _t2121 = Proto.BeTreeConfig(epsilon=epsilon, max_pivots=max_pivots, max_deltas=max_deltas, max_leaf=max_leaf)
-    storage_config = _t2121
-    _t2122 = _try_extract_value_uint128(parser, get(config, "betree_locator_root_pageid", nothing))
-    root_pageid = _t2122
-    _t2123 = _try_extract_value_bytes(parser, get(config, "betree_locator_inline_data", nothing))
-    inline_data = _t2123
-    _t2124 = _try_extract_value_int64(parser, get(config, "betree_locator_element_count", nothing))
-    element_count = _t2124
-    _t2125 = _try_extract_value_int64(parser, get(config, "betree_locator_tree_height", nothing))
-    tree_height = _t2125
-    _t2126 = 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 = _t2126
-    _t2127 = Proto.BeTreeInfo(key_types=key_types, value_types=value_types, storage_config=storage_config, relation_locator=relation_locator)
-    return _t2127
+    _t2125 = _try_extract_value_float64(parser, get(config, "betree_config_epsilon", nothing))
+    epsilon = _t2125
+    _t2126 = _try_extract_value_int64(parser, get(config, "betree_config_max_pivots", nothing))
+    max_pivots = _t2126
+    _t2127 = _try_extract_value_int64(parser, get(config, "betree_config_max_deltas", nothing))
+    max_deltas = _t2127
+    _t2128 = _try_extract_value_int64(parser, get(config, "betree_config_max_leaf", nothing))
+    max_leaf = _t2128
+    _t2129 = Proto.BeTreeConfig(epsilon=epsilon, max_pivots=max_pivots, max_deltas=max_deltas, max_leaf=max_leaf)
+    storage_config = _t2129
+    _t2130 = _try_extract_value_uint128(parser, get(config, "betree_locator_root_pageid", nothing))
+    root_pageid = _t2130
+    _t2131 = _try_extract_value_bytes(parser, get(config, "betree_locator_inline_data", nothing))
+    inline_data = _t2131
+    _t2132 = _try_extract_value_int64(parser, get(config, "betree_locator_element_count", nothing))
+    element_count = _t2132
+    _t2133 = _try_extract_value_int64(parser, get(config, "betree_locator_tree_height", nothing))
+    tree_height = _t2133
+    _t2134 = 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 = _t2134
+    _t2135 = Proto.BeTreeInfo(key_types=key_types, value_types=value_types, storage_config=storage_config, relation_locator=relation_locator)
+    return _t2135
 end
 
 function default_configure(parser::ParserState)::Proto.Configure
-    _t2128 = Proto.IVMConfig(level=Proto.MaintenanceLevel.MAINTENANCE_LEVEL_OFF)
-    ivm_config = _t2128
-    _t2129 = Proto.Configure(semantics_version=0, ivm_config=ivm_config)
-    return _t2129
+    _t2136 = Proto.IVMConfig(level=Proto.MaintenanceLevel.MAINTENANCE_LEVEL_OFF)
+    ivm_config = _t2136
+    _t2137 = Proto.Configure(semantics_version=0, ivm_config=ivm_config)
+    return _t2137
 end
 
 function construct_configure(parser::ParserState, config_dict::Vector{Tuple{String, Proto.Value}})::Proto.Configure
@@ -531,2815 +531,2813 @@ function construct_configure(parser::ParserState, config_dict::Vector{Tuple{Stri
             end
         end
     end
-    _t2130 = Proto.IVMConfig(level=maintenance_level)
-    ivm_config = _t2130
-    _t2131 = _extract_value_int64(parser, get(config, "semantics_version", nothing), 0)
-    semantics_version = _t2131
-    _t2132 = Proto.Configure(semantics_version=semantics_version, ivm_config=ivm_config)
-    return _t2132
+    _t2138 = Proto.IVMConfig(level=maintenance_level)
+    ivm_config = _t2138
+    _t2139 = _extract_value_int64(parser, get(config, "semantics_version", nothing), 0)
+    semantics_version = _t2139
+    _t2140 = Proto.Configure(semantics_version=semantics_version, ivm_config=ivm_config)
+    return _t2140
 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)
-    _t2133 = _extract_value_int64(parser, get(config, "partition_size", nothing), 0)
-    partition_size = _t2133
-    _t2134 = _extract_value_string(parser, get(config, "compression", nothing), "")
-    compression = _t2134
-    _t2135 = _extract_value_boolean(parser, get(config, "syntax_header_row", nothing), true)
-    syntax_header_row = _t2135
-    _t2136 = _extract_value_string(parser, get(config, "syntax_missing_string", nothing), "")
-    syntax_missing_string = _t2136
-    _t2137 = _extract_value_string(parser, get(config, "syntax_delim", nothing), ",")
-    syntax_delim = _t2137
-    _t2138 = _extract_value_string(parser, get(config, "syntax_quotechar", nothing), "\"")
-    syntax_quotechar = _t2138
-    _t2139 = _extract_value_string(parser, get(config, "syntax_escapechar", nothing), "\\")
-    syntax_escapechar = _t2139
-    _t2140 = 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 _t2140
+    _t2141 = _extract_value_int64(parser, get(config, "partition_size", nothing), 0)
+    partition_size = _t2141
+    _t2142 = _extract_value_string(parser, get(config, "compression", nothing), "")
+    compression = _t2142
+    _t2143 = _extract_value_boolean(parser, get(config, "syntax_header_row", nothing), true)
+    syntax_header_row = _t2143
+    _t2144 = _extract_value_string(parser, get(config, "syntax_missing_string", nothing), "")
+    syntax_missing_string = _t2144
+    _t2145 = _extract_value_string(parser, get(config, "syntax_delim", nothing), ",")
+    syntax_delim = _t2145
+    _t2146 = _extract_value_string(parser, get(config, "syntax_quotechar", nothing), "\"")
+    syntax_quotechar = _t2146
+    _t2147 = _extract_value_string(parser, get(config, "syntax_escapechar", nothing), "\\")
+    syntax_escapechar = _t2147
+    _t2148 = 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 _t2148
 end
 
 function construct_export_csv_config_with_source(parser::ParserState, path::String, csv_source::Proto.ExportCSVSource, csv_config::Proto.CSVConfig)::Proto.ExportCSVConfig
-    _t2141 = Proto.ExportCSVConfig(path=path, csv_source=csv_source, csv_config=csv_config)
-    return _t2141
+    _t2149 = Proto.ExportCSVConfig(path=path, csv_source=csv_source, csv_config=csv_config)
+    return _t2149
 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)
-    _t2142 = Proto.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(!isnothing(scope_opt) ? scope_opt : ""), properties=props, auth_properties=auth_props)
-    return _t2142
+    _t2150 = Proto.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(!isnothing(scope_opt) ? scope_opt : ""), properties=props, auth_properties=auth_props)
+    return _t2150
 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
-    _t2143 = 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 _t2143
+    _t2151 = 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 _t2151
 end
 
 function construct_export_iceberg_config_full(parser::ParserState, locator::Proto.IcebergLocator, config::Proto.IcebergCatalogConfig, table_def::Proto.RelationId, columns::Vector{Proto.ExportColumn}, 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}[]))
-    _t2144 = _extract_value_string(parser, get(cfg, "prefix", nothing), "")
-    prefix = _t2144
-    _t2145 = _extract_value_int64(parser, get(cfg, "target_file_size_bytes", nothing), 0)
-    target_file_size_bytes = _t2145
-    _t2146 = _extract_value_string(parser, get(cfg, "compression", nothing), "")
-    compression = _t2146
+    _t2152 = _extract_value_string(parser, get(cfg, "prefix", nothing), "")
+    prefix = _t2152
+    _t2153 = _extract_value_int64(parser, get(cfg, "target_file_size_bytes", nothing), 0)
+    target_file_size_bytes = _t2153
+    _t2154 = _extract_value_string(parser, get(cfg, "compression", nothing), "")
+    compression = _t2154
     table_props = Dict(table_property_pairs)
-    _t2147 = Proto.ExportIcebergConfig(locator=locator, config=config, table_def=table_def, columns=columns, prefix=prefix, target_file_size_bytes=target_file_size_bytes, compression=compression, table_properties=table_props)
-    return _t2147
+    _t2155 = Proto.ExportIcebergConfig(locator=locator, config=config, table_def=table_def, columns=columns, prefix=prefix, target_file_size_bytes=target_file_size_bytes, compression=compression, table_properties=table_props)
+    return _t2155
 end
 
 # --- Parse functions ---
 
 function parse_transaction(parser::ParserState)::Proto.Transaction
-    span_start678 = span_start(parser)
+    span_start680 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "transaction")
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "configure", 1))
-        _t1345 = parse_configure(parser)
-        _t1344 = _t1345
+        _t1349 = parse_configure(parser)
+        _t1348 = _t1349
     else
-        _t1344 = nothing
+        _t1348 = nothing
     end
-    configure672 = _t1344
+    configure674 = _t1348
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "sync", 1))
-        _t1347 = parse_sync(parser)
-        _t1346 = _t1347
+        _t1351 = parse_sync(parser)
+        _t1350 = _t1351
     else
-        _t1346 = nothing
+        _t1350 = nothing
     end
-    sync673 = _t1346
-    xs674 = Proto.Epoch[]
-    cond675 = match_lookahead_literal(parser, "(", 0)
-    while cond675
-        _t1348 = parse_epoch(parser)
-        item676 = _t1348
-        push!(xs674, item676)
-        cond675 = match_lookahead_literal(parser, "(", 0)
+    sync675 = _t1350
+    xs676 = Proto.Epoch[]
+    cond677 = match_lookahead_literal(parser, "(", 0)
+    while cond677
+        _t1352 = parse_epoch(parser)
+        item678 = _t1352
+        push!(xs676, item678)
+        cond677 = match_lookahead_literal(parser, "(", 0)
     end
-    epochs677 = xs674
+    epochs679 = xs676
     consume_literal!(parser, ")")
-    _t1349 = default_configure(parser)
-    _t1350 = Proto.Transaction(epochs=epochs677, configure=(!isnothing(configure672) ? configure672 : _t1349), sync=sync673)
-    result679 = _t1350
-    record_span!(parser, span_start678, "Transaction")
-    return result679
+    _t1353 = default_configure(parser)
+    _t1354 = Proto.Transaction(epochs=epochs679, configure=(!isnothing(configure674) ? configure674 : _t1353), sync=sync675)
+    result681 = _t1354
+    record_span!(parser, span_start680, "Transaction")
+    return result681
 end
 
 function parse_configure(parser::ParserState)::Proto.Configure
-    span_start681 = span_start(parser)
+    span_start683 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "configure")
-    _t1351 = parse_config_dict(parser)
-    config_dict680 = _t1351
+    _t1355 = parse_config_dict(parser)
+    config_dict682 = _t1355
     consume_literal!(parser, ")")
-    _t1352 = construct_configure(parser, config_dict680)
-    result682 = _t1352
-    record_span!(parser, span_start681, "Configure")
-    return result682
+    _t1356 = construct_configure(parser, config_dict682)
+    result684 = _t1356
+    record_span!(parser, span_start683, "Configure")
+    return result684
 end
 
 function parse_config_dict(parser::ParserState)::Vector{Tuple{String, Proto.Value}}
     consume_literal!(parser, "{")
-    xs683 = Tuple{String, Proto.Value}[]
-    cond684 = match_lookahead_literal(parser, ":", 0)
-    while cond684
-        _t1353 = parse_config_key_value(parser)
-        item685 = _t1353
-        push!(xs683, item685)
-        cond684 = match_lookahead_literal(parser, ":", 0)
+    xs685 = Tuple{String, Proto.Value}[]
+    cond686 = match_lookahead_literal(parser, ":", 0)
+    while cond686
+        _t1357 = parse_config_key_value(parser)
+        item687 = _t1357
+        push!(xs685, item687)
+        cond686 = match_lookahead_literal(parser, ":", 0)
     end
-    config_key_values686 = xs683
+    config_key_values688 = xs685
     consume_literal!(parser, "}")
-    return config_key_values686
+    return config_key_values688
 end
 
 function parse_config_key_value(parser::ParserState)::Tuple{String, Proto.Value}
     consume_literal!(parser, ":")
-    symbol687 = consume_terminal!(parser, "SYMBOL")
-    _t1354 = parse_raw_value(parser)
-    raw_value688 = _t1354
-    return (symbol687, raw_value688,)
+    symbol689 = consume_terminal!(parser, "SYMBOL")
+    _t1358 = parse_raw_value(parser)
+    raw_value690 = _t1358
+    return (symbol689, raw_value690,)
 end
 
 function parse_raw_value(parser::ParserState)::Proto.Value
-    span_start702 = span_start(parser)
+    span_start704 = span_start(parser)
     if match_lookahead_literal(parser, "true", 0)
-        _t1355 = 12
+        _t1359 = 12
     else
         if match_lookahead_literal(parser, "missing", 0)
-            _t1356 = 11
+            _t1360 = 11
         else
             if match_lookahead_literal(parser, "false", 0)
-                _t1357 = 12
+                _t1361 = 12
             else
                 if match_lookahead_literal(parser, "(", 0)
                     if match_lookahead_literal(parser, "datetime", 1)
-                        _t1359 = 1
+                        _t1363 = 1
                     else
                         if match_lookahead_literal(parser, "date", 1)
-                            _t1360 = 0
+                            _t1364 = 0
                         else
-                            _t1360 = -1
+                            _t1364 = -1
                         end
-                        _t1359 = _t1360
+                        _t1363 = _t1364
                     end
-                    _t1358 = _t1359
+                    _t1362 = _t1363
                 else
                     if match_lookahead_terminal(parser, "UINT32", 0)
-                        _t1361 = 7
+                        _t1365 = 7
                     else
                         if match_lookahead_terminal(parser, "UINT128", 0)
-                            _t1362 = 8
+                            _t1366 = 8
                         else
                             if match_lookahead_terminal(parser, "STRING", 0)
-                                _t1363 = 2
+                                _t1367 = 2
                             else
                                 if match_lookahead_terminal(parser, "INT32", 0)
-                                    _t1364 = 3
+                                    _t1368 = 3
                                 else
                                     if match_lookahead_terminal(parser, "INT128", 0)
-                                        _t1365 = 9
+                                        _t1369 = 9
                                     else
                                         if match_lookahead_terminal(parser, "INT", 0)
-                                            _t1366 = 4
+                                            _t1370 = 4
                                         else
                                             if match_lookahead_terminal(parser, "FLOAT32", 0)
-                                                _t1367 = 5
+                                                _t1371 = 5
                                             else
                                                 if match_lookahead_terminal(parser, "FLOAT", 0)
-                                                    _t1368 = 6
+                                                    _t1372 = 6
                                                 else
                                                     if match_lookahead_terminal(parser, "DECIMAL", 0)
-                                                        _t1369 = 10
+                                                        _t1373 = 10
                                                     else
-                                                        _t1369 = -1
+                                                        _t1373 = -1
                                                     end
-                                                    _t1368 = _t1369
+                                                    _t1372 = _t1373
                                                 end
-                                                _t1367 = _t1368
+                                                _t1371 = _t1372
                                             end
-                                            _t1366 = _t1367
+                                            _t1370 = _t1371
                                         end
-                                        _t1365 = _t1366
+                                        _t1369 = _t1370
                                     end
-                                    _t1364 = _t1365
+                                    _t1368 = _t1369
                                 end
-                                _t1363 = _t1364
+                                _t1367 = _t1368
                             end
-                            _t1362 = _t1363
+                            _t1366 = _t1367
                         end
-                        _t1361 = _t1362
+                        _t1365 = _t1366
                     end
-                    _t1358 = _t1361
+                    _t1362 = _t1365
                 end
-                _t1357 = _t1358
+                _t1361 = _t1362
             end
-            _t1356 = _t1357
+            _t1360 = _t1361
         end
-        _t1355 = _t1356
+        _t1359 = _t1360
     end
-    prediction689 = _t1355
-    if prediction689 == 12
-        _t1371 = parse_boolean_value(parser)
-        boolean_value701 = _t1371
-        _t1372 = Proto.Value(value=OneOf(:boolean_value, boolean_value701))
-        _t1370 = _t1372
+    prediction691 = _t1359
+    if prediction691 == 12
+        _t1375 = parse_boolean_value(parser)
+        boolean_value703 = _t1375
+        _t1376 = Proto.Value(value=OneOf(:boolean_value, boolean_value703))
+        _t1374 = _t1376
     else
-        if prediction689 == 11
+        if prediction691 == 11
             consume_literal!(parser, "missing")
-            _t1374 = Proto.MissingValue()
-            _t1375 = Proto.Value(value=OneOf(:missing_value, _t1374))
-            _t1373 = _t1375
+            _t1378 = Proto.MissingValue()
+            _t1379 = Proto.Value(value=OneOf(:missing_value, _t1378))
+            _t1377 = _t1379
         else
-            if prediction689 == 10
-                decimal700 = consume_terminal!(parser, "DECIMAL")
-                _t1377 = Proto.Value(value=OneOf(:decimal_value, decimal700))
-                _t1376 = _t1377
+            if prediction691 == 10
+                decimal702 = consume_terminal!(parser, "DECIMAL")
+                _t1381 = Proto.Value(value=OneOf(:decimal_value, decimal702))
+                _t1380 = _t1381
             else
-                if prediction689 == 9
-                    int128699 = consume_terminal!(parser, "INT128")
-                    _t1379 = Proto.Value(value=OneOf(:int128_value, int128699))
-                    _t1378 = _t1379
+                if prediction691 == 9
+                    int128701 = consume_terminal!(parser, "INT128")
+                    _t1383 = Proto.Value(value=OneOf(:int128_value, int128701))
+                    _t1382 = _t1383
                 else
-                    if prediction689 == 8
-                        uint128698 = consume_terminal!(parser, "UINT128")
-                        _t1381 = Proto.Value(value=OneOf(:uint128_value, uint128698))
-                        _t1380 = _t1381
+                    if prediction691 == 8
+                        uint128700 = consume_terminal!(parser, "UINT128")
+                        _t1385 = Proto.Value(value=OneOf(:uint128_value, uint128700))
+                        _t1384 = _t1385
                     else
-                        if prediction689 == 7
-                            uint32697 = consume_terminal!(parser, "UINT32")
-                            _t1383 = Proto.Value(value=OneOf(:uint32_value, uint32697))
-                            _t1382 = _t1383
+                        if prediction691 == 7
+                            uint32699 = consume_terminal!(parser, "UINT32")
+                            _t1387 = Proto.Value(value=OneOf(:uint32_value, uint32699))
+                            _t1386 = _t1387
                         else
-                            if prediction689 == 6
-                                float696 = consume_terminal!(parser, "FLOAT")
-                                _t1385 = Proto.Value(value=OneOf(:float_value, float696))
-                                _t1384 = _t1385
+                            if prediction691 == 6
+                                float698 = consume_terminal!(parser, "FLOAT")
+                                _t1389 = Proto.Value(value=OneOf(:float_value, float698))
+                                _t1388 = _t1389
                             else
-                                if prediction689 == 5
-                                    float32695 = consume_terminal!(parser, "FLOAT32")
-                                    _t1387 = Proto.Value(value=OneOf(:float32_value, float32695))
-                                    _t1386 = _t1387
+                                if prediction691 == 5
+                                    float32697 = consume_terminal!(parser, "FLOAT32")
+                                    _t1391 = Proto.Value(value=OneOf(:float32_value, float32697))
+                                    _t1390 = _t1391
                                 else
-                                    if prediction689 == 4
-                                        int694 = consume_terminal!(parser, "INT")
-                                        _t1389 = Proto.Value(value=OneOf(:int_value, int694))
-                                        _t1388 = _t1389
+                                    if prediction691 == 4
+                                        int696 = consume_terminal!(parser, "INT")
+                                        _t1393 = Proto.Value(value=OneOf(:int_value, int696))
+                                        _t1392 = _t1393
                                     else
-                                        if prediction689 == 3
-                                            int32693 = consume_terminal!(parser, "INT32")
-                                            _t1391 = Proto.Value(value=OneOf(:int32_value, int32693))
-                                            _t1390 = _t1391
+                                        if prediction691 == 3
+                                            int32695 = consume_terminal!(parser, "INT32")
+                                            _t1395 = Proto.Value(value=OneOf(:int32_value, int32695))
+                                            _t1394 = _t1395
                                         else
-                                            if prediction689 == 2
-                                                string692 = consume_terminal!(parser, "STRING")
-                                                _t1393 = Proto.Value(value=OneOf(:string_value, string692))
-                                                _t1392 = _t1393
+                                            if prediction691 == 2
+                                                string694 = consume_terminal!(parser, "STRING")
+                                                _t1397 = Proto.Value(value=OneOf(:string_value, string694))
+                                                _t1396 = _t1397
                                             else
-                                                if prediction689 == 1
-                                                    _t1395 = parse_raw_datetime(parser)
-                                                    raw_datetime691 = _t1395
-                                                    _t1396 = Proto.Value(value=OneOf(:datetime_value, raw_datetime691))
-                                                    _t1394 = _t1396
+                                                if prediction691 == 1
+                                                    _t1399 = parse_raw_datetime(parser)
+                                                    raw_datetime693 = _t1399
+                                                    _t1400 = Proto.Value(value=OneOf(:datetime_value, raw_datetime693))
+                                                    _t1398 = _t1400
                                                 else
-                                                    if prediction689 == 0
-                                                        _t1398 = parse_raw_date(parser)
-                                                        raw_date690 = _t1398
-                                                        _t1399 = Proto.Value(value=OneOf(:date_value, raw_date690))
-                                                        _t1397 = _t1399
+                                                    if prediction691 == 0
+                                                        _t1402 = parse_raw_date(parser)
+                                                        raw_date692 = _t1402
+                                                        _t1403 = Proto.Value(value=OneOf(:date_value, raw_date692))
+                                                        _t1401 = _t1403
                                                     else
                                                         throw(ParseError("Unexpected token in raw_value" * ": " * string(lookahead(parser, 0))))
                                                     end
-                                                    _t1394 = _t1397
+                                                    _t1398 = _t1401
                                                 end
-                                                _t1392 = _t1394
+                                                _t1396 = _t1398
                                             end
-                                            _t1390 = _t1392
+                                            _t1394 = _t1396
                                         end
-                                        _t1388 = _t1390
+                                        _t1392 = _t1394
                                     end
-                                    _t1386 = _t1388
+                                    _t1390 = _t1392
                                 end
-                                _t1384 = _t1386
+                                _t1388 = _t1390
                             end
-                            _t1382 = _t1384
+                            _t1386 = _t1388
                         end
-                        _t1380 = _t1382
+                        _t1384 = _t1386
                     end
-                    _t1378 = _t1380
+                    _t1382 = _t1384
                 end
-                _t1376 = _t1378
+                _t1380 = _t1382
             end
-            _t1373 = _t1376
+            _t1377 = _t1380
         end
-        _t1370 = _t1373
+        _t1374 = _t1377
     end
-    result703 = _t1370
-    record_span!(parser, span_start702, "Value")
-    return result703
+    result705 = _t1374
+    record_span!(parser, span_start704, "Value")
+    return result705
 end
 
 function parse_raw_date(parser::ParserState)::Proto.DateValue
-    span_start707 = span_start(parser)
+    span_start709 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "date")
-    int704 = consume_terminal!(parser, "INT")
-    int_3705 = consume_terminal!(parser, "INT")
-    int_4706 = consume_terminal!(parser, "INT")
+    int706 = consume_terminal!(parser, "INT")
+    int_3707 = consume_terminal!(parser, "INT")
+    int_4708 = consume_terminal!(parser, "INT")
     consume_literal!(parser, ")")
-    _t1400 = Proto.DateValue(year=Int32(int704), month=Int32(int_3705), day=Int32(int_4706))
-    result708 = _t1400
-    record_span!(parser, span_start707, "DateValue")
-    return result708
+    _t1404 = Proto.DateValue(year=Int32(int706), month=Int32(int_3707), day=Int32(int_4708))
+    result710 = _t1404
+    record_span!(parser, span_start709, "DateValue")
+    return result710
 end
 
 function parse_raw_datetime(parser::ParserState)::Proto.DateTimeValue
-    span_start716 = span_start(parser)
+    span_start718 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "datetime")
-    int709 = consume_terminal!(parser, "INT")
-    int_3710 = consume_terminal!(parser, "INT")
-    int_4711 = consume_terminal!(parser, "INT")
-    int_5712 = consume_terminal!(parser, "INT")
-    int_6713 = consume_terminal!(parser, "INT")
-    int_7714 = consume_terminal!(parser, "INT")
+    int711 = consume_terminal!(parser, "INT")
+    int_3712 = consume_terminal!(parser, "INT")
+    int_4713 = consume_terminal!(parser, "INT")
+    int_5714 = consume_terminal!(parser, "INT")
+    int_6715 = consume_terminal!(parser, "INT")
+    int_7716 = consume_terminal!(parser, "INT")
     if match_lookahead_terminal(parser, "INT", 0)
-        _t1401 = consume_terminal!(parser, "INT")
+        _t1405 = consume_terminal!(parser, "INT")
     else
-        _t1401 = nothing
+        _t1405 = nothing
     end
-    int_8715 = _t1401
+    int_8717 = _t1405
     consume_literal!(parser, ")")
-    _t1402 = Proto.DateTimeValue(year=Int32(int709), month=Int32(int_3710), day=Int32(int_4711), hour=Int32(int_5712), minute=Int32(int_6713), second=Int32(int_7714), microsecond=Int32((!isnothing(int_8715) ? int_8715 : 0)))
-    result717 = _t1402
-    record_span!(parser, span_start716, "DateTimeValue")
-    return result717
+    _t1406 = Proto.DateTimeValue(year=Int32(int711), month=Int32(int_3712), day=Int32(int_4713), hour=Int32(int_5714), minute=Int32(int_6715), second=Int32(int_7716), microsecond=Int32((!isnothing(int_8717) ? int_8717 : 0)))
+    result719 = _t1406
+    record_span!(parser, span_start718, "DateTimeValue")
+    return result719
 end
 
 function parse_boolean_value(parser::ParserState)::Bool
     if match_lookahead_literal(parser, "true", 0)
-        _t1403 = 0
+        _t1407 = 0
     else
         if match_lookahead_literal(parser, "false", 0)
-            _t1404 = 1
+            _t1408 = 1
         else
-            _t1404 = -1
+            _t1408 = -1
         end
-        _t1403 = _t1404
+        _t1407 = _t1408
     end
-    prediction718 = _t1403
-    if prediction718 == 1
+    prediction720 = _t1407
+    if prediction720 == 1
         consume_literal!(parser, "false")
-        _t1405 = false
+        _t1409 = false
     else
-        if prediction718 == 0
+        if prediction720 == 0
             consume_literal!(parser, "true")
-            _t1406 = true
+            _t1410 = true
         else
             throw(ParseError("Unexpected token in boolean_value" * ": " * string(lookahead(parser, 0))))
         end
-        _t1405 = _t1406
+        _t1409 = _t1410
     end
-    return _t1405
+    return _t1409
 end
 
 function parse_sync(parser::ParserState)::Proto.Sync
-    span_start723 = span_start(parser)
+    span_start725 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "sync")
-    xs719 = Proto.FragmentId[]
-    cond720 = match_lookahead_literal(parser, ":", 0)
-    while cond720
-        _t1407 = parse_fragment_id(parser)
-        item721 = _t1407
-        push!(xs719, item721)
-        cond720 = match_lookahead_literal(parser, ":", 0)
+    xs721 = Proto.FragmentId[]
+    cond722 = match_lookahead_literal(parser, ":", 0)
+    while cond722
+        _t1411 = parse_fragment_id(parser)
+        item723 = _t1411
+        push!(xs721, item723)
+        cond722 = match_lookahead_literal(parser, ":", 0)
     end
-    fragment_ids722 = xs719
+    fragment_ids724 = xs721
     consume_literal!(parser, ")")
-    _t1408 = Proto.Sync(fragments=fragment_ids722)
-    result724 = _t1408
-    record_span!(parser, span_start723, "Sync")
-    return result724
+    _t1412 = Proto.Sync(fragments=fragment_ids724)
+    result726 = _t1412
+    record_span!(parser, span_start725, "Sync")
+    return result726
 end
 
 function parse_fragment_id(parser::ParserState)::Proto.FragmentId
-    span_start726 = span_start(parser)
+    span_start728 = span_start(parser)
     consume_literal!(parser, ":")
-    symbol725 = consume_terminal!(parser, "SYMBOL")
-    result727 = Proto.FragmentId(Vector{UInt8}(symbol725))
-    record_span!(parser, span_start726, "FragmentId")
-    return result727
+    symbol727 = consume_terminal!(parser, "SYMBOL")
+    result729 = Proto.FragmentId(Vector{UInt8}(symbol727))
+    record_span!(parser, span_start728, "FragmentId")
+    return result729
 end
 
 function parse_epoch(parser::ParserState)::Proto.Epoch
-    span_start730 = span_start(parser)
+    span_start732 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "epoch")
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "writes", 1))
-        _t1410 = parse_epoch_writes(parser)
-        _t1409 = _t1410
+        _t1414 = parse_epoch_writes(parser)
+        _t1413 = _t1414
     else
-        _t1409 = nothing
+        _t1413 = nothing
     end
-    epoch_writes728 = _t1409
+    epoch_writes730 = _t1413
     if match_lookahead_literal(parser, "(", 0)
-        _t1412 = parse_epoch_reads(parser)
-        _t1411 = _t1412
+        _t1416 = parse_epoch_reads(parser)
+        _t1415 = _t1416
     else
-        _t1411 = nothing
+        _t1415 = nothing
     end
-    epoch_reads729 = _t1411
+    epoch_reads731 = _t1415
     consume_literal!(parser, ")")
-    _t1413 = Proto.Epoch(writes=(!isnothing(epoch_writes728) ? epoch_writes728 : Proto.Write[]), reads=(!isnothing(epoch_reads729) ? epoch_reads729 : Proto.Read[]))
-    result731 = _t1413
-    record_span!(parser, span_start730, "Epoch")
-    return result731
+    _t1417 = Proto.Epoch(writes=(!isnothing(epoch_writes730) ? epoch_writes730 : Proto.Write[]), reads=(!isnothing(epoch_reads731) ? epoch_reads731 : Proto.Read[]))
+    result733 = _t1417
+    record_span!(parser, span_start732, "Epoch")
+    return result733
 end
 
 function parse_epoch_writes(parser::ParserState)::Vector{Proto.Write}
     consume_literal!(parser, "(")
     consume_literal!(parser, "writes")
-    xs732 = Proto.Write[]
-    cond733 = match_lookahead_literal(parser, "(", 0)
-    while cond733
-        _t1414 = parse_write(parser)
-        item734 = _t1414
-        push!(xs732, item734)
-        cond733 = match_lookahead_literal(parser, "(", 0)
+    xs734 = Proto.Write[]
+    cond735 = match_lookahead_literal(parser, "(", 0)
+    while cond735
+        _t1418 = parse_write(parser)
+        item736 = _t1418
+        push!(xs734, item736)
+        cond735 = match_lookahead_literal(parser, "(", 0)
     end
-    writes735 = xs732
+    writes737 = xs734
     consume_literal!(parser, ")")
-    return writes735
+    return writes737
 end
 
 function parse_write(parser::ParserState)::Proto.Write
-    span_start741 = span_start(parser)
+    span_start743 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "undefine", 1)
-            _t1416 = 1
+            _t1420 = 1
         else
             if match_lookahead_literal(parser, "snapshot", 1)
-                _t1417 = 3
+                _t1421 = 3
             else
                 if match_lookahead_literal(parser, "define", 1)
-                    _t1418 = 0
+                    _t1422 = 0
                 else
                     if match_lookahead_literal(parser, "context", 1)
-                        _t1419 = 2
+                        _t1423 = 2
                     else
-                        _t1419 = -1
+                        _t1423 = -1
                     end
-                    _t1418 = _t1419
+                    _t1422 = _t1423
                 end
-                _t1417 = _t1418
+                _t1421 = _t1422
             end
-            _t1416 = _t1417
+            _t1420 = _t1421
         end
-        _t1415 = _t1416
+        _t1419 = _t1420
     else
-        _t1415 = -1
+        _t1419 = -1
     end
-    prediction736 = _t1415
-    if prediction736 == 3
-        _t1421 = parse_snapshot(parser)
-        snapshot740 = _t1421
-        _t1422 = Proto.Write(write_type=OneOf(:snapshot, snapshot740))
-        _t1420 = _t1422
+    prediction738 = _t1419
+    if prediction738 == 3
+        _t1425 = parse_snapshot(parser)
+        snapshot742 = _t1425
+        _t1426 = Proto.Write(write_type=OneOf(:snapshot, snapshot742))
+        _t1424 = _t1426
     else
-        if prediction736 == 2
-            _t1424 = parse_context(parser)
-            context739 = _t1424
-            _t1425 = Proto.Write(write_type=OneOf(:context, context739))
-            _t1423 = _t1425
+        if prediction738 == 2
+            _t1428 = parse_context(parser)
+            context741 = _t1428
+            _t1429 = Proto.Write(write_type=OneOf(:context, context741))
+            _t1427 = _t1429
         else
-            if prediction736 == 1
-                _t1427 = parse_undefine(parser)
-                undefine738 = _t1427
-                _t1428 = Proto.Write(write_type=OneOf(:undefine, undefine738))
-                _t1426 = _t1428
+            if prediction738 == 1
+                _t1431 = parse_undefine(parser)
+                undefine740 = _t1431
+                _t1432 = Proto.Write(write_type=OneOf(:undefine, undefine740))
+                _t1430 = _t1432
             else
-                if prediction736 == 0
-                    _t1430 = parse_define(parser)
-                    define737 = _t1430
-                    _t1431 = Proto.Write(write_type=OneOf(:define, define737))
-                    _t1429 = _t1431
+                if prediction738 == 0
+                    _t1434 = parse_define(parser)
+                    define739 = _t1434
+                    _t1435 = Proto.Write(write_type=OneOf(:define, define739))
+                    _t1433 = _t1435
                 else
                     throw(ParseError("Unexpected token in write" * ": " * string(lookahead(parser, 0))))
                 end
-                _t1426 = _t1429
+                _t1430 = _t1433
             end
-            _t1423 = _t1426
+            _t1427 = _t1430
         end
-        _t1420 = _t1423
+        _t1424 = _t1427
     end
-    result742 = _t1420
-    record_span!(parser, span_start741, "Write")
-    return result742
+    result744 = _t1424
+    record_span!(parser, span_start743, "Write")
+    return result744
 end
 
 function parse_define(parser::ParserState)::Proto.Define
-    span_start744 = span_start(parser)
+    span_start746 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "define")
-    _t1432 = parse_fragment(parser)
-    fragment743 = _t1432
+    _t1436 = parse_fragment(parser)
+    fragment745 = _t1436
     consume_literal!(parser, ")")
-    _t1433 = Proto.Define(fragment=fragment743)
-    result745 = _t1433
-    record_span!(parser, span_start744, "Define")
-    return result745
+    _t1437 = Proto.Define(fragment=fragment745)
+    result747 = _t1437
+    record_span!(parser, span_start746, "Define")
+    return result747
 end
 
 function parse_fragment(parser::ParserState)::Proto.Fragment
-    span_start751 = span_start(parser)
+    span_start753 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "fragment")
-    _t1434 = parse_new_fragment_id(parser)
-    new_fragment_id746 = _t1434
-    xs747 = Proto.Declaration[]
-    cond748 = match_lookahead_literal(parser, "(", 0)
-    while cond748
-        _t1435 = parse_declaration(parser)
-        item749 = _t1435
-        push!(xs747, item749)
-        cond748 = match_lookahead_literal(parser, "(", 0)
+    _t1438 = parse_new_fragment_id(parser)
+    new_fragment_id748 = _t1438
+    xs749 = Proto.Declaration[]
+    cond750 = match_lookahead_literal(parser, "(", 0)
+    while cond750
+        _t1439 = parse_declaration(parser)
+        item751 = _t1439
+        push!(xs749, item751)
+        cond750 = match_lookahead_literal(parser, "(", 0)
     end
-    declarations750 = xs747
+    declarations752 = xs749
     consume_literal!(parser, ")")
-    result752 = construct_fragment(parser, new_fragment_id746, declarations750)
-    record_span!(parser, span_start751, "Fragment")
-    return result752
+    result754 = construct_fragment(parser, new_fragment_id748, declarations752)
+    record_span!(parser, span_start753, "Fragment")
+    return result754
 end
 
 function parse_new_fragment_id(parser::ParserState)::Proto.FragmentId
-    span_start754 = span_start(parser)
-    _t1436 = parse_fragment_id(parser)
-    fragment_id753 = _t1436
-    start_fragment!(parser, fragment_id753)
-    result755 = fragment_id753
-    record_span!(parser, span_start754, "FragmentId")
-    return result755
+    span_start756 = span_start(parser)
+    _t1440 = parse_fragment_id(parser)
+    fragment_id755 = _t1440
+    start_fragment!(parser, fragment_id755)
+    result757 = fragment_id755
+    record_span!(parser, span_start756, "FragmentId")
+    return result757
 end
 
 function parse_declaration(parser::ParserState)::Proto.Declaration
-    span_start761 = span_start(parser)
+    span_start763 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "iceberg_data", 1)
-            _t1438 = 3
+            _t1442 = 3
         else
             if match_lookahead_literal(parser, "functional_dependency", 1)
-                _t1439 = 2
+                _t1443 = 2
             else
                 if match_lookahead_literal(parser, "edb", 1)
-                    _t1440 = 3
+                    _t1444 = 3
                 else
                     if match_lookahead_literal(parser, "def", 1)
-                        _t1441 = 0
+                        _t1445 = 0
                     else
                         if match_lookahead_literal(parser, "csv_data", 1)
-                            _t1442 = 3
+                            _t1446 = 3
                         else
                             if match_lookahead_literal(parser, "betree_relation", 1)
-                                _t1443 = 3
+                                _t1447 = 3
                             else
                                 if match_lookahead_literal(parser, "algorithm", 1)
-                                    _t1444 = 1
+                                    _t1448 = 1
                                 else
-                                    _t1444 = -1
+                                    _t1448 = -1
                                 end
-                                _t1443 = _t1444
+                                _t1447 = _t1448
                             end
-                            _t1442 = _t1443
+                            _t1446 = _t1447
                         end
-                        _t1441 = _t1442
+                        _t1445 = _t1446
                     end
-                    _t1440 = _t1441
+                    _t1444 = _t1445
                 end
-                _t1439 = _t1440
+                _t1443 = _t1444
             end
-            _t1438 = _t1439
+            _t1442 = _t1443
         end
-        _t1437 = _t1438
+        _t1441 = _t1442
     else
-        _t1437 = -1
+        _t1441 = -1
     end
-    prediction756 = _t1437
-    if prediction756 == 3
-        _t1446 = parse_data(parser)
-        data760 = _t1446
-        _t1447 = Proto.Declaration(declaration_type=OneOf(:data, data760))
-        _t1445 = _t1447
+    prediction758 = _t1441
+    if prediction758 == 3
+        _t1450 = parse_data(parser)
+        data762 = _t1450
+        _t1451 = Proto.Declaration(declaration_type=OneOf(:data, data762))
+        _t1449 = _t1451
     else
-        if prediction756 == 2
-            _t1449 = parse_constraint(parser)
-            constraint759 = _t1449
-            _t1450 = Proto.Declaration(declaration_type=OneOf(:constraint, constraint759))
-            _t1448 = _t1450
+        if prediction758 == 2
+            _t1453 = parse_constraint(parser)
+            constraint761 = _t1453
+            _t1454 = Proto.Declaration(declaration_type=OneOf(:constraint, constraint761))
+            _t1452 = _t1454
         else
-            if prediction756 == 1
-                _t1452 = parse_algorithm(parser)
-                algorithm758 = _t1452
-                _t1453 = Proto.Declaration(declaration_type=OneOf(:algorithm, algorithm758))
-                _t1451 = _t1453
+            if prediction758 == 1
+                _t1456 = parse_algorithm(parser)
+                algorithm760 = _t1456
+                _t1457 = Proto.Declaration(declaration_type=OneOf(:algorithm, algorithm760))
+                _t1455 = _t1457
             else
-                if prediction756 == 0
-                    _t1455 = parse_def(parser)
-                    def757 = _t1455
-                    _t1456 = Proto.Declaration(declaration_type=OneOf(:def, def757))
-                    _t1454 = _t1456
+                if prediction758 == 0
+                    _t1459 = parse_def(parser)
+                    def759 = _t1459
+                    _t1460 = Proto.Declaration(declaration_type=OneOf(:def, def759))
+                    _t1458 = _t1460
                 else
                     throw(ParseError("Unexpected token in declaration" * ": " * string(lookahead(parser, 0))))
                 end
-                _t1451 = _t1454
+                _t1455 = _t1458
             end
-            _t1448 = _t1451
+            _t1452 = _t1455
         end
-        _t1445 = _t1448
+        _t1449 = _t1452
     end
-    result762 = _t1445
-    record_span!(parser, span_start761, "Declaration")
-    return result762
+    result764 = _t1449
+    record_span!(parser, span_start763, "Declaration")
+    return result764
 end
 
 function parse_def(parser::ParserState)::Proto.Def
-    span_start766 = span_start(parser)
+    span_start768 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "def")
-    _t1457 = parse_relation_id(parser)
-    relation_id763 = _t1457
-    _t1458 = parse_abstraction(parser)
-    abstraction764 = _t1458
+    _t1461 = parse_relation_id(parser)
+    relation_id765 = _t1461
+    _t1462 = parse_abstraction(parser)
+    abstraction766 = _t1462
     if match_lookahead_literal(parser, "(", 0)
-        _t1460 = parse_attrs(parser)
-        _t1459 = _t1460
+        _t1464 = parse_attrs(parser)
+        _t1463 = _t1464
     else
-        _t1459 = nothing
+        _t1463 = nothing
     end
-    attrs765 = _t1459
+    attrs767 = _t1463
     consume_literal!(parser, ")")
-    _t1461 = Proto.Def(name=relation_id763, body=abstraction764, attrs=(!isnothing(attrs765) ? attrs765 : Proto.Attribute[]))
-    result767 = _t1461
-    record_span!(parser, span_start766, "Def")
-    return result767
+    _t1465 = Proto.Def(name=relation_id765, body=abstraction766, attrs=(!isnothing(attrs767) ? attrs767 : Proto.Attribute[]))
+    result769 = _t1465
+    record_span!(parser, span_start768, "Def")
+    return result769
 end
 
 function parse_relation_id(parser::ParserState)::Proto.RelationId
-    span_start771 = span_start(parser)
+    span_start773 = span_start(parser)
     if match_lookahead_literal(parser, ":", 0)
-        _t1462 = 0
+        _t1466 = 0
     else
         if match_lookahead_terminal(parser, "UINT128", 0)
-            _t1463 = 1
+            _t1467 = 1
         else
-            _t1463 = -1
+            _t1467 = -1
         end
-        _t1462 = _t1463
+        _t1466 = _t1467
     end
-    prediction768 = _t1462
-    if prediction768 == 1
-        uint128770 = consume_terminal!(parser, "UINT128")
-        _t1464 = Proto.RelationId(uint128770.low, uint128770.high)
+    prediction770 = _t1466
+    if prediction770 == 1
+        uint128772 = consume_terminal!(parser, "UINT128")
+        _t1468 = Proto.RelationId(uint128772.low, uint128772.high)
     else
-        if prediction768 == 0
+        if prediction770 == 0
             consume_literal!(parser, ":")
-            symbol769 = consume_terminal!(parser, "SYMBOL")
-            _t1465 = relation_id_from_string(parser, symbol769)
+            symbol771 = consume_terminal!(parser, "SYMBOL")
+            _t1469 = relation_id_from_string(parser, symbol771)
         else
             throw(ParseError("Unexpected token in relation_id" * ": " * string(lookahead(parser, 0))))
         end
-        _t1464 = _t1465
+        _t1468 = _t1469
     end
-    result772 = _t1464
-    record_span!(parser, span_start771, "RelationId")
-    return result772
+    result774 = _t1468
+    record_span!(parser, span_start773, "RelationId")
+    return result774
 end
 
 function parse_abstraction(parser::ParserState)::Proto.Abstraction
-    span_start775 = span_start(parser)
+    span_start777 = span_start(parser)
     consume_literal!(parser, "(")
-    _t1466 = parse_bindings(parser)
-    bindings773 = _t1466
-    _t1467 = parse_formula(parser)
-    formula774 = _t1467
+    _t1470 = parse_bindings(parser)
+    bindings775 = _t1470
+    _t1471 = parse_formula(parser)
+    formula776 = _t1471
     consume_literal!(parser, ")")
-    _t1468 = Proto.Abstraction(vars=vcat(bindings773[1], !isnothing(bindings773[2]) ? bindings773[2] : []), value=formula774)
-    result776 = _t1468
-    record_span!(parser, span_start775, "Abstraction")
-    return result776
+    _t1472 = Proto.Abstraction(vars=vcat(bindings775[1], !isnothing(bindings775[2]) ? bindings775[2] : []), value=formula776)
+    result778 = _t1472
+    record_span!(parser, span_start777, "Abstraction")
+    return result778
 end
 
 function parse_bindings(parser::ParserState)::Tuple{Vector{Proto.Binding}, Vector{Proto.Binding}}
     consume_literal!(parser, "[")
-    xs777 = Proto.Binding[]
-    cond778 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    while cond778
-        _t1469 = parse_binding(parser)
-        item779 = _t1469
-        push!(xs777, item779)
-        cond778 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    xs779 = Proto.Binding[]
+    cond780 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    while cond780
+        _t1473 = parse_binding(parser)
+        item781 = _t1473
+        push!(xs779, item781)
+        cond780 = match_lookahead_terminal(parser, "SYMBOL", 0)
     end
-    bindings780 = xs777
+    bindings782 = xs779
     if match_lookahead_literal(parser, "|", 0)
-        _t1471 = parse_value_bindings(parser)
-        _t1470 = _t1471
+        _t1475 = parse_value_bindings(parser)
+        _t1474 = _t1475
     else
-        _t1470 = nothing
+        _t1474 = nothing
     end
-    value_bindings781 = _t1470
+    value_bindings783 = _t1474
     consume_literal!(parser, "]")
-    return (bindings780, (!isnothing(value_bindings781) ? value_bindings781 : Proto.Binding[]),)
+    return (bindings782, (!isnothing(value_bindings783) ? value_bindings783 : Proto.Binding[]),)
 end
 
 function parse_binding(parser::ParserState)::Proto.Binding
-    span_start784 = span_start(parser)
-    symbol782 = consume_terminal!(parser, "SYMBOL")
+    span_start786 = span_start(parser)
+    symbol784 = consume_terminal!(parser, "SYMBOL")
     consume_literal!(parser, "::")
-    _t1472 = parse_type(parser)
-    type783 = _t1472
-    _t1473 = Proto.Var(name=symbol782)
-    _t1474 = Proto.Binding(var=_t1473, var"#type"=type783)
-    result785 = _t1474
-    record_span!(parser, span_start784, "Binding")
-    return result785
+    _t1476 = parse_type(parser)
+    type785 = _t1476
+    _t1477 = Proto.Var(name=symbol784)
+    _t1478 = Proto.Binding(var=_t1477, var"#type"=type785)
+    result787 = _t1478
+    record_span!(parser, span_start786, "Binding")
+    return result787
 end
 
 function parse_type(parser::ParserState)::Proto.var"#Type"
-    span_start801 = span_start(parser)
+    span_start803 = span_start(parser)
     if match_lookahead_literal(parser, "UNKNOWN", 0)
-        _t1475 = 0
+        _t1479 = 0
     else
         if match_lookahead_literal(parser, "UINT32", 0)
-            _t1476 = 13
+            _t1480 = 13
         else
             if match_lookahead_literal(parser, "UINT128", 0)
-                _t1477 = 4
+                _t1481 = 4
             else
                 if match_lookahead_literal(parser, "STRING", 0)
-                    _t1478 = 1
+                    _t1482 = 1
                 else
                     if match_lookahead_literal(parser, "MISSING", 0)
-                        _t1479 = 8
+                        _t1483 = 8
                     else
                         if match_lookahead_literal(parser, "INT32", 0)
-                            _t1480 = 11
+                            _t1484 = 11
                         else
                             if match_lookahead_literal(parser, "INT128", 0)
-                                _t1481 = 5
+                                _t1485 = 5
                             else
                                 if match_lookahead_literal(parser, "INT", 0)
-                                    _t1482 = 2
+                                    _t1486 = 2
                                 else
                                     if match_lookahead_literal(parser, "FLOAT32", 0)
-                                        _t1483 = 12
+                                        _t1487 = 12
                                     else
                                         if match_lookahead_literal(parser, "FLOAT", 0)
-                                            _t1484 = 3
+                                            _t1488 = 3
                                         else
                                             if match_lookahead_literal(parser, "DATETIME", 0)
-                                                _t1485 = 7
+                                                _t1489 = 7
                                             else
                                                 if match_lookahead_literal(parser, "DATE", 0)
-                                                    _t1486 = 6
+                                                    _t1490 = 6
                                                 else
                                                     if match_lookahead_literal(parser, "BOOLEAN", 0)
-                                                        _t1487 = 10
+                                                        _t1491 = 10
                                                     else
                                                         if match_lookahead_literal(parser, "(", 0)
-                                                            _t1488 = 9
+                                                            _t1492 = 9
                                                         else
-                                                            _t1488 = -1
+                                                            _t1492 = -1
                                                         end
-                                                        _t1487 = _t1488
+                                                        _t1491 = _t1492
                                                     end
-                                                    _t1486 = _t1487
+                                                    _t1490 = _t1491
                                                 end
-                                                _t1485 = _t1486
+                                                _t1489 = _t1490
                                             end
-                                            _t1484 = _t1485
+                                            _t1488 = _t1489
                                         end
-                                        _t1483 = _t1484
+                                        _t1487 = _t1488
                                     end
-                                    _t1482 = _t1483
+                                    _t1486 = _t1487
                                 end
-                                _t1481 = _t1482
+                                _t1485 = _t1486
                             end
-                            _t1480 = _t1481
+                            _t1484 = _t1485
                         end
-                        _t1479 = _t1480
+                        _t1483 = _t1484
                     end
-                    _t1478 = _t1479
+                    _t1482 = _t1483
                 end
-                _t1477 = _t1478
+                _t1481 = _t1482
             end
-            _t1476 = _t1477
+            _t1480 = _t1481
         end
-        _t1475 = _t1476
+        _t1479 = _t1480
     end
-    prediction786 = _t1475
-    if prediction786 == 13
-        _t1490 = parse_uint32_type(parser)
-        uint32_type800 = _t1490
-        _t1491 = Proto.var"#Type"(var"#type"=OneOf(:uint32_type, uint32_type800))
-        _t1489 = _t1491
+    prediction788 = _t1479
+    if prediction788 == 13
+        _t1494 = parse_uint32_type(parser)
+        uint32_type802 = _t1494
+        _t1495 = Proto.var"#Type"(var"#type"=OneOf(:uint32_type, uint32_type802))
+        _t1493 = _t1495
     else
-        if prediction786 == 12
-            _t1493 = parse_float32_type(parser)
-            float32_type799 = _t1493
-            _t1494 = Proto.var"#Type"(var"#type"=OneOf(:float32_type, float32_type799))
-            _t1492 = _t1494
+        if prediction788 == 12
+            _t1497 = parse_float32_type(parser)
+            float32_type801 = _t1497
+            _t1498 = Proto.var"#Type"(var"#type"=OneOf(:float32_type, float32_type801))
+            _t1496 = _t1498
         else
-            if prediction786 == 11
-                _t1496 = parse_int32_type(parser)
-                int32_type798 = _t1496
-                _t1497 = Proto.var"#Type"(var"#type"=OneOf(:int32_type, int32_type798))
-                _t1495 = _t1497
+            if prediction788 == 11
+                _t1500 = parse_int32_type(parser)
+                int32_type800 = _t1500
+                _t1501 = Proto.var"#Type"(var"#type"=OneOf(:int32_type, int32_type800))
+                _t1499 = _t1501
             else
-                if prediction786 == 10
-                    _t1499 = parse_boolean_type(parser)
-                    boolean_type797 = _t1499
-                    _t1500 = Proto.var"#Type"(var"#type"=OneOf(:boolean_type, boolean_type797))
-                    _t1498 = _t1500
+                if prediction788 == 10
+                    _t1503 = parse_boolean_type(parser)
+                    boolean_type799 = _t1503
+                    _t1504 = Proto.var"#Type"(var"#type"=OneOf(:boolean_type, boolean_type799))
+                    _t1502 = _t1504
                 else
-                    if prediction786 == 9
-                        _t1502 = parse_decimal_type(parser)
-                        decimal_type796 = _t1502
-                        _t1503 = Proto.var"#Type"(var"#type"=OneOf(:decimal_type, decimal_type796))
-                        _t1501 = _t1503
+                    if prediction788 == 9
+                        _t1506 = parse_decimal_type(parser)
+                        decimal_type798 = _t1506
+                        _t1507 = Proto.var"#Type"(var"#type"=OneOf(:decimal_type, decimal_type798))
+                        _t1505 = _t1507
                     else
-                        if prediction786 == 8
-                            _t1505 = parse_missing_type(parser)
-                            missing_type795 = _t1505
-                            _t1506 = Proto.var"#Type"(var"#type"=OneOf(:missing_type, missing_type795))
-                            _t1504 = _t1506
+                        if prediction788 == 8
+                            _t1509 = parse_missing_type(parser)
+                            missing_type797 = _t1509
+                            _t1510 = Proto.var"#Type"(var"#type"=OneOf(:missing_type, missing_type797))
+                            _t1508 = _t1510
                         else
-                            if prediction786 == 7
-                                _t1508 = parse_datetime_type(parser)
-                                datetime_type794 = _t1508
-                                _t1509 = Proto.var"#Type"(var"#type"=OneOf(:datetime_type, datetime_type794))
-                                _t1507 = _t1509
+                            if prediction788 == 7
+                                _t1512 = parse_datetime_type(parser)
+                                datetime_type796 = _t1512
+                                _t1513 = Proto.var"#Type"(var"#type"=OneOf(:datetime_type, datetime_type796))
+                                _t1511 = _t1513
                             else
-                                if prediction786 == 6
-                                    _t1511 = parse_date_type(parser)
-                                    date_type793 = _t1511
-                                    _t1512 = Proto.var"#Type"(var"#type"=OneOf(:date_type, date_type793))
-                                    _t1510 = _t1512
+                                if prediction788 == 6
+                                    _t1515 = parse_date_type(parser)
+                                    date_type795 = _t1515
+                                    _t1516 = Proto.var"#Type"(var"#type"=OneOf(:date_type, date_type795))
+                                    _t1514 = _t1516
                                 else
-                                    if prediction786 == 5
-                                        _t1514 = parse_int128_type(parser)
-                                        int128_type792 = _t1514
-                                        _t1515 = Proto.var"#Type"(var"#type"=OneOf(:int128_type, int128_type792))
-                                        _t1513 = _t1515
+                                    if prediction788 == 5
+                                        _t1518 = parse_int128_type(parser)
+                                        int128_type794 = _t1518
+                                        _t1519 = Proto.var"#Type"(var"#type"=OneOf(:int128_type, int128_type794))
+                                        _t1517 = _t1519
                                     else
-                                        if prediction786 == 4
-                                            _t1517 = parse_uint128_type(parser)
-                                            uint128_type791 = _t1517
-                                            _t1518 = Proto.var"#Type"(var"#type"=OneOf(:uint128_type, uint128_type791))
-                                            _t1516 = _t1518
+                                        if prediction788 == 4
+                                            _t1521 = parse_uint128_type(parser)
+                                            uint128_type793 = _t1521
+                                            _t1522 = Proto.var"#Type"(var"#type"=OneOf(:uint128_type, uint128_type793))
+                                            _t1520 = _t1522
                                         else
-                                            if prediction786 == 3
-                                                _t1520 = parse_float_type(parser)
-                                                float_type790 = _t1520
-                                                _t1521 = Proto.var"#Type"(var"#type"=OneOf(:float_type, float_type790))
-                                                _t1519 = _t1521
+                                            if prediction788 == 3
+                                                _t1524 = parse_float_type(parser)
+                                                float_type792 = _t1524
+                                                _t1525 = Proto.var"#Type"(var"#type"=OneOf(:float_type, float_type792))
+                                                _t1523 = _t1525
                                             else
-                                                if prediction786 == 2
-                                                    _t1523 = parse_int_type(parser)
-                                                    int_type789 = _t1523
-                                                    _t1524 = Proto.var"#Type"(var"#type"=OneOf(:int_type, int_type789))
-                                                    _t1522 = _t1524
+                                                if prediction788 == 2
+                                                    _t1527 = parse_int_type(parser)
+                                                    int_type791 = _t1527
+                                                    _t1528 = Proto.var"#Type"(var"#type"=OneOf(:int_type, int_type791))
+                                                    _t1526 = _t1528
                                                 else
-                                                    if prediction786 == 1
-                                                        _t1526 = parse_string_type(parser)
-                                                        string_type788 = _t1526
-                                                        _t1527 = Proto.var"#Type"(var"#type"=OneOf(:string_type, string_type788))
-                                                        _t1525 = _t1527
+                                                    if prediction788 == 1
+                                                        _t1530 = parse_string_type(parser)
+                                                        string_type790 = _t1530
+                                                        _t1531 = Proto.var"#Type"(var"#type"=OneOf(:string_type, string_type790))
+                                                        _t1529 = _t1531
                                                     else
-                                                        if prediction786 == 0
-                                                            _t1529 = parse_unspecified_type(parser)
-                                                            unspecified_type787 = _t1529
-                                                            _t1530 = Proto.var"#Type"(var"#type"=OneOf(:unspecified_type, unspecified_type787))
-                                                            _t1528 = _t1530
+                                                        if prediction788 == 0
+                                                            _t1533 = parse_unspecified_type(parser)
+                                                            unspecified_type789 = _t1533
+                                                            _t1534 = Proto.var"#Type"(var"#type"=OneOf(:unspecified_type, unspecified_type789))
+                                                            _t1532 = _t1534
                                                         else
                                                             throw(ParseError("Unexpected token in type" * ": " * string(lookahead(parser, 0))))
                                                         end
-                                                        _t1525 = _t1528
+                                                        _t1529 = _t1532
                                                     end
-                                                    _t1522 = _t1525
+                                                    _t1526 = _t1529
                                                 end
-                                                _t1519 = _t1522
+                                                _t1523 = _t1526
                                             end
-                                            _t1516 = _t1519
+                                            _t1520 = _t1523
                                         end
-                                        _t1513 = _t1516
+                                        _t1517 = _t1520
                                     end
-                                    _t1510 = _t1513
+                                    _t1514 = _t1517
                                 end
-                                _t1507 = _t1510
+                                _t1511 = _t1514
                             end
-                            _t1504 = _t1507
+                            _t1508 = _t1511
                         end
-                        _t1501 = _t1504
+                        _t1505 = _t1508
                     end
-                    _t1498 = _t1501
+                    _t1502 = _t1505
                 end
-                _t1495 = _t1498
+                _t1499 = _t1502
             end
-            _t1492 = _t1495
+            _t1496 = _t1499
         end
-        _t1489 = _t1492
+        _t1493 = _t1496
     end
-    result802 = _t1489
-    record_span!(parser, span_start801, "Type")
-    return result802
+    result804 = _t1493
+    record_span!(parser, span_start803, "Type")
+    return result804
 end
 
 function parse_unspecified_type(parser::ParserState)::Proto.UnspecifiedType
-    span_start803 = span_start(parser)
+    span_start805 = span_start(parser)
     consume_literal!(parser, "UNKNOWN")
-    _t1531 = Proto.UnspecifiedType()
-    result804 = _t1531
-    record_span!(parser, span_start803, "UnspecifiedType")
-    return result804
+    _t1535 = Proto.UnspecifiedType()
+    result806 = _t1535
+    record_span!(parser, span_start805, "UnspecifiedType")
+    return result806
 end
 
 function parse_string_type(parser::ParserState)::Proto.StringType
-    span_start805 = span_start(parser)
+    span_start807 = span_start(parser)
     consume_literal!(parser, "STRING")
-    _t1532 = Proto.StringType()
-    result806 = _t1532
-    record_span!(parser, span_start805, "StringType")
-    return result806
+    _t1536 = Proto.StringType()
+    result808 = _t1536
+    record_span!(parser, span_start807, "StringType")
+    return result808
 end
 
 function parse_int_type(parser::ParserState)::Proto.IntType
-    span_start807 = span_start(parser)
+    span_start809 = span_start(parser)
     consume_literal!(parser, "INT")
-    _t1533 = Proto.IntType()
-    result808 = _t1533
-    record_span!(parser, span_start807, "IntType")
-    return result808
+    _t1537 = Proto.IntType()
+    result810 = _t1537
+    record_span!(parser, span_start809, "IntType")
+    return result810
 end
 
 function parse_float_type(parser::ParserState)::Proto.FloatType
-    span_start809 = span_start(parser)
+    span_start811 = span_start(parser)
     consume_literal!(parser, "FLOAT")
-    _t1534 = Proto.FloatType()
-    result810 = _t1534
-    record_span!(parser, span_start809, "FloatType")
-    return result810
+    _t1538 = Proto.FloatType()
+    result812 = _t1538
+    record_span!(parser, span_start811, "FloatType")
+    return result812
 end
 
 function parse_uint128_type(parser::ParserState)::Proto.UInt128Type
-    span_start811 = span_start(parser)
+    span_start813 = span_start(parser)
     consume_literal!(parser, "UINT128")
-    _t1535 = Proto.UInt128Type()
-    result812 = _t1535
-    record_span!(parser, span_start811, "UInt128Type")
-    return result812
+    _t1539 = Proto.UInt128Type()
+    result814 = _t1539
+    record_span!(parser, span_start813, "UInt128Type")
+    return result814
 end
 
 function parse_int128_type(parser::ParserState)::Proto.Int128Type
-    span_start813 = span_start(parser)
+    span_start815 = span_start(parser)
     consume_literal!(parser, "INT128")
-    _t1536 = Proto.Int128Type()
-    result814 = _t1536
-    record_span!(parser, span_start813, "Int128Type")
-    return result814
+    _t1540 = Proto.Int128Type()
+    result816 = _t1540
+    record_span!(parser, span_start815, "Int128Type")
+    return result816
 end
 
 function parse_date_type(parser::ParserState)::Proto.DateType
-    span_start815 = span_start(parser)
+    span_start817 = span_start(parser)
     consume_literal!(parser, "DATE")
-    _t1537 = Proto.DateType()
-    result816 = _t1537
-    record_span!(parser, span_start815, "DateType")
-    return result816
+    _t1541 = Proto.DateType()
+    result818 = _t1541
+    record_span!(parser, span_start817, "DateType")
+    return result818
 end
 
 function parse_datetime_type(parser::ParserState)::Proto.DateTimeType
-    span_start817 = span_start(parser)
+    span_start819 = span_start(parser)
     consume_literal!(parser, "DATETIME")
-    _t1538 = Proto.DateTimeType()
-    result818 = _t1538
-    record_span!(parser, span_start817, "DateTimeType")
-    return result818
+    _t1542 = Proto.DateTimeType()
+    result820 = _t1542
+    record_span!(parser, span_start819, "DateTimeType")
+    return result820
 end
 
 function parse_missing_type(parser::ParserState)::Proto.MissingType
-    span_start819 = span_start(parser)
+    span_start821 = span_start(parser)
     consume_literal!(parser, "MISSING")
-    _t1539 = Proto.MissingType()
-    result820 = _t1539
-    record_span!(parser, span_start819, "MissingType")
-    return result820
+    _t1543 = Proto.MissingType()
+    result822 = _t1543
+    record_span!(parser, span_start821, "MissingType")
+    return result822
 end
 
 function parse_decimal_type(parser::ParserState)::Proto.DecimalType
-    span_start823 = span_start(parser)
+    span_start825 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "DECIMAL")
-    int821 = consume_terminal!(parser, "INT")
-    int_3822 = consume_terminal!(parser, "INT")
+    int823 = consume_terminal!(parser, "INT")
+    int_3824 = consume_terminal!(parser, "INT")
     consume_literal!(parser, ")")
-    _t1540 = Proto.DecimalType(precision=Int32(int821), scale=Int32(int_3822))
-    result824 = _t1540
-    record_span!(parser, span_start823, "DecimalType")
-    return result824
+    _t1544 = Proto.DecimalType(precision=Int32(int823), scale=Int32(int_3824))
+    result826 = _t1544
+    record_span!(parser, span_start825, "DecimalType")
+    return result826
 end
 
 function parse_boolean_type(parser::ParserState)::Proto.BooleanType
-    span_start825 = span_start(parser)
+    span_start827 = span_start(parser)
     consume_literal!(parser, "BOOLEAN")
-    _t1541 = Proto.BooleanType()
-    result826 = _t1541
-    record_span!(parser, span_start825, "BooleanType")
-    return result826
+    _t1545 = Proto.BooleanType()
+    result828 = _t1545
+    record_span!(parser, span_start827, "BooleanType")
+    return result828
 end
 
 function parse_int32_type(parser::ParserState)::Proto.Int32Type
-    span_start827 = span_start(parser)
+    span_start829 = span_start(parser)
     consume_literal!(parser, "INT32")
-    _t1542 = Proto.Int32Type()
-    result828 = _t1542
-    record_span!(parser, span_start827, "Int32Type")
-    return result828
+    _t1546 = Proto.Int32Type()
+    result830 = _t1546
+    record_span!(parser, span_start829, "Int32Type")
+    return result830
 end
 
 function parse_float32_type(parser::ParserState)::Proto.Float32Type
-    span_start829 = span_start(parser)
+    span_start831 = span_start(parser)
     consume_literal!(parser, "FLOAT32")
-    _t1543 = Proto.Float32Type()
-    result830 = _t1543
-    record_span!(parser, span_start829, "Float32Type")
-    return result830
+    _t1547 = Proto.Float32Type()
+    result832 = _t1547
+    record_span!(parser, span_start831, "Float32Type")
+    return result832
 end
 
 function parse_uint32_type(parser::ParserState)::Proto.UInt32Type
-    span_start831 = span_start(parser)
+    span_start833 = span_start(parser)
     consume_literal!(parser, "UINT32")
-    _t1544 = Proto.UInt32Type()
-    result832 = _t1544
-    record_span!(parser, span_start831, "UInt32Type")
-    return result832
+    _t1548 = Proto.UInt32Type()
+    result834 = _t1548
+    record_span!(parser, span_start833, "UInt32Type")
+    return result834
 end
 
 function parse_value_bindings(parser::ParserState)::Vector{Proto.Binding}
     consume_literal!(parser, "|")
-    xs833 = Proto.Binding[]
-    cond834 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    while cond834
-        _t1545 = parse_binding(parser)
-        item835 = _t1545
-        push!(xs833, item835)
-        cond834 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    xs835 = Proto.Binding[]
+    cond836 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    while cond836
+        _t1549 = parse_binding(parser)
+        item837 = _t1549
+        push!(xs835, item837)
+        cond836 = match_lookahead_terminal(parser, "SYMBOL", 0)
     end
-    bindings836 = xs833
-    return bindings836
+    bindings838 = xs835
+    return bindings838
 end
 
 function parse_formula(parser::ParserState)::Proto.Formula
-    span_start851 = span_start(parser)
+    span_start853 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "true", 1)
-            _t1547 = 0
+            _t1551 = 0
         else
             if match_lookahead_literal(parser, "relatom", 1)
-                _t1548 = 11
+                _t1552 = 11
             else
                 if match_lookahead_literal(parser, "reduce", 1)
-                    _t1549 = 3
+                    _t1553 = 3
                 else
                     if match_lookahead_literal(parser, "primitive", 1)
-                        _t1550 = 10
+                        _t1554 = 10
                     else
                         if match_lookahead_literal(parser, "pragma", 1)
-                            _t1551 = 9
+                            _t1555 = 9
                         else
                             if match_lookahead_literal(parser, "or", 1)
-                                _t1552 = 5
+                                _t1556 = 5
                             else
                                 if match_lookahead_literal(parser, "not", 1)
-                                    _t1553 = 6
+                                    _t1557 = 6
                                 else
                                     if match_lookahead_literal(parser, "ffi", 1)
-                                        _t1554 = 7
+                                        _t1558 = 7
                                     else
                                         if match_lookahead_literal(parser, "false", 1)
-                                            _t1555 = 1
+                                            _t1559 = 1
                                         else
                                             if match_lookahead_literal(parser, "exists", 1)
-                                                _t1556 = 2
+                                                _t1560 = 2
                                             else
                                                 if match_lookahead_literal(parser, "cast", 1)
-                                                    _t1557 = 12
+                                                    _t1561 = 12
                                                 else
                                                     if match_lookahead_literal(parser, "atom", 1)
-                                                        _t1558 = 8
+                                                        _t1562 = 8
                                                     else
                                                         if match_lookahead_literal(parser, "and", 1)
-                                                            _t1559 = 4
+                                                            _t1563 = 4
                                                         else
                                                             if match_lookahead_literal(parser, ">=", 1)
-                                                                _t1560 = 10
+                                                                _t1564 = 10
                                                             else
                                                                 if match_lookahead_literal(parser, ">", 1)
-                                                                    _t1561 = 10
+                                                                    _t1565 = 10
                                                                 else
                                                                     if match_lookahead_literal(parser, "=", 1)
-                                                                        _t1562 = 10
+                                                                        _t1566 = 10
                                                                     else
                                                                         if match_lookahead_literal(parser, "<=", 1)
-                                                                            _t1563 = 10
+                                                                            _t1567 = 10
                                                                         else
                                                                             if match_lookahead_literal(parser, "<", 1)
-                                                                                _t1564 = 10
+                                                                                _t1568 = 10
                                                                             else
                                                                                 if match_lookahead_literal(parser, "/", 1)
-                                                                                    _t1565 = 10
+                                                                                    _t1569 = 10
                                                                                 else
                                                                                     if match_lookahead_literal(parser, "-", 1)
-                                                                                        _t1566 = 10
+                                                                                        _t1570 = 10
                                                                                     else
                                                                                         if match_lookahead_literal(parser, "+", 1)
-                                                                                            _t1567 = 10
+                                                                                            _t1571 = 10
                                                                                         else
                                                                                             if match_lookahead_literal(parser, "*", 1)
-                                                                                                _t1568 = 10
+                                                                                                _t1572 = 10
                                                                                             else
-                                                                                                _t1568 = -1
+                                                                                                _t1572 = -1
                                                                                             end
-                                                                                            _t1567 = _t1568
+                                                                                            _t1571 = _t1572
                                                                                         end
-                                                                                        _t1566 = _t1567
+                                                                                        _t1570 = _t1571
                                                                                     end
-                                                                                    _t1565 = _t1566
+                                                                                    _t1569 = _t1570
                                                                                 end
-                                                                                _t1564 = _t1565
+                                                                                _t1568 = _t1569
                                                                             end
-                                                                            _t1563 = _t1564
+                                                                            _t1567 = _t1568
                                                                         end
-                                                                        _t1562 = _t1563
+                                                                        _t1566 = _t1567
                                                                     end
-                                                                    _t1561 = _t1562
+                                                                    _t1565 = _t1566
                                                                 end
-                                                                _t1560 = _t1561
+                                                                _t1564 = _t1565
                                                             end
-                                                            _t1559 = _t1560
+                                                            _t1563 = _t1564
                                                         end
-                                                        _t1558 = _t1559
+                                                        _t1562 = _t1563
                                                     end
-                                                    _t1557 = _t1558
+                                                    _t1561 = _t1562
                                                 end
-                                                _t1556 = _t1557
+                                                _t1560 = _t1561
                                             end
-                                            _t1555 = _t1556
+                                            _t1559 = _t1560
                                         end
-                                        _t1554 = _t1555
+                                        _t1558 = _t1559
                                     end
-                                    _t1553 = _t1554
+                                    _t1557 = _t1558
                                 end
-                                _t1552 = _t1553
+                                _t1556 = _t1557
                             end
-                            _t1551 = _t1552
+                            _t1555 = _t1556
                         end
-                        _t1550 = _t1551
+                        _t1554 = _t1555
                     end
-                    _t1549 = _t1550
+                    _t1553 = _t1554
                 end
-                _t1548 = _t1549
+                _t1552 = _t1553
             end
-            _t1547 = _t1548
+            _t1551 = _t1552
         end
-        _t1546 = _t1547
+        _t1550 = _t1551
     else
-        _t1546 = -1
+        _t1550 = -1
     end
-    prediction837 = _t1546
-    if prediction837 == 12
-        _t1570 = parse_cast(parser)
-        cast850 = _t1570
-        _t1571 = Proto.Formula(formula_type=OneOf(:cast, cast850))
-        _t1569 = _t1571
+    prediction839 = _t1550
+    if prediction839 == 12
+        _t1574 = parse_cast(parser)
+        cast852 = _t1574
+        _t1575 = Proto.Formula(formula_type=OneOf(:cast, cast852))
+        _t1573 = _t1575
     else
-        if prediction837 == 11
-            _t1573 = parse_rel_atom(parser)
-            rel_atom849 = _t1573
-            _t1574 = Proto.Formula(formula_type=OneOf(:rel_atom, rel_atom849))
-            _t1572 = _t1574
+        if prediction839 == 11
+            _t1577 = parse_rel_atom(parser)
+            rel_atom851 = _t1577
+            _t1578 = Proto.Formula(formula_type=OneOf(:rel_atom, rel_atom851))
+            _t1576 = _t1578
         else
-            if prediction837 == 10
-                _t1576 = parse_primitive(parser)
-                primitive848 = _t1576
-                _t1577 = Proto.Formula(formula_type=OneOf(:primitive, primitive848))
-                _t1575 = _t1577
+            if prediction839 == 10
+                _t1580 = parse_primitive(parser)
+                primitive850 = _t1580
+                _t1581 = Proto.Formula(formula_type=OneOf(:primitive, primitive850))
+                _t1579 = _t1581
             else
-                if prediction837 == 9
-                    _t1579 = parse_pragma(parser)
-                    pragma847 = _t1579
-                    _t1580 = Proto.Formula(formula_type=OneOf(:pragma, pragma847))
-                    _t1578 = _t1580
+                if prediction839 == 9
+                    _t1583 = parse_pragma(parser)
+                    pragma849 = _t1583
+                    _t1584 = Proto.Formula(formula_type=OneOf(:pragma, pragma849))
+                    _t1582 = _t1584
                 else
-                    if prediction837 == 8
-                        _t1582 = parse_atom(parser)
-                        atom846 = _t1582
-                        _t1583 = Proto.Formula(formula_type=OneOf(:atom, atom846))
-                        _t1581 = _t1583
+                    if prediction839 == 8
+                        _t1586 = parse_atom(parser)
+                        atom848 = _t1586
+                        _t1587 = Proto.Formula(formula_type=OneOf(:atom, atom848))
+                        _t1585 = _t1587
                     else
-                        if prediction837 == 7
-                            _t1585 = parse_ffi(parser)
-                            ffi845 = _t1585
-                            _t1586 = Proto.Formula(formula_type=OneOf(:ffi, ffi845))
-                            _t1584 = _t1586
+                        if prediction839 == 7
+                            _t1589 = parse_ffi(parser)
+                            ffi847 = _t1589
+                            _t1590 = Proto.Formula(formula_type=OneOf(:ffi, ffi847))
+                            _t1588 = _t1590
                         else
-                            if prediction837 == 6
-                                _t1588 = parse_not(parser)
-                                not844 = _t1588
-                                _t1589 = Proto.Formula(formula_type=OneOf(:not, not844))
-                                _t1587 = _t1589
+                            if prediction839 == 6
+                                _t1592 = parse_not(parser)
+                                not846 = _t1592
+                                _t1593 = Proto.Formula(formula_type=OneOf(:not, not846))
+                                _t1591 = _t1593
                             else
-                                if prediction837 == 5
-                                    _t1591 = parse_disjunction(parser)
-                                    disjunction843 = _t1591
-                                    _t1592 = Proto.Formula(formula_type=OneOf(:disjunction, disjunction843))
-                                    _t1590 = _t1592
+                                if prediction839 == 5
+                                    _t1595 = parse_disjunction(parser)
+                                    disjunction845 = _t1595
+                                    _t1596 = Proto.Formula(formula_type=OneOf(:disjunction, disjunction845))
+                                    _t1594 = _t1596
                                 else
-                                    if prediction837 == 4
-                                        _t1594 = parse_conjunction(parser)
-                                        conjunction842 = _t1594
-                                        _t1595 = Proto.Formula(formula_type=OneOf(:conjunction, conjunction842))
-                                        _t1593 = _t1595
+                                    if prediction839 == 4
+                                        _t1598 = parse_conjunction(parser)
+                                        conjunction844 = _t1598
+                                        _t1599 = Proto.Formula(formula_type=OneOf(:conjunction, conjunction844))
+                                        _t1597 = _t1599
                                     else
-                                        if prediction837 == 3
-                                            _t1597 = parse_reduce(parser)
-                                            reduce841 = _t1597
-                                            _t1598 = Proto.Formula(formula_type=OneOf(:reduce, reduce841))
-                                            _t1596 = _t1598
+                                        if prediction839 == 3
+                                            _t1601 = parse_reduce(parser)
+                                            reduce843 = _t1601
+                                            _t1602 = Proto.Formula(formula_type=OneOf(:reduce, reduce843))
+                                            _t1600 = _t1602
                                         else
-                                            if prediction837 == 2
-                                                _t1600 = parse_exists(parser)
-                                                exists840 = _t1600
-                                                _t1601 = Proto.Formula(formula_type=OneOf(:exists, exists840))
-                                                _t1599 = _t1601
+                                            if prediction839 == 2
+                                                _t1604 = parse_exists(parser)
+                                                exists842 = _t1604
+                                                _t1605 = Proto.Formula(formula_type=OneOf(:exists, exists842))
+                                                _t1603 = _t1605
                                             else
-                                                if prediction837 == 1
-                                                    _t1603 = parse_false(parser)
-                                                    false839 = _t1603
-                                                    _t1604 = Proto.Formula(formula_type=OneOf(:disjunction, false839))
-                                                    _t1602 = _t1604
+                                                if prediction839 == 1
+                                                    _t1607 = parse_false(parser)
+                                                    false841 = _t1607
+                                                    _t1608 = Proto.Formula(formula_type=OneOf(:disjunction, false841))
+                                                    _t1606 = _t1608
                                                 else
-                                                    if prediction837 == 0
-                                                        _t1606 = parse_true(parser)
-                                                        true838 = _t1606
-                                                        _t1607 = Proto.Formula(formula_type=OneOf(:conjunction, true838))
-                                                        _t1605 = _t1607
+                                                    if prediction839 == 0
+                                                        _t1610 = parse_true(parser)
+                                                        true840 = _t1610
+                                                        _t1611 = Proto.Formula(formula_type=OneOf(:conjunction, true840))
+                                                        _t1609 = _t1611
                                                     else
                                                         throw(ParseError("Unexpected token in formula" * ": " * string(lookahead(parser, 0))))
                                                     end
-                                                    _t1602 = _t1605
+                                                    _t1606 = _t1609
                                                 end
-                                                _t1599 = _t1602
+                                                _t1603 = _t1606
                                             end
-                                            _t1596 = _t1599
+                                            _t1600 = _t1603
                                         end
-                                        _t1593 = _t1596
+                                        _t1597 = _t1600
                                     end
-                                    _t1590 = _t1593
+                                    _t1594 = _t1597
                                 end
-                                _t1587 = _t1590
+                                _t1591 = _t1594
                             end
-                            _t1584 = _t1587
+                            _t1588 = _t1591
                         end
-                        _t1581 = _t1584
+                        _t1585 = _t1588
                     end
-                    _t1578 = _t1581
+                    _t1582 = _t1585
                 end
-                _t1575 = _t1578
+                _t1579 = _t1582
             end
-            _t1572 = _t1575
+            _t1576 = _t1579
         end
-        _t1569 = _t1572
+        _t1573 = _t1576
     end
-    result852 = _t1569
-    record_span!(parser, span_start851, "Formula")
-    return result852
+    result854 = _t1573
+    record_span!(parser, span_start853, "Formula")
+    return result854
 end
 
 function parse_true(parser::ParserState)::Proto.Conjunction
-    span_start853 = span_start(parser)
+    span_start855 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "true")
     consume_literal!(parser, ")")
-    _t1608 = Proto.Conjunction(args=Proto.Formula[])
-    result854 = _t1608
-    record_span!(parser, span_start853, "Conjunction")
-    return result854
+    _t1612 = Proto.Conjunction(args=Proto.Formula[])
+    result856 = _t1612
+    record_span!(parser, span_start855, "Conjunction")
+    return result856
 end
 
 function parse_false(parser::ParserState)::Proto.Disjunction
-    span_start855 = span_start(parser)
+    span_start857 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "false")
     consume_literal!(parser, ")")
-    _t1609 = Proto.Disjunction(args=Proto.Formula[])
-    result856 = _t1609
-    record_span!(parser, span_start855, "Disjunction")
-    return result856
+    _t1613 = Proto.Disjunction(args=Proto.Formula[])
+    result858 = _t1613
+    record_span!(parser, span_start857, "Disjunction")
+    return result858
 end
 
 function parse_exists(parser::ParserState)::Proto.Exists
-    span_start859 = span_start(parser)
+    span_start861 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "exists")
-    _t1610 = parse_bindings(parser)
-    bindings857 = _t1610
-    _t1611 = parse_formula(parser)
-    formula858 = _t1611
+    _t1614 = parse_bindings(parser)
+    bindings859 = _t1614
+    _t1615 = parse_formula(parser)
+    formula860 = _t1615
     consume_literal!(parser, ")")
-    _t1612 = Proto.Abstraction(vars=vcat(bindings857[1], !isnothing(bindings857[2]) ? bindings857[2] : []), value=formula858)
-    _t1613 = Proto.Exists(body=_t1612)
-    result860 = _t1613
-    record_span!(parser, span_start859, "Exists")
-    return result860
+    _t1616 = Proto.Abstraction(vars=vcat(bindings859[1], !isnothing(bindings859[2]) ? bindings859[2] : []), value=formula860)
+    _t1617 = Proto.Exists(body=_t1616)
+    result862 = _t1617
+    record_span!(parser, span_start861, "Exists")
+    return result862
 end
 
 function parse_reduce(parser::ParserState)::Proto.Reduce
-    span_start864 = span_start(parser)
+    span_start866 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "reduce")
-    _t1614 = parse_abstraction(parser)
-    abstraction861 = _t1614
-    _t1615 = parse_abstraction(parser)
-    abstraction_3862 = _t1615
-    _t1616 = parse_terms(parser)
-    terms863 = _t1616
+    _t1618 = parse_abstraction(parser)
+    abstraction863 = _t1618
+    _t1619 = parse_abstraction(parser)
+    abstraction_3864 = _t1619
+    _t1620 = parse_terms(parser)
+    terms865 = _t1620
     consume_literal!(parser, ")")
-    _t1617 = Proto.Reduce(op=abstraction861, body=abstraction_3862, terms=terms863)
-    result865 = _t1617
-    record_span!(parser, span_start864, "Reduce")
-    return result865
+    _t1621 = Proto.Reduce(op=abstraction863, body=abstraction_3864, terms=terms865)
+    result867 = _t1621
+    record_span!(parser, span_start866, "Reduce")
+    return result867
 end
 
 function parse_terms(parser::ParserState)::Vector{Proto.Term}
     consume_literal!(parser, "(")
     consume_literal!(parser, "terms")
-    xs866 = Proto.Term[]
-    cond867 = (((((((((((((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 cond867
-        _t1618 = parse_term(parser)
-        item868 = _t1618
-        push!(xs866, item868)
-        cond867 = (((((((((((((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))
+    xs868 = Proto.Term[]
+    cond869 = (((((((((((((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 cond869
+        _t1622 = parse_term(parser)
+        item870 = _t1622
+        push!(xs868, item870)
+        cond869 = (((((((((((((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
-    terms869 = xs866
+    terms871 = xs868
     consume_literal!(parser, ")")
-    return terms869
+    return terms871
 end
 
 function parse_term(parser::ParserState)::Proto.Term
-    span_start873 = span_start(parser)
+    span_start875 = span_start(parser)
     if match_lookahead_literal(parser, "true", 0)
-        _t1619 = 1
+        _t1623 = 1
     else
         if match_lookahead_literal(parser, "missing", 0)
-            _t1620 = 1
+            _t1624 = 1
         else
             if match_lookahead_literal(parser, "false", 0)
-                _t1621 = 1
+                _t1625 = 1
             else
                 if match_lookahead_literal(parser, "(", 0)
-                    _t1622 = 1
+                    _t1626 = 1
                 else
                     if match_lookahead_terminal(parser, "SYMBOL", 0)
-                        _t1623 = 0
+                        _t1627 = 0
                     else
                         if match_lookahead_terminal(parser, "UINT32", 0)
-                            _t1624 = 1
+                            _t1628 = 1
                         else
                             if match_lookahead_terminal(parser, "UINT128", 0)
-                                _t1625 = 1
+                                _t1629 = 1
                             else
                                 if match_lookahead_terminal(parser, "STRING", 0)
-                                    _t1626 = 1
+                                    _t1630 = 1
                                 else
                                     if match_lookahead_terminal(parser, "INT32", 0)
-                                        _t1627 = 1
+                                        _t1631 = 1
                                     else
                                         if match_lookahead_terminal(parser, "INT128", 0)
-                                            _t1628 = 1
+                                            _t1632 = 1
                                         else
                                             if match_lookahead_terminal(parser, "INT", 0)
-                                                _t1629 = 1
+                                                _t1633 = 1
                                             else
                                                 if match_lookahead_terminal(parser, "FLOAT32", 0)
-                                                    _t1630 = 1
+                                                    _t1634 = 1
                                                 else
                                                     if match_lookahead_terminal(parser, "FLOAT", 0)
-                                                        _t1631 = 1
+                                                        _t1635 = 1
                                                     else
                                                         if match_lookahead_terminal(parser, "DECIMAL", 0)
-                                                            _t1632 = 1
+                                                            _t1636 = 1
                                                         else
-                                                            _t1632 = -1
+                                                            _t1636 = -1
                                                         end
-                                                        _t1631 = _t1632
+                                                        _t1635 = _t1636
                                                     end
-                                                    _t1630 = _t1631
+                                                    _t1634 = _t1635
                                                 end
-                                                _t1629 = _t1630
+                                                _t1633 = _t1634
                                             end
-                                            _t1628 = _t1629
+                                            _t1632 = _t1633
                                         end
-                                        _t1627 = _t1628
+                                        _t1631 = _t1632
                                     end
-                                    _t1626 = _t1627
+                                    _t1630 = _t1631
                                 end
-                                _t1625 = _t1626
+                                _t1629 = _t1630
                             end
-                            _t1624 = _t1625
+                            _t1628 = _t1629
                         end
-                        _t1623 = _t1624
+                        _t1627 = _t1628
                     end
-                    _t1622 = _t1623
+                    _t1626 = _t1627
                 end
-                _t1621 = _t1622
+                _t1625 = _t1626
             end
-            _t1620 = _t1621
+            _t1624 = _t1625
         end
-        _t1619 = _t1620
+        _t1623 = _t1624
     end
-    prediction870 = _t1619
-    if prediction870 == 1
-        _t1634 = parse_value(parser)
-        value872 = _t1634
-        _t1635 = Proto.Term(term_type=OneOf(:constant, value872))
-        _t1633 = _t1635
+    prediction872 = _t1623
+    if prediction872 == 1
+        _t1638 = parse_value(parser)
+        value874 = _t1638
+        _t1639 = Proto.Term(term_type=OneOf(:constant, value874))
+        _t1637 = _t1639
     else
-        if prediction870 == 0
-            _t1637 = parse_var(parser)
-            var871 = _t1637
-            _t1638 = Proto.Term(term_type=OneOf(:var, var871))
-            _t1636 = _t1638
+        if prediction872 == 0
+            _t1641 = parse_var(parser)
+            var873 = _t1641
+            _t1642 = Proto.Term(term_type=OneOf(:var, var873))
+            _t1640 = _t1642
         else
             throw(ParseError("Unexpected token in term" * ": " * string(lookahead(parser, 0))))
         end
-        _t1633 = _t1636
+        _t1637 = _t1640
     end
-    result874 = _t1633
-    record_span!(parser, span_start873, "Term")
-    return result874
+    result876 = _t1637
+    record_span!(parser, span_start875, "Term")
+    return result876
 end
 
 function parse_var(parser::ParserState)::Proto.Var
-    span_start876 = span_start(parser)
-    symbol875 = consume_terminal!(parser, "SYMBOL")
-    _t1639 = Proto.Var(name=symbol875)
-    result877 = _t1639
-    record_span!(parser, span_start876, "Var")
-    return result877
+    span_start878 = span_start(parser)
+    symbol877 = consume_terminal!(parser, "SYMBOL")
+    _t1643 = Proto.Var(name=symbol877)
+    result879 = _t1643
+    record_span!(parser, span_start878, "Var")
+    return result879
 end
 
 function parse_value(parser::ParserState)::Proto.Value
-    span_start891 = span_start(parser)
+    span_start893 = span_start(parser)
     if match_lookahead_literal(parser, "true", 0)
-        _t1640 = 12
+        _t1644 = 12
     else
         if match_lookahead_literal(parser, "missing", 0)
-            _t1641 = 11
+            _t1645 = 11
         else
             if match_lookahead_literal(parser, "false", 0)
-                _t1642 = 12
+                _t1646 = 12
             else
                 if match_lookahead_literal(parser, "(", 0)
                     if match_lookahead_literal(parser, "datetime", 1)
-                        _t1644 = 1
+                        _t1648 = 1
                     else
                         if match_lookahead_literal(parser, "date", 1)
-                            _t1645 = 0
+                            _t1649 = 0
                         else
-                            _t1645 = -1
+                            _t1649 = -1
                         end
-                        _t1644 = _t1645
+                        _t1648 = _t1649
                     end
-                    _t1643 = _t1644
+                    _t1647 = _t1648
                 else
                     if match_lookahead_terminal(parser, "UINT32", 0)
-                        _t1646 = 7
+                        _t1650 = 7
                     else
                         if match_lookahead_terminal(parser, "UINT128", 0)
-                            _t1647 = 8
+                            _t1651 = 8
                         else
                             if match_lookahead_terminal(parser, "STRING", 0)
-                                _t1648 = 2
+                                _t1652 = 2
                             else
                                 if match_lookahead_terminal(parser, "INT32", 0)
-                                    _t1649 = 3
+                                    _t1653 = 3
                                 else
                                     if match_lookahead_terminal(parser, "INT128", 0)
-                                        _t1650 = 9
+                                        _t1654 = 9
                                     else
                                         if match_lookahead_terminal(parser, "INT", 0)
-                                            _t1651 = 4
+                                            _t1655 = 4
                                         else
                                             if match_lookahead_terminal(parser, "FLOAT32", 0)
-                                                _t1652 = 5
+                                                _t1656 = 5
                                             else
                                                 if match_lookahead_terminal(parser, "FLOAT", 0)
-                                                    _t1653 = 6
+                                                    _t1657 = 6
                                                 else
                                                     if match_lookahead_terminal(parser, "DECIMAL", 0)
-                                                        _t1654 = 10
+                                                        _t1658 = 10
                                                     else
-                                                        _t1654 = -1
+                                                        _t1658 = -1
                                                     end
-                                                    _t1653 = _t1654
+                                                    _t1657 = _t1658
                                                 end
-                                                _t1652 = _t1653
+                                                _t1656 = _t1657
                                             end
-                                            _t1651 = _t1652
+                                            _t1655 = _t1656
                                         end
-                                        _t1650 = _t1651
+                                        _t1654 = _t1655
                                     end
-                                    _t1649 = _t1650
+                                    _t1653 = _t1654
                                 end
-                                _t1648 = _t1649
+                                _t1652 = _t1653
                             end
-                            _t1647 = _t1648
+                            _t1651 = _t1652
                         end
-                        _t1646 = _t1647
+                        _t1650 = _t1651
                     end
-                    _t1643 = _t1646
+                    _t1647 = _t1650
                 end
-                _t1642 = _t1643
+                _t1646 = _t1647
             end
-            _t1641 = _t1642
+            _t1645 = _t1646
         end
-        _t1640 = _t1641
+        _t1644 = _t1645
     end
-    prediction878 = _t1640
-    if prediction878 == 12
-        _t1656 = parse_boolean_value(parser)
-        boolean_value890 = _t1656
-        _t1657 = Proto.Value(value=OneOf(:boolean_value, boolean_value890))
-        _t1655 = _t1657
+    prediction880 = _t1644
+    if prediction880 == 12
+        _t1660 = parse_boolean_value(parser)
+        boolean_value892 = _t1660
+        _t1661 = Proto.Value(value=OneOf(:boolean_value, boolean_value892))
+        _t1659 = _t1661
     else
-        if prediction878 == 11
+        if prediction880 == 11
             consume_literal!(parser, "missing")
-            _t1659 = Proto.MissingValue()
-            _t1660 = Proto.Value(value=OneOf(:missing_value, _t1659))
-            _t1658 = _t1660
+            _t1663 = Proto.MissingValue()
+            _t1664 = Proto.Value(value=OneOf(:missing_value, _t1663))
+            _t1662 = _t1664
         else
-            if prediction878 == 10
-                formatted_decimal889 = consume_terminal!(parser, "DECIMAL")
-                _t1662 = Proto.Value(value=OneOf(:decimal_value, formatted_decimal889))
-                _t1661 = _t1662
+            if prediction880 == 10
+                formatted_decimal891 = consume_terminal!(parser, "DECIMAL")
+                _t1666 = Proto.Value(value=OneOf(:decimal_value, formatted_decimal891))
+                _t1665 = _t1666
             else
-                if prediction878 == 9
-                    formatted_int128888 = consume_terminal!(parser, "INT128")
-                    _t1664 = Proto.Value(value=OneOf(:int128_value, formatted_int128888))
-                    _t1663 = _t1664
+                if prediction880 == 9
+                    formatted_int128890 = consume_terminal!(parser, "INT128")
+                    _t1668 = Proto.Value(value=OneOf(:int128_value, formatted_int128890))
+                    _t1667 = _t1668
                 else
-                    if prediction878 == 8
-                        formatted_uint128887 = consume_terminal!(parser, "UINT128")
-                        _t1666 = Proto.Value(value=OneOf(:uint128_value, formatted_uint128887))
-                        _t1665 = _t1666
+                    if prediction880 == 8
+                        formatted_uint128889 = consume_terminal!(parser, "UINT128")
+                        _t1670 = Proto.Value(value=OneOf(:uint128_value, formatted_uint128889))
+                        _t1669 = _t1670
                     else
-                        if prediction878 == 7
-                            formatted_uint32886 = consume_terminal!(parser, "UINT32")
-                            _t1668 = Proto.Value(value=OneOf(:uint32_value, formatted_uint32886))
-                            _t1667 = _t1668
+                        if prediction880 == 7
+                            formatted_uint32888 = consume_terminal!(parser, "UINT32")
+                            _t1672 = Proto.Value(value=OneOf(:uint32_value, formatted_uint32888))
+                            _t1671 = _t1672
                         else
-                            if prediction878 == 6
-                                formatted_float885 = consume_terminal!(parser, "FLOAT")
-                                _t1670 = Proto.Value(value=OneOf(:float_value, formatted_float885))
-                                _t1669 = _t1670
+                            if prediction880 == 6
+                                formatted_float887 = consume_terminal!(parser, "FLOAT")
+                                _t1674 = Proto.Value(value=OneOf(:float_value, formatted_float887))
+                                _t1673 = _t1674
                             else
-                                if prediction878 == 5
-                                    formatted_float32884 = consume_terminal!(parser, "FLOAT32")
-                                    _t1672 = Proto.Value(value=OneOf(:float32_value, formatted_float32884))
-                                    _t1671 = _t1672
+                                if prediction880 == 5
+                                    formatted_float32886 = consume_terminal!(parser, "FLOAT32")
+                                    _t1676 = Proto.Value(value=OneOf(:float32_value, formatted_float32886))
+                                    _t1675 = _t1676
                                 else
-                                    if prediction878 == 4
-                                        formatted_int883 = consume_terminal!(parser, "INT")
-                                        _t1674 = Proto.Value(value=OneOf(:int_value, formatted_int883))
-                                        _t1673 = _t1674
+                                    if prediction880 == 4
+                                        formatted_int885 = consume_terminal!(parser, "INT")
+                                        _t1678 = Proto.Value(value=OneOf(:int_value, formatted_int885))
+                                        _t1677 = _t1678
                                     else
-                                        if prediction878 == 3
-                                            formatted_int32882 = consume_terminal!(parser, "INT32")
-                                            _t1676 = Proto.Value(value=OneOf(:int32_value, formatted_int32882))
-                                            _t1675 = _t1676
+                                        if prediction880 == 3
+                                            formatted_int32884 = consume_terminal!(parser, "INT32")
+                                            _t1680 = Proto.Value(value=OneOf(:int32_value, formatted_int32884))
+                                            _t1679 = _t1680
                                         else
-                                            if prediction878 == 2
-                                                formatted_string881 = consume_terminal!(parser, "STRING")
-                                                _t1678 = Proto.Value(value=OneOf(:string_value, formatted_string881))
-                                                _t1677 = _t1678
+                                            if prediction880 == 2
+                                                formatted_string883 = consume_terminal!(parser, "STRING")
+                                                _t1682 = Proto.Value(value=OneOf(:string_value, formatted_string883))
+                                                _t1681 = _t1682
                                             else
-                                                if prediction878 == 1
-                                                    _t1680 = parse_datetime(parser)
-                                                    datetime880 = _t1680
-                                                    _t1681 = Proto.Value(value=OneOf(:datetime_value, datetime880))
-                                                    _t1679 = _t1681
+                                                if prediction880 == 1
+                                                    _t1684 = parse_datetime(parser)
+                                                    datetime882 = _t1684
+                                                    _t1685 = Proto.Value(value=OneOf(:datetime_value, datetime882))
+                                                    _t1683 = _t1685
                                                 else
-                                                    if prediction878 == 0
-                                                        _t1683 = parse_date(parser)
-                                                        date879 = _t1683
-                                                        _t1684 = Proto.Value(value=OneOf(:date_value, date879))
-                                                        _t1682 = _t1684
+                                                    if prediction880 == 0
+                                                        _t1687 = parse_date(parser)
+                                                        date881 = _t1687
+                                                        _t1688 = Proto.Value(value=OneOf(:date_value, date881))
+                                                        _t1686 = _t1688
                                                     else
                                                         throw(ParseError("Unexpected token in value" * ": " * string(lookahead(parser, 0))))
                                                     end
-                                                    _t1679 = _t1682
+                                                    _t1683 = _t1686
                                                 end
-                                                _t1677 = _t1679
+                                                _t1681 = _t1683
                                             end
-                                            _t1675 = _t1677
+                                            _t1679 = _t1681
                                         end
-                                        _t1673 = _t1675
+                                        _t1677 = _t1679
                                     end
-                                    _t1671 = _t1673
+                                    _t1675 = _t1677
                                 end
-                                _t1669 = _t1671
+                                _t1673 = _t1675
                             end
-                            _t1667 = _t1669
+                            _t1671 = _t1673
                         end
-                        _t1665 = _t1667
+                        _t1669 = _t1671
                     end
-                    _t1663 = _t1665
+                    _t1667 = _t1669
                 end
-                _t1661 = _t1663
+                _t1665 = _t1667
             end
-            _t1658 = _t1661
+            _t1662 = _t1665
         end
-        _t1655 = _t1658
+        _t1659 = _t1662
     end
-    result892 = _t1655
-    record_span!(parser, span_start891, "Value")
-    return result892
+    result894 = _t1659
+    record_span!(parser, span_start893, "Value")
+    return result894
 end
 
 function parse_date(parser::ParserState)::Proto.DateValue
-    span_start896 = span_start(parser)
+    span_start898 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "date")
-    formatted_int893 = consume_terminal!(parser, "INT")
-    formatted_int_3894 = consume_terminal!(parser, "INT")
-    formatted_int_4895 = consume_terminal!(parser, "INT")
+    formatted_int895 = consume_terminal!(parser, "INT")
+    formatted_int_3896 = consume_terminal!(parser, "INT")
+    formatted_int_4897 = consume_terminal!(parser, "INT")
     consume_literal!(parser, ")")
-    _t1685 = Proto.DateValue(year=Int32(formatted_int893), month=Int32(formatted_int_3894), day=Int32(formatted_int_4895))
-    result897 = _t1685
-    record_span!(parser, span_start896, "DateValue")
-    return result897
+    _t1689 = Proto.DateValue(year=Int32(formatted_int895), month=Int32(formatted_int_3896), day=Int32(formatted_int_4897))
+    result899 = _t1689
+    record_span!(parser, span_start898, "DateValue")
+    return result899
 end
 
 function parse_datetime(parser::ParserState)::Proto.DateTimeValue
-    span_start905 = span_start(parser)
+    span_start907 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "datetime")
-    formatted_int898 = consume_terminal!(parser, "INT")
-    formatted_int_3899 = consume_terminal!(parser, "INT")
-    formatted_int_4900 = consume_terminal!(parser, "INT")
-    formatted_int_5901 = consume_terminal!(parser, "INT")
-    formatted_int_6902 = consume_terminal!(parser, "INT")
-    formatted_int_7903 = consume_terminal!(parser, "INT")
+    formatted_int900 = consume_terminal!(parser, "INT")
+    formatted_int_3901 = consume_terminal!(parser, "INT")
+    formatted_int_4902 = consume_terminal!(parser, "INT")
+    formatted_int_5903 = consume_terminal!(parser, "INT")
+    formatted_int_6904 = consume_terminal!(parser, "INT")
+    formatted_int_7905 = consume_terminal!(parser, "INT")
     if match_lookahead_terminal(parser, "INT", 0)
-        _t1686 = consume_terminal!(parser, "INT")
+        _t1690 = consume_terminal!(parser, "INT")
     else
-        _t1686 = nothing
+        _t1690 = nothing
     end
-    formatted_int_8904 = _t1686
+    formatted_int_8906 = _t1690
     consume_literal!(parser, ")")
-    _t1687 = Proto.DateTimeValue(year=Int32(formatted_int898), month=Int32(formatted_int_3899), day=Int32(formatted_int_4900), hour=Int32(formatted_int_5901), minute=Int32(formatted_int_6902), second=Int32(formatted_int_7903), microsecond=Int32((!isnothing(formatted_int_8904) ? formatted_int_8904 : 0)))
-    result906 = _t1687
-    record_span!(parser, span_start905, "DateTimeValue")
-    return result906
+    _t1691 = Proto.DateTimeValue(year=Int32(formatted_int900), month=Int32(formatted_int_3901), day=Int32(formatted_int_4902), hour=Int32(formatted_int_5903), minute=Int32(formatted_int_6904), second=Int32(formatted_int_7905), microsecond=Int32((!isnothing(formatted_int_8906) ? formatted_int_8906 : 0)))
+    result908 = _t1691
+    record_span!(parser, span_start907, "DateTimeValue")
+    return result908
 end
 
 function parse_conjunction(parser::ParserState)::Proto.Conjunction
-    span_start911 = span_start(parser)
+    span_start913 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "and")
-    xs907 = Proto.Formula[]
-    cond908 = match_lookahead_literal(parser, "(", 0)
-    while cond908
-        _t1688 = parse_formula(parser)
-        item909 = _t1688
-        push!(xs907, item909)
-        cond908 = match_lookahead_literal(parser, "(", 0)
+    xs909 = Proto.Formula[]
+    cond910 = match_lookahead_literal(parser, "(", 0)
+    while cond910
+        _t1692 = parse_formula(parser)
+        item911 = _t1692
+        push!(xs909, item911)
+        cond910 = match_lookahead_literal(parser, "(", 0)
     end
-    formulas910 = xs907
+    formulas912 = xs909
     consume_literal!(parser, ")")
-    _t1689 = Proto.Conjunction(args=formulas910)
-    result912 = _t1689
-    record_span!(parser, span_start911, "Conjunction")
-    return result912
+    _t1693 = Proto.Conjunction(args=formulas912)
+    result914 = _t1693
+    record_span!(parser, span_start913, "Conjunction")
+    return result914
 end
 
 function parse_disjunction(parser::ParserState)::Proto.Disjunction
-    span_start917 = span_start(parser)
+    span_start919 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "or")
-    xs913 = Proto.Formula[]
-    cond914 = match_lookahead_literal(parser, "(", 0)
-    while cond914
-        _t1690 = parse_formula(parser)
-        item915 = _t1690
-        push!(xs913, item915)
-        cond914 = match_lookahead_literal(parser, "(", 0)
+    xs915 = Proto.Formula[]
+    cond916 = match_lookahead_literal(parser, "(", 0)
+    while cond916
+        _t1694 = parse_formula(parser)
+        item917 = _t1694
+        push!(xs915, item917)
+        cond916 = match_lookahead_literal(parser, "(", 0)
     end
-    formulas916 = xs913
+    formulas918 = xs915
     consume_literal!(parser, ")")
-    _t1691 = Proto.Disjunction(args=formulas916)
-    result918 = _t1691
-    record_span!(parser, span_start917, "Disjunction")
-    return result918
+    _t1695 = Proto.Disjunction(args=formulas918)
+    result920 = _t1695
+    record_span!(parser, span_start919, "Disjunction")
+    return result920
 end
 
 function parse_not(parser::ParserState)::Proto.Not
-    span_start920 = span_start(parser)
+    span_start922 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "not")
-    _t1692 = parse_formula(parser)
-    formula919 = _t1692
+    _t1696 = parse_formula(parser)
+    formula921 = _t1696
     consume_literal!(parser, ")")
-    _t1693 = Proto.Not(arg=formula919)
-    result921 = _t1693
-    record_span!(parser, span_start920, "Not")
-    return result921
+    _t1697 = Proto.Not(arg=formula921)
+    result923 = _t1697
+    record_span!(parser, span_start922, "Not")
+    return result923
 end
 
 function parse_ffi(parser::ParserState)::Proto.FFI
-    span_start925 = span_start(parser)
+    span_start927 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "ffi")
-    _t1694 = parse_name(parser)
-    name922 = _t1694
-    _t1695 = parse_ffi_args(parser)
-    ffi_args923 = _t1695
-    _t1696 = parse_terms(parser)
-    terms924 = _t1696
+    _t1698 = parse_name(parser)
+    name924 = _t1698
+    _t1699 = parse_ffi_args(parser)
+    ffi_args925 = _t1699
+    _t1700 = parse_terms(parser)
+    terms926 = _t1700
     consume_literal!(parser, ")")
-    _t1697 = Proto.FFI(name=name922, args=ffi_args923, terms=terms924)
-    result926 = _t1697
-    record_span!(parser, span_start925, "FFI")
-    return result926
+    _t1701 = Proto.FFI(name=name924, args=ffi_args925, terms=terms926)
+    result928 = _t1701
+    record_span!(parser, span_start927, "FFI")
+    return result928
 end
 
 function parse_name(parser::ParserState)::String
     consume_literal!(parser, ":")
-    symbol927 = consume_terminal!(parser, "SYMBOL")
-    return symbol927
+    symbol929 = consume_terminal!(parser, "SYMBOL")
+    return symbol929
 end
 
 function parse_ffi_args(parser::ParserState)::Vector{Proto.Abstraction}
     consume_literal!(parser, "(")
     consume_literal!(parser, "args")
-    xs928 = Proto.Abstraction[]
-    cond929 = match_lookahead_literal(parser, "(", 0)
-    while cond929
-        _t1698 = parse_abstraction(parser)
-        item930 = _t1698
-        push!(xs928, item930)
-        cond929 = match_lookahead_literal(parser, "(", 0)
+    xs930 = Proto.Abstraction[]
+    cond931 = match_lookahead_literal(parser, "(", 0)
+    while cond931
+        _t1702 = parse_abstraction(parser)
+        item932 = _t1702
+        push!(xs930, item932)
+        cond931 = match_lookahead_literal(parser, "(", 0)
     end
-    abstractions931 = xs928
+    abstractions933 = xs930
     consume_literal!(parser, ")")
-    return abstractions931
+    return abstractions933
 end
 
 function parse_atom(parser::ParserState)::Proto.Atom
-    span_start937 = span_start(parser)
+    span_start939 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "atom")
-    _t1699 = parse_relation_id(parser)
-    relation_id932 = _t1699
-    xs933 = Proto.Term[]
-    cond934 = (((((((((((((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 cond934
-        _t1700 = parse_term(parser)
-        item935 = _t1700
-        push!(xs933, item935)
-        cond934 = (((((((((((((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))
+    _t1703 = parse_relation_id(parser)
+    relation_id934 = _t1703
+    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
+        _t1704 = parse_term(parser)
+        item937 = _t1704
+        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
-    terms936 = xs933
+    terms938 = xs935
     consume_literal!(parser, ")")
-    _t1701 = Proto.Atom(name=relation_id932, terms=terms936)
-    result938 = _t1701
-    record_span!(parser, span_start937, "Atom")
-    return result938
+    _t1705 = Proto.Atom(name=relation_id934, terms=terms938)
+    result940 = _t1705
+    record_span!(parser, span_start939, "Atom")
+    return result940
 end
 
 function parse_pragma(parser::ParserState)::Proto.Pragma
-    span_start944 = span_start(parser)
+    span_start946 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "pragma")
-    _t1702 = parse_name(parser)
-    name939 = _t1702
-    xs940 = Proto.Term[]
-    cond941 = (((((((((((((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 cond941
-        _t1703 = parse_term(parser)
-        item942 = _t1703
-        push!(xs940, item942)
-        cond941 = (((((((((((((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))
+    _t1706 = parse_name(parser)
+    name941 = _t1706
+    xs942 = Proto.Term[]
+    cond943 = (((((((((((((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 cond943
+        _t1707 = parse_term(parser)
+        item944 = _t1707
+        push!(xs942, item944)
+        cond943 = (((((((((((((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
-    terms943 = xs940
+    terms945 = xs942
     consume_literal!(parser, ")")
-    _t1704 = Proto.Pragma(name=name939, terms=terms943)
-    result945 = _t1704
-    record_span!(parser, span_start944, "Pragma")
-    return result945
+    _t1708 = Proto.Pragma(name=name941, terms=terms945)
+    result947 = _t1708
+    record_span!(parser, span_start946, "Pragma")
+    return result947
 end
 
 function parse_primitive(parser::ParserState)::Proto.Primitive
-    span_start961 = span_start(parser)
+    span_start963 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "primitive", 1)
-            _t1706 = 9
+            _t1710 = 9
         else
             if match_lookahead_literal(parser, ">=", 1)
-                _t1707 = 4
+                _t1711 = 4
             else
                 if match_lookahead_literal(parser, ">", 1)
-                    _t1708 = 3
+                    _t1712 = 3
                 else
                     if match_lookahead_literal(parser, "=", 1)
-                        _t1709 = 0
+                        _t1713 = 0
                     else
                         if match_lookahead_literal(parser, "<=", 1)
-                            _t1710 = 2
+                            _t1714 = 2
                         else
                             if match_lookahead_literal(parser, "<", 1)
-                                _t1711 = 1
+                                _t1715 = 1
                             else
                                 if match_lookahead_literal(parser, "/", 1)
-                                    _t1712 = 8
+                                    _t1716 = 8
                                 else
                                     if match_lookahead_literal(parser, "-", 1)
-                                        _t1713 = 6
+                                        _t1717 = 6
                                     else
                                         if match_lookahead_literal(parser, "+", 1)
-                                            _t1714 = 5
+                                            _t1718 = 5
                                         else
                                             if match_lookahead_literal(parser, "*", 1)
-                                                _t1715 = 7
+                                                _t1719 = 7
                                             else
-                                                _t1715 = -1
+                                                _t1719 = -1
                                             end
-                                            _t1714 = _t1715
+                                            _t1718 = _t1719
                                         end
-                                        _t1713 = _t1714
+                                        _t1717 = _t1718
                                     end
-                                    _t1712 = _t1713
+                                    _t1716 = _t1717
                                 end
-                                _t1711 = _t1712
+                                _t1715 = _t1716
                             end
-                            _t1710 = _t1711
+                            _t1714 = _t1715
                         end
-                        _t1709 = _t1710
+                        _t1713 = _t1714
                     end
-                    _t1708 = _t1709
+                    _t1712 = _t1713
                 end
-                _t1707 = _t1708
+                _t1711 = _t1712
             end
-            _t1706 = _t1707
+            _t1710 = _t1711
         end
-        _t1705 = _t1706
+        _t1709 = _t1710
     else
-        _t1705 = -1
+        _t1709 = -1
     end
-    prediction946 = _t1705
-    if prediction946 == 9
+    prediction948 = _t1709
+    if prediction948 == 9
         consume_literal!(parser, "(")
         consume_literal!(parser, "primitive")
-        _t1717 = parse_name(parser)
-        name956 = _t1717
-        xs957 = Proto.RelTerm[]
-        cond958 = ((((((((((((((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 cond958
-            _t1718 = parse_rel_term(parser)
-            item959 = _t1718
-            push!(xs957, item959)
-            cond958 = ((((((((((((((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))
+        _t1721 = parse_name(parser)
+        name958 = _t1721
+        xs959 = Proto.RelTerm[]
+        cond960 = ((((((((((((((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 cond960
+            _t1722 = parse_rel_term(parser)
+            item961 = _t1722
+            push!(xs959, item961)
+            cond960 = ((((((((((((((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_terms960 = xs957
+        rel_terms962 = xs959
         consume_literal!(parser, ")")
-        _t1719 = Proto.Primitive(name=name956, terms=rel_terms960)
-        _t1716 = _t1719
+        _t1723 = Proto.Primitive(name=name958, terms=rel_terms962)
+        _t1720 = _t1723
     else
-        if prediction946 == 8
-            _t1721 = parse_divide(parser)
-            divide955 = _t1721
-            _t1720 = divide955
+        if prediction948 == 8
+            _t1725 = parse_divide(parser)
+            divide957 = _t1725
+            _t1724 = divide957
         else
-            if prediction946 == 7
-                _t1723 = parse_multiply(parser)
-                multiply954 = _t1723
-                _t1722 = multiply954
+            if prediction948 == 7
+                _t1727 = parse_multiply(parser)
+                multiply956 = _t1727
+                _t1726 = multiply956
             else
-                if prediction946 == 6
-                    _t1725 = parse_minus(parser)
-                    minus953 = _t1725
-                    _t1724 = minus953
+                if prediction948 == 6
+                    _t1729 = parse_minus(parser)
+                    minus955 = _t1729
+                    _t1728 = minus955
                 else
-                    if prediction946 == 5
-                        _t1727 = parse_add(parser)
-                        add952 = _t1727
-                        _t1726 = add952
+                    if prediction948 == 5
+                        _t1731 = parse_add(parser)
+                        add954 = _t1731
+                        _t1730 = add954
                     else
-                        if prediction946 == 4
-                            _t1729 = parse_gt_eq(parser)
-                            gt_eq951 = _t1729
-                            _t1728 = gt_eq951
+                        if prediction948 == 4
+                            _t1733 = parse_gt_eq(parser)
+                            gt_eq953 = _t1733
+                            _t1732 = gt_eq953
                         else
-                            if prediction946 == 3
-                                _t1731 = parse_gt(parser)
-                                gt950 = _t1731
-                                _t1730 = gt950
+                            if prediction948 == 3
+                                _t1735 = parse_gt(parser)
+                                gt952 = _t1735
+                                _t1734 = gt952
                             else
-                                if prediction946 == 2
-                                    _t1733 = parse_lt_eq(parser)
-                                    lt_eq949 = _t1733
-                                    _t1732 = lt_eq949
+                                if prediction948 == 2
+                                    _t1737 = parse_lt_eq(parser)
+                                    lt_eq951 = _t1737
+                                    _t1736 = lt_eq951
                                 else
-                                    if prediction946 == 1
-                                        _t1735 = parse_lt(parser)
-                                        lt948 = _t1735
-                                        _t1734 = lt948
+                                    if prediction948 == 1
+                                        _t1739 = parse_lt(parser)
+                                        lt950 = _t1739
+                                        _t1738 = lt950
                                     else
-                                        if prediction946 == 0
-                                            _t1737 = parse_eq(parser)
-                                            eq947 = _t1737
-                                            _t1736 = eq947
+                                        if prediction948 == 0
+                                            _t1741 = parse_eq(parser)
+                                            eq949 = _t1741
+                                            _t1740 = eq949
                                         else
                                             throw(ParseError("Unexpected token in primitive" * ": " * string(lookahead(parser, 0))))
                                         end
-                                        _t1734 = _t1736
+                                        _t1738 = _t1740
                                     end
-                                    _t1732 = _t1734
+                                    _t1736 = _t1738
                                 end
-                                _t1730 = _t1732
+                                _t1734 = _t1736
                             end
-                            _t1728 = _t1730
+                            _t1732 = _t1734
                         end
-                        _t1726 = _t1728
+                        _t1730 = _t1732
                     end
-                    _t1724 = _t1726
+                    _t1728 = _t1730
                 end
-                _t1722 = _t1724
+                _t1726 = _t1728
             end
-            _t1720 = _t1722
+            _t1724 = _t1726
         end
-        _t1716 = _t1720
+        _t1720 = _t1724
     end
-    result962 = _t1716
-    record_span!(parser, span_start961, "Primitive")
-    return result962
+    result964 = _t1720
+    record_span!(parser, span_start963, "Primitive")
+    return result964
 end
 
 function parse_eq(parser::ParserState)::Proto.Primitive
-    span_start965 = span_start(parser)
+    span_start967 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "=")
-    _t1738 = parse_term(parser)
-    term963 = _t1738
-    _t1739 = parse_term(parser)
-    term_3964 = _t1739
+    _t1742 = parse_term(parser)
+    term965 = _t1742
+    _t1743 = parse_term(parser)
+    term_3966 = _t1743
     consume_literal!(parser, ")")
-    _t1740 = Proto.RelTerm(rel_term_type=OneOf(:term, term963))
-    _t1741 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3964))
-    _t1742 = Proto.Primitive(name="rel_primitive_eq", terms=Proto.RelTerm[_t1740, _t1741])
-    result966 = _t1742
-    record_span!(parser, span_start965, "Primitive")
-    return result966
+    _t1744 = Proto.RelTerm(rel_term_type=OneOf(:term, term965))
+    _t1745 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3966))
+    _t1746 = Proto.Primitive(name="rel_primitive_eq", terms=Proto.RelTerm[_t1744, _t1745])
+    result968 = _t1746
+    record_span!(parser, span_start967, "Primitive")
+    return result968
 end
 
 function parse_lt(parser::ParserState)::Proto.Primitive
-    span_start969 = span_start(parser)
+    span_start971 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "<")
-    _t1743 = parse_term(parser)
-    term967 = _t1743
-    _t1744 = parse_term(parser)
-    term_3968 = _t1744
+    _t1747 = parse_term(parser)
+    term969 = _t1747
+    _t1748 = parse_term(parser)
+    term_3970 = _t1748
     consume_literal!(parser, ")")
-    _t1745 = Proto.RelTerm(rel_term_type=OneOf(:term, term967))
-    _t1746 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3968))
-    _t1747 = Proto.Primitive(name="rel_primitive_lt_monotype", terms=Proto.RelTerm[_t1745, _t1746])
-    result970 = _t1747
-    record_span!(parser, span_start969, "Primitive")
-    return result970
+    _t1749 = Proto.RelTerm(rel_term_type=OneOf(:term, term969))
+    _t1750 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3970))
+    _t1751 = Proto.Primitive(name="rel_primitive_lt_monotype", terms=Proto.RelTerm[_t1749, _t1750])
+    result972 = _t1751
+    record_span!(parser, span_start971, "Primitive")
+    return result972
 end
 
 function parse_lt_eq(parser::ParserState)::Proto.Primitive
-    span_start973 = span_start(parser)
+    span_start975 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "<=")
-    _t1748 = parse_term(parser)
-    term971 = _t1748
-    _t1749 = parse_term(parser)
-    term_3972 = _t1749
+    _t1752 = parse_term(parser)
+    term973 = _t1752
+    _t1753 = parse_term(parser)
+    term_3974 = _t1753
     consume_literal!(parser, ")")
-    _t1750 = Proto.RelTerm(rel_term_type=OneOf(:term, term971))
-    _t1751 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3972))
-    _t1752 = Proto.Primitive(name="rel_primitive_lt_eq_monotype", terms=Proto.RelTerm[_t1750, _t1751])
-    result974 = _t1752
-    record_span!(parser, span_start973, "Primitive")
-    return result974
+    _t1754 = Proto.RelTerm(rel_term_type=OneOf(:term, term973))
+    _t1755 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3974))
+    _t1756 = Proto.Primitive(name="rel_primitive_lt_eq_monotype", terms=Proto.RelTerm[_t1754, _t1755])
+    result976 = _t1756
+    record_span!(parser, span_start975, "Primitive")
+    return result976
 end
 
 function parse_gt(parser::ParserState)::Proto.Primitive
-    span_start977 = span_start(parser)
+    span_start979 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, ">")
-    _t1753 = parse_term(parser)
-    term975 = _t1753
-    _t1754 = parse_term(parser)
-    term_3976 = _t1754
+    _t1757 = parse_term(parser)
+    term977 = _t1757
+    _t1758 = parse_term(parser)
+    term_3978 = _t1758
     consume_literal!(parser, ")")
-    _t1755 = Proto.RelTerm(rel_term_type=OneOf(:term, term975))
-    _t1756 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3976))
-    _t1757 = Proto.Primitive(name="rel_primitive_gt_monotype", terms=Proto.RelTerm[_t1755, _t1756])
-    result978 = _t1757
-    record_span!(parser, span_start977, "Primitive")
-    return result978
+    _t1759 = Proto.RelTerm(rel_term_type=OneOf(:term, term977))
+    _t1760 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3978))
+    _t1761 = Proto.Primitive(name="rel_primitive_gt_monotype", terms=Proto.RelTerm[_t1759, _t1760])
+    result980 = _t1761
+    record_span!(parser, span_start979, "Primitive")
+    return result980
 end
 
 function parse_gt_eq(parser::ParserState)::Proto.Primitive
-    span_start981 = span_start(parser)
+    span_start983 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, ">=")
-    _t1758 = parse_term(parser)
-    term979 = _t1758
-    _t1759 = parse_term(parser)
-    term_3980 = _t1759
+    _t1762 = parse_term(parser)
+    term981 = _t1762
+    _t1763 = parse_term(parser)
+    term_3982 = _t1763
     consume_literal!(parser, ")")
-    _t1760 = Proto.RelTerm(rel_term_type=OneOf(:term, term979))
-    _t1761 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3980))
-    _t1762 = Proto.Primitive(name="rel_primitive_gt_eq_monotype", terms=Proto.RelTerm[_t1760, _t1761])
-    result982 = _t1762
-    record_span!(parser, span_start981, "Primitive")
-    return result982
+    _t1764 = Proto.RelTerm(rel_term_type=OneOf(:term, term981))
+    _t1765 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3982))
+    _t1766 = Proto.Primitive(name="rel_primitive_gt_eq_monotype", terms=Proto.RelTerm[_t1764, _t1765])
+    result984 = _t1766
+    record_span!(parser, span_start983, "Primitive")
+    return result984
 end
 
 function parse_add(parser::ParserState)::Proto.Primitive
-    span_start986 = span_start(parser)
+    span_start988 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "+")
-    _t1763 = parse_term(parser)
-    term983 = _t1763
-    _t1764 = parse_term(parser)
-    term_3984 = _t1764
-    _t1765 = parse_term(parser)
-    term_4985 = _t1765
+    _t1767 = parse_term(parser)
+    term985 = _t1767
+    _t1768 = parse_term(parser)
+    term_3986 = _t1768
+    _t1769 = parse_term(parser)
+    term_4987 = _t1769
     consume_literal!(parser, ")")
-    _t1766 = Proto.RelTerm(rel_term_type=OneOf(:term, term983))
-    _t1767 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3984))
-    _t1768 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4985))
-    _t1769 = Proto.Primitive(name="rel_primitive_add_monotype", terms=Proto.RelTerm[_t1766, _t1767, _t1768])
-    result987 = _t1769
-    record_span!(parser, span_start986, "Primitive")
-    return result987
+    _t1770 = Proto.RelTerm(rel_term_type=OneOf(:term, term985))
+    _t1771 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3986))
+    _t1772 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4987))
+    _t1773 = Proto.Primitive(name="rel_primitive_add_monotype", terms=Proto.RelTerm[_t1770, _t1771, _t1772])
+    result989 = _t1773
+    record_span!(parser, span_start988, "Primitive")
+    return result989
 end
 
 function parse_minus(parser::ParserState)::Proto.Primitive
-    span_start991 = span_start(parser)
+    span_start993 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "-")
-    _t1770 = parse_term(parser)
-    term988 = _t1770
-    _t1771 = parse_term(parser)
-    term_3989 = _t1771
-    _t1772 = parse_term(parser)
-    term_4990 = _t1772
+    _t1774 = parse_term(parser)
+    term990 = _t1774
+    _t1775 = parse_term(parser)
+    term_3991 = _t1775
+    _t1776 = parse_term(parser)
+    term_4992 = _t1776
     consume_literal!(parser, ")")
-    _t1773 = Proto.RelTerm(rel_term_type=OneOf(:term, term988))
-    _t1774 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3989))
-    _t1775 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4990))
-    _t1776 = Proto.Primitive(name="rel_primitive_subtract_monotype", terms=Proto.RelTerm[_t1773, _t1774, _t1775])
-    result992 = _t1776
-    record_span!(parser, span_start991, "Primitive")
-    return result992
+    _t1777 = Proto.RelTerm(rel_term_type=OneOf(:term, term990))
+    _t1778 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3991))
+    _t1779 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4992))
+    _t1780 = Proto.Primitive(name="rel_primitive_subtract_monotype", terms=Proto.RelTerm[_t1777, _t1778, _t1779])
+    result994 = _t1780
+    record_span!(parser, span_start993, "Primitive")
+    return result994
 end
 
 function parse_multiply(parser::ParserState)::Proto.Primitive
-    span_start996 = span_start(parser)
+    span_start998 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "*")
-    _t1777 = parse_term(parser)
-    term993 = _t1777
-    _t1778 = parse_term(parser)
-    term_3994 = _t1778
-    _t1779 = parse_term(parser)
-    term_4995 = _t1779
+    _t1781 = parse_term(parser)
+    term995 = _t1781
+    _t1782 = parse_term(parser)
+    term_3996 = _t1782
+    _t1783 = parse_term(parser)
+    term_4997 = _t1783
     consume_literal!(parser, ")")
-    _t1780 = Proto.RelTerm(rel_term_type=OneOf(:term, term993))
-    _t1781 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3994))
-    _t1782 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4995))
-    _t1783 = Proto.Primitive(name="rel_primitive_multiply_monotype", terms=Proto.RelTerm[_t1780, _t1781, _t1782])
-    result997 = _t1783
-    record_span!(parser, span_start996, "Primitive")
-    return result997
+    _t1784 = Proto.RelTerm(rel_term_type=OneOf(:term, term995))
+    _t1785 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3996))
+    _t1786 = Proto.RelTerm(rel_term_type=OneOf(:term, term_4997))
+    _t1787 = Proto.Primitive(name="rel_primitive_multiply_monotype", terms=Proto.RelTerm[_t1784, _t1785, _t1786])
+    result999 = _t1787
+    record_span!(parser, span_start998, "Primitive")
+    return result999
 end
 
 function parse_divide(parser::ParserState)::Proto.Primitive
-    span_start1001 = span_start(parser)
+    span_start1003 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "/")
-    _t1784 = parse_term(parser)
-    term998 = _t1784
-    _t1785 = parse_term(parser)
-    term_3999 = _t1785
-    _t1786 = parse_term(parser)
-    term_41000 = _t1786
+    _t1788 = parse_term(parser)
+    term1000 = _t1788
+    _t1789 = parse_term(parser)
+    term_31001 = _t1789
+    _t1790 = parse_term(parser)
+    term_41002 = _t1790
     consume_literal!(parser, ")")
-    _t1787 = Proto.RelTerm(rel_term_type=OneOf(:term, term998))
-    _t1788 = Proto.RelTerm(rel_term_type=OneOf(:term, term_3999))
-    _t1789 = Proto.RelTerm(rel_term_type=OneOf(:term, term_41000))
-    _t1790 = Proto.Primitive(name="rel_primitive_divide_monotype", terms=Proto.RelTerm[_t1787, _t1788, _t1789])
-    result1002 = _t1790
-    record_span!(parser, span_start1001, "Primitive")
-    return result1002
+    _t1791 = Proto.RelTerm(rel_term_type=OneOf(:term, term1000))
+    _t1792 = Proto.RelTerm(rel_term_type=OneOf(:term, term_31001))
+    _t1793 = Proto.RelTerm(rel_term_type=OneOf(:term, term_41002))
+    _t1794 = Proto.Primitive(name="rel_primitive_divide_monotype", terms=Proto.RelTerm[_t1791, _t1792, _t1793])
+    result1004 = _t1794
+    record_span!(parser, span_start1003, "Primitive")
+    return result1004
 end
 
 function parse_rel_term(parser::ParserState)::Proto.RelTerm
-    span_start1006 = span_start(parser)
+    span_start1008 = span_start(parser)
     if match_lookahead_literal(parser, "true", 0)
-        _t1791 = 1
+        _t1795 = 1
     else
         if match_lookahead_literal(parser, "missing", 0)
-            _t1792 = 1
+            _t1796 = 1
         else
             if match_lookahead_literal(parser, "false", 0)
-                _t1793 = 1
+                _t1797 = 1
             else
                 if match_lookahead_literal(parser, "(", 0)
-                    _t1794 = 1
+                    _t1798 = 1
                 else
                     if match_lookahead_literal(parser, "#", 0)
-                        _t1795 = 0
+                        _t1799 = 0
                     else
                         if match_lookahead_terminal(parser, "SYMBOL", 0)
-                            _t1796 = 1
+                            _t1800 = 1
                         else
                             if match_lookahead_terminal(parser, "UINT32", 0)
-                                _t1797 = 1
+                                _t1801 = 1
                             else
                                 if match_lookahead_terminal(parser, "UINT128", 0)
-                                    _t1798 = 1
+                                    _t1802 = 1
                                 else
                                     if match_lookahead_terminal(parser, "STRING", 0)
-                                        _t1799 = 1
+                                        _t1803 = 1
                                     else
                                         if match_lookahead_terminal(parser, "INT32", 0)
-                                            _t1800 = 1
+                                            _t1804 = 1
                                         else
                                             if match_lookahead_terminal(parser, "INT128", 0)
-                                                _t1801 = 1
+                                                _t1805 = 1
                                             else
                                                 if match_lookahead_terminal(parser, "INT", 0)
-                                                    _t1802 = 1
+                                                    _t1806 = 1
                                                 else
                                                     if match_lookahead_terminal(parser, "FLOAT32", 0)
-                                                        _t1803 = 1
+                                                        _t1807 = 1
                                                     else
                                                         if match_lookahead_terminal(parser, "FLOAT", 0)
-                                                            _t1804 = 1
+                                                            _t1808 = 1
                                                         else
                                                             if match_lookahead_terminal(parser, "DECIMAL", 0)
-                                                                _t1805 = 1
+                                                                _t1809 = 1
                                                             else
-                                                                _t1805 = -1
+                                                                _t1809 = -1
                                                             end
-                                                            _t1804 = _t1805
+                                                            _t1808 = _t1809
                                                         end
-                                                        _t1803 = _t1804
+                                                        _t1807 = _t1808
                                                     end
-                                                    _t1802 = _t1803
+                                                    _t1806 = _t1807
                                                 end
-                                                _t1801 = _t1802
+                                                _t1805 = _t1806
                                             end
-                                            _t1800 = _t1801
+                                            _t1804 = _t1805
                                         end
-                                        _t1799 = _t1800
+                                        _t1803 = _t1804
                                     end
-                                    _t1798 = _t1799
+                                    _t1802 = _t1803
                                 end
-                                _t1797 = _t1798
+                                _t1801 = _t1802
                             end
-                            _t1796 = _t1797
+                            _t1800 = _t1801
                         end
-                        _t1795 = _t1796
+                        _t1799 = _t1800
                     end
-                    _t1794 = _t1795
+                    _t1798 = _t1799
                 end
-                _t1793 = _t1794
+                _t1797 = _t1798
             end
-            _t1792 = _t1793
+            _t1796 = _t1797
         end
-        _t1791 = _t1792
+        _t1795 = _t1796
     end
-    prediction1003 = _t1791
-    if prediction1003 == 1
-        _t1807 = parse_term(parser)
-        term1005 = _t1807
-        _t1808 = Proto.RelTerm(rel_term_type=OneOf(:term, term1005))
-        _t1806 = _t1808
+    prediction1005 = _t1795
+    if prediction1005 == 1
+        _t1811 = parse_term(parser)
+        term1007 = _t1811
+        _t1812 = Proto.RelTerm(rel_term_type=OneOf(:term, term1007))
+        _t1810 = _t1812
     else
-        if prediction1003 == 0
-            _t1810 = parse_specialized_value(parser)
-            specialized_value1004 = _t1810
-            _t1811 = Proto.RelTerm(rel_term_type=OneOf(:specialized_value, specialized_value1004))
-            _t1809 = _t1811
+        if prediction1005 == 0
+            _t1814 = parse_specialized_value(parser)
+            specialized_value1006 = _t1814
+            _t1815 = Proto.RelTerm(rel_term_type=OneOf(:specialized_value, specialized_value1006))
+            _t1813 = _t1815
         else
             throw(ParseError("Unexpected token in rel_term" * ": " * string(lookahead(parser, 0))))
         end
-        _t1806 = _t1809
+        _t1810 = _t1813
     end
-    result1007 = _t1806
-    record_span!(parser, span_start1006, "RelTerm")
-    return result1007
+    result1009 = _t1810
+    record_span!(parser, span_start1008, "RelTerm")
+    return result1009
 end
 
 function parse_specialized_value(parser::ParserState)::Proto.Value
-    span_start1009 = span_start(parser)
+    span_start1011 = span_start(parser)
     consume_literal!(parser, "#")
-    _t1812 = parse_raw_value(parser)
-    raw_value1008 = _t1812
-    result1010 = raw_value1008
-    record_span!(parser, span_start1009, "Value")
-    return result1010
+    _t1816 = parse_raw_value(parser)
+    raw_value1010 = _t1816
+    result1012 = raw_value1010
+    record_span!(parser, span_start1011, "Value")
+    return result1012
 end
 
 function parse_rel_atom(parser::ParserState)::Proto.RelAtom
-    span_start1016 = span_start(parser)
+    span_start1018 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "relatom")
-    _t1813 = parse_name(parser)
-    name1011 = _t1813
-    xs1012 = Proto.RelTerm[]
-    cond1013 = ((((((((((((((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 cond1013
-        _t1814 = parse_rel_term(parser)
-        item1014 = _t1814
-        push!(xs1012, item1014)
-        cond1013 = ((((((((((((((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))
+    _t1817 = parse_name(parser)
+    name1013 = _t1817
+    xs1014 = Proto.RelTerm[]
+    cond1015 = ((((((((((((((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 cond1015
+        _t1818 = parse_rel_term(parser)
+        item1016 = _t1818
+        push!(xs1014, item1016)
+        cond1015 = ((((((((((((((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_terms1015 = xs1012
+    rel_terms1017 = xs1014
     consume_literal!(parser, ")")
-    _t1815 = Proto.RelAtom(name=name1011, terms=rel_terms1015)
-    result1017 = _t1815
-    record_span!(parser, span_start1016, "RelAtom")
-    return result1017
+    _t1819 = Proto.RelAtom(name=name1013, terms=rel_terms1017)
+    result1019 = _t1819
+    record_span!(parser, span_start1018, "RelAtom")
+    return result1019
 end
 
 function parse_cast(parser::ParserState)::Proto.Cast
-    span_start1020 = span_start(parser)
+    span_start1022 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "cast")
-    _t1816 = parse_term(parser)
-    term1018 = _t1816
-    _t1817 = parse_term(parser)
-    term_31019 = _t1817
+    _t1820 = parse_term(parser)
+    term1020 = _t1820
+    _t1821 = parse_term(parser)
+    term_31021 = _t1821
     consume_literal!(parser, ")")
-    _t1818 = Proto.Cast(input=term1018, result=term_31019)
-    result1021 = _t1818
-    record_span!(parser, span_start1020, "Cast")
-    return result1021
+    _t1822 = Proto.Cast(input=term1020, result=term_31021)
+    result1023 = _t1822
+    record_span!(parser, span_start1022, "Cast")
+    return result1023
 end
 
 function parse_attrs(parser::ParserState)::Vector{Proto.Attribute}
     consume_literal!(parser, "(")
     consume_literal!(parser, "attrs")
-    xs1022 = Proto.Attribute[]
-    cond1023 = match_lookahead_literal(parser, "(", 0)
-    while cond1023
-        _t1819 = parse_attribute(parser)
-        item1024 = _t1819
-        push!(xs1022, item1024)
-        cond1023 = match_lookahead_literal(parser, "(", 0)
+    xs1024 = Proto.Attribute[]
+    cond1025 = match_lookahead_literal(parser, "(", 0)
+    while cond1025
+        _t1823 = parse_attribute(parser)
+        item1026 = _t1823
+        push!(xs1024, item1026)
+        cond1025 = match_lookahead_literal(parser, "(", 0)
     end
-    attributes1025 = xs1022
+    attributes1027 = xs1024
     consume_literal!(parser, ")")
-    return attributes1025
+    return attributes1027
 end
 
 function parse_attribute(parser::ParserState)::Proto.Attribute
-    span_start1031 = span_start(parser)
+    span_start1033 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "attribute")
-    _t1820 = parse_name(parser)
-    name1026 = _t1820
-    xs1027 = Proto.Value[]
-    cond1028 = ((((((((((((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 cond1028
-        _t1821 = parse_raw_value(parser)
-        item1029 = _t1821
-        push!(xs1027, item1029)
-        cond1028 = ((((((((((((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))
+    _t1824 = parse_name(parser)
+    name1028 = _t1824
+    xs1029 = Proto.Value[]
+    cond1030 = ((((((((((((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 cond1030
+        _t1825 = parse_raw_value(parser)
+        item1031 = _t1825
+        push!(xs1029, item1031)
+        cond1030 = ((((((((((((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_values1030 = xs1027
+    raw_values1032 = xs1029
     consume_literal!(parser, ")")
-    _t1822 = Proto.Attribute(name=name1026, args=raw_values1030)
-    result1032 = _t1822
-    record_span!(parser, span_start1031, "Attribute")
-    return result1032
+    _t1826 = Proto.Attribute(name=name1028, args=raw_values1032)
+    result1034 = _t1826
+    record_span!(parser, span_start1033, "Attribute")
+    return result1034
 end
 
 function parse_algorithm(parser::ParserState)::Proto.Algorithm
-    span_start1038 = span_start(parser)
+    span_start1041 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "algorithm")
-    xs1033 = Proto.RelationId[]
-    cond1034 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
-    while cond1034
-        _t1823 = parse_relation_id(parser)
-        item1035 = _t1823
-        push!(xs1033, item1035)
-        cond1034 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    xs1035 = Proto.RelationId[]
+    cond1036 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    while cond1036
+        _t1827 = parse_relation_id(parser)
+        item1037 = _t1827
+        push!(xs1035, item1037)
+        cond1036 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    end
+    relation_ids1038 = xs1035
+    _t1828 = parse_script(parser)
+    script1039 = _t1828
+    if match_lookahead_literal(parser, "(", 0)
+        _t1830 = parse_attrs(parser)
+        _t1829 = _t1830
+    else
+        _t1829 = nothing
     end
-    relation_ids1036 = xs1033
-    _t1824 = parse_script(parser)
-    script1037 = _t1824
+    attrs1040 = _t1829
     consume_literal!(parser, ")")
-    _t1825 = Proto.Algorithm(var"#global"=relation_ids1036, body=script1037)
-    result1039 = _t1825
-    record_span!(parser, span_start1038, "Algorithm")
-    return result1039
+    _t1831 = Proto.Algorithm(var"#global"=relation_ids1038, body=script1039, attrs=(!isnothing(attrs1040) ? attrs1040 : Proto.Attribute[]))
+    result1042 = _t1831
+    record_span!(parser, span_start1041, "Algorithm")
+    return result1042
 end
 
 function parse_script(parser::ParserState)::Proto.Script
-    span_start1044 = span_start(parser)
+    span_start1047 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "script")
-    xs1040 = Proto.Construct[]
-    cond1041 = match_lookahead_literal(parser, "(", 0)
-    while cond1041
-        _t1826 = parse_construct(parser)
-        item1042 = _t1826
-        push!(xs1040, item1042)
-        cond1041 = match_lookahead_literal(parser, "(", 0)
+    xs1043 = Proto.Construct[]
+    cond1044 = match_lookahead_literal(parser, "(", 0)
+    while cond1044
+        _t1832 = parse_construct(parser)
+        item1045 = _t1832
+        push!(xs1043, item1045)
+        cond1044 = match_lookahead_literal(parser, "(", 0)
     end
-    constructs1043 = xs1040
+    constructs1046 = xs1043
     consume_literal!(parser, ")")
-    _t1827 = Proto.Script(constructs=constructs1043)
-    result1045 = _t1827
-    record_span!(parser, span_start1044, "Script")
-    return result1045
+    _t1833 = Proto.Script(constructs=constructs1046)
+    result1048 = _t1833
+    record_span!(parser, span_start1047, "Script")
+    return result1048
 end
 
 function parse_construct(parser::ParserState)::Proto.Construct
-    span_start1049 = span_start(parser)
+    span_start1052 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "upsert", 1)
-            _t1829 = 1
+            _t1835 = 1
         else
             if match_lookahead_literal(parser, "monus", 1)
-                _t1830 = 1
+                _t1836 = 1
             else
                 if match_lookahead_literal(parser, "monoid", 1)
-                    _t1831 = 1
+                    _t1837 = 1
                 else
                     if match_lookahead_literal(parser, "loop", 1)
-                        _t1832 = 0
+                        _t1838 = 0
                     else
                         if match_lookahead_literal(parser, "break", 1)
-                            _t1833 = 1
+                            _t1839 = 1
                         else
                             if match_lookahead_literal(parser, "assign", 1)
-                                _t1834 = 1
+                                _t1840 = 1
                             else
-                                _t1834 = -1
+                                _t1840 = -1
                             end
-                            _t1833 = _t1834
+                            _t1839 = _t1840
                         end
-                        _t1832 = _t1833
+                        _t1838 = _t1839
                     end
-                    _t1831 = _t1832
+                    _t1837 = _t1838
                 end
-                _t1830 = _t1831
+                _t1836 = _t1837
             end
-            _t1829 = _t1830
+            _t1835 = _t1836
         end
-        _t1828 = _t1829
+        _t1834 = _t1835
     else
-        _t1828 = -1
+        _t1834 = -1
     end
-    prediction1046 = _t1828
-    if prediction1046 == 1
-        _t1836 = parse_instruction(parser)
-        instruction1048 = _t1836
-        _t1837 = Proto.Construct(construct_type=OneOf(:instruction, instruction1048))
-        _t1835 = _t1837
+    prediction1049 = _t1834
+    if prediction1049 == 1
+        _t1842 = parse_instruction(parser)
+        instruction1051 = _t1842
+        _t1843 = Proto.Construct(construct_type=OneOf(:instruction, instruction1051))
+        _t1841 = _t1843
     else
-        if prediction1046 == 0
-            _t1839 = parse_loop(parser)
-            loop1047 = _t1839
-            _t1840 = Proto.Construct(construct_type=OneOf(:loop, loop1047))
-            _t1838 = _t1840
+        if prediction1049 == 0
+            _t1845 = parse_loop(parser)
+            loop1050 = _t1845
+            _t1846 = Proto.Construct(construct_type=OneOf(:loop, loop1050))
+            _t1844 = _t1846
         else
             throw(ParseError("Unexpected token in construct" * ": " * string(lookahead(parser, 0))))
         end
-        _t1835 = _t1838
+        _t1841 = _t1844
     end
-    result1050 = _t1835
-    record_span!(parser, span_start1049, "Construct")
-    return result1050
+    result1053 = _t1841
+    record_span!(parser, span_start1052, "Construct")
+    return result1053
 end
 
 function parse_loop(parser::ParserState)::Proto.Loop
-    span_start1053 = span_start(parser)
+    span_start1057 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "loop")
-    _t1841 = parse_init(parser)
-    init1051 = _t1841
-    _t1842 = parse_script(parser)
-    script1052 = _t1842
+    _t1847 = parse_init(parser)
+    init1054 = _t1847
+    _t1848 = parse_script(parser)
+    script1055 = _t1848
+    if match_lookahead_literal(parser, "(", 0)
+        _t1850 = parse_attrs(parser)
+        _t1849 = _t1850
+    else
+        _t1849 = nothing
+    end
+    attrs1056 = _t1849
     consume_literal!(parser, ")")
-    _t1843 = Proto.Loop(init=init1051, body=script1052)
-    result1054 = _t1843
-    record_span!(parser, span_start1053, "Loop")
-    return result1054
+    _t1851 = Proto.Loop(init=init1054, body=script1055, attrs=(!isnothing(attrs1056) ? attrs1056 : Proto.Attribute[]))
+    result1058 = _t1851
+    record_span!(parser, span_start1057, "Loop")
+    return result1058
 end
 
 function parse_init(parser::ParserState)::Vector{Proto.Instruction}
     consume_literal!(parser, "(")
     consume_literal!(parser, "init")
-    xs1055 = Proto.Instruction[]
-    cond1056 = match_lookahead_literal(parser, "(", 0)
-    while cond1056
-        _t1844 = parse_instruction(parser)
-        item1057 = _t1844
-        push!(xs1055, item1057)
-        cond1056 = match_lookahead_literal(parser, "(", 0)
+    xs1059 = Proto.Instruction[]
+    cond1060 = match_lookahead_literal(parser, "(", 0)
+    while cond1060
+        _t1852 = parse_instruction(parser)
+        item1061 = _t1852
+        push!(xs1059, item1061)
+        cond1060 = match_lookahead_literal(parser, "(", 0)
     end
-    instructions1058 = xs1055
+    instructions1062 = xs1059
     consume_literal!(parser, ")")
-    return instructions1058
+    return instructions1062
 end
 
 function parse_instruction(parser::ParserState)::Proto.Instruction
-    span_start1065 = span_start(parser)
+    span_start1069 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "upsert", 1)
-            _t1846 = 1
+            _t1854 = 1
         else
             if match_lookahead_literal(parser, "monus", 1)
-                _t1847 = 4
+                _t1855 = 4
             else
                 if match_lookahead_literal(parser, "monoid", 1)
-                    _t1848 = 3
+                    _t1856 = 3
                 else
                     if match_lookahead_literal(parser, "break", 1)
-                        _t1849 = 2
+                        _t1857 = 2
                     else
                         if match_lookahead_literal(parser, "assign", 1)
-                            _t1850 = 0
+                            _t1858 = 0
                         else
-                            _t1850 = -1
+                            _t1858 = -1
                         end
-                        _t1849 = _t1850
+                        _t1857 = _t1858
                     end
-                    _t1848 = _t1849
+                    _t1856 = _t1857
                 end
-                _t1847 = _t1848
+                _t1855 = _t1856
             end
-            _t1846 = _t1847
+            _t1854 = _t1855
         end
-        _t1845 = _t1846
+        _t1853 = _t1854
     else
-        _t1845 = -1
+        _t1853 = -1
     end
-    prediction1059 = _t1845
-    if prediction1059 == 4
-        _t1852 = parse_monus_def(parser)
-        monus_def1064 = _t1852
-        _t1853 = Proto.Instruction(instr_type=OneOf(:monus_def, monus_def1064))
-        _t1851 = _t1853
+    prediction1063 = _t1853
+    if prediction1063 == 4
+        _t1860 = parse_monus_def(parser)
+        monus_def1068 = _t1860
+        _t1861 = Proto.Instruction(instr_type=OneOf(:monus_def, monus_def1068))
+        _t1859 = _t1861
     else
-        if prediction1059 == 3
-            _t1855 = parse_monoid_def(parser)
-            monoid_def1063 = _t1855
-            _t1856 = Proto.Instruction(instr_type=OneOf(:monoid_def, monoid_def1063))
-            _t1854 = _t1856
+        if prediction1063 == 3
+            _t1863 = parse_monoid_def(parser)
+            monoid_def1067 = _t1863
+            _t1864 = Proto.Instruction(instr_type=OneOf(:monoid_def, monoid_def1067))
+            _t1862 = _t1864
         else
-            if prediction1059 == 2
-                _t1858 = parse_break(parser)
-                break1062 = _t1858
-                _t1859 = Proto.Instruction(instr_type=OneOf(:var"#break", break1062))
-                _t1857 = _t1859
+            if prediction1063 == 2
+                _t1866 = parse_break(parser)
+                break1066 = _t1866
+                _t1867 = Proto.Instruction(instr_type=OneOf(:var"#break", break1066))
+                _t1865 = _t1867
             else
-                if prediction1059 == 1
-                    _t1861 = parse_upsert(parser)
-                    upsert1061 = _t1861
-                    _t1862 = Proto.Instruction(instr_type=OneOf(:upsert, upsert1061))
-                    _t1860 = _t1862
+                if prediction1063 == 1
+                    _t1869 = parse_upsert(parser)
+                    upsert1065 = _t1869
+                    _t1870 = Proto.Instruction(instr_type=OneOf(:upsert, upsert1065))
+                    _t1868 = _t1870
                 else
-                    if prediction1059 == 0
-                        _t1864 = parse_assign(parser)
-                        assign1060 = _t1864
-                        _t1865 = Proto.Instruction(instr_type=OneOf(:assign, assign1060))
-                        _t1863 = _t1865
+                    if prediction1063 == 0
+                        _t1872 = parse_assign(parser)
+                        assign1064 = _t1872
+                        _t1873 = Proto.Instruction(instr_type=OneOf(:assign, assign1064))
+                        _t1871 = _t1873
                     else
                         throw(ParseError("Unexpected token in instruction" * ": " * string(lookahead(parser, 0))))
                     end
-                    _t1860 = _t1863
+                    _t1868 = _t1871
                 end
-                _t1857 = _t1860
+                _t1865 = _t1868
             end
-            _t1854 = _t1857
+            _t1862 = _t1865
         end
-        _t1851 = _t1854
+        _t1859 = _t1862
     end
-    result1066 = _t1851
-    record_span!(parser, span_start1065, "Instruction")
-    return result1066
+    result1070 = _t1859
+    record_span!(parser, span_start1069, "Instruction")
+    return result1070
 end
 
 function parse_assign(parser::ParserState)::Proto.Assign
-    span_start1070 = span_start(parser)
+    span_start1074 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "assign")
-    _t1866 = parse_relation_id(parser)
-    relation_id1067 = _t1866
-    _t1867 = parse_abstraction(parser)
-    abstraction1068 = _t1867
+    _t1874 = parse_relation_id(parser)
+    relation_id1071 = _t1874
+    _t1875 = parse_abstraction(parser)
+    abstraction1072 = _t1875
     if match_lookahead_literal(parser, "(", 0)
-        _t1869 = parse_attrs(parser)
-        _t1868 = _t1869
+        _t1877 = parse_attrs(parser)
+        _t1876 = _t1877
     else
-        _t1868 = nothing
+        _t1876 = nothing
     end
-    attrs1069 = _t1868
+    attrs1073 = _t1876
     consume_literal!(parser, ")")
-    _t1870 = Proto.Assign(name=relation_id1067, body=abstraction1068, attrs=(!isnothing(attrs1069) ? attrs1069 : Proto.Attribute[]))
-    result1071 = _t1870
-    record_span!(parser, span_start1070, "Assign")
-    return result1071
+    _t1878 = Proto.Assign(name=relation_id1071, body=abstraction1072, attrs=(!isnothing(attrs1073) ? attrs1073 : Proto.Attribute[]))
+    result1075 = _t1878
+    record_span!(parser, span_start1074, "Assign")
+    return result1075
 end
 
 function parse_upsert(parser::ParserState)::Proto.Upsert
-    span_start1075 = span_start(parser)
+    span_start1079 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "upsert")
-    _t1871 = parse_relation_id(parser)
-    relation_id1072 = _t1871
-    _t1872 = parse_abstraction_with_arity(parser)
-    abstraction_with_arity1073 = _t1872
+    _t1879 = parse_relation_id(parser)
+    relation_id1076 = _t1879
+    _t1880 = parse_abstraction_with_arity(parser)
+    abstraction_with_arity1077 = _t1880
     if match_lookahead_literal(parser, "(", 0)
-        _t1874 = parse_attrs(parser)
-        _t1873 = _t1874
+        _t1882 = parse_attrs(parser)
+        _t1881 = _t1882
     else
-        _t1873 = nothing
+        _t1881 = nothing
     end
-    attrs1074 = _t1873
+    attrs1078 = _t1881
     consume_literal!(parser, ")")
-    _t1875 = Proto.Upsert(name=relation_id1072, body=abstraction_with_arity1073[1], attrs=(!isnothing(attrs1074) ? attrs1074 : Proto.Attribute[]), value_arity=abstraction_with_arity1073[2])
-    result1076 = _t1875
-    record_span!(parser, span_start1075, "Upsert")
-    return result1076
+    _t1883 = Proto.Upsert(name=relation_id1076, body=abstraction_with_arity1077[1], attrs=(!isnothing(attrs1078) ? attrs1078 : Proto.Attribute[]), value_arity=abstraction_with_arity1077[2])
+    result1080 = _t1883
+    record_span!(parser, span_start1079, "Upsert")
+    return result1080
 end
 
 function parse_abstraction_with_arity(parser::ParserState)::Tuple{Proto.Abstraction, Int64}
     consume_literal!(parser, "(")
-    _t1876 = parse_bindings(parser)
-    bindings1077 = _t1876
-    _t1877 = parse_formula(parser)
-    formula1078 = _t1877
+    _t1884 = parse_bindings(parser)
+    bindings1081 = _t1884
+    _t1885 = parse_formula(parser)
+    formula1082 = _t1885
     consume_literal!(parser, ")")
-    _t1878 = Proto.Abstraction(vars=vcat(bindings1077[1], !isnothing(bindings1077[2]) ? bindings1077[2] : []), value=formula1078)
-    return (_t1878, length(bindings1077[2]),)
+    _t1886 = Proto.Abstraction(vars=vcat(bindings1081[1], !isnothing(bindings1081[2]) ? bindings1081[2] : []), value=formula1082)
+    return (_t1886, length(bindings1081[2]),)
 end
 
 function parse_break(parser::ParserState)::Proto.Break
-    span_start1082 = span_start(parser)
+    span_start1086 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "break")
-    _t1879 = parse_relation_id(parser)
-    relation_id1079 = _t1879
-    _t1880 = parse_abstraction(parser)
-    abstraction1080 = _t1880
+    _t1887 = parse_relation_id(parser)
+    relation_id1083 = _t1887
+    _t1888 = parse_abstraction(parser)
+    abstraction1084 = _t1888
     if match_lookahead_literal(parser, "(", 0)
-        _t1882 = parse_attrs(parser)
-        _t1881 = _t1882
+        _t1890 = parse_attrs(parser)
+        _t1889 = _t1890
     else
-        _t1881 = nothing
+        _t1889 = nothing
     end
-    attrs1081 = _t1881
+    attrs1085 = _t1889
     consume_literal!(parser, ")")
-    _t1883 = Proto.Break(name=relation_id1079, body=abstraction1080, attrs=(!isnothing(attrs1081) ? attrs1081 : Proto.Attribute[]))
-    result1083 = _t1883
-    record_span!(parser, span_start1082, "Break")
-    return result1083
+    _t1891 = Proto.Break(name=relation_id1083, body=abstraction1084, attrs=(!isnothing(attrs1085) ? attrs1085 : Proto.Attribute[]))
+    result1087 = _t1891
+    record_span!(parser, span_start1086, "Break")
+    return result1087
 end
 
 function parse_monoid_def(parser::ParserState)::Proto.MonoidDef
-    span_start1088 = span_start(parser)
+    span_start1092 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "monoid")
-    _t1884 = parse_monoid(parser)
-    monoid1084 = _t1884
-    _t1885 = parse_relation_id(parser)
-    relation_id1085 = _t1885
-    _t1886 = parse_abstraction_with_arity(parser)
-    abstraction_with_arity1086 = _t1886
+    _t1892 = parse_monoid(parser)
+    monoid1088 = _t1892
+    _t1893 = parse_relation_id(parser)
+    relation_id1089 = _t1893
+    _t1894 = parse_abstraction_with_arity(parser)
+    abstraction_with_arity1090 = _t1894
     if match_lookahead_literal(parser, "(", 0)
-        _t1888 = parse_attrs(parser)
-        _t1887 = _t1888
+        _t1896 = parse_attrs(parser)
+        _t1895 = _t1896
     else
-        _t1887 = nothing
+        _t1895 = nothing
     end
-    attrs1087 = _t1887
+    attrs1091 = _t1895
     consume_literal!(parser, ")")
-    _t1889 = Proto.MonoidDef(monoid=monoid1084, name=relation_id1085, body=abstraction_with_arity1086[1], attrs=(!isnothing(attrs1087) ? attrs1087 : Proto.Attribute[]), value_arity=abstraction_with_arity1086[2])
-    result1089 = _t1889
-    record_span!(parser, span_start1088, "MonoidDef")
-    return result1089
+    _t1897 = Proto.MonoidDef(monoid=monoid1088, name=relation_id1089, body=abstraction_with_arity1090[1], attrs=(!isnothing(attrs1091) ? attrs1091 : Proto.Attribute[]), value_arity=abstraction_with_arity1090[2])
+    result1093 = _t1897
+    record_span!(parser, span_start1092, "MonoidDef")
+    return result1093
 end
 
 function parse_monoid(parser::ParserState)::Proto.Monoid
-    span_start1095 = span_start(parser)
+    span_start1099 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "sum", 1)
-            _t1891 = 3
+            _t1899 = 3
         else
             if match_lookahead_literal(parser, "or", 1)
-                _t1892 = 0
+                _t1900 = 0
             else
                 if match_lookahead_literal(parser, "min", 1)
-                    _t1893 = 1
+                    _t1901 = 1
                 else
                     if match_lookahead_literal(parser, "max", 1)
-                        _t1894 = 2
+                        _t1902 = 2
                     else
-                        _t1894 = -1
+                        _t1902 = -1
                     end
-                    _t1893 = _t1894
+                    _t1901 = _t1902
                 end
-                _t1892 = _t1893
+                _t1900 = _t1901
             end
-            _t1891 = _t1892
+            _t1899 = _t1900
         end
-        _t1890 = _t1891
+        _t1898 = _t1899
     else
-        _t1890 = -1
+        _t1898 = -1
     end
-    prediction1090 = _t1890
-    if prediction1090 == 3
-        _t1896 = parse_sum_monoid(parser)
-        sum_monoid1094 = _t1896
-        _t1897 = Proto.Monoid(value=OneOf(:sum_monoid, sum_monoid1094))
-        _t1895 = _t1897
+    prediction1094 = _t1898
+    if prediction1094 == 3
+        _t1904 = parse_sum_monoid(parser)
+        sum_monoid1098 = _t1904
+        _t1905 = Proto.Monoid(value=OneOf(:sum_monoid, sum_monoid1098))
+        _t1903 = _t1905
     else
-        if prediction1090 == 2
-            _t1899 = parse_max_monoid(parser)
-            max_monoid1093 = _t1899
-            _t1900 = Proto.Monoid(value=OneOf(:max_monoid, max_monoid1093))
-            _t1898 = _t1900
+        if prediction1094 == 2
+            _t1907 = parse_max_monoid(parser)
+            max_monoid1097 = _t1907
+            _t1908 = Proto.Monoid(value=OneOf(:max_monoid, max_monoid1097))
+            _t1906 = _t1908
         else
-            if prediction1090 == 1
-                _t1902 = parse_min_monoid(parser)
-                min_monoid1092 = _t1902
-                _t1903 = Proto.Monoid(value=OneOf(:min_monoid, min_monoid1092))
-                _t1901 = _t1903
+            if prediction1094 == 1
+                _t1910 = parse_min_monoid(parser)
+                min_monoid1096 = _t1910
+                _t1911 = Proto.Monoid(value=OneOf(:min_monoid, min_monoid1096))
+                _t1909 = _t1911
             else
-                if prediction1090 == 0
-                    _t1905 = parse_or_monoid(parser)
-                    or_monoid1091 = _t1905
-                    _t1906 = Proto.Monoid(value=OneOf(:or_monoid, or_monoid1091))
-                    _t1904 = _t1906
+                if prediction1094 == 0
+                    _t1913 = parse_or_monoid(parser)
+                    or_monoid1095 = _t1913
+                    _t1914 = Proto.Monoid(value=OneOf(:or_monoid, or_monoid1095))
+                    _t1912 = _t1914
                 else
                     throw(ParseError("Unexpected token in monoid" * ": " * string(lookahead(parser, 0))))
                 end
-                _t1901 = _t1904
+                _t1909 = _t1912
             end
-            _t1898 = _t1901
+            _t1906 = _t1909
         end
-        _t1895 = _t1898
+        _t1903 = _t1906
     end
-    result1096 = _t1895
-    record_span!(parser, span_start1095, "Monoid")
-    return result1096
+    result1100 = _t1903
+    record_span!(parser, span_start1099, "Monoid")
+    return result1100
 end
 
 function parse_or_monoid(parser::ParserState)::Proto.OrMonoid
-    span_start1097 = span_start(parser)
+    span_start1101 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "or")
     consume_literal!(parser, ")")
-    _t1907 = Proto.OrMonoid()
-    result1098 = _t1907
-    record_span!(parser, span_start1097, "OrMonoid")
-    return result1098
+    _t1915 = Proto.OrMonoid()
+    result1102 = _t1915
+    record_span!(parser, span_start1101, "OrMonoid")
+    return result1102
 end
 
 function parse_min_monoid(parser::ParserState)::Proto.MinMonoid
-    span_start1100 = span_start(parser)
+    span_start1104 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "min")
-    _t1908 = parse_type(parser)
-    type1099 = _t1908
+    _t1916 = parse_type(parser)
+    type1103 = _t1916
     consume_literal!(parser, ")")
-    _t1909 = Proto.MinMonoid(var"#type"=type1099)
-    result1101 = _t1909
-    record_span!(parser, span_start1100, "MinMonoid")
-    return result1101
+    _t1917 = Proto.MinMonoid(var"#type"=type1103)
+    result1105 = _t1917
+    record_span!(parser, span_start1104, "MinMonoid")
+    return result1105
 end
 
 function parse_max_monoid(parser::ParserState)::Proto.MaxMonoid
-    span_start1103 = span_start(parser)
+    span_start1107 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "max")
-    _t1910 = parse_type(parser)
-    type1102 = _t1910
+    _t1918 = parse_type(parser)
+    type1106 = _t1918
     consume_literal!(parser, ")")
-    _t1911 = Proto.MaxMonoid(var"#type"=type1102)
-    result1104 = _t1911
-    record_span!(parser, span_start1103, "MaxMonoid")
-    return result1104
+    _t1919 = Proto.MaxMonoid(var"#type"=type1106)
+    result1108 = _t1919
+    record_span!(parser, span_start1107, "MaxMonoid")
+    return result1108
 end
 
 function parse_sum_monoid(parser::ParserState)::Proto.SumMonoid
-    span_start1106 = span_start(parser)
+    span_start1110 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "sum")
-    _t1912 = parse_type(parser)
-    type1105 = _t1912
+    _t1920 = parse_type(parser)
+    type1109 = _t1920
     consume_literal!(parser, ")")
-    _t1913 = Proto.SumMonoid(var"#type"=type1105)
-    result1107 = _t1913
-    record_span!(parser, span_start1106, "SumMonoid")
-    return result1107
+    _t1921 = Proto.SumMonoid(var"#type"=type1109)
+    result1111 = _t1921
+    record_span!(parser, span_start1110, "SumMonoid")
+    return result1111
 end
 
 function parse_monus_def(parser::ParserState)::Proto.MonusDef
-    span_start1112 = span_start(parser)
+    span_start1116 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "monus")
-    _t1914 = parse_monoid(parser)
-    monoid1108 = _t1914
-    _t1915 = parse_relation_id(parser)
-    relation_id1109 = _t1915
-    _t1916 = parse_abstraction_with_arity(parser)
-    abstraction_with_arity1110 = _t1916
+    _t1922 = parse_monoid(parser)
+    monoid1112 = _t1922
+    _t1923 = parse_relation_id(parser)
+    relation_id1113 = _t1923
+    _t1924 = parse_abstraction_with_arity(parser)
+    abstraction_with_arity1114 = _t1924
     if match_lookahead_literal(parser, "(", 0)
-        _t1918 = parse_attrs(parser)
-        _t1917 = _t1918
+        _t1926 = parse_attrs(parser)
+        _t1925 = _t1926
     else
-        _t1917 = nothing
+        _t1925 = nothing
     end
-    attrs1111 = _t1917
+    attrs1115 = _t1925
     consume_literal!(parser, ")")
-    _t1919 = Proto.MonusDef(monoid=monoid1108, name=relation_id1109, body=abstraction_with_arity1110[1], attrs=(!isnothing(attrs1111) ? attrs1111 : Proto.Attribute[]), value_arity=abstraction_with_arity1110[2])
-    result1113 = _t1919
-    record_span!(parser, span_start1112, "MonusDef")
-    return result1113
+    _t1927 = Proto.MonusDef(monoid=monoid1112, name=relation_id1113, body=abstraction_with_arity1114[1], attrs=(!isnothing(attrs1115) ? attrs1115 : Proto.Attribute[]), value_arity=abstraction_with_arity1114[2])
+    result1117 = _t1927
+    record_span!(parser, span_start1116, "MonusDef")
+    return result1117
 end
 
 function parse_constraint(parser::ParserState)::Proto.Constraint
-    span_start1118 = span_start(parser)
+    span_start1122 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "functional_dependency")
-    _t1920 = parse_relation_id(parser)
-    relation_id1114 = _t1920
-    _t1921 = parse_abstraction(parser)
-    abstraction1115 = _t1921
-    _t1922 = parse_functional_dependency_keys(parser)
-    functional_dependency_keys1116 = _t1922
-    _t1923 = parse_functional_dependency_values(parser)
-    functional_dependency_values1117 = _t1923
+    _t1928 = parse_relation_id(parser)
+    relation_id1118 = _t1928
+    _t1929 = parse_abstraction(parser)
+    abstraction1119 = _t1929
+    _t1930 = parse_functional_dependency_keys(parser)
+    functional_dependency_keys1120 = _t1930
+    _t1931 = parse_functional_dependency_values(parser)
+    functional_dependency_values1121 = _t1931
     consume_literal!(parser, ")")
-    _t1924 = Proto.FunctionalDependency(guard=abstraction1115, keys=functional_dependency_keys1116, values=functional_dependency_values1117)
-    _t1925 = Proto.Constraint(constraint_type=OneOf(:functional_dependency, _t1924), name=relation_id1114)
-    result1119 = _t1925
-    record_span!(parser, span_start1118, "Constraint")
-    return result1119
+    _t1932 = Proto.FunctionalDependency(guard=abstraction1119, keys=functional_dependency_keys1120, values=functional_dependency_values1121)
+    _t1933 = Proto.Constraint(constraint_type=OneOf(:functional_dependency, _t1932), name=relation_id1118)
+    result1123 = _t1933
+    record_span!(parser, span_start1122, "Constraint")
+    return result1123
 end
 
 function parse_functional_dependency_keys(parser::ParserState)::Vector{Proto.Var}
     consume_literal!(parser, "(")
     consume_literal!(parser, "keys")
-    xs1120 = Proto.Var[]
-    cond1121 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    while cond1121
-        _t1926 = parse_var(parser)
-        item1122 = _t1926
-        push!(xs1120, item1122)
-        cond1121 = match_lookahead_terminal(parser, "SYMBOL", 0)
-    end
-    vars1123 = xs1120
-    consume_literal!(parser, ")")
-    return vars1123
-end
-
-function parse_functional_dependency_values(parser::ParserState)::Vector{Proto.Var}
-    consume_literal!(parser, "(")
-    consume_literal!(parser, "values")
     xs1124 = Proto.Var[]
     cond1125 = match_lookahead_terminal(parser, "SYMBOL", 0)
     while cond1125
-        _t1927 = parse_var(parser)
-        item1126 = _t1927
+        _t1934 = parse_var(parser)
+        item1126 = _t1934
         push!(xs1124, item1126)
         cond1125 = match_lookahead_terminal(parser, "SYMBOL", 0)
     end
@@ -3348,173 +3346,173 @@ function parse_functional_dependency_values(parser::ParserState)::Vector{Proto.V
     return vars1127
 end
 
+function parse_functional_dependency_values(parser::ParserState)::Vector{Proto.Var}
+    consume_literal!(parser, "(")
+    consume_literal!(parser, "values")
+    xs1128 = Proto.Var[]
+    cond1129 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    while cond1129
+        _t1935 = parse_var(parser)
+        item1130 = _t1935
+        push!(xs1128, item1130)
+        cond1129 = match_lookahead_terminal(parser, "SYMBOL", 0)
+    end
+    vars1131 = xs1128
+    consume_literal!(parser, ")")
+    return vars1131
+end
+
 function parse_data(parser::ParserState)::Proto.Data
-    span_start1133 = span_start(parser)
+    span_start1137 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "iceberg_data", 1)
-            _t1929 = 3
+            _t1937 = 3
         else
             if match_lookahead_literal(parser, "edb", 1)
-                _t1930 = 0
+                _t1938 = 0
             else
                 if match_lookahead_literal(parser, "csv_data", 1)
-                    _t1931 = 2
+                    _t1939 = 2
                 else
                     if match_lookahead_literal(parser, "betree_relation", 1)
-                        _t1932 = 1
+                        _t1940 = 1
                     else
-                        _t1932 = -1
+                        _t1940 = -1
                     end
-                    _t1931 = _t1932
+                    _t1939 = _t1940
                 end
-                _t1930 = _t1931
+                _t1938 = _t1939
             end
-            _t1929 = _t1930
+            _t1937 = _t1938
         end
-        _t1928 = _t1929
+        _t1936 = _t1937
     else
-        _t1928 = -1
+        _t1936 = -1
     end
-    prediction1128 = _t1928
-    if prediction1128 == 3
-        _t1934 = parse_iceberg_data(parser)
-        iceberg_data1132 = _t1934
-        _t1935 = Proto.Data(data_type=OneOf(:iceberg_data, iceberg_data1132))
-        _t1933 = _t1935
+    prediction1132 = _t1936
+    if prediction1132 == 3
+        _t1942 = parse_iceberg_data(parser)
+        iceberg_data1136 = _t1942
+        _t1943 = Proto.Data(data_type=OneOf(:iceberg_data, iceberg_data1136))
+        _t1941 = _t1943
     else
-        if prediction1128 == 2
-            _t1937 = parse_csv_data(parser)
-            csv_data1131 = _t1937
-            _t1938 = Proto.Data(data_type=OneOf(:csv_data, csv_data1131))
-            _t1936 = _t1938
+        if prediction1132 == 2
+            _t1945 = parse_csv_data(parser)
+            csv_data1135 = _t1945
+            _t1946 = Proto.Data(data_type=OneOf(:csv_data, csv_data1135))
+            _t1944 = _t1946
         else
-            if prediction1128 == 1
-                _t1940 = parse_betree_relation(parser)
-                betree_relation1130 = _t1940
-                _t1941 = Proto.Data(data_type=OneOf(:betree_relation, betree_relation1130))
-                _t1939 = _t1941
+            if prediction1132 == 1
+                _t1948 = parse_betree_relation(parser)
+                betree_relation1134 = _t1948
+                _t1949 = Proto.Data(data_type=OneOf(:betree_relation, betree_relation1134))
+                _t1947 = _t1949
             else
-                if prediction1128 == 0
-                    _t1943 = parse_edb(parser)
-                    edb1129 = _t1943
-                    _t1944 = Proto.Data(data_type=OneOf(:edb, edb1129))
-                    _t1942 = _t1944
+                if prediction1132 == 0
+                    _t1951 = parse_edb(parser)
+                    edb1133 = _t1951
+                    _t1952 = Proto.Data(data_type=OneOf(:edb, edb1133))
+                    _t1950 = _t1952
                 else
                     throw(ParseError("Unexpected token in data" * ": " * string(lookahead(parser, 0))))
                 end
-                _t1939 = _t1942
+                _t1947 = _t1950
             end
-            _t1936 = _t1939
+            _t1944 = _t1947
         end
-        _t1933 = _t1936
+        _t1941 = _t1944
     end
-    result1134 = _t1933
-    record_span!(parser, span_start1133, "Data")
-    return result1134
+    result1138 = _t1941
+    record_span!(parser, span_start1137, "Data")
+    return result1138
 end
 
 function parse_edb(parser::ParserState)::Proto.EDB
-    span_start1138 = span_start(parser)
+    span_start1142 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "edb")
-    _t1945 = parse_relation_id(parser)
-    relation_id1135 = _t1945
-    _t1946 = parse_edb_path(parser)
-    edb_path1136 = _t1946
-    _t1947 = parse_edb_types(parser)
-    edb_types1137 = _t1947
+    _t1953 = parse_relation_id(parser)
+    relation_id1139 = _t1953
+    _t1954 = parse_edb_path(parser)
+    edb_path1140 = _t1954
+    _t1955 = parse_edb_types(parser)
+    edb_types1141 = _t1955
     consume_literal!(parser, ")")
-    _t1948 = Proto.EDB(target_id=relation_id1135, path=edb_path1136, types=edb_types1137)
-    result1139 = _t1948
-    record_span!(parser, span_start1138, "EDB")
-    return result1139
+    _t1956 = Proto.EDB(target_id=relation_id1139, path=edb_path1140, types=edb_types1141)
+    result1143 = _t1956
+    record_span!(parser, span_start1142, "EDB")
+    return result1143
 end
 
 function parse_edb_path(parser::ParserState)::Vector{String}
     consume_literal!(parser, "[")
-    xs1140 = String[]
-    cond1141 = match_lookahead_terminal(parser, "STRING", 0)
-    while cond1141
-        item1142 = consume_terminal!(parser, "STRING")
-        push!(xs1140, item1142)
-        cond1141 = match_lookahead_terminal(parser, "STRING", 0)
+    xs1144 = String[]
+    cond1145 = match_lookahead_terminal(parser, "STRING", 0)
+    while cond1145
+        item1146 = consume_terminal!(parser, "STRING")
+        push!(xs1144, item1146)
+        cond1145 = match_lookahead_terminal(parser, "STRING", 0)
     end
-    strings1143 = xs1140
+    strings1147 = xs1144
     consume_literal!(parser, "]")
-    return strings1143
+    return strings1147
 end
 
 function parse_edb_types(parser::ParserState)::Vector{Proto.var"#Type"}
     consume_literal!(parser, "[")
-    xs1144 = Proto.var"#Type"[]
-    cond1145 = (((((((((((((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 cond1145
-        _t1949 = parse_type(parser)
-        item1146 = _t1949
-        push!(xs1144, item1146)
-        cond1145 = (((((((((((((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))
+    xs1148 = Proto.var"#Type"[]
+    cond1149 = (((((((((((((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 cond1149
+        _t1957 = parse_type(parser)
+        item1150 = _t1957
+        push!(xs1148, item1150)
+        cond1149 = (((((((((((((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
-    types1147 = xs1144
+    types1151 = xs1148
     consume_literal!(parser, "]")
-    return types1147
+    return types1151
 end
 
 function parse_betree_relation(parser::ParserState)::Proto.BeTreeRelation
-    span_start1150 = span_start(parser)
+    span_start1154 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "betree_relation")
-    _t1950 = parse_relation_id(parser)
-    relation_id1148 = _t1950
-    _t1951 = parse_betree_info(parser)
-    betree_info1149 = _t1951
+    _t1958 = parse_relation_id(parser)
+    relation_id1152 = _t1958
+    _t1959 = parse_betree_info(parser)
+    betree_info1153 = _t1959
     consume_literal!(parser, ")")
-    _t1952 = Proto.BeTreeRelation(name=relation_id1148, relation_info=betree_info1149)
-    result1151 = _t1952
-    record_span!(parser, span_start1150, "BeTreeRelation")
-    return result1151
+    _t1960 = Proto.BeTreeRelation(name=relation_id1152, relation_info=betree_info1153)
+    result1155 = _t1960
+    record_span!(parser, span_start1154, "BeTreeRelation")
+    return result1155
 end
 
 function parse_betree_info(parser::ParserState)::Proto.BeTreeInfo
-    span_start1155 = span_start(parser)
+    span_start1159 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "betree_info")
-    _t1953 = parse_betree_info_key_types(parser)
-    betree_info_key_types1152 = _t1953
-    _t1954 = parse_betree_info_value_types(parser)
-    betree_info_value_types1153 = _t1954
-    _t1955 = parse_config_dict(parser)
-    config_dict1154 = _t1955
+    _t1961 = parse_betree_info_key_types(parser)
+    betree_info_key_types1156 = _t1961
+    _t1962 = parse_betree_info_value_types(parser)
+    betree_info_value_types1157 = _t1962
+    _t1963 = parse_config_dict(parser)
+    config_dict1158 = _t1963
     consume_literal!(parser, ")")
-    _t1956 = construct_betree_info(parser, betree_info_key_types1152, betree_info_value_types1153, config_dict1154)
-    result1156 = _t1956
-    record_span!(parser, span_start1155, "BeTreeInfo")
-    return result1156
+    _t1964 = construct_betree_info(parser, betree_info_key_types1156, betree_info_value_types1157, config_dict1158)
+    result1160 = _t1964
+    record_span!(parser, span_start1159, "BeTreeInfo")
+    return result1160
 end
 
 function parse_betree_info_key_types(parser::ParserState)::Vector{Proto.var"#Type"}
     consume_literal!(parser, "(")
     consume_literal!(parser, "key_types")
-    xs1157 = Proto.var"#Type"[]
-    cond1158 = (((((((((((((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 cond1158
-        _t1957 = parse_type(parser)
-        item1159 = _t1957
-        push!(xs1157, item1159)
-        cond1158 = (((((((((((((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
-    types1160 = xs1157
-    consume_literal!(parser, ")")
-    return types1160
-end
-
-function parse_betree_info_value_types(parser::ParserState)::Vector{Proto.var"#Type"}
-    consume_literal!(parser, "(")
-    consume_literal!(parser, "value_types")
     xs1161 = Proto.var"#Type"[]
     cond1162 = (((((((((((((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 cond1162
-        _t1958 = parse_type(parser)
-        item1163 = _t1958
+        _t1965 = parse_type(parser)
+        item1163 = _t1965
         push!(xs1161, item1163)
         cond1162 = (((((((((((((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
@@ -3523,866 +3521,882 @@ function parse_betree_info_value_types(parser::ParserState)::Vector{Proto.var"#T
     return types1164
 end
 
+function parse_betree_info_value_types(parser::ParserState)::Vector{Proto.var"#Type"}
+    consume_literal!(parser, "(")
+    consume_literal!(parser, "value_types")
+    xs1165 = Proto.var"#Type"[]
+    cond1166 = (((((((((((((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 cond1166
+        _t1966 = parse_type(parser)
+        item1167 = _t1966
+        push!(xs1165, item1167)
+        cond1166 = (((((((((((((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
+    types1168 = xs1165
+    consume_literal!(parser, ")")
+    return types1168
+end
+
 function parse_csv_data(parser::ParserState)::Proto.CSVData
-    span_start1169 = span_start(parser)
+    span_start1173 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "csv_data")
-    _t1959 = parse_csvlocator(parser)
-    csvlocator1165 = _t1959
-    _t1960 = parse_csv_config(parser)
-    csv_config1166 = _t1960
-    _t1961 = parse_gnf_columns(parser)
-    gnf_columns1167 = _t1961
-    _t1962 = parse_csv_asof(parser)
-    csv_asof1168 = _t1962
+    _t1967 = parse_csvlocator(parser)
+    csvlocator1169 = _t1967
+    _t1968 = parse_csv_config(parser)
+    csv_config1170 = _t1968
+    _t1969 = parse_gnf_columns(parser)
+    gnf_columns1171 = _t1969
+    _t1970 = parse_csv_asof(parser)
+    csv_asof1172 = _t1970
     consume_literal!(parser, ")")
-    _t1963 = Proto.CSVData(locator=csvlocator1165, config=csv_config1166, columns=gnf_columns1167, asof=csv_asof1168)
-    result1170 = _t1963
-    record_span!(parser, span_start1169, "CSVData")
-    return result1170
+    _t1971 = Proto.CSVData(locator=csvlocator1169, config=csv_config1170, columns=gnf_columns1171, asof=csv_asof1172)
+    result1174 = _t1971
+    record_span!(parser, span_start1173, "CSVData")
+    return result1174
 end
 
 function parse_csvlocator(parser::ParserState)::Proto.CSVLocator
-    span_start1173 = span_start(parser)
+    span_start1177 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "csv_locator")
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "paths", 1))
-        _t1965 = parse_csv_locator_paths(parser)
-        _t1964 = _t1965
+        _t1973 = parse_csv_locator_paths(parser)
+        _t1972 = _t1973
     else
-        _t1964 = nothing
+        _t1972 = nothing
     end
-    csv_locator_paths1171 = _t1964
+    csv_locator_paths1175 = _t1972
     if match_lookahead_literal(parser, "(", 0)
-        _t1967 = parse_csv_locator_inline_data(parser)
-        _t1966 = _t1967
+        _t1975 = parse_csv_locator_inline_data(parser)
+        _t1974 = _t1975
     else
-        _t1966 = nothing
+        _t1974 = nothing
     end
-    csv_locator_inline_data1172 = _t1966
+    csv_locator_inline_data1176 = _t1974
     consume_literal!(parser, ")")
-    _t1968 = Proto.CSVLocator(paths=(!isnothing(csv_locator_paths1171) ? csv_locator_paths1171 : String[]), inline_data=Vector{UInt8}((!isnothing(csv_locator_inline_data1172) ? csv_locator_inline_data1172 : "")))
-    result1174 = _t1968
-    record_span!(parser, span_start1173, "CSVLocator")
-    return result1174
+    _t1976 = Proto.CSVLocator(paths=(!isnothing(csv_locator_paths1175) ? csv_locator_paths1175 : String[]), inline_data=Vector{UInt8}((!isnothing(csv_locator_inline_data1176) ? csv_locator_inline_data1176 : "")))
+    result1178 = _t1976
+    record_span!(parser, span_start1177, "CSVLocator")
+    return result1178
 end
 
 function parse_csv_locator_paths(parser::ParserState)::Vector{String}
     consume_literal!(parser, "(")
     consume_literal!(parser, "paths")
-    xs1175 = String[]
-    cond1176 = match_lookahead_terminal(parser, "STRING", 0)
-    while cond1176
-        item1177 = consume_terminal!(parser, "STRING")
-        push!(xs1175, item1177)
-        cond1176 = match_lookahead_terminal(parser, "STRING", 0)
+    xs1179 = String[]
+    cond1180 = match_lookahead_terminal(parser, "STRING", 0)
+    while cond1180
+        item1181 = consume_terminal!(parser, "STRING")
+        push!(xs1179, item1181)
+        cond1180 = match_lookahead_terminal(parser, "STRING", 0)
     end
-    strings1178 = xs1175
+    strings1182 = xs1179
     consume_literal!(parser, ")")
-    return strings1178
+    return strings1182
 end
 
 function parse_csv_locator_inline_data(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "inline_data")
-    string1179 = consume_terminal!(parser, "STRING")
+    string1183 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1179
+    return string1183
 end
 
 function parse_csv_config(parser::ParserState)::Proto.CSVConfig
-    span_start1181 = span_start(parser)
+    span_start1185 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "csv_config")
-    _t1969 = parse_config_dict(parser)
-    config_dict1180 = _t1969
+    _t1977 = parse_config_dict(parser)
+    config_dict1184 = _t1977
     consume_literal!(parser, ")")
-    _t1970 = construct_csv_config(parser, config_dict1180)
-    result1182 = _t1970
-    record_span!(parser, span_start1181, "CSVConfig")
-    return result1182
+    _t1978 = construct_csv_config(parser, config_dict1184)
+    result1186 = _t1978
+    record_span!(parser, span_start1185, "CSVConfig")
+    return result1186
 end
 
 function parse_gnf_columns(parser::ParserState)::Vector{Proto.GNFColumn}
     consume_literal!(parser, "(")
     consume_literal!(parser, "columns")
-    xs1183 = Proto.GNFColumn[]
-    cond1184 = match_lookahead_literal(parser, "(", 0)
-    while cond1184
-        _t1971 = parse_gnf_column(parser)
-        item1185 = _t1971
-        push!(xs1183, item1185)
-        cond1184 = match_lookahead_literal(parser, "(", 0)
+    xs1187 = Proto.GNFColumn[]
+    cond1188 = match_lookahead_literal(parser, "(", 0)
+    while cond1188
+        _t1979 = parse_gnf_column(parser)
+        item1189 = _t1979
+        push!(xs1187, item1189)
+        cond1188 = match_lookahead_literal(parser, "(", 0)
     end
-    gnf_columns1186 = xs1183
+    gnf_columns1190 = xs1187
     consume_literal!(parser, ")")
-    return gnf_columns1186
+    return gnf_columns1190
 end
 
 function parse_gnf_column(parser::ParserState)::Proto.GNFColumn
-    span_start1193 = span_start(parser)
+    span_start1197 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "column")
-    _t1972 = parse_gnf_column_path(parser)
-    gnf_column_path1187 = _t1972
+    _t1980 = parse_gnf_column_path(parser)
+    gnf_column_path1191 = _t1980
     if (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
-        _t1974 = parse_relation_id(parser)
-        _t1973 = _t1974
+        _t1982 = parse_relation_id(parser)
+        _t1981 = _t1982
     else
-        _t1973 = nothing
+        _t1981 = nothing
     end
-    relation_id1188 = _t1973
+    relation_id1192 = _t1981
     consume_literal!(parser, "[")
-    xs1189 = Proto.var"#Type"[]
-    cond1190 = (((((((((((((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 cond1190
-        _t1975 = parse_type(parser)
-        item1191 = _t1975
-        push!(xs1189, item1191)
-        cond1190 = (((((((((((((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))
+    xs1193 = Proto.var"#Type"[]
+    cond1194 = (((((((((((((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 cond1194
+        _t1983 = parse_type(parser)
+        item1195 = _t1983
+        push!(xs1193, item1195)
+        cond1194 = (((((((((((((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
-    types1192 = xs1189
+    types1196 = xs1193
     consume_literal!(parser, "]")
     consume_literal!(parser, ")")
-    _t1976 = Proto.GNFColumn(column_path=gnf_column_path1187, target_id=relation_id1188, types=types1192)
-    result1194 = _t1976
-    record_span!(parser, span_start1193, "GNFColumn")
-    return result1194
+    _t1984 = Proto.GNFColumn(column_path=gnf_column_path1191, target_id=relation_id1192, types=types1196)
+    result1198 = _t1984
+    record_span!(parser, span_start1197, "GNFColumn")
+    return result1198
 end
 
 function parse_gnf_column_path(parser::ParserState)::Vector{String}
     if match_lookahead_literal(parser, "[", 0)
-        _t1977 = 1
+        _t1985 = 1
     else
         if match_lookahead_terminal(parser, "STRING", 0)
-            _t1978 = 0
+            _t1986 = 0
         else
-            _t1978 = -1
+            _t1986 = -1
         end
-        _t1977 = _t1978
+        _t1985 = _t1986
     end
-    prediction1195 = _t1977
-    if prediction1195 == 1
+    prediction1199 = _t1985
+    if prediction1199 == 1
         consume_literal!(parser, "[")
-        xs1197 = String[]
-        cond1198 = match_lookahead_terminal(parser, "STRING", 0)
-        while cond1198
-            item1199 = consume_terminal!(parser, "STRING")
-            push!(xs1197, item1199)
-            cond1198 = match_lookahead_terminal(parser, "STRING", 0)
+        xs1201 = String[]
+        cond1202 = match_lookahead_terminal(parser, "STRING", 0)
+        while cond1202
+            item1203 = consume_terminal!(parser, "STRING")
+            push!(xs1201, item1203)
+            cond1202 = match_lookahead_terminal(parser, "STRING", 0)
         end
-        strings1200 = xs1197
+        strings1204 = xs1201
         consume_literal!(parser, "]")
-        _t1979 = strings1200
+        _t1987 = strings1204
     else
-        if prediction1195 == 0
-            string1196 = consume_terminal!(parser, "STRING")
-            _t1980 = String[string1196]
+        if prediction1199 == 0
+            string1200 = consume_terminal!(parser, "STRING")
+            _t1988 = String[string1200]
         else
             throw(ParseError("Unexpected token in gnf_column_path" * ": " * string(lookahead(parser, 0))))
         end
-        _t1979 = _t1980
+        _t1987 = _t1988
     end
-    return _t1979
+    return _t1987
 end
 
 function parse_csv_asof(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "asof")
-    string1201 = consume_terminal!(parser, "STRING")
+    string1205 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1201
+    return string1205
 end
 
 function parse_iceberg_data(parser::ParserState)::Proto.IcebergData
-    span_start1208 = span_start(parser)
+    span_start1212 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "iceberg_data")
-    _t1981 = parse_iceberg_locator(parser)
-    iceberg_locator1202 = _t1981
-    _t1982 = parse_iceberg_catalog_config(parser)
-    iceberg_catalog_config1203 = _t1982
-    _t1983 = parse_gnf_columns(parser)
-    gnf_columns1204 = _t1983
+    _t1989 = parse_iceberg_locator(parser)
+    iceberg_locator1206 = _t1989
+    _t1990 = parse_iceberg_catalog_config(parser)
+    iceberg_catalog_config1207 = _t1990
+    _t1991 = parse_gnf_columns(parser)
+    gnf_columns1208 = _t1991
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "from_snapshot", 1))
-        _t1985 = parse_iceberg_from_snapshot(parser)
-        _t1984 = _t1985
+        _t1993 = parse_iceberg_from_snapshot(parser)
+        _t1992 = _t1993
     else
-        _t1984 = nothing
+        _t1992 = nothing
     end
-    iceberg_from_snapshot1205 = _t1984
+    iceberg_from_snapshot1209 = _t1992
     if match_lookahead_literal(parser, "(", 0)
-        _t1987 = parse_iceberg_to_snapshot(parser)
-        _t1986 = _t1987
+        _t1995 = parse_iceberg_to_snapshot(parser)
+        _t1994 = _t1995
     else
-        _t1986 = nothing
+        _t1994 = nothing
     end
-    iceberg_to_snapshot1206 = _t1986
-    _t1988 = parse_boolean_value(parser)
-    boolean_value1207 = _t1988
+    iceberg_to_snapshot1210 = _t1994
+    _t1996 = parse_boolean_value(parser)
+    boolean_value1211 = _t1996
     consume_literal!(parser, ")")
-    _t1989 = construct_iceberg_data(parser, iceberg_locator1202, iceberg_catalog_config1203, gnf_columns1204, iceberg_from_snapshot1205, iceberg_to_snapshot1206, boolean_value1207)
-    result1209 = _t1989
-    record_span!(parser, span_start1208, "IcebergData")
-    return result1209
+    _t1997 = construct_iceberg_data(parser, iceberg_locator1206, iceberg_catalog_config1207, gnf_columns1208, iceberg_from_snapshot1209, iceberg_to_snapshot1210, boolean_value1211)
+    result1213 = _t1997
+    record_span!(parser, span_start1212, "IcebergData")
+    return result1213
 end
 
 function parse_iceberg_locator(parser::ParserState)::Proto.IcebergLocator
-    span_start1213 = span_start(parser)
+    span_start1217 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "iceberg_locator")
-    _t1990 = parse_iceberg_locator_table_name(parser)
-    iceberg_locator_table_name1210 = _t1990
-    _t1991 = parse_iceberg_locator_namespace(parser)
-    iceberg_locator_namespace1211 = _t1991
-    _t1992 = parse_iceberg_locator_warehouse(parser)
-    iceberg_locator_warehouse1212 = _t1992
+    _t1998 = parse_iceberg_locator_table_name(parser)
+    iceberg_locator_table_name1214 = _t1998
+    _t1999 = parse_iceberg_locator_namespace(parser)
+    iceberg_locator_namespace1215 = _t1999
+    _t2000 = parse_iceberg_locator_warehouse(parser)
+    iceberg_locator_warehouse1216 = _t2000
     consume_literal!(parser, ")")
-    _t1993 = Proto.IcebergLocator(table_name=iceberg_locator_table_name1210, namespace=iceberg_locator_namespace1211, warehouse=iceberg_locator_warehouse1212)
-    result1214 = _t1993
-    record_span!(parser, span_start1213, "IcebergLocator")
-    return result1214
+    _t2001 = Proto.IcebergLocator(table_name=iceberg_locator_table_name1214, namespace=iceberg_locator_namespace1215, warehouse=iceberg_locator_warehouse1216)
+    result1218 = _t2001
+    record_span!(parser, span_start1217, "IcebergLocator")
+    return result1218
 end
 
 function parse_iceberg_locator_table_name(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "table_name")
-    string1215 = consume_terminal!(parser, "STRING")
+    string1219 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1215
+    return string1219
 end
 
 function parse_iceberg_locator_namespace(parser::ParserState)::Vector{String}
     consume_literal!(parser, "(")
     consume_literal!(parser, "namespace")
-    xs1216 = String[]
-    cond1217 = match_lookahead_terminal(parser, "STRING", 0)
-    while cond1217
-        item1218 = consume_terminal!(parser, "STRING")
-        push!(xs1216, item1218)
-        cond1217 = match_lookahead_terminal(parser, "STRING", 0)
+    xs1220 = String[]
+    cond1221 = match_lookahead_terminal(parser, "STRING", 0)
+    while cond1221
+        item1222 = consume_terminal!(parser, "STRING")
+        push!(xs1220, item1222)
+        cond1221 = match_lookahead_terminal(parser, "STRING", 0)
     end
-    strings1219 = xs1216
+    strings1223 = xs1220
     consume_literal!(parser, ")")
-    return strings1219
+    return strings1223
 end
 
 function parse_iceberg_locator_warehouse(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "warehouse")
-    string1220 = consume_terminal!(parser, "STRING")
+    string1224 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1220
+    return string1224
 end
 
 function parse_iceberg_catalog_config(parser::ParserState)::Proto.IcebergCatalogConfig
-    span_start1225 = span_start(parser)
+    span_start1229 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "iceberg_catalog_config")
-    _t1994 = parse_iceberg_catalog_uri(parser)
-    iceberg_catalog_uri1221 = _t1994
+    _t2002 = parse_iceberg_catalog_uri(parser)
+    iceberg_catalog_uri1225 = _t2002
     if (match_lookahead_literal(parser, "(", 0) && match_lookahead_literal(parser, "scope", 1))
-        _t1996 = parse_iceberg_catalog_config_scope(parser)
-        _t1995 = _t1996
+        _t2004 = parse_iceberg_catalog_config_scope(parser)
+        _t2003 = _t2004
     else
-        _t1995 = nothing
+        _t2003 = nothing
     end
-    iceberg_catalog_config_scope1222 = _t1995
-    _t1997 = parse_iceberg_properties(parser)
-    iceberg_properties1223 = _t1997
-    _t1998 = parse_iceberg_auth_properties(parser)
-    iceberg_auth_properties1224 = _t1998
+    iceberg_catalog_config_scope1226 = _t2003
+    _t2005 = parse_iceberg_properties(parser)
+    iceberg_properties1227 = _t2005
+    _t2006 = parse_iceberg_auth_properties(parser)
+    iceberg_auth_properties1228 = _t2006
     consume_literal!(parser, ")")
-    _t1999 = construct_iceberg_catalog_config(parser, iceberg_catalog_uri1221, iceberg_catalog_config_scope1222, iceberg_properties1223, iceberg_auth_properties1224)
-    result1226 = _t1999
-    record_span!(parser, span_start1225, "IcebergCatalogConfig")
-    return result1226
+    _t2007 = construct_iceberg_catalog_config(parser, iceberg_catalog_uri1225, iceberg_catalog_config_scope1226, iceberg_properties1227, iceberg_auth_properties1228)
+    result1230 = _t2007
+    record_span!(parser, span_start1229, "IcebergCatalogConfig")
+    return result1230
 end
 
 function parse_iceberg_catalog_uri(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "catalog_uri")
-    string1227 = consume_terminal!(parser, "STRING")
+    string1231 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1227
+    return string1231
 end
 
 function parse_iceberg_catalog_config_scope(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "scope")
-    string1228 = consume_terminal!(parser, "STRING")
+    string1232 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1228
+    return string1232
 end
 
 function parse_iceberg_properties(parser::ParserState)::Vector{Tuple{String, String}}
     consume_literal!(parser, "(")
     consume_literal!(parser, "properties")
-    xs1229 = Tuple{String, String}[]
-    cond1230 = match_lookahead_literal(parser, "(", 0)
-    while cond1230
-        _t2000 = parse_iceberg_property_entry(parser)
-        item1231 = _t2000
-        push!(xs1229, item1231)
-        cond1230 = match_lookahead_literal(parser, "(", 0)
+    xs1233 = Tuple{String, String}[]
+    cond1234 = match_lookahead_literal(parser, "(", 0)
+    while cond1234
+        _t2008 = parse_iceberg_property_entry(parser)
+        item1235 = _t2008
+        push!(xs1233, item1235)
+        cond1234 = match_lookahead_literal(parser, "(", 0)
     end
-    iceberg_property_entrys1232 = xs1229
+    iceberg_property_entrys1236 = xs1233
     consume_literal!(parser, ")")
-    return iceberg_property_entrys1232
+    return iceberg_property_entrys1236
 end
 
 function parse_iceberg_property_entry(parser::ParserState)::Tuple{String, String}
     consume_literal!(parser, "(")
     consume_literal!(parser, "prop")
-    string1233 = consume_terminal!(parser, "STRING")
-    string_31234 = consume_terminal!(parser, "STRING")
+    string1237 = consume_terminal!(parser, "STRING")
+    string_31238 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return (string1233, string_31234,)
+    return (string1237, string_31238,)
 end
 
 function parse_iceberg_auth_properties(parser::ParserState)::Vector{Tuple{String, String}}
     consume_literal!(parser, "(")
     consume_literal!(parser, "auth_properties")
-    xs1235 = Tuple{String, String}[]
-    cond1236 = match_lookahead_literal(parser, "(", 0)
-    while cond1236
-        _t2001 = parse_iceberg_masked_property_entry(parser)
-        item1237 = _t2001
-        push!(xs1235, item1237)
-        cond1236 = match_lookahead_literal(parser, "(", 0)
+    xs1239 = Tuple{String, String}[]
+    cond1240 = match_lookahead_literal(parser, "(", 0)
+    while cond1240
+        _t2009 = parse_iceberg_masked_property_entry(parser)
+        item1241 = _t2009
+        push!(xs1239, item1241)
+        cond1240 = match_lookahead_literal(parser, "(", 0)
     end
-    iceberg_masked_property_entrys1238 = xs1235
+    iceberg_masked_property_entrys1242 = xs1239
     consume_literal!(parser, ")")
-    return iceberg_masked_property_entrys1238
+    return iceberg_masked_property_entrys1242
 end
 
 function parse_iceberg_masked_property_entry(parser::ParserState)::Tuple{String, String}
     consume_literal!(parser, "(")
     consume_literal!(parser, "prop")
-    string1239 = consume_terminal!(parser, "STRING")
-    string_31240 = consume_terminal!(parser, "STRING")
+    string1243 = consume_terminal!(parser, "STRING")
+    string_31244 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return (string1239, string_31240,)
+    return (string1243, string_31244,)
 end
 
 function parse_iceberg_from_snapshot(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "from_snapshot")
-    string1241 = consume_terminal!(parser, "STRING")
+    string1245 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1241
+    return string1245
 end
 
 function parse_iceberg_to_snapshot(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "to_snapshot")
-    string1242 = consume_terminal!(parser, "STRING")
+    string1246 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1242
+    return string1246
 end
 
 function parse_undefine(parser::ParserState)::Proto.Undefine
-    span_start1244 = span_start(parser)
+    span_start1248 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "undefine")
-    _t2002 = parse_fragment_id(parser)
-    fragment_id1243 = _t2002
+    _t2010 = parse_fragment_id(parser)
+    fragment_id1247 = _t2010
     consume_literal!(parser, ")")
-    _t2003 = Proto.Undefine(fragment_id=fragment_id1243)
-    result1245 = _t2003
-    record_span!(parser, span_start1244, "Undefine")
-    return result1245
+    _t2011 = Proto.Undefine(fragment_id=fragment_id1247)
+    result1249 = _t2011
+    record_span!(parser, span_start1248, "Undefine")
+    return result1249
 end
 
 function parse_context(parser::ParserState)::Proto.Context
-    span_start1250 = span_start(parser)
+    span_start1254 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "context")
-    xs1246 = Proto.RelationId[]
-    cond1247 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
-    while cond1247
-        _t2004 = parse_relation_id(parser)
-        item1248 = _t2004
-        push!(xs1246, item1248)
-        cond1247 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    xs1250 = Proto.RelationId[]
+    cond1251 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
+    while cond1251
+        _t2012 = parse_relation_id(parser)
+        item1252 = _t2012
+        push!(xs1250, item1252)
+        cond1251 = (match_lookahead_literal(parser, ":", 0) || match_lookahead_terminal(parser, "UINT128", 0))
     end
-    relation_ids1249 = xs1246
+    relation_ids1253 = xs1250
     consume_literal!(parser, ")")
-    _t2005 = Proto.Context(relations=relation_ids1249)
-    result1251 = _t2005
-    record_span!(parser, span_start1250, "Context")
-    return result1251
+    _t2013 = Proto.Context(relations=relation_ids1253)
+    result1255 = _t2013
+    record_span!(parser, span_start1254, "Context")
+    return result1255
 end
 
 function parse_snapshot(parser::ParserState)::Proto.Snapshot
-    span_start1257 = span_start(parser)
+    span_start1261 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "snapshot")
-    _t2006 = parse_edb_path(parser)
-    edb_path1252 = _t2006
-    xs1253 = Proto.SnapshotMapping[]
-    cond1254 = match_lookahead_literal(parser, "[", 0)
-    while cond1254
-        _t2007 = parse_snapshot_mapping(parser)
-        item1255 = _t2007
-        push!(xs1253, item1255)
-        cond1254 = match_lookahead_literal(parser, "[", 0)
+    _t2014 = parse_edb_path(parser)
+    edb_path1256 = _t2014
+    xs1257 = Proto.SnapshotMapping[]
+    cond1258 = match_lookahead_literal(parser, "[", 0)
+    while cond1258
+        _t2015 = parse_snapshot_mapping(parser)
+        item1259 = _t2015
+        push!(xs1257, item1259)
+        cond1258 = match_lookahead_literal(parser, "[", 0)
     end
-    snapshot_mappings1256 = xs1253
+    snapshot_mappings1260 = xs1257
     consume_literal!(parser, ")")
-    _t2008 = Proto.Snapshot(mappings=snapshot_mappings1256, prefix=edb_path1252)
-    result1258 = _t2008
-    record_span!(parser, span_start1257, "Snapshot")
-    return result1258
+    _t2016 = Proto.Snapshot(mappings=snapshot_mappings1260, prefix=edb_path1256)
+    result1262 = _t2016
+    record_span!(parser, span_start1261, "Snapshot")
+    return result1262
 end
 
 function parse_snapshot_mapping(parser::ParserState)::Proto.SnapshotMapping
-    span_start1261 = span_start(parser)
-    _t2009 = parse_edb_path(parser)
-    edb_path1259 = _t2009
-    _t2010 = parse_relation_id(parser)
-    relation_id1260 = _t2010
-    _t2011 = Proto.SnapshotMapping(destination_path=edb_path1259, source_relation=relation_id1260)
-    result1262 = _t2011
-    record_span!(parser, span_start1261, "SnapshotMapping")
-    return result1262
+    span_start1265 = span_start(parser)
+    _t2017 = parse_edb_path(parser)
+    edb_path1263 = _t2017
+    _t2018 = parse_relation_id(parser)
+    relation_id1264 = _t2018
+    _t2019 = Proto.SnapshotMapping(destination_path=edb_path1263, source_relation=relation_id1264)
+    result1266 = _t2019
+    record_span!(parser, span_start1265, "SnapshotMapping")
+    return result1266
 end
 
 function parse_epoch_reads(parser::ParserState)::Vector{Proto.Read}
     consume_literal!(parser, "(")
     consume_literal!(parser, "reads")
-    xs1263 = Proto.Read[]
-    cond1264 = match_lookahead_literal(parser, "(", 0)
-    while cond1264
-        _t2012 = parse_read(parser)
-        item1265 = _t2012
-        push!(xs1263, item1265)
-        cond1264 = match_lookahead_literal(parser, "(", 0)
+    xs1267 = Proto.Read[]
+    cond1268 = match_lookahead_literal(parser, "(", 0)
+    while cond1268
+        _t2020 = parse_read(parser)
+        item1269 = _t2020
+        push!(xs1267, item1269)
+        cond1268 = match_lookahead_literal(parser, "(", 0)
     end
-    reads1266 = xs1263
+    reads1270 = xs1267
     consume_literal!(parser, ")")
-    return reads1266
+    return reads1270
 end
 
 function parse_read(parser::ParserState)::Proto.Read
-    span_start1273 = span_start(parser)
+    span_start1277 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "what_if", 1)
-            _t2014 = 2
+            _t2022 = 2
         else
             if match_lookahead_literal(parser, "output", 1)
-                _t2015 = 1
+                _t2023 = 1
             else
                 if match_lookahead_literal(parser, "export_iceberg", 1)
-                    _t2016 = 4
+                    _t2024 = 4
                 else
                     if match_lookahead_literal(parser, "export", 1)
-                        _t2017 = 4
+                        _t2025 = 4
                     else
                         if match_lookahead_literal(parser, "demand", 1)
-                            _t2018 = 0
+                            _t2026 = 0
                         else
                             if match_lookahead_literal(parser, "abort", 1)
-                                _t2019 = 3
+                                _t2027 = 3
                             else
-                                _t2019 = -1
+                                _t2027 = -1
                             end
-                            _t2018 = _t2019
+                            _t2026 = _t2027
                         end
-                        _t2017 = _t2018
+                        _t2025 = _t2026
                     end
-                    _t2016 = _t2017
+                    _t2024 = _t2025
                 end
-                _t2015 = _t2016
+                _t2023 = _t2024
             end
-            _t2014 = _t2015
+            _t2022 = _t2023
         end
-        _t2013 = _t2014
+        _t2021 = _t2022
     else
-        _t2013 = -1
+        _t2021 = -1
     end
-    prediction1267 = _t2013
-    if prediction1267 == 4
-        _t2021 = parse_export(parser)
-        export1272 = _t2021
-        _t2022 = Proto.Read(read_type=OneOf(:var"#export", export1272))
-        _t2020 = _t2022
+    prediction1271 = _t2021
+    if prediction1271 == 4
+        _t2029 = parse_export(parser)
+        export1276 = _t2029
+        _t2030 = Proto.Read(read_type=OneOf(:var"#export", export1276))
+        _t2028 = _t2030
     else
-        if prediction1267 == 3
-            _t2024 = parse_abort(parser)
-            abort1271 = _t2024
-            _t2025 = Proto.Read(read_type=OneOf(:abort, abort1271))
-            _t2023 = _t2025
+        if prediction1271 == 3
+            _t2032 = parse_abort(parser)
+            abort1275 = _t2032
+            _t2033 = Proto.Read(read_type=OneOf(:abort, abort1275))
+            _t2031 = _t2033
         else
-            if prediction1267 == 2
-                _t2027 = parse_what_if(parser)
-                what_if1270 = _t2027
-                _t2028 = Proto.Read(read_type=OneOf(:what_if, what_if1270))
-                _t2026 = _t2028
+            if prediction1271 == 2
+                _t2035 = parse_what_if(parser)
+                what_if1274 = _t2035
+                _t2036 = Proto.Read(read_type=OneOf(:what_if, what_if1274))
+                _t2034 = _t2036
             else
-                if prediction1267 == 1
-                    _t2030 = parse_output(parser)
-                    output1269 = _t2030
-                    _t2031 = Proto.Read(read_type=OneOf(:output, output1269))
-                    _t2029 = _t2031
+                if prediction1271 == 1
+                    _t2038 = parse_output(parser)
+                    output1273 = _t2038
+                    _t2039 = Proto.Read(read_type=OneOf(:output, output1273))
+                    _t2037 = _t2039
                 else
-                    if prediction1267 == 0
-                        _t2033 = parse_demand(parser)
-                        demand1268 = _t2033
-                        _t2034 = Proto.Read(read_type=OneOf(:demand, demand1268))
-                        _t2032 = _t2034
+                    if prediction1271 == 0
+                        _t2041 = parse_demand(parser)
+                        demand1272 = _t2041
+                        _t2042 = Proto.Read(read_type=OneOf(:demand, demand1272))
+                        _t2040 = _t2042
                     else
                         throw(ParseError("Unexpected token in read" * ": " * string(lookahead(parser, 0))))
                     end
-                    _t2029 = _t2032
+                    _t2037 = _t2040
                 end
-                _t2026 = _t2029
+                _t2034 = _t2037
             end
-            _t2023 = _t2026
+            _t2031 = _t2034
         end
-        _t2020 = _t2023
+        _t2028 = _t2031
     end
-    result1274 = _t2020
-    record_span!(parser, span_start1273, "Read")
-    return result1274
+    result1278 = _t2028
+    record_span!(parser, span_start1277, "Read")
+    return result1278
 end
 
 function parse_demand(parser::ParserState)::Proto.Demand
-    span_start1276 = span_start(parser)
+    span_start1280 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "demand")
-    _t2035 = parse_relation_id(parser)
-    relation_id1275 = _t2035
+    _t2043 = parse_relation_id(parser)
+    relation_id1279 = _t2043
     consume_literal!(parser, ")")
-    _t2036 = Proto.Demand(relation_id=relation_id1275)
-    result1277 = _t2036
-    record_span!(parser, span_start1276, "Demand")
-    return result1277
+    _t2044 = Proto.Demand(relation_id=relation_id1279)
+    result1281 = _t2044
+    record_span!(parser, span_start1280, "Demand")
+    return result1281
 end
 
 function parse_output(parser::ParserState)::Proto.Output
-    span_start1280 = span_start(parser)
+    span_start1284 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "output")
-    _t2037 = parse_name(parser)
-    name1278 = _t2037
-    _t2038 = parse_relation_id(parser)
-    relation_id1279 = _t2038
+    _t2045 = parse_name(parser)
+    name1282 = _t2045
+    _t2046 = parse_relation_id(parser)
+    relation_id1283 = _t2046
     consume_literal!(parser, ")")
-    _t2039 = Proto.Output(name=name1278, relation_id=relation_id1279)
-    result1281 = _t2039
-    record_span!(parser, span_start1280, "Output")
-    return result1281
+    _t2047 = Proto.Output(name=name1282, relation_id=relation_id1283)
+    result1285 = _t2047
+    record_span!(parser, span_start1284, "Output")
+    return result1285
 end
 
 function parse_what_if(parser::ParserState)::Proto.WhatIf
-    span_start1284 = span_start(parser)
+    span_start1288 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "what_if")
-    _t2040 = parse_name(parser)
-    name1282 = _t2040
-    _t2041 = parse_epoch(parser)
-    epoch1283 = _t2041
+    _t2048 = parse_name(parser)
+    name1286 = _t2048
+    _t2049 = parse_epoch(parser)
+    epoch1287 = _t2049
     consume_literal!(parser, ")")
-    _t2042 = Proto.WhatIf(branch=name1282, epoch=epoch1283)
-    result1285 = _t2042
-    record_span!(parser, span_start1284, "WhatIf")
-    return result1285
+    _t2050 = Proto.WhatIf(branch=name1286, epoch=epoch1287)
+    result1289 = _t2050
+    record_span!(parser, span_start1288, "WhatIf")
+    return result1289
 end
 
 function parse_abort(parser::ParserState)::Proto.Abort
-    span_start1288 = span_start(parser)
+    span_start1292 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "abort")
     if (match_lookahead_literal(parser, ":", 0) && match_lookahead_terminal(parser, "SYMBOL", 1))
-        _t2044 = parse_name(parser)
-        _t2043 = _t2044
+        _t2052 = parse_name(parser)
+        _t2051 = _t2052
     else
-        _t2043 = nothing
+        _t2051 = nothing
     end
-    name1286 = _t2043
-    _t2045 = parse_relation_id(parser)
-    relation_id1287 = _t2045
+    name1290 = _t2051
+    _t2053 = parse_relation_id(parser)
+    relation_id1291 = _t2053
     consume_literal!(parser, ")")
-    _t2046 = Proto.Abort(name=(!isnothing(name1286) ? name1286 : "abort"), relation_id=relation_id1287)
-    result1289 = _t2046
-    record_span!(parser, span_start1288, "Abort")
-    return result1289
+    _t2054 = Proto.Abort(name=(!isnothing(name1290) ? name1290 : "abort"), relation_id=relation_id1291)
+    result1293 = _t2054
+    record_span!(parser, span_start1292, "Abort")
+    return result1293
 end
 
 function parse_export(parser::ParserState)::Proto.Export
-    span_start1293 = span_start(parser)
+    span_start1297 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "export_iceberg", 1)
-            _t2048 = 1
+            _t2056 = 1
         else
             if match_lookahead_literal(parser, "export", 1)
-                _t2049 = 0
+                _t2057 = 0
             else
-                _t2049 = -1
+                _t2057 = -1
             end
-            _t2048 = _t2049
+            _t2056 = _t2057
         end
-        _t2047 = _t2048
+        _t2055 = _t2056
     else
-        _t2047 = -1
+        _t2055 = -1
     end
-    prediction1290 = _t2047
-    if prediction1290 == 1
+    prediction1294 = _t2055
+    if prediction1294 == 1
         consume_literal!(parser, "(")
         consume_literal!(parser, "export_iceberg")
-        _t2051 = parse_export_iceberg_config(parser)
-        export_iceberg_config1292 = _t2051
+        _t2059 = parse_export_iceberg_config(parser)
+        export_iceberg_config1296 = _t2059
         consume_literal!(parser, ")")
-        _t2052 = Proto.Export(export_config=OneOf(:iceberg_config, export_iceberg_config1292))
-        _t2050 = _t2052
+        _t2060 = Proto.Export(export_config=OneOf(:iceberg_config, export_iceberg_config1296))
+        _t2058 = _t2060
     else
-        if prediction1290 == 0
+        if prediction1294 == 0
             consume_literal!(parser, "(")
             consume_literal!(parser, "export")
-            _t2054 = parse_export_csv_config(parser)
-            export_csv_config1291 = _t2054
+            _t2062 = parse_export_csv_config(parser)
+            export_csv_config1295 = _t2062
             consume_literal!(parser, ")")
-            _t2055 = Proto.Export(export_config=OneOf(:csv_config, export_csv_config1291))
-            _t2053 = _t2055
+            _t2063 = Proto.Export(export_config=OneOf(:csv_config, export_csv_config1295))
+            _t2061 = _t2063
         else
             throw(ParseError("Unexpected token in export" * ": " * string(lookahead(parser, 0))))
         end
-        _t2050 = _t2053
+        _t2058 = _t2061
     end
-    result1294 = _t2050
-    record_span!(parser, span_start1293, "Export")
-    return result1294
+    result1298 = _t2058
+    record_span!(parser, span_start1297, "Export")
+    return result1298
 end
 
 function parse_export_csv_config(parser::ParserState)::Proto.ExportCSVConfig
-    span_start1302 = span_start(parser)
+    span_start1306 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "export_csv_config_v2", 1)
-            _t2057 = 0
+            _t2065 = 0
         else
             if match_lookahead_literal(parser, "export_csv_config", 1)
-                _t2058 = 1
+                _t2066 = 1
             else
-                _t2058 = -1
+                _t2066 = -1
             end
-            _t2057 = _t2058
+            _t2065 = _t2066
         end
-        _t2056 = _t2057
+        _t2064 = _t2065
     else
-        _t2056 = -1
+        _t2064 = -1
     end
-    prediction1295 = _t2056
-    if prediction1295 == 1
+    prediction1299 = _t2064
+    if prediction1299 == 1
         consume_literal!(parser, "(")
         consume_literal!(parser, "export_csv_config")
-        _t2060 = parse_export_csv_path(parser)
-        export_csv_path1299 = _t2060
-        _t2061 = parse_export_csv_columns_list(parser)
-        export_csv_columns_list1300 = _t2061
-        _t2062 = parse_config_dict(parser)
-        config_dict1301 = _t2062
+        _t2068 = parse_export_csv_path(parser)
+        export_csv_path1303 = _t2068
+        _t2069 = parse_export_csv_columns_list(parser)
+        export_csv_columns_list1304 = _t2069
+        _t2070 = parse_config_dict(parser)
+        config_dict1305 = _t2070
         consume_literal!(parser, ")")
-        _t2063 = construct_export_csv_config(parser, export_csv_path1299, export_csv_columns_list1300, config_dict1301)
-        _t2059 = _t2063
+        _t2071 = construct_export_csv_config(parser, export_csv_path1303, export_csv_columns_list1304, config_dict1305)
+        _t2067 = _t2071
     else
-        if prediction1295 == 0
+        if prediction1299 == 0
             consume_literal!(parser, "(")
             consume_literal!(parser, "export_csv_config_v2")
-            _t2065 = parse_export_csv_path(parser)
-            export_csv_path1296 = _t2065
-            _t2066 = parse_export_csv_source(parser)
-            export_csv_source1297 = _t2066
-            _t2067 = parse_csv_config(parser)
-            csv_config1298 = _t2067
+            _t2073 = parse_export_csv_path(parser)
+            export_csv_path1300 = _t2073
+            _t2074 = parse_export_csv_source(parser)
+            export_csv_source1301 = _t2074
+            _t2075 = parse_csv_config(parser)
+            csv_config1302 = _t2075
             consume_literal!(parser, ")")
-            _t2068 = construct_export_csv_config_with_source(parser, export_csv_path1296, export_csv_source1297, csv_config1298)
-            _t2064 = _t2068
+            _t2076 = construct_export_csv_config_with_source(parser, export_csv_path1300, export_csv_source1301, csv_config1302)
+            _t2072 = _t2076
         else
             throw(ParseError("Unexpected token in export_csv_config" * ": " * string(lookahead(parser, 0))))
         end
-        _t2059 = _t2064
+        _t2067 = _t2072
     end
-    result1303 = _t2059
-    record_span!(parser, span_start1302, "ExportCSVConfig")
-    return result1303
+    result1307 = _t2067
+    record_span!(parser, span_start1306, "ExportCSVConfig")
+    return result1307
 end
 
 function parse_export_csv_path(parser::ParserState)::String
     consume_literal!(parser, "(")
     consume_literal!(parser, "path")
-    string1304 = consume_terminal!(parser, "STRING")
+    string1308 = consume_terminal!(parser, "STRING")
     consume_literal!(parser, ")")
-    return string1304
+    return string1308
 end
 
 function parse_export_csv_source(parser::ParserState)::Proto.ExportCSVSource
-    span_start1311 = span_start(parser)
+    span_start1315 = span_start(parser)
     if match_lookahead_literal(parser, "(", 0)
         if match_lookahead_literal(parser, "table_def", 1)
-            _t2070 = 1
+            _t2078 = 1
         else
             if match_lookahead_literal(parser, "gnf_columns", 1)
-                _t2071 = 0
+                _t2079 = 0
             else
-                _t2071 = -1
+                _t2079 = -1
             end
-            _t2070 = _t2071
+            _t2078 = _t2079
         end
-        _t2069 = _t2070
+        _t2077 = _t2078
     else
-        _t2069 = -1
+        _t2077 = -1
     end
-    prediction1305 = _t2069
-    if prediction1305 == 1
+    prediction1309 = _t2077
+    if prediction1309 == 1
         consume_literal!(parser, "(")
         consume_literal!(parser, "table_def")
-        _t2073 = parse_relation_id(parser)
-        relation_id1310 = _t2073
+        _t2081 = parse_relation_id(parser)
+        relation_id1314 = _t2081
         consume_literal!(parser, ")")
-        _t2074 = Proto.ExportCSVSource(csv_source=OneOf(:table_def, relation_id1310))
-        _t2072 = _t2074
+        _t2082 = Proto.ExportCSVSource(csv_source=OneOf(:table_def, relation_id1314))
+        _t2080 = _t2082
     else
-        if prediction1305 == 0
+        if prediction1309 == 0
             consume_literal!(parser, "(")
             consume_literal!(parser, "gnf_columns")
-            xs1306 = Proto.ExportCSVColumn[]
-            cond1307 = match_lookahead_literal(parser, "(", 0)
-            while cond1307
-                _t2076 = parse_export_csv_column(parser)
-                item1308 = _t2076
-                push!(xs1306, item1308)
-                cond1307 = match_lookahead_literal(parser, "(", 0)
+            xs1310 = Proto.ExportCSVColumn[]
+            cond1311 = match_lookahead_literal(parser, "(", 0)
+            while cond1311
+                _t2084 = parse_export_csv_column(parser)
+                item1312 = _t2084
+                push!(xs1310, item1312)
+                cond1311 = match_lookahead_literal(parser, "(", 0)
             end
-            export_csv_columns1309 = xs1306
+            export_csv_columns1313 = xs1310
             consume_literal!(parser, ")")
-            _t2077 = Proto.ExportCSVColumns(columns=export_csv_columns1309)
-            _t2078 = Proto.ExportCSVSource(csv_source=OneOf(:gnf_columns, _t2077))
-            _t2075 = _t2078
+            _t2085 = Proto.ExportCSVColumns(columns=export_csv_columns1313)
+            _t2086 = Proto.ExportCSVSource(csv_source=OneOf(:gnf_columns, _t2085))
+            _t2083 = _t2086
         else
             throw(ParseError("Unexpected token in export_csv_source" * ": " * string(lookahead(parser, 0))))
         end
-        _t2072 = _t2075
+        _t2080 = _t2083
     end
-    result1312 = _t2072
-    record_span!(parser, span_start1311, "ExportCSVSource")
-    return result1312
+    result1316 = _t2080
+    record_span!(parser, span_start1315, "ExportCSVSource")
+    return result1316
 end
 
 function parse_export_csv_column(parser::ParserState)::Proto.ExportCSVColumn
-    span_start1315 = span_start(parser)
+    span_start1319 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "column")
-    string1313 = consume_terminal!(parser, "STRING")
-    _t2079 = parse_relation_id(parser)
-    relation_id1314 = _t2079
+    string1317 = consume_terminal!(parser, "STRING")
+    _t2087 = parse_relation_id(parser)
+    relation_id1318 = _t2087
     consume_literal!(parser, ")")
-    _t2080 = Proto.ExportCSVColumn(column_name=string1313, column_data=relation_id1314)
-    result1316 = _t2080
-    record_span!(parser, span_start1315, "ExportCSVColumn")
-    return result1316
+    _t2088 = Proto.ExportCSVColumn(column_name=string1317, column_data=relation_id1318)
+    result1320 = _t2088
+    record_span!(parser, span_start1319, "ExportCSVColumn")
+    return result1320
 end
 
 function parse_export_csv_columns_list(parser::ParserState)::Vector{Proto.ExportCSVColumn}
     consume_literal!(parser, "(")
     consume_literal!(parser, "columns")
-    xs1317 = Proto.ExportCSVColumn[]
-    cond1318 = match_lookahead_literal(parser, "(", 0)
-    while cond1318
-        _t2081 = parse_export_csv_column(parser)
-        item1319 = _t2081
-        push!(xs1317, item1319)
-        cond1318 = match_lookahead_literal(parser, "(", 0)
+    xs1321 = Proto.ExportCSVColumn[]
+    cond1322 = match_lookahead_literal(parser, "(", 0)
+    while cond1322
+        _t2089 = parse_export_csv_column(parser)
+        item1323 = _t2089
+        push!(xs1321, item1323)
+        cond1322 = match_lookahead_literal(parser, "(", 0)
     end
-    export_csv_columns1320 = xs1317
+    export_csv_columns1324 = xs1321
     consume_literal!(parser, ")")
-    return export_csv_columns1320
+    return export_csv_columns1324
 end
 
 function parse_export_iceberg_config(parser::ParserState)::Proto.ExportIcebergConfig
-    span_start1327 = span_start(parser)
+    span_start1331 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "export_iceberg_config")
-    _t2082 = parse_iceberg_locator(parser)
-    iceberg_locator1321 = _t2082
-    _t2083 = parse_iceberg_catalog_config(parser)
-    iceberg_catalog_config1322 = _t2083
-    _t2084 = parse_export_iceberg_table_def(parser)
-    export_iceberg_table_def1323 = _t2084
-    _t2085 = parse_export_iceberg_columns(parser)
-    export_iceberg_columns1324 = _t2085
-    _t2086 = parse_iceberg_table_properties(parser)
-    iceberg_table_properties1325 = _t2086
+    _t2090 = parse_iceberg_locator(parser)
+    iceberg_locator1325 = _t2090
+    _t2091 = parse_iceberg_catalog_config(parser)
+    iceberg_catalog_config1326 = _t2091
+    _t2092 = parse_export_iceberg_table_def(parser)
+    export_iceberg_table_def1327 = _t2092
+    _t2093 = parse_export_iceberg_columns(parser)
+    export_iceberg_columns1328 = _t2093
+    _t2094 = parse_iceberg_table_properties(parser)
+    iceberg_table_properties1329 = _t2094
     if match_lookahead_literal(parser, "{", 0)
-        _t2088 = parse_config_dict(parser)
-        _t2087 = _t2088
+        _t2096 = parse_config_dict(parser)
+        _t2095 = _t2096
     else
-        _t2087 = nothing
+        _t2095 = nothing
     end
-    config_dict1326 = _t2087
+    config_dict1330 = _t2095
     consume_literal!(parser, ")")
-    _t2089 = construct_export_iceberg_config_full(parser, iceberg_locator1321, iceberg_catalog_config1322, export_iceberg_table_def1323, export_iceberg_columns1324, iceberg_table_properties1325, config_dict1326)
-    result1328 = _t2089
-    record_span!(parser, span_start1327, "ExportIcebergConfig")
-    return result1328
+    _t2097 = construct_export_iceberg_config_full(parser, iceberg_locator1325, iceberg_catalog_config1326, export_iceberg_table_def1327, export_iceberg_columns1328, iceberg_table_properties1329, config_dict1330)
+    result1332 = _t2097
+    record_span!(parser, span_start1331, "ExportIcebergConfig")
+    return result1332
 end
 
 function parse_export_iceberg_table_def(parser::ParserState)::Proto.RelationId
-    span_start1330 = span_start(parser)
+    span_start1334 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "table_def")
-    _t2090 = parse_relation_id(parser)
-    relation_id1329 = _t2090
+    _t2098 = parse_relation_id(parser)
+    relation_id1333 = _t2098
     consume_literal!(parser, ")")
-    result1331 = relation_id1329
-    record_span!(parser, span_start1330, "RelationId")
-    return result1331
+    result1335 = relation_id1333
+    record_span!(parser, span_start1334, "RelationId")
+    return result1335
 end
 
 function parse_export_iceberg_columns(parser::ParserState)::Vector{Proto.ExportColumn}
     consume_literal!(parser, "(")
     consume_literal!(parser, "columns")
-    xs1332 = Proto.ExportColumn[]
-    cond1333 = match_lookahead_literal(parser, "(", 0)
-    while cond1333
-        _t2091 = parse_export_iceberg_column(parser)
-        item1334 = _t2091
-        push!(xs1332, item1334)
-        cond1333 = match_lookahead_literal(parser, "(", 0)
+    xs1336 = Proto.ExportColumn[]
+    cond1337 = match_lookahead_literal(parser, "(", 0)
+    while cond1337
+        _t2099 = parse_export_iceberg_column(parser)
+        item1338 = _t2099
+        push!(xs1336, item1338)
+        cond1337 = match_lookahead_literal(parser, "(", 0)
     end
-    export_iceberg_columns1335 = xs1332
+    export_iceberg_columns1339 = xs1336
     consume_literal!(parser, ")")
-    return export_iceberg_columns1335
+    return export_iceberg_columns1339
 end
 
 function parse_export_iceberg_column(parser::ParserState)::Proto.ExportColumn
-    span_start1338 = span_start(parser)
+    span_start1342 = span_start(parser)
     consume_literal!(parser, "(")
     consume_literal!(parser, "column")
-    string1336 = consume_terminal!(parser, "STRING")
-    _t2092 = parse_boolean_value(parser)
-    boolean_value1337 = _t2092
+    string1340 = consume_terminal!(parser, "STRING")
+    _t2100 = parse_boolean_value(parser)
+    boolean_value1341 = _t2100
     consume_literal!(parser, ")")
-    _t2093 = Proto.ExportColumn(name=string1336, nullable=boolean_value1337)
-    result1339 = _t2093
-    record_span!(parser, span_start1338, "ExportColumn")
-    return result1339
+    _t2101 = Proto.ExportColumn(name=string1340, nullable=boolean_value1341)
+    result1343 = _t2101
+    record_span!(parser, span_start1342, "ExportColumn")
+    return result1343
 end
 
 function parse_iceberg_table_properties(parser::ParserState)::Vector{Tuple{String, String}}
     consume_literal!(parser, "(")
     consume_literal!(parser, "table_properties")
-    xs1340 = Tuple{String, String}[]
-    cond1341 = match_lookahead_literal(parser, "(", 0)
-    while cond1341
-        _t2094 = parse_iceberg_property_entry(parser)
-        item1342 = _t2094
-        push!(xs1340, item1342)
-        cond1341 = match_lookahead_literal(parser, "(", 0)
+    xs1344 = Tuple{String, String}[]
+    cond1345 = match_lookahead_literal(parser, "(", 0)
+    while cond1345
+        _t2102 = parse_iceberg_property_entry(parser)
+        item1346 = _t2102
+        push!(xs1344, item1346)
+        cond1345 = match_lookahead_literal(parser, "(", 0)
     end
-    iceberg_property_entrys1343 = xs1340
+    iceberg_property_entrys1347 = xs1344
     consume_literal!(parser, ")")
-    return iceberg_property_entrys1343
+    return iceberg_property_entrys1347
 end
 
 
diff --git a/sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl b/sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl
index 7bfca498..ecf80047 100644
--- a/sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl
+++ b/sdks/julia/LogicalQueryProtocol.jl/src/pretty.jl
@@ -377,151 +377,151 @@ end
 # --- Helper functions ---
 
 function _make_value_int32(pp::PrettyPrinter, v::Int32)::Proto.Value
-    _t1781 = Proto.Value(value=OneOf(:int32_value, v))
-    return _t1781
+    _t1791 = Proto.Value(value=OneOf(:int32_value, v))
+    return _t1791
 end
 
 function _make_value_int64(pp::PrettyPrinter, v::Int64)::Proto.Value
-    _t1782 = Proto.Value(value=OneOf(:int_value, v))
-    return _t1782
+    _t1792 = Proto.Value(value=OneOf(:int_value, v))
+    return _t1792
 end
 
 function _make_value_float64(pp::PrettyPrinter, v::Float64)::Proto.Value
-    _t1783 = Proto.Value(value=OneOf(:float_value, v))
-    return _t1783
+    _t1793 = Proto.Value(value=OneOf(:float_value, v))
+    return _t1793
 end
 
 function _make_value_string(pp::PrettyPrinter, v::String)::Proto.Value
-    _t1784 = Proto.Value(value=OneOf(:string_value, v))
-    return _t1784
+    _t1794 = Proto.Value(value=OneOf(:string_value, v))
+    return _t1794
 end
 
 function _make_value_boolean(pp::PrettyPrinter, v::Bool)::Proto.Value
-    _t1785 = Proto.Value(value=OneOf(:boolean_value, v))
-    return _t1785
+    _t1795 = Proto.Value(value=OneOf(:boolean_value, v))
+    return _t1795
 end
 
 function _make_value_uint128(pp::PrettyPrinter, v::Proto.UInt128Value)::Proto.Value
-    _t1786 = Proto.Value(value=OneOf(:uint128_value, v))
-    return _t1786
+    _t1796 = Proto.Value(value=OneOf(:uint128_value, v))
+    return _t1796
 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,))
+        _t1797 = _make_value_string(pp, "auto")
+        push!(result, ("ivm.maintenance_level", _t1797,))
     else
         if msg.ivm_config.level == Proto.MaintenanceLevel.MAINTENANCE_LEVEL_ALL
-            _t1788 = _make_value_string(pp, "all")
-            push!(result, ("ivm.maintenance_level", _t1788,))
+            _t1798 = _make_value_string(pp, "all")
+            push!(result, ("ivm.maintenance_level", _t1798,))
         else
             if msg.ivm_config.level == Proto.MaintenanceLevel.MAINTENANCE_LEVEL_OFF
-                _t1789 = _make_value_string(pp, "off")
-                push!(result, ("ivm.maintenance_level", _t1789,))
+                _t1799 = _make_value_string(pp, "off")
+                push!(result, ("ivm.maintenance_level", _t1799,))
             end
         end
     end
-    _t1790 = _make_value_int64(pp, msg.semantics_version)
-    push!(result, ("semantics_version", _t1790,))
+    _t1800 = _make_value_int64(pp, msg.semantics_version)
+    push!(result, ("semantics_version", _t1800,))
     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,))
+    _t1801 = _make_value_int32(pp, msg.header_row)
+    push!(result, ("csv_header_row", _t1801,))
+    _t1802 = _make_value_int64(pp, msg.skip)
+    push!(result, ("csv_skip", _t1802,))
     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,))
+        _t1803 = _make_value_string(pp, msg.new_line)
+        push!(result, ("csv_new_line", _t1803,))
+    end
+    _t1804 = _make_value_string(pp, msg.delimiter)
+    push!(result, ("csv_delimiter", _t1804,))
+    _t1805 = _make_value_string(pp, msg.quotechar)
+    push!(result, ("csv_quotechar", _t1805,))
+    _t1806 = _make_value_string(pp, msg.escapechar)
+    push!(result, ("csv_escapechar", _t1806,))
     if msg.comment != ""
-        _t1797 = _make_value_string(pp, msg.comment)
-        push!(result, ("csv_comment", _t1797,))
+        _t1807 = _make_value_string(pp, msg.comment)
+        push!(result, ("csv_comment", _t1807,))
     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,))
+        _t1808 = _make_value_string(pp, missing_string)
+        push!(result, ("csv_missing_strings", _t1808,))
+    end
+    _t1809 = _make_value_string(pp, msg.decimal_separator)
+    push!(result, ("csv_decimal_separator", _t1809,))
+    _t1810 = _make_value_string(pp, msg.encoding)
+    push!(result, ("csv_encoding", _t1810,))
+    _t1811 = _make_value_string(pp, msg.compression)
+    push!(result, ("csv_compression", _t1811,))
     if msg.partition_size_mb != 0
-        _t1802 = _make_value_int64(pp, msg.partition_size_mb)
-        push!(result, ("csv_partition_size_mb", _t1802,))
+        _t1812 = _make_value_int64(pp, msg.partition_size_mb)
+        push!(result, ("csv_partition_size_mb", _t1812,))
     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}[]
-    _t1803 = _make_value_float64(pp, msg.storage_config.epsilon)
-    push!(result, ("betree_config_epsilon", _t1803,))
-    _t1804 = _make_value_int64(pp, msg.storage_config.max_pivots)
-    push!(result, ("betree_config_max_pivots", _t1804,))
-    _t1805 = _make_value_int64(pp, msg.storage_config.max_deltas)
-    push!(result, ("betree_config_max_deltas", _t1805,))
-    _t1806 = _make_value_int64(pp, msg.storage_config.max_leaf)
-    push!(result, ("betree_config_max_leaf", _t1806,))
+    _t1813 = _make_value_float64(pp, msg.storage_config.epsilon)
+    push!(result, ("betree_config_epsilon", _t1813,))
+    _t1814 = _make_value_int64(pp, msg.storage_config.max_pivots)
+    push!(result, ("betree_config_max_pivots", _t1814,))
+    _t1815 = _make_value_int64(pp, msg.storage_config.max_deltas)
+    push!(result, ("betree_config_max_deltas", _t1815,))
+    _t1816 = _make_value_int64(pp, msg.storage_config.max_leaf)
+    push!(result, ("betree_config_max_leaf", _t1816,))
     if _has_proto_field(msg.relation_locator, Symbol("root_pageid"))
         if !isnothing(_get_oneof_field(msg.relation_locator, :root_pageid))
-            _t1807 = _make_value_uint128(pp, _get_oneof_field(msg.relation_locator, :root_pageid))
-            push!(result, ("betree_locator_root_pageid", _t1807,))
+            _t1817 = _make_value_uint128(pp, _get_oneof_field(msg.relation_locator, :root_pageid))
+            push!(result, ("betree_locator_root_pageid", _t1817,))
         end
     end
     if _has_proto_field(msg.relation_locator, Symbol("inline_data"))
         if !isnothing(_get_oneof_field(msg.relation_locator, :inline_data))
-            _t1808 = _make_value_string(pp, String(copy(_get_oneof_field(msg.relation_locator, :inline_data))))
-            push!(result, ("betree_locator_inline_data", _t1808,))
+            _t1818 = _make_value_string(pp, String(copy(_get_oneof_field(msg.relation_locator, :inline_data))))
+            push!(result, ("betree_locator_inline_data", _t1818,))
         end
     end
-    _t1809 = _make_value_int64(pp, msg.relation_locator.element_count)
-    push!(result, ("betree_locator_element_count", _t1809,))
-    _t1810 = _make_value_int64(pp, msg.relation_locator.tree_height)
-    push!(result, ("betree_locator_tree_height", _t1810,))
+    _t1819 = _make_value_int64(pp, msg.relation_locator.element_count)
+    push!(result, ("betree_locator_element_count", _t1819,))
+    _t1820 = _make_value_int64(pp, msg.relation_locator.tree_height)
+    push!(result, ("betree_locator_tree_height", _t1820,))
     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)
-        _t1811 = _make_value_int64(pp, msg.partition_size)
-        push!(result, ("partition_size", _t1811,))
+        _t1821 = _make_value_int64(pp, msg.partition_size)
+        push!(result, ("partition_size", _t1821,))
     end
     if !isnothing(msg.compression)
-        _t1812 = _make_value_string(pp, msg.compression)
-        push!(result, ("compression", _t1812,))
+        _t1822 = _make_value_string(pp, msg.compression)
+        push!(result, ("compression", _t1822,))
     end
     if !isnothing(msg.syntax_header_row)
-        _t1813 = _make_value_boolean(pp, msg.syntax_header_row)
-        push!(result, ("syntax_header_row", _t1813,))
+        _t1823 = _make_value_boolean(pp, msg.syntax_header_row)
+        push!(result, ("syntax_header_row", _t1823,))
     end
     if !isnothing(msg.syntax_missing_string)
-        _t1814 = _make_value_string(pp, msg.syntax_missing_string)
-        push!(result, ("syntax_missing_string", _t1814,))
+        _t1824 = _make_value_string(pp, msg.syntax_missing_string)
+        push!(result, ("syntax_missing_string", _t1824,))
     end
     if !isnothing(msg.syntax_delim)
-        _t1815 = _make_value_string(pp, msg.syntax_delim)
-        push!(result, ("syntax_delim", _t1815,))
+        _t1825 = _make_value_string(pp, msg.syntax_delim)
+        push!(result, ("syntax_delim", _t1825,))
     end
     if !isnothing(msg.syntax_quotechar)
-        _t1816 = _make_value_string(pp, msg.syntax_quotechar)
-        push!(result, ("syntax_quotechar", _t1816,))
+        _t1826 = _make_value_string(pp, msg.syntax_quotechar)
+        push!(result, ("syntax_quotechar", _t1826,))
     end
     if !isnothing(msg.syntax_escapechar)
-        _t1817 = _make_value_string(pp, msg.syntax_escapechar)
-        push!(result, ("syntax_escapechar", _t1817,))
+        _t1827 = _make_value_string(pp, msg.syntax_escapechar)
+        push!(result, ("syntax_escapechar", _t1827,))
     end
     return sort(result)
 end
@@ -534,7 +534,7 @@ function deconstruct_iceberg_catalog_config_scope_optional(pp::PrettyPrinter, ms
     if msg.scope != ""
         return msg.scope
     else
-        _t1818 = nothing
+        _t1828 = nothing
     end
     return nothing
 end
@@ -543,7 +543,7 @@ function deconstruct_iceberg_data_from_snapshot_optional(pp::PrettyPrinter, msg:
     if msg.from_snapshot != ""
         return msg.from_snapshot
     else
-        _t1819 = nothing
+        _t1829 = nothing
     end
     return nothing
 end
@@ -552,7 +552,7 @@ function deconstruct_iceberg_data_to_snapshot_optional(pp::PrettyPrinter, msg::P
     if msg.to_snapshot != ""
         return msg.to_snapshot
     else
-        _t1820 = nothing
+        _t1830 = nothing
     end
     return nothing
 end
@@ -560,21 +560,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 != ""
-        _t1821 = _make_value_string(pp, msg.prefix)
-        push!(result, ("prefix", _t1821,))
+        _t1831 = _make_value_string(pp, msg.prefix)
+        push!(result, ("prefix", _t1831,))
     end
     if msg.target_file_size_bytes != 0
-        _t1822 = _make_value_int64(pp, msg.target_file_size_bytes)
-        push!(result, ("target_file_size_bytes", _t1822,))
+        _t1832 = _make_value_int64(pp, msg.target_file_size_bytes)
+        push!(result, ("target_file_size_bytes", _t1832,))
     end
     if msg.compression != ""
-        _t1823 = _make_value_string(pp, msg.compression)
-        push!(result, ("compression", _t1823,))
+        _t1833 = _make_value_string(pp, msg.compression)
+        push!(result, ("compression", _t1833,))
     end
     if length(result) == 0
         return nothing
     else
-        _t1824 = nothing
+        _t1834 = nothing
     end
     return sort(result)
 end
@@ -589,7 +589,7 @@ function deconstruct_relation_id_uint128(pp::PrettyPrinter, msg::Proto.RelationI
     if isnothing(name)
         return relation_id_to_uint128(pp, msg)
     else
-        _t1825 = nothing
+        _t1835 = nothing
     end
     return nothing
 end
@@ -608,47 +608,47 @@ end
 # --- Pretty-print functions ---
 
 function pretty_transaction(pp::PrettyPrinter, msg::Proto.Transaction)
-    flat809 = try_flat(pp, msg, pretty_transaction)
-    if !isnothing(flat809)
-        write(pp, flat809)
+    flat813 = try_flat(pp, msg, pretty_transaction)
+    if !isnothing(flat813)
+        write(pp, flat813)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("configure"))
-            _t1600 = _dollar_dollar.configure
+            _t1608 = _dollar_dollar.configure
         else
-            _t1600 = nothing
+            _t1608 = nothing
         end
         if _has_proto_field(_dollar_dollar, Symbol("sync"))
-            _t1601 = _dollar_dollar.sync
+            _t1609 = _dollar_dollar.sync
         else
-            _t1601 = nothing
+            _t1609 = nothing
         end
-        fields800 = (_t1600, _t1601, _dollar_dollar.epochs,)
-        unwrapped_fields801 = fields800
+        fields804 = (_t1608, _t1609, _dollar_dollar.epochs,)
+        unwrapped_fields805 = fields804
         write(pp, "(transaction")
         indent_sexp!(pp)
-        field802 = unwrapped_fields801[1]
-        if !isnothing(field802)
+        field806 = unwrapped_fields805[1]
+        if !isnothing(field806)
             newline(pp)
-            opt_val803 = field802
-            pretty_configure(pp, opt_val803)
+            opt_val807 = field806
+            pretty_configure(pp, opt_val807)
         end
-        field804 = unwrapped_fields801[2]
-        if !isnothing(field804)
+        field808 = unwrapped_fields805[2]
+        if !isnothing(field808)
             newline(pp)
-            opt_val805 = field804
-            pretty_sync(pp, opt_val805)
+            opt_val809 = field808
+            pretty_sync(pp, opt_val809)
         end
-        field806 = unwrapped_fields801[3]
-        if !isempty(field806)
+        field810 = unwrapped_fields805[3]
+        if !isempty(field810)
             newline(pp)
-            for (i1602, elem807) in enumerate(field806)
-                i808 = i1602 - 1
-                if (i808 > 0)
+            for (i1610, elem811) in enumerate(field810)
+                i812 = i1610 - 1
+                if (i812 > 0)
                     newline(pp)
                 end
-                pretty_epoch(pp, elem807)
+                pretty_epoch(pp, elem811)
             end
         end
         dedent!(pp)
@@ -658,19 +658,19 @@ function pretty_transaction(pp::PrettyPrinter, msg::Proto.Transaction)
 end
 
 function pretty_configure(pp::PrettyPrinter, msg::Proto.Configure)
-    flat812 = try_flat(pp, msg, pretty_configure)
-    if !isnothing(flat812)
-        write(pp, flat812)
+    flat816 = try_flat(pp, msg, pretty_configure)
+    if !isnothing(flat816)
+        write(pp, flat816)
         return nothing
     else
         _dollar_dollar = msg
-        _t1603 = deconstruct_configure(pp, _dollar_dollar)
-        fields810 = _t1603
-        unwrapped_fields811 = fields810
+        _t1611 = deconstruct_configure(pp, _dollar_dollar)
+        fields814 = _t1611
+        unwrapped_fields815 = fields814
         write(pp, "(configure")
         indent_sexp!(pp)
         newline(pp)
-        pretty_config_dict(pp, unwrapped_fields811)
+        pretty_config_dict(pp, unwrapped_fields815)
         dedent!(pp)
         write(pp, ")")
     end
@@ -678,22 +678,22 @@ function pretty_configure(pp::PrettyPrinter, msg::Proto.Configure)
 end
 
 function pretty_config_dict(pp::PrettyPrinter, msg::Vector{Tuple{String, Proto.Value}})
-    flat816 = try_flat(pp, msg, pretty_config_dict)
-    if !isnothing(flat816)
-        write(pp, flat816)
+    flat820 = try_flat(pp, msg, pretty_config_dict)
+    if !isnothing(flat820)
+        write(pp, flat820)
         return nothing
     else
-        fields813 = msg
+        fields817 = msg
         write(pp, "{")
         indent!(pp)
-        if !isempty(fields813)
+        if !isempty(fields817)
             newline(pp)
-            for (i1604, elem814) in enumerate(fields813)
-                i815 = i1604 - 1
-                if (i815 > 0)
+            for (i1612, elem818) in enumerate(fields817)
+                i819 = i1612 - 1
+                if (i819 > 0)
                     newline(pp)
                 end
-                pretty_config_key_value(pp, elem814)
+                pretty_config_key_value(pp, elem818)
             end
         end
         dedent!(pp)
@@ -703,163 +703,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})
-    flat821 = try_flat(pp, msg, pretty_config_key_value)
-    if !isnothing(flat821)
-        write(pp, flat821)
+    flat825 = try_flat(pp, msg, pretty_config_key_value)
+    if !isnothing(flat825)
+        write(pp, flat825)
         return nothing
     else
         _dollar_dollar = msg
-        fields817 = (_dollar_dollar[1], _dollar_dollar[2],)
-        unwrapped_fields818 = fields817
+        fields821 = (_dollar_dollar[1], _dollar_dollar[2],)
+        unwrapped_fields822 = fields821
         write(pp, ":")
-        field819 = unwrapped_fields818[1]
-        write(pp, field819)
+        field823 = unwrapped_fields822[1]
+        write(pp, field823)
         write(pp, " ")
-        field820 = unwrapped_fields818[2]
-        pretty_raw_value(pp, field820)
+        field824 = unwrapped_fields822[2]
+        pretty_raw_value(pp, field824)
     end
     return nothing
 end
 
 function pretty_raw_value(pp::PrettyPrinter, msg::Proto.Value)
-    flat847 = try_flat(pp, msg, pretty_raw_value)
-    if !isnothing(flat847)
-        write(pp, flat847)
+    flat851 = try_flat(pp, msg, pretty_raw_value)
+    if !isnothing(flat851)
+        write(pp, flat851)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("date_value"))
-            _t1605 = _get_oneof_field(_dollar_dollar, :date_value)
+            _t1613 = _get_oneof_field(_dollar_dollar, :date_value)
         else
-            _t1605 = nothing
+            _t1613 = nothing
         end
-        deconstruct_result845 = _t1605
-        if !isnothing(deconstruct_result845)
-            unwrapped846 = deconstruct_result845
-            pretty_raw_date(pp, unwrapped846)
+        deconstruct_result849 = _t1613
+        if !isnothing(deconstruct_result849)
+            unwrapped850 = deconstruct_result849
+            pretty_raw_date(pp, unwrapped850)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("datetime_value"))
-                _t1606 = _get_oneof_field(_dollar_dollar, :datetime_value)
+                _t1614 = _get_oneof_field(_dollar_dollar, :datetime_value)
             else
-                _t1606 = nothing
+                _t1614 = nothing
             end
-            deconstruct_result843 = _t1606
-            if !isnothing(deconstruct_result843)
-                unwrapped844 = deconstruct_result843
-                pretty_raw_datetime(pp, unwrapped844)
+            deconstruct_result847 = _t1614
+            if !isnothing(deconstruct_result847)
+                unwrapped848 = deconstruct_result847
+                pretty_raw_datetime(pp, unwrapped848)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("string_value"))
-                    _t1607 = _get_oneof_field(_dollar_dollar, :string_value)
+                    _t1615 = _get_oneof_field(_dollar_dollar, :string_value)
                 else
-                    _t1607 = nothing
+                    _t1615 = nothing
                 end
-                deconstruct_result841 = _t1607
-                if !isnothing(deconstruct_result841)
-                    unwrapped842 = deconstruct_result841
-                    write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped842))
+                deconstruct_result845 = _t1615
+                if !isnothing(deconstruct_result845)
+                    unwrapped846 = deconstruct_result845
+                    write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped846))
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("int32_value"))
-                        _t1608 = _get_oneof_field(_dollar_dollar, :int32_value)
+                        _t1616 = _get_oneof_field(_dollar_dollar, :int32_value)
                     else
-                        _t1608 = nothing
+                        _t1616 = nothing
                     end
-                    deconstruct_result839 = _t1608
-                    if !isnothing(deconstruct_result839)
-                        unwrapped840 = deconstruct_result839
-                        write(pp, (string(Int64(unwrapped840)) * "i32"))
+                    deconstruct_result843 = _t1616
+                    if !isnothing(deconstruct_result843)
+                        unwrapped844 = deconstruct_result843
+                        write(pp, (string(Int64(unwrapped844)) * "i32"))
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("int_value"))
-                            _t1609 = _get_oneof_field(_dollar_dollar, :int_value)
+                            _t1617 = _get_oneof_field(_dollar_dollar, :int_value)
                         else
-                            _t1609 = nothing
+                            _t1617 = nothing
                         end
-                        deconstruct_result837 = _t1609
-                        if !isnothing(deconstruct_result837)
-                            unwrapped838 = deconstruct_result837
-                            write(pp, string(unwrapped838))
+                        deconstruct_result841 = _t1617
+                        if !isnothing(deconstruct_result841)
+                            unwrapped842 = deconstruct_result841
+                            write(pp, string(unwrapped842))
                         else
                             _dollar_dollar = msg
                             if _has_proto_field(_dollar_dollar, Symbol("float32_value"))
-                                _t1610 = _get_oneof_field(_dollar_dollar, :float32_value)
+                                _t1618 = _get_oneof_field(_dollar_dollar, :float32_value)
                             else
-                                _t1610 = nothing
+                                _t1618 = nothing
                             end
-                            deconstruct_result835 = _t1610
-                            if !isnothing(deconstruct_result835)
-                                unwrapped836 = deconstruct_result835
-                                write(pp, format_float32_literal(unwrapped836))
+                            deconstruct_result839 = _t1618
+                            if !isnothing(deconstruct_result839)
+                                unwrapped840 = deconstruct_result839
+                                write(pp, format_float32_literal(unwrapped840))
                             else
                                 _dollar_dollar = msg
                                 if _has_proto_field(_dollar_dollar, Symbol("float_value"))
-                                    _t1611 = _get_oneof_field(_dollar_dollar, :float_value)
+                                    _t1619 = _get_oneof_field(_dollar_dollar, :float_value)
                                 else
-                                    _t1611 = nothing
+                                    _t1619 = nothing
                                 end
-                                deconstruct_result833 = _t1611
-                                if !isnothing(deconstruct_result833)
-                                    unwrapped834 = deconstruct_result833
-                                    write(pp, lowercase(string(unwrapped834)))
+                                deconstruct_result837 = _t1619
+                                if !isnothing(deconstruct_result837)
+                                    unwrapped838 = deconstruct_result837
+                                    write(pp, lowercase(string(unwrapped838)))
                                 else
                                     _dollar_dollar = msg
                                     if _has_proto_field(_dollar_dollar, Symbol("uint32_value"))
-                                        _t1612 = _get_oneof_field(_dollar_dollar, :uint32_value)
+                                        _t1620 = _get_oneof_field(_dollar_dollar, :uint32_value)
                                     else
-                                        _t1612 = nothing
+                                        _t1620 = nothing
                                     end
-                                    deconstruct_result831 = _t1612
-                                    if !isnothing(deconstruct_result831)
-                                        unwrapped832 = deconstruct_result831
-                                        write(pp, (string(Int64(unwrapped832)) * "u32"))
+                                    deconstruct_result835 = _t1620
+                                    if !isnothing(deconstruct_result835)
+                                        unwrapped836 = deconstruct_result835
+                                        write(pp, (string(Int64(unwrapped836)) * "u32"))
                                     else
                                         _dollar_dollar = msg
                                         if _has_proto_field(_dollar_dollar, Symbol("uint128_value"))
-                                            _t1613 = _get_oneof_field(_dollar_dollar, :uint128_value)
+                                            _t1621 = _get_oneof_field(_dollar_dollar, :uint128_value)
                                         else
-                                            _t1613 = nothing
+                                            _t1621 = nothing
                                         end
-                                        deconstruct_result829 = _t1613
-                                        if !isnothing(deconstruct_result829)
-                                            unwrapped830 = deconstruct_result829
-                                            write(pp, format_uint128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped830))
+                                        deconstruct_result833 = _t1621
+                                        if !isnothing(deconstruct_result833)
+                                            unwrapped834 = deconstruct_result833
+                                            write(pp, format_uint128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped834))
                                         else
                                             _dollar_dollar = msg
                                             if _has_proto_field(_dollar_dollar, Symbol("int128_value"))
-                                                _t1614 = _get_oneof_field(_dollar_dollar, :int128_value)
+                                                _t1622 = _get_oneof_field(_dollar_dollar, :int128_value)
                                             else
-                                                _t1614 = nothing
+                                                _t1622 = nothing
                                             end
-                                            deconstruct_result827 = _t1614
-                                            if !isnothing(deconstruct_result827)
-                                                unwrapped828 = deconstruct_result827
-                                                write(pp, format_int128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped828))
+                                            deconstruct_result831 = _t1622
+                                            if !isnothing(deconstruct_result831)
+                                                unwrapped832 = deconstruct_result831
+                                                write(pp, format_int128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped832))
                                             else
                                                 _dollar_dollar = msg
                                                 if _has_proto_field(_dollar_dollar, Symbol("decimal_value"))
-                                                    _t1615 = _get_oneof_field(_dollar_dollar, :decimal_value)
+                                                    _t1623 = _get_oneof_field(_dollar_dollar, :decimal_value)
                                                 else
-                                                    _t1615 = nothing
+                                                    _t1623 = nothing
                                                 end
-                                                deconstruct_result825 = _t1615
-                                                if !isnothing(deconstruct_result825)
-                                                    unwrapped826 = deconstruct_result825
-                                                    write(pp, format_decimal(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped826))
+                                                deconstruct_result829 = _t1623
+                                                if !isnothing(deconstruct_result829)
+                                                    unwrapped830 = deconstruct_result829
+                                                    write(pp, format_decimal(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped830))
                                                 else
                                                     _dollar_dollar = msg
                                                     if _has_proto_field(_dollar_dollar, Symbol("boolean_value"))
-                                                        _t1616 = _get_oneof_field(_dollar_dollar, :boolean_value)
+                                                        _t1624 = _get_oneof_field(_dollar_dollar, :boolean_value)
                                                     else
-                                                        _t1616 = nothing
+                                                        _t1624 = nothing
                                                     end
-                                                    deconstruct_result823 = _t1616
-                                                    if !isnothing(deconstruct_result823)
-                                                        unwrapped824 = deconstruct_result823
-                                                        pretty_boolean_value(pp, unwrapped824)
+                                                    deconstruct_result827 = _t1624
+                                                    if !isnothing(deconstruct_result827)
+                                                        unwrapped828 = deconstruct_result827
+                                                        pretty_boolean_value(pp, unwrapped828)
                                                     else
-                                                        fields822 = msg
+                                                        fields826 = msg
                                                         write(pp, "missing")
                                                     end
                                                 end
@@ -878,25 +878,25 @@ function pretty_raw_value(pp::PrettyPrinter, msg::Proto.Value)
 end
 
 function pretty_raw_date(pp::PrettyPrinter, msg::Proto.DateValue)
-    flat853 = try_flat(pp, msg, pretty_raw_date)
-    if !isnothing(flat853)
-        write(pp, flat853)
+    flat857 = try_flat(pp, msg, pretty_raw_date)
+    if !isnothing(flat857)
+        write(pp, flat857)
         return nothing
     else
         _dollar_dollar = msg
-        fields848 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day),)
-        unwrapped_fields849 = fields848
+        fields852 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day),)
+        unwrapped_fields853 = fields852
         write(pp, "(date")
         indent_sexp!(pp)
         newline(pp)
-        field850 = unwrapped_fields849[1]
-        write(pp, string(field850))
+        field854 = unwrapped_fields853[1]
+        write(pp, string(field854))
         newline(pp)
-        field851 = unwrapped_fields849[2]
-        write(pp, string(field851))
+        field855 = unwrapped_fields853[2]
+        write(pp, string(field855))
         newline(pp)
-        field852 = unwrapped_fields849[3]
-        write(pp, string(field852))
+        field856 = unwrapped_fields853[3]
+        write(pp, string(field856))
         dedent!(pp)
         write(pp, ")")
     end
@@ -904,39 +904,39 @@ function pretty_raw_date(pp::PrettyPrinter, msg::Proto.DateValue)
 end
 
 function pretty_raw_datetime(pp::PrettyPrinter, msg::Proto.DateTimeValue)
-    flat864 = try_flat(pp, msg, pretty_raw_datetime)
-    if !isnothing(flat864)
-        write(pp, flat864)
+    flat868 = try_flat(pp, msg, pretty_raw_datetime)
+    if !isnothing(flat868)
+        write(pp, flat868)
         return nothing
     else
         _dollar_dollar = msg
-        fields854 = (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_fields855 = fields854
+        fields858 = (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_fields859 = fields858
         write(pp, "(datetime")
         indent_sexp!(pp)
         newline(pp)
-        field856 = unwrapped_fields855[1]
-        write(pp, string(field856))
+        field860 = unwrapped_fields859[1]
+        write(pp, string(field860))
         newline(pp)
-        field857 = unwrapped_fields855[2]
-        write(pp, string(field857))
+        field861 = unwrapped_fields859[2]
+        write(pp, string(field861))
         newline(pp)
-        field858 = unwrapped_fields855[3]
-        write(pp, string(field858))
+        field862 = unwrapped_fields859[3]
+        write(pp, string(field862))
         newline(pp)
-        field859 = unwrapped_fields855[4]
-        write(pp, string(field859))
+        field863 = unwrapped_fields859[4]
+        write(pp, string(field863))
         newline(pp)
-        field860 = unwrapped_fields855[5]
-        write(pp, string(field860))
+        field864 = unwrapped_fields859[5]
+        write(pp, string(field864))
         newline(pp)
-        field861 = unwrapped_fields855[6]
-        write(pp, string(field861))
-        field862 = unwrapped_fields855[7]
-        if !isnothing(field862)
+        field865 = unwrapped_fields859[6]
+        write(pp, string(field865))
+        field866 = unwrapped_fields859[7]
+        if !isnothing(field866)
             newline(pp)
-            opt_val863 = field862
-            write(pp, string(opt_val863))
+            opt_val867 = field866
+            write(pp, string(opt_val867))
         end
         dedent!(pp)
         write(pp, ")")
@@ -947,24 +947,24 @@ end
 function pretty_boolean_value(pp::PrettyPrinter, msg::Bool)
     _dollar_dollar = msg
     if _dollar_dollar
-        _t1617 = ()
+        _t1625 = ()
     else
-        _t1617 = nothing
+        _t1625 = nothing
     end
-    deconstruct_result867 = _t1617
-    if !isnothing(deconstruct_result867)
-        unwrapped868 = deconstruct_result867
+    deconstruct_result871 = _t1625
+    if !isnothing(deconstruct_result871)
+        unwrapped872 = deconstruct_result871
         write(pp, "true")
     else
         _dollar_dollar = msg
         if !_dollar_dollar
-            _t1618 = ()
+            _t1626 = ()
         else
-            _t1618 = nothing
+            _t1626 = nothing
         end
-        deconstruct_result865 = _t1618
-        if !isnothing(deconstruct_result865)
-            unwrapped866 = deconstruct_result865
+        deconstruct_result869 = _t1626
+        if !isnothing(deconstruct_result869)
+            unwrapped870 = deconstruct_result869
             write(pp, "false")
         else
             throw(ParseError("No matching rule for boolean_value"))
@@ -974,24 +974,24 @@ function pretty_boolean_value(pp::PrettyPrinter, msg::Bool)
 end
 
 function pretty_sync(pp::PrettyPrinter, msg::Proto.Sync)
-    flat873 = try_flat(pp, msg, pretty_sync)
-    if !isnothing(flat873)
-        write(pp, flat873)
+    flat877 = try_flat(pp, msg, pretty_sync)
+    if !isnothing(flat877)
+        write(pp, flat877)
         return nothing
     else
         _dollar_dollar = msg
-        fields869 = _dollar_dollar.fragments
-        unwrapped_fields870 = fields869
+        fields873 = _dollar_dollar.fragments
+        unwrapped_fields874 = fields873
         write(pp, "(sync")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields870)
+        if !isempty(unwrapped_fields874)
             newline(pp)
-            for (i1619, elem871) in enumerate(unwrapped_fields870)
-                i872 = i1619 - 1
-                if (i872 > 0)
+            for (i1627, elem875) in enumerate(unwrapped_fields874)
+                i876 = i1627 - 1
+                if (i876 > 0)
                     newline(pp)
                 end
-                pretty_fragment_id(pp, elem871)
+                pretty_fragment_id(pp, elem875)
             end
         end
         dedent!(pp)
@@ -1001,52 +1001,52 @@ function pretty_sync(pp::PrettyPrinter, msg::Proto.Sync)
 end
 
 function pretty_fragment_id(pp::PrettyPrinter, msg::Proto.FragmentId)
-    flat876 = try_flat(pp, msg, pretty_fragment_id)
-    if !isnothing(flat876)
-        write(pp, flat876)
+    flat880 = try_flat(pp, msg, pretty_fragment_id)
+    if !isnothing(flat880)
+        write(pp, flat880)
         return nothing
     else
         _dollar_dollar = msg
-        fields874 = fragment_id_to_string(pp, _dollar_dollar)
-        unwrapped_fields875 = fields874
+        fields878 = fragment_id_to_string(pp, _dollar_dollar)
+        unwrapped_fields879 = fields878
         write(pp, ":")
-        write(pp, unwrapped_fields875)
+        write(pp, unwrapped_fields879)
     end
     return nothing
 end
 
 function pretty_epoch(pp::PrettyPrinter, msg::Proto.Epoch)
-    flat883 = try_flat(pp, msg, pretty_epoch)
-    if !isnothing(flat883)
-        write(pp, flat883)
+    flat887 = try_flat(pp, msg, pretty_epoch)
+    if !isnothing(flat887)
+        write(pp, flat887)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.writes)
-            _t1620 = _dollar_dollar.writes
+            _t1628 = _dollar_dollar.writes
         else
-            _t1620 = nothing
+            _t1628 = nothing
         end
         if !isempty(_dollar_dollar.reads)
-            _t1621 = _dollar_dollar.reads
+            _t1629 = _dollar_dollar.reads
         else
-            _t1621 = nothing
+            _t1629 = nothing
         end
-        fields877 = (_t1620, _t1621,)
-        unwrapped_fields878 = fields877
+        fields881 = (_t1628, _t1629,)
+        unwrapped_fields882 = fields881
         write(pp, "(epoch")
         indent_sexp!(pp)
-        field879 = unwrapped_fields878[1]
-        if !isnothing(field879)
+        field883 = unwrapped_fields882[1]
+        if !isnothing(field883)
             newline(pp)
-            opt_val880 = field879
-            pretty_epoch_writes(pp, opt_val880)
+            opt_val884 = field883
+            pretty_epoch_writes(pp, opt_val884)
         end
-        field881 = unwrapped_fields878[2]
-        if !isnothing(field881)
+        field885 = unwrapped_fields882[2]
+        if !isnothing(field885)
             newline(pp)
-            opt_val882 = field881
-            pretty_epoch_reads(pp, opt_val882)
+            opt_val886 = field885
+            pretty_epoch_reads(pp, opt_val886)
         end
         dedent!(pp)
         write(pp, ")")
@@ -1055,22 +1055,22 @@ function pretty_epoch(pp::PrettyPrinter, msg::Proto.Epoch)
 end
 
 function pretty_epoch_writes(pp::PrettyPrinter, msg::Vector{Proto.Write})
-    flat887 = try_flat(pp, msg, pretty_epoch_writes)
-    if !isnothing(flat887)
-        write(pp, flat887)
+    flat891 = try_flat(pp, msg, pretty_epoch_writes)
+    if !isnothing(flat891)
+        write(pp, flat891)
         return nothing
     else
-        fields884 = msg
+        fields888 = msg
         write(pp, "(writes")
         indent_sexp!(pp)
-        if !isempty(fields884)
+        if !isempty(fields888)
             newline(pp)
-            for (i1622, elem885) in enumerate(fields884)
-                i886 = i1622 - 1
-                if (i886 > 0)
+            for (i1630, elem889) in enumerate(fields888)
+                i890 = i1630 - 1
+                if (i890 > 0)
                     newline(pp)
                 end
-                pretty_write(pp, elem885)
+                pretty_write(pp, elem889)
             end
         end
         dedent!(pp)
@@ -1080,54 +1080,54 @@ function pretty_epoch_writes(pp::PrettyPrinter, msg::Vector{Proto.Write})
 end
 
 function pretty_write(pp::PrettyPrinter, msg::Proto.Write)
-    flat896 = try_flat(pp, msg, pretty_write)
-    if !isnothing(flat896)
-        write(pp, flat896)
+    flat900 = try_flat(pp, msg, pretty_write)
+    if !isnothing(flat900)
+        write(pp, flat900)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("define"))
-            _t1623 = _get_oneof_field(_dollar_dollar, :define)
+            _t1631 = _get_oneof_field(_dollar_dollar, :define)
         else
-            _t1623 = nothing
+            _t1631 = nothing
         end
-        deconstruct_result894 = _t1623
-        if !isnothing(deconstruct_result894)
-            unwrapped895 = deconstruct_result894
-            pretty_define(pp, unwrapped895)
+        deconstruct_result898 = _t1631
+        if !isnothing(deconstruct_result898)
+            unwrapped899 = deconstruct_result898
+            pretty_define(pp, unwrapped899)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("undefine"))
-                _t1624 = _get_oneof_field(_dollar_dollar, :undefine)
+                _t1632 = _get_oneof_field(_dollar_dollar, :undefine)
             else
-                _t1624 = nothing
+                _t1632 = nothing
             end
-            deconstruct_result892 = _t1624
-            if !isnothing(deconstruct_result892)
-                unwrapped893 = deconstruct_result892
-                pretty_undefine(pp, unwrapped893)
+            deconstruct_result896 = _t1632
+            if !isnothing(deconstruct_result896)
+                unwrapped897 = deconstruct_result896
+                pretty_undefine(pp, unwrapped897)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("context"))
-                    _t1625 = _get_oneof_field(_dollar_dollar, :context)
+                    _t1633 = _get_oneof_field(_dollar_dollar, :context)
                 else
-                    _t1625 = nothing
+                    _t1633 = nothing
                 end
-                deconstruct_result890 = _t1625
-                if !isnothing(deconstruct_result890)
-                    unwrapped891 = deconstruct_result890
-                    pretty_context(pp, unwrapped891)
+                deconstruct_result894 = _t1633
+                if !isnothing(deconstruct_result894)
+                    unwrapped895 = deconstruct_result894
+                    pretty_context(pp, unwrapped895)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("snapshot"))
-                        _t1626 = _get_oneof_field(_dollar_dollar, :snapshot)
+                        _t1634 = _get_oneof_field(_dollar_dollar, :snapshot)
                     else
-                        _t1626 = nothing
+                        _t1634 = nothing
                     end
-                    deconstruct_result888 = _t1626
-                    if !isnothing(deconstruct_result888)
-                        unwrapped889 = deconstruct_result888
-                        pretty_snapshot(pp, unwrapped889)
+                    deconstruct_result892 = _t1634
+                    if !isnothing(deconstruct_result892)
+                        unwrapped893 = deconstruct_result892
+                        pretty_snapshot(pp, unwrapped893)
                     else
                         throw(ParseError("No matching rule for write"))
                     end
@@ -1139,18 +1139,18 @@ function pretty_write(pp::PrettyPrinter, msg::Proto.Write)
 end
 
 function pretty_define(pp::PrettyPrinter, msg::Proto.Define)
-    flat899 = try_flat(pp, msg, pretty_define)
-    if !isnothing(flat899)
-        write(pp, flat899)
+    flat903 = try_flat(pp, msg, pretty_define)
+    if !isnothing(flat903)
+        write(pp, flat903)
         return nothing
     else
         _dollar_dollar = msg
-        fields897 = _dollar_dollar.fragment
-        unwrapped_fields898 = fields897
+        fields901 = _dollar_dollar.fragment
+        unwrapped_fields902 = fields901
         write(pp, "(define")
         indent_sexp!(pp)
         newline(pp)
-        pretty_fragment(pp, unwrapped_fields898)
+        pretty_fragment(pp, unwrapped_fields902)
         dedent!(pp)
         write(pp, ")")
     end
@@ -1158,29 +1158,29 @@ function pretty_define(pp::PrettyPrinter, msg::Proto.Define)
 end
 
 function pretty_fragment(pp::PrettyPrinter, msg::Proto.Fragment)
-    flat906 = try_flat(pp, msg, pretty_fragment)
-    if !isnothing(flat906)
-        write(pp, flat906)
+    flat910 = try_flat(pp, msg, pretty_fragment)
+    if !isnothing(flat910)
+        write(pp, flat910)
         return nothing
     else
         _dollar_dollar = msg
         start_pretty_fragment(pp, _dollar_dollar)
-        fields900 = (_dollar_dollar.id, _dollar_dollar.declarations,)
-        unwrapped_fields901 = fields900
+        fields904 = (_dollar_dollar.id, _dollar_dollar.declarations,)
+        unwrapped_fields905 = fields904
         write(pp, "(fragment")
         indent_sexp!(pp)
         newline(pp)
-        field902 = unwrapped_fields901[1]
-        pretty_new_fragment_id(pp, field902)
-        field903 = unwrapped_fields901[2]
-        if !isempty(field903)
+        field906 = unwrapped_fields905[1]
+        pretty_new_fragment_id(pp, field906)
+        field907 = unwrapped_fields905[2]
+        if !isempty(field907)
             newline(pp)
-            for (i1627, elem904) in enumerate(field903)
-                i905 = i1627 - 1
-                if (i905 > 0)
+            for (i1635, elem908) in enumerate(field907)
+                i909 = i1635 - 1
+                if (i909 > 0)
                     newline(pp)
                 end
-                pretty_declaration(pp, elem904)
+                pretty_declaration(pp, elem908)
             end
         end
         dedent!(pp)
@@ -1190,66 +1190,66 @@ function pretty_fragment(pp::PrettyPrinter, msg::Proto.Fragment)
 end
 
 function pretty_new_fragment_id(pp::PrettyPrinter, msg::Proto.FragmentId)
-    flat908 = try_flat(pp, msg, pretty_new_fragment_id)
-    if !isnothing(flat908)
-        write(pp, flat908)
+    flat912 = try_flat(pp, msg, pretty_new_fragment_id)
+    if !isnothing(flat912)
+        write(pp, flat912)
         return nothing
     else
-        fields907 = msg
-        pretty_fragment_id(pp, fields907)
+        fields911 = msg
+        pretty_fragment_id(pp, fields911)
     end
     return nothing
 end
 
 function pretty_declaration(pp::PrettyPrinter, msg::Proto.Declaration)
-    flat917 = try_flat(pp, msg, pretty_declaration)
-    if !isnothing(flat917)
-        write(pp, flat917)
+    flat921 = try_flat(pp, msg, pretty_declaration)
+    if !isnothing(flat921)
+        write(pp, flat921)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("def"))
-            _t1628 = _get_oneof_field(_dollar_dollar, :def)
+            _t1636 = _get_oneof_field(_dollar_dollar, :def)
         else
-            _t1628 = nothing
+            _t1636 = nothing
         end
-        deconstruct_result915 = _t1628
-        if !isnothing(deconstruct_result915)
-            unwrapped916 = deconstruct_result915
-            pretty_def(pp, unwrapped916)
+        deconstruct_result919 = _t1636
+        if !isnothing(deconstruct_result919)
+            unwrapped920 = deconstruct_result919
+            pretty_def(pp, unwrapped920)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("algorithm"))
-                _t1629 = _get_oneof_field(_dollar_dollar, :algorithm)
+                _t1637 = _get_oneof_field(_dollar_dollar, :algorithm)
             else
-                _t1629 = nothing
+                _t1637 = nothing
             end
-            deconstruct_result913 = _t1629
-            if !isnothing(deconstruct_result913)
-                unwrapped914 = deconstruct_result913
-                pretty_algorithm(pp, unwrapped914)
+            deconstruct_result917 = _t1637
+            if !isnothing(deconstruct_result917)
+                unwrapped918 = deconstruct_result917
+                pretty_algorithm(pp, unwrapped918)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("constraint"))
-                    _t1630 = _get_oneof_field(_dollar_dollar, :constraint)
+                    _t1638 = _get_oneof_field(_dollar_dollar, :constraint)
                 else
-                    _t1630 = nothing
+                    _t1638 = nothing
                 end
-                deconstruct_result911 = _t1630
-                if !isnothing(deconstruct_result911)
-                    unwrapped912 = deconstruct_result911
-                    pretty_constraint(pp, unwrapped912)
+                deconstruct_result915 = _t1638
+                if !isnothing(deconstruct_result915)
+                    unwrapped916 = deconstruct_result915
+                    pretty_constraint(pp, unwrapped916)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("data"))
-                        _t1631 = _get_oneof_field(_dollar_dollar, :data)
+                        _t1639 = _get_oneof_field(_dollar_dollar, :data)
                     else
-                        _t1631 = nothing
+                        _t1639 = nothing
                     end
-                    deconstruct_result909 = _t1631
-                    if !isnothing(deconstruct_result909)
-                        unwrapped910 = deconstruct_result909
-                        pretty_data(pp, unwrapped910)
+                    deconstruct_result913 = _t1639
+                    if !isnothing(deconstruct_result913)
+                        unwrapped914 = deconstruct_result913
+                        pretty_data(pp, unwrapped914)
                     else
                         throw(ParseError("No matching rule for declaration"))
                     end
@@ -1261,32 +1261,32 @@ function pretty_declaration(pp::PrettyPrinter, msg::Proto.Declaration)
 end
 
 function pretty_def(pp::PrettyPrinter, msg::Proto.Def)
-    flat924 = try_flat(pp, msg, pretty_def)
-    if !isnothing(flat924)
-        write(pp, flat924)
+    flat928 = try_flat(pp, msg, pretty_def)
+    if !isnothing(flat928)
+        write(pp, flat928)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1632 = _dollar_dollar.attrs
+            _t1640 = _dollar_dollar.attrs
         else
-            _t1632 = nothing
+            _t1640 = nothing
         end
-        fields918 = (_dollar_dollar.name, _dollar_dollar.body, _t1632,)
-        unwrapped_fields919 = fields918
+        fields922 = (_dollar_dollar.name, _dollar_dollar.body, _t1640,)
+        unwrapped_fields923 = fields922
         write(pp, "(def")
         indent_sexp!(pp)
         newline(pp)
-        field920 = unwrapped_fields919[1]
-        pretty_relation_id(pp, field920)
+        field924 = unwrapped_fields923[1]
+        pretty_relation_id(pp, field924)
         newline(pp)
-        field921 = unwrapped_fields919[2]
-        pretty_abstraction(pp, field921)
-        field922 = unwrapped_fields919[3]
-        if !isnothing(field922)
+        field925 = unwrapped_fields923[2]
+        pretty_abstraction(pp, field925)
+        field926 = unwrapped_fields923[3]
+        if !isnothing(field926)
             newline(pp)
-            opt_val923 = field922
-            pretty_attrs(pp, opt_val923)
+            opt_val927 = field926
+            pretty_attrs(pp, opt_val927)
         end
         dedent!(pp)
         write(pp, ")")
@@ -1295,30 +1295,30 @@ function pretty_def(pp::PrettyPrinter, msg::Proto.Def)
 end
 
 function pretty_relation_id(pp::PrettyPrinter, msg::Proto.RelationId)
-    flat929 = try_flat(pp, msg, pretty_relation_id)
-    if !isnothing(flat929)
-        write(pp, flat929)
+    flat933 = try_flat(pp, msg, pretty_relation_id)
+    if !isnothing(flat933)
+        write(pp, flat933)
         return nothing
     else
         _dollar_dollar = msg
         if !isnothing(relation_id_to_string(pp, _dollar_dollar))
-            _t1634 = deconstruct_relation_id_string(pp, _dollar_dollar)
-            _t1633 = _t1634
+            _t1642 = deconstruct_relation_id_string(pp, _dollar_dollar)
+            _t1641 = _t1642
         else
-            _t1633 = nothing
+            _t1641 = nothing
         end
-        deconstruct_result927 = _t1633
-        if !isnothing(deconstruct_result927)
-            unwrapped928 = deconstruct_result927
+        deconstruct_result931 = _t1641
+        if !isnothing(deconstruct_result931)
+            unwrapped932 = deconstruct_result931
             write(pp, ":")
-            write(pp, unwrapped928)
+            write(pp, unwrapped932)
         else
             _dollar_dollar = msg
-            _t1635 = deconstruct_relation_id_uint128(pp, _dollar_dollar)
-            deconstruct_result925 = _t1635
-            if !isnothing(deconstruct_result925)
-                unwrapped926 = deconstruct_result925
-                write(pp, format_uint128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped926))
+            _t1643 = deconstruct_relation_id_uint128(pp, _dollar_dollar)
+            deconstruct_result929 = _t1643
+            if !isnothing(deconstruct_result929)
+                unwrapped930 = deconstruct_result929
+                write(pp, format_uint128(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped930))
             else
                 throw(ParseError("No matching rule for relation_id"))
             end
@@ -1328,22 +1328,22 @@ function pretty_relation_id(pp::PrettyPrinter, msg::Proto.RelationId)
 end
 
 function pretty_abstraction(pp::PrettyPrinter, msg::Proto.Abstraction)
-    flat934 = try_flat(pp, msg, pretty_abstraction)
-    if !isnothing(flat934)
-        write(pp, flat934)
+    flat938 = try_flat(pp, msg, pretty_abstraction)
+    if !isnothing(flat938)
+        write(pp, flat938)
         return nothing
     else
         _dollar_dollar = msg
-        _t1636 = deconstruct_bindings(pp, _dollar_dollar)
-        fields930 = (_t1636, _dollar_dollar.value,)
-        unwrapped_fields931 = fields930
+        _t1644 = deconstruct_bindings(pp, _dollar_dollar)
+        fields934 = (_t1644, _dollar_dollar.value,)
+        unwrapped_fields935 = fields934
         write(pp, "(")
         indent!(pp)
-        field932 = unwrapped_fields931[1]
-        pretty_bindings(pp, field932)
+        field936 = unwrapped_fields935[1]
+        pretty_bindings(pp, field936)
         newline(pp)
-        field933 = unwrapped_fields931[2]
-        pretty_formula(pp, field933)
+        field937 = unwrapped_fields935[2]
+        pretty_formula(pp, field937)
         dedent!(pp)
         write(pp, ")")
     end
@@ -1351,34 +1351,34 @@ function pretty_abstraction(pp::PrettyPrinter, msg::Proto.Abstraction)
 end
 
 function pretty_bindings(pp::PrettyPrinter, msg::Tuple{Vector{Proto.Binding}, Vector{Proto.Binding}})
-    flat942 = try_flat(pp, msg, pretty_bindings)
-    if !isnothing(flat942)
-        write(pp, flat942)
+    flat946 = try_flat(pp, msg, pretty_bindings)
+    if !isnothing(flat946)
+        write(pp, flat946)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar[2])
-            _t1637 = _dollar_dollar[2]
+            _t1645 = _dollar_dollar[2]
         else
-            _t1637 = nothing
+            _t1645 = nothing
         end
-        fields935 = (_dollar_dollar[1], _t1637,)
-        unwrapped_fields936 = fields935
+        fields939 = (_dollar_dollar[1], _t1645,)
+        unwrapped_fields940 = fields939
         write(pp, "[")
         indent!(pp)
-        field937 = unwrapped_fields936[1]
-        for (i1638, elem938) in enumerate(field937)
-            i939 = i1638 - 1
-            if (i939 > 0)
+        field941 = unwrapped_fields940[1]
+        for (i1646, elem942) in enumerate(field941)
+            i943 = i1646 - 1
+            if (i943 > 0)
                 newline(pp)
             end
-            pretty_binding(pp, elem938)
+            pretty_binding(pp, elem942)
         end
-        field940 = unwrapped_fields936[2]
-        if !isnothing(field940)
+        field944 = unwrapped_fields940[2]
+        if !isnothing(field944)
             newline(pp)
-            opt_val941 = field940
-            pretty_value_bindings(pp, opt_val941)
+            opt_val945 = field944
+            pretty_value_bindings(pp, opt_val945)
         end
         dedent!(pp)
         write(pp, "]")
@@ -1387,182 +1387,182 @@ function pretty_bindings(pp::PrettyPrinter, msg::Tuple{Vector{Proto.Binding}, Ve
 end
 
 function pretty_binding(pp::PrettyPrinter, msg::Proto.Binding)
-    flat947 = try_flat(pp, msg, pretty_binding)
-    if !isnothing(flat947)
-        write(pp, flat947)
+    flat951 = try_flat(pp, msg, pretty_binding)
+    if !isnothing(flat951)
+        write(pp, flat951)
         return nothing
     else
         _dollar_dollar = msg
-        fields943 = (_dollar_dollar.var.name, _dollar_dollar.var"#type",)
-        unwrapped_fields944 = fields943
-        field945 = unwrapped_fields944[1]
-        write(pp, field945)
+        fields947 = (_dollar_dollar.var.name, _dollar_dollar.var"#type",)
+        unwrapped_fields948 = fields947
+        field949 = unwrapped_fields948[1]
+        write(pp, field949)
         write(pp, "::")
-        field946 = unwrapped_fields944[2]
-        pretty_type(pp, field946)
+        field950 = unwrapped_fields948[2]
+        pretty_type(pp, field950)
     end
     return nothing
 end
 
 function pretty_type(pp::PrettyPrinter, msg::Proto.var"#Type")
-    flat976 = try_flat(pp, msg, pretty_type)
-    if !isnothing(flat976)
-        write(pp, flat976)
+    flat980 = try_flat(pp, msg, pretty_type)
+    if !isnothing(flat980)
+        write(pp, flat980)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("unspecified_type"))
-            _t1639 = _get_oneof_field(_dollar_dollar, :unspecified_type)
+            _t1647 = _get_oneof_field(_dollar_dollar, :unspecified_type)
         else
-            _t1639 = nothing
+            _t1647 = nothing
         end
-        deconstruct_result974 = _t1639
-        if !isnothing(deconstruct_result974)
-            unwrapped975 = deconstruct_result974
-            pretty_unspecified_type(pp, unwrapped975)
+        deconstruct_result978 = _t1647
+        if !isnothing(deconstruct_result978)
+            unwrapped979 = deconstruct_result978
+            pretty_unspecified_type(pp, unwrapped979)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("string_type"))
-                _t1640 = _get_oneof_field(_dollar_dollar, :string_type)
+                _t1648 = _get_oneof_field(_dollar_dollar, :string_type)
             else
-                _t1640 = nothing
+                _t1648 = nothing
             end
-            deconstruct_result972 = _t1640
-            if !isnothing(deconstruct_result972)
-                unwrapped973 = deconstruct_result972
-                pretty_string_type(pp, unwrapped973)
+            deconstruct_result976 = _t1648
+            if !isnothing(deconstruct_result976)
+                unwrapped977 = deconstruct_result976
+                pretty_string_type(pp, unwrapped977)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("int_type"))
-                    _t1641 = _get_oneof_field(_dollar_dollar, :int_type)
+                    _t1649 = _get_oneof_field(_dollar_dollar, :int_type)
                 else
-                    _t1641 = nothing
+                    _t1649 = nothing
                 end
-                deconstruct_result970 = _t1641
-                if !isnothing(deconstruct_result970)
-                    unwrapped971 = deconstruct_result970
-                    pretty_int_type(pp, unwrapped971)
+                deconstruct_result974 = _t1649
+                if !isnothing(deconstruct_result974)
+                    unwrapped975 = deconstruct_result974
+                    pretty_int_type(pp, unwrapped975)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("float_type"))
-                        _t1642 = _get_oneof_field(_dollar_dollar, :float_type)
+                        _t1650 = _get_oneof_field(_dollar_dollar, :float_type)
                     else
-                        _t1642 = nothing
+                        _t1650 = nothing
                     end
-                    deconstruct_result968 = _t1642
-                    if !isnothing(deconstruct_result968)
-                        unwrapped969 = deconstruct_result968
-                        pretty_float_type(pp, unwrapped969)
+                    deconstruct_result972 = _t1650
+                    if !isnothing(deconstruct_result972)
+                        unwrapped973 = deconstruct_result972
+                        pretty_float_type(pp, unwrapped973)
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("uint128_type"))
-                            _t1643 = _get_oneof_field(_dollar_dollar, :uint128_type)
+                            _t1651 = _get_oneof_field(_dollar_dollar, :uint128_type)
                         else
-                            _t1643 = nothing
+                            _t1651 = nothing
                         end
-                        deconstruct_result966 = _t1643
-                        if !isnothing(deconstruct_result966)
-                            unwrapped967 = deconstruct_result966
-                            pretty_uint128_type(pp, unwrapped967)
+                        deconstruct_result970 = _t1651
+                        if !isnothing(deconstruct_result970)
+                            unwrapped971 = deconstruct_result970
+                            pretty_uint128_type(pp, unwrapped971)
                         else
                             _dollar_dollar = msg
                             if _has_proto_field(_dollar_dollar, Symbol("int128_type"))
-                                _t1644 = _get_oneof_field(_dollar_dollar, :int128_type)
+                                _t1652 = _get_oneof_field(_dollar_dollar, :int128_type)
                             else
-                                _t1644 = nothing
+                                _t1652 = nothing
                             end
-                            deconstruct_result964 = _t1644
-                            if !isnothing(deconstruct_result964)
-                                unwrapped965 = deconstruct_result964
-                                pretty_int128_type(pp, unwrapped965)
+                            deconstruct_result968 = _t1652
+                            if !isnothing(deconstruct_result968)
+                                unwrapped969 = deconstruct_result968
+                                pretty_int128_type(pp, unwrapped969)
                             else
                                 _dollar_dollar = msg
                                 if _has_proto_field(_dollar_dollar, Symbol("date_type"))
-                                    _t1645 = _get_oneof_field(_dollar_dollar, :date_type)
+                                    _t1653 = _get_oneof_field(_dollar_dollar, :date_type)
                                 else
-                                    _t1645 = nothing
+                                    _t1653 = nothing
                                 end
-                                deconstruct_result962 = _t1645
-                                if !isnothing(deconstruct_result962)
-                                    unwrapped963 = deconstruct_result962
-                                    pretty_date_type(pp, unwrapped963)
+                                deconstruct_result966 = _t1653
+                                if !isnothing(deconstruct_result966)
+                                    unwrapped967 = deconstruct_result966
+                                    pretty_date_type(pp, unwrapped967)
                                 else
                                     _dollar_dollar = msg
                                     if _has_proto_field(_dollar_dollar, Symbol("datetime_type"))
-                                        _t1646 = _get_oneof_field(_dollar_dollar, :datetime_type)
+                                        _t1654 = _get_oneof_field(_dollar_dollar, :datetime_type)
                                     else
-                                        _t1646 = nothing
+                                        _t1654 = nothing
                                     end
-                                    deconstruct_result960 = _t1646
-                                    if !isnothing(deconstruct_result960)
-                                        unwrapped961 = deconstruct_result960
-                                        pretty_datetime_type(pp, unwrapped961)
+                                    deconstruct_result964 = _t1654
+                                    if !isnothing(deconstruct_result964)
+                                        unwrapped965 = deconstruct_result964
+                                        pretty_datetime_type(pp, unwrapped965)
                                     else
                                         _dollar_dollar = msg
                                         if _has_proto_field(_dollar_dollar, Symbol("missing_type"))
-                                            _t1647 = _get_oneof_field(_dollar_dollar, :missing_type)
+                                            _t1655 = _get_oneof_field(_dollar_dollar, :missing_type)
                                         else
-                                            _t1647 = nothing
+                                            _t1655 = nothing
                                         end
-                                        deconstruct_result958 = _t1647
-                                        if !isnothing(deconstruct_result958)
-                                            unwrapped959 = deconstruct_result958
-                                            pretty_missing_type(pp, unwrapped959)
+                                        deconstruct_result962 = _t1655
+                                        if !isnothing(deconstruct_result962)
+                                            unwrapped963 = deconstruct_result962
+                                            pretty_missing_type(pp, unwrapped963)
                                         else
                                             _dollar_dollar = msg
                                             if _has_proto_field(_dollar_dollar, Symbol("decimal_type"))
-                                                _t1648 = _get_oneof_field(_dollar_dollar, :decimal_type)
+                                                _t1656 = _get_oneof_field(_dollar_dollar, :decimal_type)
                                             else
-                                                _t1648 = nothing
+                                                _t1656 = nothing
                                             end
-                                            deconstruct_result956 = _t1648
-                                            if !isnothing(deconstruct_result956)
-                                                unwrapped957 = deconstruct_result956
-                                                pretty_decimal_type(pp, unwrapped957)
+                                            deconstruct_result960 = _t1656
+                                            if !isnothing(deconstruct_result960)
+                                                unwrapped961 = deconstruct_result960
+                                                pretty_decimal_type(pp, unwrapped961)
                                             else
                                                 _dollar_dollar = msg
                                                 if _has_proto_field(_dollar_dollar, Symbol("boolean_type"))
-                                                    _t1649 = _get_oneof_field(_dollar_dollar, :boolean_type)
+                                                    _t1657 = _get_oneof_field(_dollar_dollar, :boolean_type)
                                                 else
-                                                    _t1649 = nothing
+                                                    _t1657 = nothing
                                                 end
-                                                deconstruct_result954 = _t1649
-                                                if !isnothing(deconstruct_result954)
-                                                    unwrapped955 = deconstruct_result954
-                                                    pretty_boolean_type(pp, unwrapped955)
+                                                deconstruct_result958 = _t1657
+                                                if !isnothing(deconstruct_result958)
+                                                    unwrapped959 = deconstruct_result958
+                                                    pretty_boolean_type(pp, unwrapped959)
                                                 else
                                                     _dollar_dollar = msg
                                                     if _has_proto_field(_dollar_dollar, Symbol("int32_type"))
-                                                        _t1650 = _get_oneof_field(_dollar_dollar, :int32_type)
+                                                        _t1658 = _get_oneof_field(_dollar_dollar, :int32_type)
                                                     else
-                                                        _t1650 = nothing
+                                                        _t1658 = nothing
                                                     end
-                                                    deconstruct_result952 = _t1650
-                                                    if !isnothing(deconstruct_result952)
-                                                        unwrapped953 = deconstruct_result952
-                                                        pretty_int32_type(pp, unwrapped953)
+                                                    deconstruct_result956 = _t1658
+                                                    if !isnothing(deconstruct_result956)
+                                                        unwrapped957 = deconstruct_result956
+                                                        pretty_int32_type(pp, unwrapped957)
                                                     else
                                                         _dollar_dollar = msg
                                                         if _has_proto_field(_dollar_dollar, Symbol("float32_type"))
-                                                            _t1651 = _get_oneof_field(_dollar_dollar, :float32_type)
+                                                            _t1659 = _get_oneof_field(_dollar_dollar, :float32_type)
                                                         else
-                                                            _t1651 = nothing
+                                                            _t1659 = nothing
                                                         end
-                                                        deconstruct_result950 = _t1651
-                                                        if !isnothing(deconstruct_result950)
-                                                            unwrapped951 = deconstruct_result950
-                                                            pretty_float32_type(pp, unwrapped951)
+                                                        deconstruct_result954 = _t1659
+                                                        if !isnothing(deconstruct_result954)
+                                                            unwrapped955 = deconstruct_result954
+                                                            pretty_float32_type(pp, unwrapped955)
                                                         else
                                                             _dollar_dollar = msg
                                                             if _has_proto_field(_dollar_dollar, Symbol("uint32_type"))
-                                                                _t1652 = _get_oneof_field(_dollar_dollar, :uint32_type)
+                                                                _t1660 = _get_oneof_field(_dollar_dollar, :uint32_type)
                                                             else
-                                                                _t1652 = nothing
+                                                                _t1660 = nothing
                                                             end
-                                                            deconstruct_result948 = _t1652
-                                                            if !isnothing(deconstruct_result948)
-                                                                unwrapped949 = deconstruct_result948
-                                                                pretty_uint32_type(pp, unwrapped949)
+                                                            deconstruct_result952 = _t1660
+                                                            if !isnothing(deconstruct_result952)
+                                                                unwrapped953 = deconstruct_result952
+                                                                pretty_uint32_type(pp, unwrapped953)
                                                             else
                                                                 throw(ParseError("No matching rule for type"))
                                                             end
@@ -1584,76 +1584,76 @@ function pretty_type(pp::PrettyPrinter, msg::Proto.var"#Type")
 end
 
 function pretty_unspecified_type(pp::PrettyPrinter, msg::Proto.UnspecifiedType)
-    fields977 = msg
+    fields981 = msg
     write(pp, "UNKNOWN")
     return nothing
 end
 
 function pretty_string_type(pp::PrettyPrinter, msg::Proto.StringType)
-    fields978 = msg
+    fields982 = msg
     write(pp, "STRING")
     return nothing
 end
 
 function pretty_int_type(pp::PrettyPrinter, msg::Proto.IntType)
-    fields979 = msg
+    fields983 = msg
     write(pp, "INT")
     return nothing
 end
 
 function pretty_float_type(pp::PrettyPrinter, msg::Proto.FloatType)
-    fields980 = msg
+    fields984 = msg
     write(pp, "FLOAT")
     return nothing
 end
 
 function pretty_uint128_type(pp::PrettyPrinter, msg::Proto.UInt128Type)
-    fields981 = msg
+    fields985 = msg
     write(pp, "UINT128")
     return nothing
 end
 
 function pretty_int128_type(pp::PrettyPrinter, msg::Proto.Int128Type)
-    fields982 = msg
+    fields986 = msg
     write(pp, "INT128")
     return nothing
 end
 
 function pretty_date_type(pp::PrettyPrinter, msg::Proto.DateType)
-    fields983 = msg
+    fields987 = msg
     write(pp, "DATE")
     return nothing
 end
 
 function pretty_datetime_type(pp::PrettyPrinter, msg::Proto.DateTimeType)
-    fields984 = msg
+    fields988 = msg
     write(pp, "DATETIME")
     return nothing
 end
 
 function pretty_missing_type(pp::PrettyPrinter, msg::Proto.MissingType)
-    fields985 = msg
+    fields989 = msg
     write(pp, "MISSING")
     return nothing
 end
 
 function pretty_decimal_type(pp::PrettyPrinter, msg::Proto.DecimalType)
-    flat990 = try_flat(pp, msg, pretty_decimal_type)
-    if !isnothing(flat990)
-        write(pp, flat990)
+    flat994 = try_flat(pp, msg, pretty_decimal_type)
+    if !isnothing(flat994)
+        write(pp, flat994)
         return nothing
     else
         _dollar_dollar = msg
-        fields986 = (Int64(_dollar_dollar.precision), Int64(_dollar_dollar.scale),)
-        unwrapped_fields987 = fields986
+        fields990 = (Int64(_dollar_dollar.precision), Int64(_dollar_dollar.scale),)
+        unwrapped_fields991 = fields990
         write(pp, "(DECIMAL")
         indent_sexp!(pp)
         newline(pp)
-        field988 = unwrapped_fields987[1]
-        write(pp, string(field988))
+        field992 = unwrapped_fields991[1]
+        write(pp, string(field992))
         newline(pp)
-        field989 = unwrapped_fields987[2]
-        write(pp, string(field989))
+        field993 = unwrapped_fields991[2]
+        write(pp, string(field993))
         dedent!(pp)
         write(pp, ")")
     end
@@ -1661,45 +1661,45 @@ function pretty_decimal_type(pp::PrettyPrinter, msg::Proto.DecimalType)
 end
 
 function pretty_boolean_type(pp::PrettyPrinter, msg::Proto.BooleanType)
-    fields991 = msg
+    fields995 = msg
     write(pp, "BOOLEAN")
     return nothing
 end
 
 function pretty_int32_type(pp::PrettyPrinter, msg::Proto.Int32Type)
-    fields992 = msg
+    fields996 = msg
     write(pp, "INT32")
     return nothing
 end
 
 function pretty_float32_type(pp::PrettyPrinter, msg::Proto.Float32Type)
-    fields993 = msg
+    fields997 = msg
     write(pp, "FLOAT32")
     return nothing
 end
 
 function pretty_uint32_type(pp::PrettyPrinter, msg::Proto.UInt32Type)
-    fields994 = msg
+    fields998 = msg
     write(pp, "UINT32")
     return nothing
 end
 
 function pretty_value_bindings(pp::PrettyPrinter, msg::Vector{Proto.Binding})
-    flat998 = try_flat(pp, msg, pretty_value_bindings)
-    if !isnothing(flat998)
-        write(pp, flat998)
+    flat1002 = try_flat(pp, msg, pretty_value_bindings)
+    if !isnothing(flat1002)
+        write(pp, flat1002)
         return nothing
     else
-        fields995 = msg
+        fields999 = msg
         write(pp, "|")
-        if !isempty(fields995)
+        if !isempty(fields999)
             write(pp, " ")
-            for (i1653, elem996) in enumerate(fields995)
-                i997 = i1653 - 1
-                if (i997 > 0)
+            for (i1661, elem1000) in enumerate(fields999)
+                i1001 = i1661 - 1
+                if (i1001 > 0)
                     newline(pp)
                 end
-                pretty_binding(pp, elem996)
+                pretty_binding(pp, elem1000)
             end
         end
     end
@@ -1707,153 +1707,153 @@ function pretty_value_bindings(pp::PrettyPrinter, msg::Vector{Proto.Binding})
 end
 
 function pretty_formula(pp::PrettyPrinter, msg::Proto.Formula)
-    flat1025 = try_flat(pp, msg, pretty_formula)
-    if !isnothing(flat1025)
-        write(pp, flat1025)
+    flat1029 = try_flat(pp, msg, pretty_formula)
+    if !isnothing(flat1029)
+        write(pp, flat1029)
         return nothing
     else
         _dollar_dollar = msg
         if (_has_proto_field(_dollar_dollar, Symbol("conjunction")) && isempty(_get_oneof_field(_dollar_dollar, :conjunction).args))
-            _t1654 = _get_oneof_field(_dollar_dollar, :conjunction)
+            _t1662 = _get_oneof_field(_dollar_dollar, :conjunction)
         else
-            _t1654 = nothing
+            _t1662 = nothing
         end
-        deconstruct_result1023 = _t1654
-        if !isnothing(deconstruct_result1023)
-            unwrapped1024 = deconstruct_result1023
-            pretty_true(pp, unwrapped1024)
+        deconstruct_result1027 = _t1662
+        if !isnothing(deconstruct_result1027)
+            unwrapped1028 = deconstruct_result1027
+            pretty_true(pp, unwrapped1028)
         else
             _dollar_dollar = msg
             if (_has_proto_field(_dollar_dollar, Symbol("disjunction")) && isempty(_get_oneof_field(_dollar_dollar, :disjunction).args))
-                _t1655 = _get_oneof_field(_dollar_dollar, :disjunction)
+                _t1663 = _get_oneof_field(_dollar_dollar, :disjunction)
             else
-                _t1655 = nothing
+                _t1663 = nothing
             end
-            deconstruct_result1021 = _t1655
-            if !isnothing(deconstruct_result1021)
-                unwrapped1022 = deconstruct_result1021
-                pretty_false(pp, unwrapped1022)
+            deconstruct_result1025 = _t1663
+            if !isnothing(deconstruct_result1025)
+                unwrapped1026 = deconstruct_result1025
+                pretty_false(pp, unwrapped1026)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("exists"))
-                    _t1656 = _get_oneof_field(_dollar_dollar, :exists)
+                    _t1664 = _get_oneof_field(_dollar_dollar, :exists)
                 else
-                    _t1656 = nothing
+                    _t1664 = nothing
                 end
-                deconstruct_result1019 = _t1656
-                if !isnothing(deconstruct_result1019)
-                    unwrapped1020 = deconstruct_result1019
-                    pretty_exists(pp, unwrapped1020)
+                deconstruct_result1023 = _t1664
+                if !isnothing(deconstruct_result1023)
+                    unwrapped1024 = deconstruct_result1023
+                    pretty_exists(pp, unwrapped1024)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("reduce"))
-                        _t1657 = _get_oneof_field(_dollar_dollar, :reduce)
+                        _t1665 = _get_oneof_field(_dollar_dollar, :reduce)
                     else
-                        _t1657 = nothing
+                        _t1665 = nothing
                     end
-                    deconstruct_result1017 = _t1657
-                    if !isnothing(deconstruct_result1017)
-                        unwrapped1018 = deconstruct_result1017
-                        pretty_reduce(pp, unwrapped1018)
+                    deconstruct_result1021 = _t1665
+                    if !isnothing(deconstruct_result1021)
+                        unwrapped1022 = deconstruct_result1021
+                        pretty_reduce(pp, unwrapped1022)
                     else
                         _dollar_dollar = msg
                         if (_has_proto_field(_dollar_dollar, Symbol("conjunction")) && !isempty(_get_oneof_field(_dollar_dollar, :conjunction).args))
-                            _t1658 = _get_oneof_field(_dollar_dollar, :conjunction)
+                            _t1666 = _get_oneof_field(_dollar_dollar, :conjunction)
                         else
-                            _t1658 = nothing
+                            _t1666 = nothing
                         end
-                        deconstruct_result1015 = _t1658
-                        if !isnothing(deconstruct_result1015)
-                            unwrapped1016 = deconstruct_result1015
-                            pretty_conjunction(pp, unwrapped1016)
+                        deconstruct_result1019 = _t1666
+                        if !isnothing(deconstruct_result1019)
+                            unwrapped1020 = deconstruct_result1019
+                            pretty_conjunction(pp, unwrapped1020)
                         else
                             _dollar_dollar = msg
                             if (_has_proto_field(_dollar_dollar, Symbol("disjunction")) && !isempty(_get_oneof_field(_dollar_dollar, :disjunction).args))
-                                _t1659 = _get_oneof_field(_dollar_dollar, :disjunction)
+                                _t1667 = _get_oneof_field(_dollar_dollar, :disjunction)
                             else
-                                _t1659 = nothing
+                                _t1667 = nothing
                             end
-                            deconstruct_result1013 = _t1659
-                            if !isnothing(deconstruct_result1013)
-                                unwrapped1014 = deconstruct_result1013
-                                pretty_disjunction(pp, unwrapped1014)
+                            deconstruct_result1017 = _t1667
+                            if !isnothing(deconstruct_result1017)
+                                unwrapped1018 = deconstruct_result1017
+                                pretty_disjunction(pp, unwrapped1018)
                             else
                                 _dollar_dollar = msg
                                 if _has_proto_field(_dollar_dollar, Symbol("not"))
-                                    _t1660 = _get_oneof_field(_dollar_dollar, :not)
+                                    _t1668 = _get_oneof_field(_dollar_dollar, :not)
                                 else
-                                    _t1660 = nothing
+                                    _t1668 = nothing
                                 end
-                                deconstruct_result1011 = _t1660
-                                if !isnothing(deconstruct_result1011)
-                                    unwrapped1012 = deconstruct_result1011
-                                    pretty_not(pp, unwrapped1012)
+                                deconstruct_result1015 = _t1668
+                                if !isnothing(deconstruct_result1015)
+                                    unwrapped1016 = deconstruct_result1015
+                                    pretty_not(pp, unwrapped1016)
                                 else
                                     _dollar_dollar = msg
                                     if _has_proto_field(_dollar_dollar, Symbol("ffi"))
-                                        _t1661 = _get_oneof_field(_dollar_dollar, :ffi)
+                                        _t1669 = _get_oneof_field(_dollar_dollar, :ffi)
                                     else
-                                        _t1661 = nothing
+                                        _t1669 = nothing
                                     end
-                                    deconstruct_result1009 = _t1661
-                                    if !isnothing(deconstruct_result1009)
-                                        unwrapped1010 = deconstruct_result1009
-                                        pretty_ffi(pp, unwrapped1010)
+                                    deconstruct_result1013 = _t1669
+                                    if !isnothing(deconstruct_result1013)
+                                        unwrapped1014 = deconstruct_result1013
+                                        pretty_ffi(pp, unwrapped1014)
                                     else
                                         _dollar_dollar = msg
                                         if _has_proto_field(_dollar_dollar, Symbol("atom"))
-                                            _t1662 = _get_oneof_field(_dollar_dollar, :atom)
+                                            _t1670 = _get_oneof_field(_dollar_dollar, :atom)
                                         else
-                                            _t1662 = nothing
+                                            _t1670 = nothing
                                         end
-                                        deconstruct_result1007 = _t1662
-                                        if !isnothing(deconstruct_result1007)
-                                            unwrapped1008 = deconstruct_result1007
-                                            pretty_atom(pp, unwrapped1008)
+                                        deconstruct_result1011 = _t1670
+                                        if !isnothing(deconstruct_result1011)
+                                            unwrapped1012 = deconstruct_result1011
+                                            pretty_atom(pp, unwrapped1012)
                                         else
                                             _dollar_dollar = msg
                                             if _has_proto_field(_dollar_dollar, Symbol("pragma"))
-                                                _t1663 = _get_oneof_field(_dollar_dollar, :pragma)
+                                                _t1671 = _get_oneof_field(_dollar_dollar, :pragma)
                                             else
-                                                _t1663 = nothing
+                                                _t1671 = nothing
                                             end
-                                            deconstruct_result1005 = _t1663
-                                            if !isnothing(deconstruct_result1005)
-                                                unwrapped1006 = deconstruct_result1005
-                                                pretty_pragma(pp, unwrapped1006)
+                                            deconstruct_result1009 = _t1671
+                                            if !isnothing(deconstruct_result1009)
+                                                unwrapped1010 = deconstruct_result1009
+                                                pretty_pragma(pp, unwrapped1010)
                                             else
                                                 _dollar_dollar = msg
                                                 if _has_proto_field(_dollar_dollar, Symbol("primitive"))
-                                                    _t1664 = _get_oneof_field(_dollar_dollar, :primitive)
+                                                    _t1672 = _get_oneof_field(_dollar_dollar, :primitive)
                                                 else
-                                                    _t1664 = nothing
+                                                    _t1672 = nothing
                                                 end
-                                                deconstruct_result1003 = _t1664
-                                                if !isnothing(deconstruct_result1003)
-                                                    unwrapped1004 = deconstruct_result1003
-                                                    pretty_primitive(pp, unwrapped1004)
+                                                deconstruct_result1007 = _t1672
+                                                if !isnothing(deconstruct_result1007)
+                                                    unwrapped1008 = deconstruct_result1007
+                                                    pretty_primitive(pp, unwrapped1008)
                                                 else
                                                     _dollar_dollar = msg
                                                     if _has_proto_field(_dollar_dollar, Symbol("rel_atom"))
-                                                        _t1665 = _get_oneof_field(_dollar_dollar, :rel_atom)
+                                                        _t1673 = _get_oneof_field(_dollar_dollar, :rel_atom)
                                                     else
-                                                        _t1665 = nothing
+                                                        _t1673 = nothing
                                                     end
-                                                    deconstruct_result1001 = _t1665
-                                                    if !isnothing(deconstruct_result1001)
-                                                        unwrapped1002 = deconstruct_result1001
-                                                        pretty_rel_atom(pp, unwrapped1002)
+                                                    deconstruct_result1005 = _t1673
+                                                    if !isnothing(deconstruct_result1005)
+                                                        unwrapped1006 = deconstruct_result1005
+                                                        pretty_rel_atom(pp, unwrapped1006)
                                                     else
                                                         _dollar_dollar = msg
                                                         if _has_proto_field(_dollar_dollar, Symbol("cast"))
-                                                            _t1666 = _get_oneof_field(_dollar_dollar, :cast)
+                                                            _t1674 = _get_oneof_field(_dollar_dollar, :cast)
                                                         else
-                                                            _t1666 = nothing
+                                                            _t1674 = nothing
                                                         end
-                                                        deconstruct_result999 = _t1666
-                                                        if !isnothing(deconstruct_result999)
-                                                            unwrapped1000 = deconstruct_result999
-                                                            pretty_cast(pp, unwrapped1000)
+                                                        deconstruct_result1003 = _t1674
+                                                        if !isnothing(deconstruct_result1003)
+                                                            unwrapped1004 = deconstruct_result1003
+                                                            pretty_cast(pp, unwrapped1004)
                                                         else
                                                             throw(ParseError("No matching rule for formula"))
                                                         end
@@ -1874,35 +1874,35 @@ function pretty_formula(pp::PrettyPrinter, msg::Proto.Formula)
 end
 
 function pretty_true(pp::PrettyPrinter, msg::Proto.Conjunction)
-    fields1026 = msg
+    fields1030 = msg
     write(pp, "(true)")
     return nothing
 end
 
 function pretty_false(pp::PrettyPrinter, msg::Proto.Disjunction)
-    fields1027 = msg
+    fields1031 = msg
     write(pp, "(false)")
     return nothing
 end
 
 function pretty_exists(pp::PrettyPrinter, msg::Proto.Exists)
-    flat1032 = try_flat(pp, msg, pretty_exists)
-    if !isnothing(flat1032)
-        write(pp, flat1032)
+    flat1036 = try_flat(pp, msg, pretty_exists)
+    if !isnothing(flat1036)
+        write(pp, flat1036)
         return nothing
     else
         _dollar_dollar = msg
-        _t1667 = deconstruct_bindings(pp, _dollar_dollar.body)
-        fields1028 = (_t1667, _dollar_dollar.body.value,)
-        unwrapped_fields1029 = fields1028
+        _t1675 = deconstruct_bindings(pp, _dollar_dollar.body)
+        fields1032 = (_t1675, _dollar_dollar.body.value,)
+        unwrapped_fields1033 = fields1032
         write(pp, "(exists")
         indent_sexp!(pp)
         newline(pp)
-        field1030 = unwrapped_fields1029[1]
-        pretty_bindings(pp, field1030)
+        field1034 = unwrapped_fields1033[1]
+        pretty_bindings(pp, field1034)
         newline(pp)
-        field1031 = unwrapped_fields1029[2]
-        pretty_formula(pp, field1031)
+        field1035 = unwrapped_fields1033[2]
+        pretty_formula(pp, field1035)
         dedent!(pp)
         write(pp, ")")
     end
@@ -1910,25 +1910,25 @@ function pretty_exists(pp::PrettyPrinter, msg::Proto.Exists)
 end
 
 function pretty_reduce(pp::PrettyPrinter, msg::Proto.Reduce)
-    flat1038 = try_flat(pp, msg, pretty_reduce)
-    if !isnothing(flat1038)
-        write(pp, flat1038)
+    flat1042 = try_flat(pp, msg, pretty_reduce)
+    if !isnothing(flat1042)
+        write(pp, flat1042)
         return nothing
     else
         _dollar_dollar = msg
-        fields1033 = (_dollar_dollar.op, _dollar_dollar.body, _dollar_dollar.terms,)
-        unwrapped_fields1034 = fields1033
+        fields1037 = (_dollar_dollar.op, _dollar_dollar.body, _dollar_dollar.terms,)
+        unwrapped_fields1038 = fields1037
         write(pp, "(reduce")
         indent_sexp!(pp)
         newline(pp)
-        field1035 = unwrapped_fields1034[1]
-        pretty_abstraction(pp, field1035)
+        field1039 = unwrapped_fields1038[1]
+        pretty_abstraction(pp, field1039)
         newline(pp)
-        field1036 = unwrapped_fields1034[2]
-        pretty_abstraction(pp, field1036)
+        field1040 = unwrapped_fields1038[2]
+        pretty_abstraction(pp, field1040)
         newline(pp)
-        field1037 = unwrapped_fields1034[3]
-        pretty_terms(pp, field1037)
+        field1041 = unwrapped_fields1038[3]
+        pretty_terms(pp, field1041)
         dedent!(pp)
         write(pp, ")")
     end
@@ -1936,22 +1936,22 @@ function pretty_reduce(pp::PrettyPrinter, msg::Proto.Reduce)
 end
 
 function pretty_terms(pp::PrettyPrinter, msg::Vector{Proto.Term})
-    flat1042 = try_flat(pp, msg, pretty_terms)
-    if !isnothing(flat1042)
-        write(pp, flat1042)
+    flat1046 = try_flat(pp, msg, pretty_terms)
+    if !isnothing(flat1046)
+        write(pp, flat1046)
         return nothing
     else
-        fields1039 = msg
+        fields1043 = msg
         write(pp, "(terms")
         indent_sexp!(pp)
-        if !isempty(fields1039)
+        if !isempty(fields1043)
             newline(pp)
-            for (i1668, elem1040) in enumerate(fields1039)
-                i1041 = i1668 - 1
-                if (i1041 > 0)
+            for (i1676, elem1044) in enumerate(fields1043)
+                i1045 = i1676 - 1
+                if (i1045 > 0)
                     newline(pp)
                 end
-                pretty_term(pp, elem1040)
+                pretty_term(pp, elem1044)
             end
         end
         dedent!(pp)
@@ -1961,32 +1961,32 @@ function pretty_terms(pp::PrettyPrinter, msg::Vector{Proto.Term})
 end
 
 function pretty_term(pp::PrettyPrinter, msg::Proto.Term)
-    flat1047 = try_flat(pp, msg, pretty_term)
-    if !isnothing(flat1047)
-        write(pp, flat1047)
+    flat1051 = try_flat(pp, msg, pretty_term)
+    if !isnothing(flat1051)
+        write(pp, flat1051)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("var"))
-            _t1669 = _get_oneof_field(_dollar_dollar, :var)
+            _t1677 = _get_oneof_field(_dollar_dollar, :var)
         else
-            _t1669 = nothing
+            _t1677 = nothing
         end
-        deconstruct_result1045 = _t1669
-        if !isnothing(deconstruct_result1045)
-            unwrapped1046 = deconstruct_result1045
-            pretty_var(pp, unwrapped1046)
+        deconstruct_result1049 = _t1677
+        if !isnothing(deconstruct_result1049)
+            unwrapped1050 = deconstruct_result1049
+            pretty_var(pp, unwrapped1050)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("constant"))
-                _t1670 = _get_oneof_field(_dollar_dollar, :constant)
+                _t1678 = _get_oneof_field(_dollar_dollar, :constant)
             else
-                _t1670 = nothing
+                _t1678 = nothing
             end
-            deconstruct_result1043 = _t1670
-            if !isnothing(deconstruct_result1043)
-                unwrapped1044 = deconstruct_result1043
-                pretty_value(pp, unwrapped1044)
+            deconstruct_result1047 = _t1678
+            if !isnothing(deconstruct_result1047)
+                unwrapped1048 = deconstruct_result1047
+                pretty_value(pp, unwrapped1048)
             else
                 throw(ParseError("No matching rule for term"))
             end
@@ -1996,158 +1996,158 @@ function pretty_term(pp::PrettyPrinter, msg::Proto.Term)
 end
 
 function pretty_var(pp::PrettyPrinter, msg::Proto.Var)
-    flat1050 = try_flat(pp, msg, pretty_var)
-    if !isnothing(flat1050)
-        write(pp, flat1050)
+    flat1054 = try_flat(pp, msg, pretty_var)
+    if !isnothing(flat1054)
+        write(pp, flat1054)
         return nothing
     else
         _dollar_dollar = msg
-        fields1048 = _dollar_dollar.name
-        unwrapped_fields1049 = fields1048
-        write(pp, unwrapped_fields1049)
+        fields1052 = _dollar_dollar.name
+        unwrapped_fields1053 = fields1052
+        write(pp, unwrapped_fields1053)
     end
     return nothing
 end
 
 function pretty_value(pp::PrettyPrinter, msg::Proto.Value)
-    flat1076 = try_flat(pp, msg, pretty_value)
-    if !isnothing(flat1076)
-        write(pp, flat1076)
+    flat1080 = try_flat(pp, msg, pretty_value)
+    if !isnothing(flat1080)
+        write(pp, flat1080)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("date_value"))
-            _t1671 = _get_oneof_field(_dollar_dollar, :date_value)
+            _t1679 = _get_oneof_field(_dollar_dollar, :date_value)
         else
-            _t1671 = nothing
+            _t1679 = nothing
         end
-        deconstruct_result1074 = _t1671
-        if !isnothing(deconstruct_result1074)
-            unwrapped1075 = deconstruct_result1074
-            pretty_date(pp, unwrapped1075)
+        deconstruct_result1078 = _t1679
+        if !isnothing(deconstruct_result1078)
+            unwrapped1079 = deconstruct_result1078
+            pretty_date(pp, unwrapped1079)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("datetime_value"))
-                _t1672 = _get_oneof_field(_dollar_dollar, :datetime_value)
+                _t1680 = _get_oneof_field(_dollar_dollar, :datetime_value)
             else
-                _t1672 = nothing
+                _t1680 = nothing
             end
-            deconstruct_result1072 = _t1672
-            if !isnothing(deconstruct_result1072)
-                unwrapped1073 = deconstruct_result1072
-                pretty_datetime(pp, unwrapped1073)
+            deconstruct_result1076 = _t1680
+            if !isnothing(deconstruct_result1076)
+                unwrapped1077 = deconstruct_result1076
+                pretty_datetime(pp, unwrapped1077)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("string_value"))
-                    _t1673 = _get_oneof_field(_dollar_dollar, :string_value)
+                    _t1681 = _get_oneof_field(_dollar_dollar, :string_value)
                 else
-                    _t1673 = nothing
+                    _t1681 = nothing
                 end
-                deconstruct_result1070 = _t1673
-                if !isnothing(deconstruct_result1070)
-                    unwrapped1071 = deconstruct_result1070
-                    write(pp, format_string(pp, unwrapped1071))
+                deconstruct_result1074 = _t1681
+                if !isnothing(deconstruct_result1074)
+                    unwrapped1075 = deconstruct_result1074
+                    write(pp, format_string(pp, unwrapped1075))
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("int32_value"))
-                        _t1674 = _get_oneof_field(_dollar_dollar, :int32_value)
+                        _t1682 = _get_oneof_field(_dollar_dollar, :int32_value)
                     else
-                        _t1674 = nothing
+                        _t1682 = nothing
                     end
-                    deconstruct_result1068 = _t1674
-                    if !isnothing(deconstruct_result1068)
-                        unwrapped1069 = deconstruct_result1068
-                        write(pp, format_int32(pp, unwrapped1069))
+                    deconstruct_result1072 = _t1682
+                    if !isnothing(deconstruct_result1072)
+                        unwrapped1073 = deconstruct_result1072
+                        write(pp, format_int32(pp, unwrapped1073))
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("int_value"))
-                            _t1675 = _get_oneof_field(_dollar_dollar, :int_value)
+                            _t1683 = _get_oneof_field(_dollar_dollar, :int_value)
                         else
-                            _t1675 = nothing
+                            _t1683 = nothing
                         end
-                        deconstruct_result1066 = _t1675
-                        if !isnothing(deconstruct_result1066)
-                            unwrapped1067 = deconstruct_result1066
-                            write(pp, format_int(pp, unwrapped1067))
+                        deconstruct_result1070 = _t1683
+                        if !isnothing(deconstruct_result1070)
+                            unwrapped1071 = deconstruct_result1070
+                            write(pp, format_int(pp, unwrapped1071))
                         else
                             _dollar_dollar = msg
                             if _has_proto_field(_dollar_dollar, Symbol("float32_value"))
-                                _t1676 = _get_oneof_field(_dollar_dollar, :float32_value)
+                                _t1684 = _get_oneof_field(_dollar_dollar, :float32_value)
                             else
-                                _t1676 = nothing
+                                _t1684 = nothing
                             end
-                            deconstruct_result1064 = _t1676
-                            if !isnothing(deconstruct_result1064)
-                                unwrapped1065 = deconstruct_result1064
-                                write(pp, format_float32(pp, unwrapped1065))
+                            deconstruct_result1068 = _t1684
+                            if !isnothing(deconstruct_result1068)
+                                unwrapped1069 = deconstruct_result1068
+                                write(pp, format_float32(pp, unwrapped1069))
                             else
                                 _dollar_dollar = msg
                                 if _has_proto_field(_dollar_dollar, Symbol("float_value"))
-                                    _t1677 = _get_oneof_field(_dollar_dollar, :float_value)
+                                    _t1685 = _get_oneof_field(_dollar_dollar, :float_value)
                                 else
-                                    _t1677 = nothing
+                                    _t1685 = nothing
                                 end
-                                deconstruct_result1062 = _t1677
-                                if !isnothing(deconstruct_result1062)
-                                    unwrapped1063 = deconstruct_result1062
-                                    write(pp, format_float(pp, unwrapped1063))
+                                deconstruct_result1066 = _t1685
+                                if !isnothing(deconstruct_result1066)
+                                    unwrapped1067 = deconstruct_result1066
+                                    write(pp, format_float(pp, unwrapped1067))
                                 else
                                     _dollar_dollar = msg
                                     if _has_proto_field(_dollar_dollar, Symbol("uint32_value"))
-                                        _t1678 = _get_oneof_field(_dollar_dollar, :uint32_value)
+                                        _t1686 = _get_oneof_field(_dollar_dollar, :uint32_value)
                                     else
-                                        _t1678 = nothing
+                                        _t1686 = nothing
                                     end
-                                    deconstruct_result1060 = _t1678
-                                    if !isnothing(deconstruct_result1060)
-                                        unwrapped1061 = deconstruct_result1060
-                                        write(pp, format_uint32(pp, unwrapped1061))
+                                    deconstruct_result1064 = _t1686
+                                    if !isnothing(deconstruct_result1064)
+                                        unwrapped1065 = deconstruct_result1064
+                                        write(pp, format_uint32(pp, unwrapped1065))
                                     else
                                         _dollar_dollar = msg
                                         if _has_proto_field(_dollar_dollar, Symbol("uint128_value"))
-                                            _t1679 = _get_oneof_field(_dollar_dollar, :uint128_value)
+                                            _t1687 = _get_oneof_field(_dollar_dollar, :uint128_value)
                                         else
-                                            _t1679 = nothing
+                                            _t1687 = nothing
                                         end
-                                        deconstruct_result1058 = _t1679
-                                        if !isnothing(deconstruct_result1058)
-                                            unwrapped1059 = deconstruct_result1058
-                                            write(pp, format_uint128(pp, unwrapped1059))
+                                        deconstruct_result1062 = _t1687
+                                        if !isnothing(deconstruct_result1062)
+                                            unwrapped1063 = deconstruct_result1062
+                                            write(pp, format_uint128(pp, unwrapped1063))
                                         else
                                             _dollar_dollar = msg
                                             if _has_proto_field(_dollar_dollar, Symbol("int128_value"))
-                                                _t1680 = _get_oneof_field(_dollar_dollar, :int128_value)
+                                                _t1688 = _get_oneof_field(_dollar_dollar, :int128_value)
                                             else
-                                                _t1680 = nothing
+                                                _t1688 = nothing
                                             end
-                                            deconstruct_result1056 = _t1680
-                                            if !isnothing(deconstruct_result1056)
-                                                unwrapped1057 = deconstruct_result1056
-                                                write(pp, format_int128(pp, unwrapped1057))
+                                            deconstruct_result1060 = _t1688
+                                            if !isnothing(deconstruct_result1060)
+                                                unwrapped1061 = deconstruct_result1060
+                                                write(pp, format_int128(pp, unwrapped1061))
                                             else
                                                 _dollar_dollar = msg
                                                 if _has_proto_field(_dollar_dollar, Symbol("decimal_value"))
-                                                    _t1681 = _get_oneof_field(_dollar_dollar, :decimal_value)
+                                                    _t1689 = _get_oneof_field(_dollar_dollar, :decimal_value)
                                                 else
-                                                    _t1681 = nothing
+                                                    _t1689 = nothing
                                                 end
-                                                deconstruct_result1054 = _t1681
-                                                if !isnothing(deconstruct_result1054)
-                                                    unwrapped1055 = deconstruct_result1054
-                                                    write(pp, format_decimal(pp, unwrapped1055))
+                                                deconstruct_result1058 = _t1689
+                                                if !isnothing(deconstruct_result1058)
+                                                    unwrapped1059 = deconstruct_result1058
+                                                    write(pp, format_decimal(pp, unwrapped1059))
                                                 else
                                                     _dollar_dollar = msg
                                                     if _has_proto_field(_dollar_dollar, Symbol("boolean_value"))
-                                                        _t1682 = _get_oneof_field(_dollar_dollar, :boolean_value)
+                                                        _t1690 = _get_oneof_field(_dollar_dollar, :boolean_value)
                                                     else
-                                                        _t1682 = nothing
+                                                        _t1690 = nothing
                                                     end
-                                                    deconstruct_result1052 = _t1682
-                                                    if !isnothing(deconstruct_result1052)
-                                                        unwrapped1053 = deconstruct_result1052
-                                                        pretty_boolean_value(pp, unwrapped1053)
+                                                    deconstruct_result1056 = _t1690
+                                                    if !isnothing(deconstruct_result1056)
+                                                        unwrapped1057 = deconstruct_result1056
+                                                        pretty_boolean_value(pp, unwrapped1057)
                                                     else
-                                                        fields1051 = msg
+                                                        fields1055 = msg
                                                         write(pp, "missing")
                                                     end
                                                 end
@@ -2166,25 +2166,25 @@ function pretty_value(pp::PrettyPrinter, msg::Proto.Value)
 end
 
 function pretty_date(pp::PrettyPrinter, msg::Proto.DateValue)
-    flat1082 = try_flat(pp, msg, pretty_date)
-    if !isnothing(flat1082)
-        write(pp, flat1082)
+    flat1086 = try_flat(pp, msg, pretty_date)
+    if !isnothing(flat1086)
+        write(pp, flat1086)
         return nothing
     else
         _dollar_dollar = msg
-        fields1077 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day),)
-        unwrapped_fields1078 = fields1077
+        fields1081 = (Int64(_dollar_dollar.year), Int64(_dollar_dollar.month), Int64(_dollar_dollar.day),)
+        unwrapped_fields1082 = fields1081
         write(pp, "(date")
         indent_sexp!(pp)
         newline(pp)
-        field1079 = unwrapped_fields1078[1]
-        write(pp, format_int(pp, field1079))
+        field1083 = unwrapped_fields1082[1]
+        write(pp, format_int(pp, field1083))
         newline(pp)
-        field1080 = unwrapped_fields1078[2]
-        write(pp, format_int(pp, field1080))
+        field1084 = unwrapped_fields1082[2]
+        write(pp, format_int(pp, field1084))
         newline(pp)
-        field1081 = unwrapped_fields1078[3]
-        write(pp, format_int(pp, field1081))
+        field1085 = unwrapped_fields1082[3]
+        write(pp, format_int(pp, field1085))
         dedent!(pp)
         write(pp, ")")
     end
@@ -2192,39 +2192,39 @@ function pretty_date(pp::PrettyPrinter, msg::Proto.DateValue)
 end
 
 function pretty_datetime(pp::PrettyPrinter, msg::Proto.DateTimeValue)
-    flat1093 = try_flat(pp, msg, pretty_datetime)
-    if !isnothing(flat1093)
-        write(pp, flat1093)
+    flat1097 = try_flat(pp, msg, pretty_datetime)
+    if !isnothing(flat1097)
+        write(pp, flat1097)
         return nothing
     else
         _dollar_dollar = msg
-        fields1083 = (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_fields1084 = fields1083
+        fields1087 = (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_fields1088 = fields1087
         write(pp, "(datetime")
         indent_sexp!(pp)
         newline(pp)
-        field1085 = unwrapped_fields1084[1]
-        write(pp, format_int(pp, field1085))
+        field1089 = unwrapped_fields1088[1]
+        write(pp, format_int(pp, field1089))
         newline(pp)
-        field1086 = unwrapped_fields1084[2]
-        write(pp, format_int(pp, field1086))
+        field1090 = unwrapped_fields1088[2]
+        write(pp, format_int(pp, field1090))
         newline(pp)
-        field1087 = unwrapped_fields1084[3]
-        write(pp, format_int(pp, field1087))
+        field1091 = unwrapped_fields1088[3]
+        write(pp, format_int(pp, field1091))
         newline(pp)
-        field1088 = unwrapped_fields1084[4]
-        write(pp, format_int(pp, field1088))
+        field1092 = unwrapped_fields1088[4]
+        write(pp, format_int(pp, field1092))
         newline(pp)
-        field1089 = unwrapped_fields1084[5]
-        write(pp, format_int(pp, field1089))
+        field1093 = unwrapped_fields1088[5]
+        write(pp, format_int(pp, field1093))
         newline(pp)
-        field1090 = unwrapped_fields1084[6]
-        write(pp, format_int(pp, field1090))
-        field1091 = unwrapped_fields1084[7]
-        if !isnothing(field1091)
+        field1094 = unwrapped_fields1088[6]
+        write(pp, format_int(pp, field1094))
+        field1095 = unwrapped_fields1088[7]
+        if !isnothing(field1095)
             newline(pp)
-            opt_val1092 = field1091
-            write(pp, format_int(pp, opt_val1092))
+            opt_val1096 = field1095
+            write(pp, format_int(pp, opt_val1096))
         end
         dedent!(pp)
         write(pp, ")")
@@ -2233,24 +2233,24 @@ function pretty_datetime(pp::PrettyPrinter, msg::Proto.DateTimeValue)
 end
 
 function pretty_conjunction(pp::PrettyPrinter, msg::Proto.Conjunction)
-    flat1098 = try_flat(pp, msg, pretty_conjunction)
-    if !isnothing(flat1098)
-        write(pp, flat1098)
+    flat1102 = try_flat(pp, msg, pretty_conjunction)
+    if !isnothing(flat1102)
+        write(pp, flat1102)
         return nothing
     else
         _dollar_dollar = msg
-        fields1094 = _dollar_dollar.args
-        unwrapped_fields1095 = fields1094
+        fields1098 = _dollar_dollar.args
+        unwrapped_fields1099 = fields1098
         write(pp, "(and")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields1095)
+        if !isempty(unwrapped_fields1099)
             newline(pp)
-            for (i1683, elem1096) in enumerate(unwrapped_fields1095)
-                i1097 = i1683 - 1
-                if (i1097 > 0)
+            for (i1691, elem1100) in enumerate(unwrapped_fields1099)
+                i1101 = i1691 - 1
+                if (i1101 > 0)
                     newline(pp)
                 end
-                pretty_formula(pp, elem1096)
+                pretty_formula(pp, elem1100)
             end
         end
         dedent!(pp)
@@ -2260,24 +2260,24 @@ function pretty_conjunction(pp::PrettyPrinter, msg::Proto.Conjunction)
 end
 
 function pretty_disjunction(pp::PrettyPrinter, msg::Proto.Disjunction)
-    flat1103 = try_flat(pp, msg, pretty_disjunction)
-    if !isnothing(flat1103)
-        write(pp, flat1103)
+    flat1107 = try_flat(pp, msg, pretty_disjunction)
+    if !isnothing(flat1107)
+        write(pp, flat1107)
         return nothing
     else
         _dollar_dollar = msg
-        fields1099 = _dollar_dollar.args
-        unwrapped_fields1100 = fields1099
+        fields1103 = _dollar_dollar.args
+        unwrapped_fields1104 = fields1103
         write(pp, "(or")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields1100)
+        if !isempty(unwrapped_fields1104)
             newline(pp)
-            for (i1684, elem1101) in enumerate(unwrapped_fields1100)
-                i1102 = i1684 - 1
-                if (i1102 > 0)
+            for (i1692, elem1105) in enumerate(unwrapped_fields1104)
+                i1106 = i1692 - 1
+                if (i1106 > 0)
                     newline(pp)
                 end
-                pretty_formula(pp, elem1101)
+                pretty_formula(pp, elem1105)
             end
         end
         dedent!(pp)
@@ -2287,18 +2287,18 @@ function pretty_disjunction(pp::PrettyPrinter, msg::Proto.Disjunction)
 end
 
 function pretty_not(pp::PrettyPrinter, msg::Proto.Not)
-    flat1106 = try_flat(pp, msg, pretty_not)
-    if !isnothing(flat1106)
-        write(pp, flat1106)
+    flat1110 = try_flat(pp, msg, pretty_not)
+    if !isnothing(flat1110)
+        write(pp, flat1110)
         return nothing
     else
         _dollar_dollar = msg
-        fields1104 = _dollar_dollar.arg
-        unwrapped_fields1105 = fields1104
+        fields1108 = _dollar_dollar.arg
+        unwrapped_fields1109 = fields1108
         write(pp, "(not")
         indent_sexp!(pp)
         newline(pp)
-        pretty_formula(pp, unwrapped_fields1105)
+        pretty_formula(pp, unwrapped_fields1109)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2306,25 +2306,25 @@ function pretty_not(pp::PrettyPrinter, msg::Proto.Not)
 end
 
 function pretty_ffi(pp::PrettyPrinter, msg::Proto.FFI)
-    flat1112 = try_flat(pp, msg, pretty_ffi)
-    if !isnothing(flat1112)
-        write(pp, flat1112)
+    flat1116 = try_flat(pp, msg, pretty_ffi)
+    if !isnothing(flat1116)
+        write(pp, flat1116)
         return nothing
     else
         _dollar_dollar = msg
-        fields1107 = (_dollar_dollar.name, _dollar_dollar.args, _dollar_dollar.terms,)
-        unwrapped_fields1108 = fields1107
+        fields1111 = (_dollar_dollar.name, _dollar_dollar.args, _dollar_dollar.terms,)
+        unwrapped_fields1112 = fields1111
         write(pp, "(ffi")
         indent_sexp!(pp)
         newline(pp)
-        field1109 = unwrapped_fields1108[1]
-        pretty_name(pp, field1109)
+        field1113 = unwrapped_fields1112[1]
+        pretty_name(pp, field1113)
         newline(pp)
-        field1110 = unwrapped_fields1108[2]
-        pretty_ffi_args(pp, field1110)
+        field1114 = unwrapped_fields1112[2]
+        pretty_ffi_args(pp, field1114)
         newline(pp)
-        field1111 = unwrapped_fields1108[3]
-        pretty_terms(pp, field1111)
+        field1115 = unwrapped_fields1112[3]
+        pretty_terms(pp, field1115)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2332,35 +2332,35 @@ function pretty_ffi(pp::PrettyPrinter, msg::Proto.FFI)
 end
 
 function pretty_name(pp::PrettyPrinter, msg::String)
-    flat1114 = try_flat(pp, msg, pretty_name)
-    if !isnothing(flat1114)
-        write(pp, flat1114)
+    flat1118 = try_flat(pp, msg, pretty_name)
+    if !isnothing(flat1118)
+        write(pp, flat1118)
         return nothing
     else
-        fields1113 = msg
+        fields1117 = msg
         write(pp, ":")
-        write(pp, fields1113)
+        write(pp, fields1117)
     end
     return nothing
 end
 
 function pretty_ffi_args(pp::PrettyPrinter, msg::Vector{Proto.Abstraction})
-    flat1118 = try_flat(pp, msg, pretty_ffi_args)
-    if !isnothing(flat1118)
-        write(pp, flat1118)
+    flat1122 = try_flat(pp, msg, pretty_ffi_args)
+    if !isnothing(flat1122)
+        write(pp, flat1122)
         return nothing
     else
-        fields1115 = msg
+        fields1119 = msg
         write(pp, "(args")
         indent_sexp!(pp)
-        if !isempty(fields1115)
+        if !isempty(fields1119)
             newline(pp)
-            for (i1685, elem1116) in enumerate(fields1115)
-                i1117 = i1685 - 1
-                if (i1117 > 0)
+            for (i1693, elem1120) in enumerate(fields1119)
+                i1121 = i1693 - 1
+                if (i1121 > 0)
                     newline(pp)
                 end
-                pretty_abstraction(pp, elem1116)
+                pretty_abstraction(pp, elem1120)
             end
         end
         dedent!(pp)
@@ -2370,28 +2370,28 @@ function pretty_ffi_args(pp::PrettyPrinter, msg::Vector{Proto.Abstraction})
 end
 
 function pretty_atom(pp::PrettyPrinter, msg::Proto.Atom)
-    flat1125 = try_flat(pp, msg, pretty_atom)
-    if !isnothing(flat1125)
-        write(pp, flat1125)
+    flat1129 = try_flat(pp, msg, pretty_atom)
+    if !isnothing(flat1129)
+        write(pp, flat1129)
         return nothing
     else
         _dollar_dollar = msg
-        fields1119 = (_dollar_dollar.name, _dollar_dollar.terms,)
-        unwrapped_fields1120 = fields1119
+        fields1123 = (_dollar_dollar.name, _dollar_dollar.terms,)
+        unwrapped_fields1124 = fields1123
         write(pp, "(atom")
         indent_sexp!(pp)
         newline(pp)
-        field1121 = unwrapped_fields1120[1]
-        pretty_relation_id(pp, field1121)
-        field1122 = unwrapped_fields1120[2]
-        if !isempty(field1122)
+        field1125 = unwrapped_fields1124[1]
+        pretty_relation_id(pp, field1125)
+        field1126 = unwrapped_fields1124[2]
+        if !isempty(field1126)
             newline(pp)
-            for (i1686, elem1123) in enumerate(field1122)
-                i1124 = i1686 - 1
-                if (i1124 > 0)
+            for (i1694, elem1127) in enumerate(field1126)
+                i1128 = i1694 - 1
+                if (i1128 > 0)
                     newline(pp)
                 end
-                pretty_term(pp, elem1123)
+                pretty_term(pp, elem1127)
             end
         end
         dedent!(pp)
@@ -2401,28 +2401,28 @@ function pretty_atom(pp::PrettyPrinter, msg::Proto.Atom)
 end
 
 function pretty_pragma(pp::PrettyPrinter, msg::Proto.Pragma)
-    flat1132 = try_flat(pp, msg, pretty_pragma)
-    if !isnothing(flat1132)
-        write(pp, flat1132)
+    flat1136 = try_flat(pp, msg, pretty_pragma)
+    if !isnothing(flat1136)
+        write(pp, flat1136)
         return nothing
     else
         _dollar_dollar = msg
-        fields1126 = (_dollar_dollar.name, _dollar_dollar.terms,)
-        unwrapped_fields1127 = fields1126
+        fields1130 = (_dollar_dollar.name, _dollar_dollar.terms,)
+        unwrapped_fields1131 = fields1130
         write(pp, "(pragma")
         indent_sexp!(pp)
         newline(pp)
-        field1128 = unwrapped_fields1127[1]
-        pretty_name(pp, field1128)
-        field1129 = unwrapped_fields1127[2]
-        if !isempty(field1129)
+        field1132 = unwrapped_fields1131[1]
+        pretty_name(pp, field1132)
+        field1133 = unwrapped_fields1131[2]
+        if !isempty(field1133)
             newline(pp)
-            for (i1687, elem1130) in enumerate(field1129)
-                i1131 = i1687 - 1
-                if (i1131 > 0)
+            for (i1695, elem1134) in enumerate(field1133)
+                i1135 = i1695 - 1
+                if (i1135 > 0)
                     newline(pp)
                 end
-                pretty_term(pp, elem1130)
+                pretty_term(pp, elem1134)
             end
         end
         dedent!(pp)
@@ -2432,118 +2432,118 @@ function pretty_pragma(pp::PrettyPrinter, msg::Proto.Pragma)
 end
 
 function pretty_primitive(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1148 = try_flat(pp, msg, pretty_primitive)
-    if !isnothing(flat1148)
-        write(pp, flat1148)
+    flat1152 = try_flat(pp, msg, pretty_primitive)
+    if !isnothing(flat1152)
+        write(pp, flat1152)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_eq"
-            _t1688 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1696 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1688 = nothing
+            _t1696 = nothing
         end
-        guard_result1147 = _t1688
-        if !isnothing(guard_result1147)
+        guard_result1151 = _t1696
+        if !isnothing(guard_result1151)
             pretty_eq(pp, msg)
         else
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_lt_monotype"
-                _t1689 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+                _t1697 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
             else
-                _t1689 = nothing
+                _t1697 = nothing
             end
-            guard_result1146 = _t1689
-            if !isnothing(guard_result1146)
+            guard_result1150 = _t1697
+            if !isnothing(guard_result1150)
                 pretty_lt(pp, msg)
             else
                 _dollar_dollar = msg
                 if _dollar_dollar.name == "rel_primitive_lt_eq_monotype"
-                    _t1690 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+                    _t1698 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
                 else
-                    _t1690 = nothing
+                    _t1698 = nothing
                 end
-                guard_result1145 = _t1690
-                if !isnothing(guard_result1145)
+                guard_result1149 = _t1698
+                if !isnothing(guard_result1149)
                     pretty_lt_eq(pp, msg)
                 else
                     _dollar_dollar = msg
                     if _dollar_dollar.name == "rel_primitive_gt_monotype"
-                        _t1691 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+                        _t1699 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
                     else
-                        _t1691 = nothing
+                        _t1699 = nothing
                     end
-                    guard_result1144 = _t1691
-                    if !isnothing(guard_result1144)
+                    guard_result1148 = _t1699
+                    if !isnothing(guard_result1148)
                         pretty_gt(pp, msg)
                     else
                         _dollar_dollar = msg
                         if _dollar_dollar.name == "rel_primitive_gt_eq_monotype"
-                            _t1692 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+                            _t1700 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
                         else
-                            _t1692 = nothing
+                            _t1700 = nothing
                         end
-                        guard_result1143 = _t1692
-                        if !isnothing(guard_result1143)
+                        guard_result1147 = _t1700
+                        if !isnothing(guard_result1147)
                             pretty_gt_eq(pp, msg)
                         else
                             _dollar_dollar = msg
                             if _dollar_dollar.name == "rel_primitive_add_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),)
+                                _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),)
                             else
-                                _t1693 = nothing
+                                _t1701 = nothing
                             end
-                            guard_result1142 = _t1693
-                            if !isnothing(guard_result1142)
+                            guard_result1146 = _t1701
+                            if !isnothing(guard_result1146)
                                 pretty_add(pp, msg)
                             else
                                 _dollar_dollar = msg
                                 if _dollar_dollar.name == "rel_primitive_subtract_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),)
+                                    _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),)
                                 else
-                                    _t1694 = nothing
+                                    _t1702 = nothing
                                 end
-                                guard_result1141 = _t1694
-                                if !isnothing(guard_result1141)
+                                guard_result1145 = _t1702
+                                if !isnothing(guard_result1145)
                                     pretty_minus(pp, msg)
                                 else
                                     _dollar_dollar = msg
                                     if _dollar_dollar.name == "rel_primitive_multiply_monotype"
-                                        _t1695 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+                                        _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),)
                                     else
-                                        _t1695 = nothing
+                                        _t1703 = nothing
                                     end
-                                    guard_result1140 = _t1695
-                                    if !isnothing(guard_result1140)
+                                    guard_result1144 = _t1703
+                                    if !isnothing(guard_result1144)
                                         pretty_multiply(pp, msg)
                                     else
                                         _dollar_dollar = msg
                                         if _dollar_dollar.name == "rel_primitive_divide_monotype"
-                                            _t1696 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+                                            _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),)
                                         else
-                                            _t1696 = nothing
+                                            _t1704 = nothing
                                         end
-                                        guard_result1139 = _t1696
-                                        if !isnothing(guard_result1139)
+                                        guard_result1143 = _t1704
+                                        if !isnothing(guard_result1143)
                                             pretty_divide(pp, msg)
                                         else
                                             _dollar_dollar = msg
-                                            fields1133 = (_dollar_dollar.name, _dollar_dollar.terms,)
-                                            unwrapped_fields1134 = fields1133
+                                            fields1137 = (_dollar_dollar.name, _dollar_dollar.terms,)
+                                            unwrapped_fields1138 = fields1137
                                             write(pp, "(primitive")
                                             indent_sexp!(pp)
                                             newline(pp)
-                                            field1135 = unwrapped_fields1134[1]
-                                            pretty_name(pp, field1135)
-                                            field1136 = unwrapped_fields1134[2]
-                                            if !isempty(field1136)
+                                            field1139 = unwrapped_fields1138[1]
+                                            pretty_name(pp, field1139)
+                                            field1140 = unwrapped_fields1138[2]
+                                            if !isempty(field1140)
                                                 newline(pp)
-                                                for (i1697, elem1137) in enumerate(field1136)
-                                                    i1138 = i1697 - 1
-                                                    if (i1138 > 0)
+                                                for (i1705, elem1141) in enumerate(field1140)
+                                                    i1142 = i1705 - 1
+                                                    if (i1142 > 0)
                                                         newline(pp)
                                                     end
-                                                    pretty_rel_term(pp, elem1137)
+                                                    pretty_rel_term(pp, elem1141)
                                                 end
                                             end
                                             dedent!(pp)
@@ -2562,27 +2562,27 @@ function pretty_primitive(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_eq(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1153 = try_flat(pp, msg, pretty_eq)
-    if !isnothing(flat1153)
-        write(pp, flat1153)
+    flat1157 = try_flat(pp, msg, pretty_eq)
+    if !isnothing(flat1157)
+        write(pp, flat1157)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_eq"
-            _t1698 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1706 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1698 = nothing
+            _t1706 = nothing
         end
-        fields1149 = _t1698
-        unwrapped_fields1150 = fields1149
+        fields1153 = _t1706
+        unwrapped_fields1154 = fields1153
         write(pp, "(=")
         indent_sexp!(pp)
         newline(pp)
-        field1151 = unwrapped_fields1150[1]
-        pretty_term(pp, field1151)
+        field1155 = unwrapped_fields1154[1]
+        pretty_term(pp, field1155)
         newline(pp)
-        field1152 = unwrapped_fields1150[2]
-        pretty_term(pp, field1152)
+        field1156 = unwrapped_fields1154[2]
+        pretty_term(pp, field1156)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2590,27 +2590,27 @@ function pretty_eq(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_lt(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1158 = try_flat(pp, msg, pretty_lt)
-    if !isnothing(flat1158)
-        write(pp, flat1158)
+    flat1162 = try_flat(pp, msg, pretty_lt)
+    if !isnothing(flat1162)
+        write(pp, flat1162)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_lt_monotype"
-            _t1699 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1707 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1699 = nothing
+            _t1707 = nothing
         end
-        fields1154 = _t1699
-        unwrapped_fields1155 = fields1154
+        fields1158 = _t1707
+        unwrapped_fields1159 = fields1158
         write(pp, "(<")
         indent_sexp!(pp)
         newline(pp)
-        field1156 = unwrapped_fields1155[1]
-        pretty_term(pp, field1156)
+        field1160 = unwrapped_fields1159[1]
+        pretty_term(pp, field1160)
         newline(pp)
-        field1157 = unwrapped_fields1155[2]
-        pretty_term(pp, field1157)
+        field1161 = unwrapped_fields1159[2]
+        pretty_term(pp, field1161)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2618,27 +2618,27 @@ function pretty_lt(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_lt_eq(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1163 = try_flat(pp, msg, pretty_lt_eq)
-    if !isnothing(flat1163)
-        write(pp, flat1163)
+    flat1167 = try_flat(pp, msg, pretty_lt_eq)
+    if !isnothing(flat1167)
+        write(pp, flat1167)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_lt_eq_monotype"
-            _t1700 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1708 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1700 = nothing
+            _t1708 = nothing
         end
-        fields1159 = _t1700
-        unwrapped_fields1160 = fields1159
+        fields1163 = _t1708
+        unwrapped_fields1164 = fields1163
         write(pp, "(<=")
         indent_sexp!(pp)
         newline(pp)
-        field1161 = unwrapped_fields1160[1]
-        pretty_term(pp, field1161)
+        field1165 = unwrapped_fields1164[1]
+        pretty_term(pp, field1165)
         newline(pp)
-        field1162 = unwrapped_fields1160[2]
-        pretty_term(pp, field1162)
+        field1166 = unwrapped_fields1164[2]
+        pretty_term(pp, field1166)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2646,27 +2646,27 @@ function pretty_lt_eq(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_gt(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1168 = try_flat(pp, msg, pretty_gt)
-    if !isnothing(flat1168)
-        write(pp, flat1168)
+    flat1172 = try_flat(pp, msg, pretty_gt)
+    if !isnothing(flat1172)
+        write(pp, flat1172)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_gt_monotype"
-            _t1701 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1709 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1701 = nothing
+            _t1709 = nothing
         end
-        fields1164 = _t1701
-        unwrapped_fields1165 = fields1164
+        fields1168 = _t1709
+        unwrapped_fields1169 = fields1168
         write(pp, "(>")
         indent_sexp!(pp)
         newline(pp)
-        field1166 = unwrapped_fields1165[1]
-        pretty_term(pp, field1166)
+        field1170 = unwrapped_fields1169[1]
+        pretty_term(pp, field1170)
         newline(pp)
-        field1167 = unwrapped_fields1165[2]
-        pretty_term(pp, field1167)
+        field1171 = unwrapped_fields1169[2]
+        pretty_term(pp, field1171)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2674,27 +2674,27 @@ function pretty_gt(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_gt_eq(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1173 = try_flat(pp, msg, pretty_gt_eq)
-    if !isnothing(flat1173)
-        write(pp, flat1173)
+    flat1177 = try_flat(pp, msg, pretty_gt_eq)
+    if !isnothing(flat1177)
+        write(pp, flat1177)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_gt_eq_monotype"
-            _t1702 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
+            _t1710 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term),)
         else
-            _t1702 = nothing
+            _t1710 = nothing
         end
-        fields1169 = _t1702
-        unwrapped_fields1170 = fields1169
+        fields1173 = _t1710
+        unwrapped_fields1174 = fields1173
         write(pp, "(>=")
         indent_sexp!(pp)
         newline(pp)
-        field1171 = unwrapped_fields1170[1]
-        pretty_term(pp, field1171)
+        field1175 = unwrapped_fields1174[1]
+        pretty_term(pp, field1175)
         newline(pp)
-        field1172 = unwrapped_fields1170[2]
-        pretty_term(pp, field1172)
+        field1176 = unwrapped_fields1174[2]
+        pretty_term(pp, field1176)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2702,30 +2702,30 @@ function pretty_gt_eq(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_add(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1179 = try_flat(pp, msg, pretty_add)
-    if !isnothing(flat1179)
-        write(pp, flat1179)
+    flat1183 = try_flat(pp, msg, pretty_add)
+    if !isnothing(flat1183)
+        write(pp, flat1183)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_add_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),)
+            _t1711 = (_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
+            _t1711 = nothing
         end
-        fields1174 = _t1703
-        unwrapped_fields1175 = fields1174
+        fields1178 = _t1711
+        unwrapped_fields1179 = fields1178
         write(pp, "(+")
         indent_sexp!(pp)
         newline(pp)
-        field1176 = unwrapped_fields1175[1]
-        pretty_term(pp, field1176)
+        field1180 = unwrapped_fields1179[1]
+        pretty_term(pp, field1180)
         newline(pp)
-        field1177 = unwrapped_fields1175[2]
-        pretty_term(pp, field1177)
+        field1181 = unwrapped_fields1179[2]
+        pretty_term(pp, field1181)
         newline(pp)
-        field1178 = unwrapped_fields1175[3]
-        pretty_term(pp, field1178)
+        field1182 = unwrapped_fields1179[3]
+        pretty_term(pp, field1182)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2733,30 +2733,30 @@ function pretty_add(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_minus(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1185 = try_flat(pp, msg, pretty_minus)
-    if !isnothing(flat1185)
-        write(pp, flat1185)
+    flat1189 = try_flat(pp, msg, pretty_minus)
+    if !isnothing(flat1189)
+        write(pp, flat1189)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_subtract_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),)
+            _t1712 = (_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
+            _t1712 = nothing
         end
-        fields1180 = _t1704
-        unwrapped_fields1181 = fields1180
+        fields1184 = _t1712
+        unwrapped_fields1185 = fields1184
         write(pp, "(-")
         indent_sexp!(pp)
         newline(pp)
-        field1182 = unwrapped_fields1181[1]
-        pretty_term(pp, field1182)
+        field1186 = unwrapped_fields1185[1]
+        pretty_term(pp, field1186)
         newline(pp)
-        field1183 = unwrapped_fields1181[2]
-        pretty_term(pp, field1183)
+        field1187 = unwrapped_fields1185[2]
+        pretty_term(pp, field1187)
         newline(pp)
-        field1184 = unwrapped_fields1181[3]
-        pretty_term(pp, field1184)
+        field1188 = unwrapped_fields1185[3]
+        pretty_term(pp, field1188)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2764,30 +2764,30 @@ function pretty_minus(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_multiply(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1191 = try_flat(pp, msg, pretty_multiply)
-    if !isnothing(flat1191)
-        write(pp, flat1191)
+    flat1195 = try_flat(pp, msg, pretty_multiply)
+    if !isnothing(flat1195)
+        write(pp, flat1195)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_multiply_monotype"
-            _t1705 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+            _t1713 = (_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
-            _t1705 = nothing
+            _t1713 = nothing
         end
-        fields1186 = _t1705
-        unwrapped_fields1187 = fields1186
+        fields1190 = _t1713
+        unwrapped_fields1191 = fields1190
         write(pp, "(*")
         indent_sexp!(pp)
         newline(pp)
-        field1188 = unwrapped_fields1187[1]
-        pretty_term(pp, field1188)
+        field1192 = unwrapped_fields1191[1]
+        pretty_term(pp, field1192)
         newline(pp)
-        field1189 = unwrapped_fields1187[2]
-        pretty_term(pp, field1189)
+        field1193 = unwrapped_fields1191[2]
+        pretty_term(pp, field1193)
         newline(pp)
-        field1190 = unwrapped_fields1187[3]
-        pretty_term(pp, field1190)
+        field1194 = unwrapped_fields1191[3]
+        pretty_term(pp, field1194)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2795,30 +2795,30 @@ function pretty_multiply(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_divide(pp::PrettyPrinter, msg::Proto.Primitive)
-    flat1197 = try_flat(pp, msg, pretty_divide)
-    if !isnothing(flat1197)
-        write(pp, flat1197)
+    flat1201 = try_flat(pp, msg, pretty_divide)
+    if !isnothing(flat1201)
+        write(pp, flat1201)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name == "rel_primitive_divide_monotype"
-            _t1706 = (_get_oneof_field(_dollar_dollar.terms[1], :term), _get_oneof_field(_dollar_dollar.terms[2], :term), _get_oneof_field(_dollar_dollar.terms[3], :term),)
+            _t1714 = (_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
-            _t1706 = nothing
+            _t1714 = nothing
         end
-        fields1192 = _t1706
-        unwrapped_fields1193 = fields1192
+        fields1196 = _t1714
+        unwrapped_fields1197 = fields1196
         write(pp, "(/")
         indent_sexp!(pp)
         newline(pp)
-        field1194 = unwrapped_fields1193[1]
-        pretty_term(pp, field1194)
+        field1198 = unwrapped_fields1197[1]
+        pretty_term(pp, field1198)
         newline(pp)
-        field1195 = unwrapped_fields1193[2]
-        pretty_term(pp, field1195)
+        field1199 = unwrapped_fields1197[2]
+        pretty_term(pp, field1199)
         newline(pp)
-        field1196 = unwrapped_fields1193[3]
-        pretty_term(pp, field1196)
+        field1200 = unwrapped_fields1197[3]
+        pretty_term(pp, field1200)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2826,32 +2826,32 @@ function pretty_divide(pp::PrettyPrinter, msg::Proto.Primitive)
 end
 
 function pretty_rel_term(pp::PrettyPrinter, msg::Proto.RelTerm)
-    flat1202 = try_flat(pp, msg, pretty_rel_term)
-    if !isnothing(flat1202)
-        write(pp, flat1202)
+    flat1206 = try_flat(pp, msg, pretty_rel_term)
+    if !isnothing(flat1206)
+        write(pp, flat1206)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("specialized_value"))
-            _t1707 = _get_oneof_field(_dollar_dollar, :specialized_value)
+            _t1715 = _get_oneof_field(_dollar_dollar, :specialized_value)
         else
-            _t1707 = nothing
+            _t1715 = nothing
         end
-        deconstruct_result1200 = _t1707
-        if !isnothing(deconstruct_result1200)
-            unwrapped1201 = deconstruct_result1200
-            pretty_specialized_value(pp, unwrapped1201)
+        deconstruct_result1204 = _t1715
+        if !isnothing(deconstruct_result1204)
+            unwrapped1205 = deconstruct_result1204
+            pretty_specialized_value(pp, unwrapped1205)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("term"))
-                _t1708 = _get_oneof_field(_dollar_dollar, :term)
+                _t1716 = _get_oneof_field(_dollar_dollar, :term)
             else
-                _t1708 = nothing
+                _t1716 = nothing
             end
-            deconstruct_result1198 = _t1708
-            if !isnothing(deconstruct_result1198)
-                unwrapped1199 = deconstruct_result1198
-                pretty_term(pp, unwrapped1199)
+            deconstruct_result1202 = _t1716
+            if !isnothing(deconstruct_result1202)
+                unwrapped1203 = deconstruct_result1202
+                pretty_term(pp, unwrapped1203)
             else
                 throw(ParseError("No matching rule for rel_term"))
             end
@@ -2861,41 +2861,41 @@ function pretty_rel_term(pp::PrettyPrinter, msg::Proto.RelTerm)
 end
 
 function pretty_specialized_value(pp::PrettyPrinter, msg::Proto.Value)
-    flat1204 = try_flat(pp, msg, pretty_specialized_value)
-    if !isnothing(flat1204)
-        write(pp, flat1204)
+    flat1208 = try_flat(pp, msg, pretty_specialized_value)
+    if !isnothing(flat1208)
+        write(pp, flat1208)
         return nothing
     else
-        fields1203 = msg
+        fields1207 = msg
         write(pp, "#")
-        pretty_raw_value(pp, fields1203)
+        pretty_raw_value(pp, fields1207)
     end
     return nothing
 end
 
 function pretty_rel_atom(pp::PrettyPrinter, msg::Proto.RelAtom)
-    flat1211 = try_flat(pp, msg, pretty_rel_atom)
-    if !isnothing(flat1211)
-        write(pp, flat1211)
+    flat1215 = try_flat(pp, msg, pretty_rel_atom)
+    if !isnothing(flat1215)
+        write(pp, flat1215)
         return nothing
     else
         _dollar_dollar = msg
-        fields1205 = (_dollar_dollar.name, _dollar_dollar.terms,)
-        unwrapped_fields1206 = fields1205
+        fields1209 = (_dollar_dollar.name, _dollar_dollar.terms,)
+        unwrapped_fields1210 = fields1209
         write(pp, "(relatom")
         indent_sexp!(pp)
         newline(pp)
-        field1207 = unwrapped_fields1206[1]
-        pretty_name(pp, field1207)
-        field1208 = unwrapped_fields1206[2]
-        if !isempty(field1208)
+        field1211 = unwrapped_fields1210[1]
+        pretty_name(pp, field1211)
+        field1212 = unwrapped_fields1210[2]
+        if !isempty(field1212)
             newline(pp)
-            for (i1709, elem1209) in enumerate(field1208)
-                i1210 = i1709 - 1
-                if (i1210 > 0)
+            for (i1717, elem1213) in enumerate(field1212)
+                i1214 = i1717 - 1
+                if (i1214 > 0)
                     newline(pp)
                 end
-                pretty_rel_term(pp, elem1209)
+                pretty_rel_term(pp, elem1213)
             end
         end
         dedent!(pp)
@@ -2905,22 +2905,22 @@ function pretty_rel_atom(pp::PrettyPrinter, msg::Proto.RelAtom)
 end
 
 function pretty_cast(pp::PrettyPrinter, msg::Proto.Cast)
-    flat1216 = try_flat(pp, msg, pretty_cast)
-    if !isnothing(flat1216)
-        write(pp, flat1216)
+    flat1220 = try_flat(pp, msg, pretty_cast)
+    if !isnothing(flat1220)
+        write(pp, flat1220)
         return nothing
     else
         _dollar_dollar = msg
-        fields1212 = (_dollar_dollar.input, _dollar_dollar.result,)
-        unwrapped_fields1213 = fields1212
+        fields1216 = (_dollar_dollar.input, _dollar_dollar.result,)
+        unwrapped_fields1217 = fields1216
         write(pp, "(cast")
         indent_sexp!(pp)
         newline(pp)
-        field1214 = unwrapped_fields1213[1]
-        pretty_term(pp, field1214)
+        field1218 = unwrapped_fields1217[1]
+        pretty_term(pp, field1218)
         newline(pp)
-        field1215 = unwrapped_fields1213[2]
-        pretty_term(pp, field1215)
+        field1219 = unwrapped_fields1217[2]
+        pretty_term(pp, field1219)
         dedent!(pp)
         write(pp, ")")
     end
@@ -2928,22 +2928,22 @@ function pretty_cast(pp::PrettyPrinter, msg::Proto.Cast)
 end
 
 function pretty_attrs(pp::PrettyPrinter, msg::Vector{Proto.Attribute})
-    flat1220 = try_flat(pp, msg, pretty_attrs)
-    if !isnothing(flat1220)
-        write(pp, flat1220)
+    flat1224 = try_flat(pp, msg, pretty_attrs)
+    if !isnothing(flat1224)
+        write(pp, flat1224)
         return nothing
     else
-        fields1217 = msg
+        fields1221 = msg
         write(pp, "(attrs")
         indent_sexp!(pp)
-        if !isempty(fields1217)
+        if !isempty(fields1221)
             newline(pp)
-            for (i1710, elem1218) in enumerate(fields1217)
-                i1219 = i1710 - 1
-                if (i1219 > 0)
+            for (i1718, elem1222) in enumerate(fields1221)
+                i1223 = i1718 - 1
+                if (i1223 > 0)
                     newline(pp)
                 end
-                pretty_attribute(pp, elem1218)
+                pretty_attribute(pp, elem1222)
             end
         end
         dedent!(pp)
@@ -2953,28 +2953,28 @@ function pretty_attrs(pp::PrettyPrinter, msg::Vector{Proto.Attribute})
 end
 
 function pretty_attribute(pp::PrettyPrinter, msg::Proto.Attribute)
-    flat1227 = try_flat(pp, msg, pretty_attribute)
-    if !isnothing(flat1227)
-        write(pp, flat1227)
+    flat1231 = try_flat(pp, msg, pretty_attribute)
+    if !isnothing(flat1231)
+        write(pp, flat1231)
         return nothing
     else
         _dollar_dollar = msg
-        fields1221 = (_dollar_dollar.name, _dollar_dollar.args,)
-        unwrapped_fields1222 = fields1221
+        fields1225 = (_dollar_dollar.name, _dollar_dollar.args,)
+        unwrapped_fields1226 = fields1225
         write(pp, "(attribute")
         indent_sexp!(pp)
         newline(pp)
-        field1223 = unwrapped_fields1222[1]
-        pretty_name(pp, field1223)
-        field1224 = unwrapped_fields1222[2]
-        if !isempty(field1224)
+        field1227 = unwrapped_fields1226[1]
+        pretty_name(pp, field1227)
+        field1228 = unwrapped_fields1226[2]
+        if !isempty(field1228)
             newline(pp)
-            for (i1711, elem1225) in enumerate(field1224)
-                i1226 = i1711 - 1
-                if (i1226 > 0)
+            for (i1719, elem1229) in enumerate(field1228)
+                i1230 = i1719 - 1
+                if (i1230 > 0)
                     newline(pp)
                 end
-                pretty_raw_value(pp, elem1225)
+                pretty_raw_value(pp, elem1229)
             end
         end
         dedent!(pp)
@@ -2984,30 +2984,41 @@ function pretty_attribute(pp::PrettyPrinter, msg::Proto.Attribute)
 end
 
 function pretty_algorithm(pp::PrettyPrinter, msg::Proto.Algorithm)
-    flat1234 = try_flat(pp, msg, pretty_algorithm)
-    if !isnothing(flat1234)
-        write(pp, flat1234)
+    flat1240 = try_flat(pp, msg, pretty_algorithm)
+    if !isnothing(flat1240)
+        write(pp, flat1240)
         return nothing
     else
         _dollar_dollar = msg
-        fields1228 = (_dollar_dollar.var"#global", _dollar_dollar.body,)
-        unwrapped_fields1229 = fields1228
+        if !isempty(_dollar_dollar.attrs)
+            _t1720 = _dollar_dollar.attrs
+        else
+            _t1720 = nothing
+        end
+        fields1232 = (_dollar_dollar.var"#global", _dollar_dollar.body, _t1720,)
+        unwrapped_fields1233 = fields1232
         write(pp, "(algorithm")
         indent_sexp!(pp)
-        field1230 = unwrapped_fields1229[1]
-        if !isempty(field1230)
+        field1234 = unwrapped_fields1233[1]
+        if !isempty(field1234)
             newline(pp)
-            for (i1712, elem1231) in enumerate(field1230)
-                i1232 = i1712 - 1
-                if (i1232 > 0)
+            for (i1721, elem1235) in enumerate(field1234)
+                i1236 = i1721 - 1
+                if (i1236 > 0)
                     newline(pp)
                 end
-                pretty_relation_id(pp, elem1231)
+                pretty_relation_id(pp, elem1235)
             end
         end
         newline(pp)
-        field1233 = unwrapped_fields1229[2]
-        pretty_script(pp, field1233)
+        field1237 = unwrapped_fields1233[2]
+        pretty_script(pp, field1237)
+        field1238 = unwrapped_fields1233[3]
+        if !isnothing(field1238)
+            newline(pp)
+            opt_val1239 = field1238
+            pretty_attrs(pp, opt_val1239)
+        end
         dedent!(pp)
         write(pp, ")")
     end
@@ -3015,24 +3026,24 @@ function pretty_algorithm(pp::PrettyPrinter, msg::Proto.Algorithm)
 end
 
 function pretty_script(pp::PrettyPrinter, msg::Proto.Script)
-    flat1239 = try_flat(pp, msg, pretty_script)
-    if !isnothing(flat1239)
-        write(pp, flat1239)
+    flat1245 = try_flat(pp, msg, pretty_script)
+    if !isnothing(flat1245)
+        write(pp, flat1245)
         return nothing
     else
         _dollar_dollar = msg
-        fields1235 = _dollar_dollar.constructs
-        unwrapped_fields1236 = fields1235
+        fields1241 = _dollar_dollar.constructs
+        unwrapped_fields1242 = fields1241
         write(pp, "(script")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields1236)
+        if !isempty(unwrapped_fields1242)
             newline(pp)
-            for (i1713, elem1237) in enumerate(unwrapped_fields1236)
-                i1238 = i1713 - 1
-                if (i1238 > 0)
+            for (i1722, elem1243) in enumerate(unwrapped_fields1242)
+                i1244 = i1722 - 1
+                if (i1244 > 0)
                     newline(pp)
                 end
-                pretty_construct(pp, elem1237)
+                pretty_construct(pp, elem1243)
             end
         end
         dedent!(pp)
@@ -3042,32 +3053,32 @@ function pretty_script(pp::PrettyPrinter, msg::Proto.Script)
 end
 
 function pretty_construct(pp::PrettyPrinter, msg::Proto.Construct)
-    flat1244 = try_flat(pp, msg, pretty_construct)
-    if !isnothing(flat1244)
-        write(pp, flat1244)
+    flat1250 = try_flat(pp, msg, pretty_construct)
+    if !isnothing(flat1250)
+        write(pp, flat1250)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("loop"))
-            _t1714 = _get_oneof_field(_dollar_dollar, :loop)
+            _t1723 = _get_oneof_field(_dollar_dollar, :loop)
         else
-            _t1714 = nothing
+            _t1723 = nothing
         end
-        deconstruct_result1242 = _t1714
-        if !isnothing(deconstruct_result1242)
-            unwrapped1243 = deconstruct_result1242
-            pretty_loop(pp, unwrapped1243)
+        deconstruct_result1248 = _t1723
+        if !isnothing(deconstruct_result1248)
+            unwrapped1249 = deconstruct_result1248
+            pretty_loop(pp, unwrapped1249)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("instruction"))
-                _t1715 = _get_oneof_field(_dollar_dollar, :instruction)
+                _t1724 = _get_oneof_field(_dollar_dollar, :instruction)
             else
-                _t1715 = nothing
+                _t1724 = nothing
             end
-            deconstruct_result1240 = _t1715
-            if !isnothing(deconstruct_result1240)
-                unwrapped1241 = deconstruct_result1240
-                pretty_instruction(pp, unwrapped1241)
+            deconstruct_result1246 = _t1724
+            if !isnothing(deconstruct_result1246)
+                unwrapped1247 = deconstruct_result1246
+                pretty_instruction(pp, unwrapped1247)
             else
                 throw(ParseError("No matching rule for construct"))
             end
@@ -3077,22 +3088,33 @@ function pretty_construct(pp::PrettyPrinter, msg::Proto.Construct)
 end
 
 function pretty_loop(pp::PrettyPrinter, msg::Proto.Loop)
-    flat1249 = try_flat(pp, msg, pretty_loop)
-    if !isnothing(flat1249)
-        write(pp, flat1249)
+    flat1257 = try_flat(pp, msg, pretty_loop)
+    if !isnothing(flat1257)
+        write(pp, flat1257)
         return nothing
     else
         _dollar_dollar = msg
-        fields1245 = (_dollar_dollar.init, _dollar_dollar.body,)
-        unwrapped_fields1246 = fields1245
+        if !isempty(_dollar_dollar.attrs)
+            _t1725 = _dollar_dollar.attrs
+        else
+            _t1725 = nothing
+        end
+        fields1251 = (_dollar_dollar.init, _dollar_dollar.body, _t1725,)
+        unwrapped_fields1252 = fields1251
         write(pp, "(loop")
         indent_sexp!(pp)
         newline(pp)
-        field1247 = unwrapped_fields1246[1]
-        pretty_init(pp, field1247)
+        field1253 = unwrapped_fields1252[1]
+        pretty_init(pp, field1253)
         newline(pp)
-        field1248 = unwrapped_fields1246[2]
-        pretty_script(pp, field1248)
+        field1254 = unwrapped_fields1252[2]
+        pretty_script(pp, field1254)
+        field1255 = unwrapped_fields1252[3]
+        if !isnothing(field1255)
+            newline(pp)
+            opt_val1256 = field1255
+            pretty_attrs(pp, opt_val1256)
+        end
         dedent!(pp)
         write(pp, ")")
     end
@@ -3100,22 +3122,22 @@ function pretty_loop(pp::PrettyPrinter, msg::Proto.Loop)
 end
 
 function pretty_init(pp::PrettyPrinter, msg::Vector{Proto.Instruction})
-    flat1253 = try_flat(pp, msg, pretty_init)
-    if !isnothing(flat1253)
-        write(pp, flat1253)
+    flat1261 = try_flat(pp, msg, pretty_init)
+    if !isnothing(flat1261)
+        write(pp, flat1261)
         return nothing
     else
-        fields1250 = msg
+        fields1258 = msg
         write(pp, "(init")
         indent_sexp!(pp)
-        if !isempty(fields1250)
+        if !isempty(fields1258)
             newline(pp)
-            for (i1716, elem1251) in enumerate(fields1250)
-                i1252 = i1716 - 1
-                if (i1252 > 0)
+            for (i1726, elem1259) in enumerate(fields1258)
+                i1260 = i1726 - 1
+                if (i1260 > 0)
                     newline(pp)
                 end
-                pretty_instruction(pp, elem1251)
+                pretty_instruction(pp, elem1259)
             end
         end
         dedent!(pp)
@@ -3125,65 +3147,65 @@ function pretty_init(pp::PrettyPrinter, msg::Vector{Proto.Instruction})
 end
 
 function pretty_instruction(pp::PrettyPrinter, msg::Proto.Instruction)
-    flat1264 = try_flat(pp, msg, pretty_instruction)
-    if !isnothing(flat1264)
-        write(pp, flat1264)
+    flat1272 = try_flat(pp, msg, pretty_instruction)
+    if !isnothing(flat1272)
+        write(pp, flat1272)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("assign"))
-            _t1717 = _get_oneof_field(_dollar_dollar, :assign)
+            _t1727 = _get_oneof_field(_dollar_dollar, :assign)
         else
-            _t1717 = nothing
+            _t1727 = nothing
         end
-        deconstruct_result1262 = _t1717
-        if !isnothing(deconstruct_result1262)
-            unwrapped1263 = deconstruct_result1262
-            pretty_assign(pp, unwrapped1263)
+        deconstruct_result1270 = _t1727
+        if !isnothing(deconstruct_result1270)
+            unwrapped1271 = deconstruct_result1270
+            pretty_assign(pp, unwrapped1271)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("upsert"))
-                _t1718 = _get_oneof_field(_dollar_dollar, :upsert)
+                _t1728 = _get_oneof_field(_dollar_dollar, :upsert)
             else
-                _t1718 = nothing
+                _t1728 = nothing
             end
-            deconstruct_result1260 = _t1718
-            if !isnothing(deconstruct_result1260)
-                unwrapped1261 = deconstruct_result1260
-                pretty_upsert(pp, unwrapped1261)
+            deconstruct_result1268 = _t1728
+            if !isnothing(deconstruct_result1268)
+                unwrapped1269 = deconstruct_result1268
+                pretty_upsert(pp, unwrapped1269)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("#break"))
-                    _t1719 = _get_oneof_field(_dollar_dollar, :var"#break")
+                    _t1729 = _get_oneof_field(_dollar_dollar, :var"#break")
                 else
-                    _t1719 = nothing
+                    _t1729 = nothing
                 end
-                deconstruct_result1258 = _t1719
-                if !isnothing(deconstruct_result1258)
-                    unwrapped1259 = deconstruct_result1258
-                    pretty_break(pp, unwrapped1259)
+                deconstruct_result1266 = _t1729
+                if !isnothing(deconstruct_result1266)
+                    unwrapped1267 = deconstruct_result1266
+                    pretty_break(pp, unwrapped1267)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("monoid_def"))
-                        _t1720 = _get_oneof_field(_dollar_dollar, :monoid_def)
+                        _t1730 = _get_oneof_field(_dollar_dollar, :monoid_def)
                     else
-                        _t1720 = nothing
+                        _t1730 = nothing
                     end
-                    deconstruct_result1256 = _t1720
-                    if !isnothing(deconstruct_result1256)
-                        unwrapped1257 = deconstruct_result1256
-                        pretty_monoid_def(pp, unwrapped1257)
+                    deconstruct_result1264 = _t1730
+                    if !isnothing(deconstruct_result1264)
+                        unwrapped1265 = deconstruct_result1264
+                        pretty_monoid_def(pp, unwrapped1265)
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("monus_def"))
-                            _t1721 = _get_oneof_field(_dollar_dollar, :monus_def)
+                            _t1731 = _get_oneof_field(_dollar_dollar, :monus_def)
                         else
-                            _t1721 = nothing
+                            _t1731 = nothing
                         end
-                        deconstruct_result1254 = _t1721
-                        if !isnothing(deconstruct_result1254)
-                            unwrapped1255 = deconstruct_result1254
-                            pretty_monus_def(pp, unwrapped1255)
+                        deconstruct_result1262 = _t1731
+                        if !isnothing(deconstruct_result1262)
+                            unwrapped1263 = deconstruct_result1262
+                            pretty_monus_def(pp, unwrapped1263)
                         else
                             throw(ParseError("No matching rule for instruction"))
                         end
@@ -3196,32 +3218,32 @@ function pretty_instruction(pp::PrettyPrinter, msg::Proto.Instruction)
 end
 
 function pretty_assign(pp::PrettyPrinter, msg::Proto.Assign)
-    flat1271 = try_flat(pp, msg, pretty_assign)
-    if !isnothing(flat1271)
-        write(pp, flat1271)
+    flat1279 = try_flat(pp, msg, pretty_assign)
+    if !isnothing(flat1279)
+        write(pp, flat1279)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1722 = _dollar_dollar.attrs
+            _t1732 = _dollar_dollar.attrs
         else
-            _t1722 = nothing
+            _t1732 = nothing
         end
-        fields1265 = (_dollar_dollar.name, _dollar_dollar.body, _t1722,)
-        unwrapped_fields1266 = fields1265
+        fields1273 = (_dollar_dollar.name, _dollar_dollar.body, _t1732,)
+        unwrapped_fields1274 = fields1273
         write(pp, "(assign")
         indent_sexp!(pp)
         newline(pp)
-        field1267 = unwrapped_fields1266[1]
-        pretty_relation_id(pp, field1267)
+        field1275 = unwrapped_fields1274[1]
+        pretty_relation_id(pp, field1275)
         newline(pp)
-        field1268 = unwrapped_fields1266[2]
-        pretty_abstraction(pp, field1268)
-        field1269 = unwrapped_fields1266[3]
-        if !isnothing(field1269)
+        field1276 = unwrapped_fields1274[2]
+        pretty_abstraction(pp, field1276)
+        field1277 = unwrapped_fields1274[3]
+        if !isnothing(field1277)
             newline(pp)
-            opt_val1270 = field1269
-            pretty_attrs(pp, opt_val1270)
+            opt_val1278 = field1277
+            pretty_attrs(pp, opt_val1278)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3230,32 +3252,32 @@ function pretty_assign(pp::PrettyPrinter, msg::Proto.Assign)
 end
 
 function pretty_upsert(pp::PrettyPrinter, msg::Proto.Upsert)
-    flat1278 = try_flat(pp, msg, pretty_upsert)
-    if !isnothing(flat1278)
-        write(pp, flat1278)
+    flat1286 = try_flat(pp, msg, pretty_upsert)
+    if !isnothing(flat1286)
+        write(pp, flat1286)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1723 = _dollar_dollar.attrs
+            _t1733 = _dollar_dollar.attrs
         else
-            _t1723 = nothing
+            _t1733 = nothing
         end
-        fields1272 = (_dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1723,)
-        unwrapped_fields1273 = fields1272
+        fields1280 = (_dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1733,)
+        unwrapped_fields1281 = fields1280
         write(pp, "(upsert")
         indent_sexp!(pp)
         newline(pp)
-        field1274 = unwrapped_fields1273[1]
-        pretty_relation_id(pp, field1274)
+        field1282 = unwrapped_fields1281[1]
+        pretty_relation_id(pp, field1282)
         newline(pp)
-        field1275 = unwrapped_fields1273[2]
-        pretty_abstraction_with_arity(pp, field1275)
-        field1276 = unwrapped_fields1273[3]
-        if !isnothing(field1276)
+        field1283 = unwrapped_fields1281[2]
+        pretty_abstraction_with_arity(pp, field1283)
+        field1284 = unwrapped_fields1281[3]
+        if !isnothing(field1284)
             newline(pp)
-            opt_val1277 = field1276
-            pretty_attrs(pp, opt_val1277)
+            opt_val1285 = field1284
+            pretty_attrs(pp, opt_val1285)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3264,22 +3286,22 @@ function pretty_upsert(pp::PrettyPrinter, msg::Proto.Upsert)
 end
 
 function pretty_abstraction_with_arity(pp::PrettyPrinter, msg::Tuple{Proto.Abstraction, Int64})
-    flat1283 = try_flat(pp, msg, pretty_abstraction_with_arity)
-    if !isnothing(flat1283)
-        write(pp, flat1283)
+    flat1291 = try_flat(pp, msg, pretty_abstraction_with_arity)
+    if !isnothing(flat1291)
+        write(pp, flat1291)
         return nothing
     else
         _dollar_dollar = msg
-        _t1724 = deconstruct_bindings_with_arity(pp, _dollar_dollar[1], _dollar_dollar[2])
-        fields1279 = (_t1724, _dollar_dollar[1].value,)
-        unwrapped_fields1280 = fields1279
+        _t1734 = deconstruct_bindings_with_arity(pp, _dollar_dollar[1], _dollar_dollar[2])
+        fields1287 = (_t1734, _dollar_dollar[1].value,)
+        unwrapped_fields1288 = fields1287
         write(pp, "(")
         indent!(pp)
-        field1281 = unwrapped_fields1280[1]
-        pretty_bindings(pp, field1281)
+        field1289 = unwrapped_fields1288[1]
+        pretty_bindings(pp, field1289)
         newline(pp)
-        field1282 = unwrapped_fields1280[2]
-        pretty_formula(pp, field1282)
+        field1290 = unwrapped_fields1288[2]
+        pretty_formula(pp, field1290)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3287,32 +3309,32 @@ function pretty_abstraction_with_arity(pp::PrettyPrinter, msg::Tuple{Proto.Abstr
 end
 
 function pretty_break(pp::PrettyPrinter, msg::Proto.Break)
-    flat1290 = try_flat(pp, msg, pretty_break)
-    if !isnothing(flat1290)
-        write(pp, flat1290)
+    flat1298 = try_flat(pp, msg, pretty_break)
+    if !isnothing(flat1298)
+        write(pp, flat1298)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1725 = _dollar_dollar.attrs
+            _t1735 = _dollar_dollar.attrs
         else
-            _t1725 = nothing
+            _t1735 = nothing
         end
-        fields1284 = (_dollar_dollar.name, _dollar_dollar.body, _t1725,)
-        unwrapped_fields1285 = fields1284
+        fields1292 = (_dollar_dollar.name, _dollar_dollar.body, _t1735,)
+        unwrapped_fields1293 = fields1292
         write(pp, "(break")
         indent_sexp!(pp)
         newline(pp)
-        field1286 = unwrapped_fields1285[1]
-        pretty_relation_id(pp, field1286)
+        field1294 = unwrapped_fields1293[1]
+        pretty_relation_id(pp, field1294)
         newline(pp)
-        field1287 = unwrapped_fields1285[2]
-        pretty_abstraction(pp, field1287)
-        field1288 = unwrapped_fields1285[3]
-        if !isnothing(field1288)
+        field1295 = unwrapped_fields1293[2]
+        pretty_abstraction(pp, field1295)
+        field1296 = unwrapped_fields1293[3]
+        if !isnothing(field1296)
             newline(pp)
-            opt_val1289 = field1288
-            pretty_attrs(pp, opt_val1289)
+            opt_val1297 = field1296
+            pretty_attrs(pp, opt_val1297)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3321,35 +3343,35 @@ function pretty_break(pp::PrettyPrinter, msg::Proto.Break)
 end
 
 function pretty_monoid_def(pp::PrettyPrinter, msg::Proto.MonoidDef)
-    flat1298 = try_flat(pp, msg, pretty_monoid_def)
-    if !isnothing(flat1298)
-        write(pp, flat1298)
+    flat1306 = try_flat(pp, msg, pretty_monoid_def)
+    if !isnothing(flat1306)
+        write(pp, flat1306)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1726 = _dollar_dollar.attrs
+            _t1736 = _dollar_dollar.attrs
         else
-            _t1726 = nothing
+            _t1736 = nothing
         end
-        fields1291 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1726,)
-        unwrapped_fields1292 = fields1291
+        fields1299 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1736,)
+        unwrapped_fields1300 = fields1299
         write(pp, "(monoid")
         indent_sexp!(pp)
         newline(pp)
-        field1293 = unwrapped_fields1292[1]
-        pretty_monoid(pp, field1293)
+        field1301 = unwrapped_fields1300[1]
+        pretty_monoid(pp, field1301)
         newline(pp)
-        field1294 = unwrapped_fields1292[2]
-        pretty_relation_id(pp, field1294)
+        field1302 = unwrapped_fields1300[2]
+        pretty_relation_id(pp, field1302)
         newline(pp)
-        field1295 = unwrapped_fields1292[3]
-        pretty_abstraction_with_arity(pp, field1295)
-        field1296 = unwrapped_fields1292[4]
-        if !isnothing(field1296)
+        field1303 = unwrapped_fields1300[3]
+        pretty_abstraction_with_arity(pp, field1303)
+        field1304 = unwrapped_fields1300[4]
+        if !isnothing(field1304)
             newline(pp)
-            opt_val1297 = field1296
-            pretty_attrs(pp, opt_val1297)
+            opt_val1305 = field1304
+            pretty_attrs(pp, opt_val1305)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3358,54 +3380,54 @@ function pretty_monoid_def(pp::PrettyPrinter, msg::Proto.MonoidDef)
 end
 
 function pretty_monoid(pp::PrettyPrinter, msg::Proto.Monoid)
-    flat1307 = try_flat(pp, msg, pretty_monoid)
-    if !isnothing(flat1307)
-        write(pp, flat1307)
+    flat1315 = try_flat(pp, msg, pretty_monoid)
+    if !isnothing(flat1315)
+        write(pp, flat1315)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("or_monoid"))
-            _t1727 = _get_oneof_field(_dollar_dollar, :or_monoid)
+            _t1737 = _get_oneof_field(_dollar_dollar, :or_monoid)
         else
-            _t1727 = nothing
+            _t1737 = nothing
         end
-        deconstruct_result1305 = _t1727
-        if !isnothing(deconstruct_result1305)
-            unwrapped1306 = deconstruct_result1305
-            pretty_or_monoid(pp, unwrapped1306)
+        deconstruct_result1313 = _t1737
+        if !isnothing(deconstruct_result1313)
+            unwrapped1314 = deconstruct_result1313
+            pretty_or_monoid(pp, unwrapped1314)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("min_monoid"))
-                _t1728 = _get_oneof_field(_dollar_dollar, :min_monoid)
+                _t1738 = _get_oneof_field(_dollar_dollar, :min_monoid)
             else
-                _t1728 = nothing
+                _t1738 = nothing
             end
-            deconstruct_result1303 = _t1728
-            if !isnothing(deconstruct_result1303)
-                unwrapped1304 = deconstruct_result1303
-                pretty_min_monoid(pp, unwrapped1304)
+            deconstruct_result1311 = _t1738
+            if !isnothing(deconstruct_result1311)
+                unwrapped1312 = deconstruct_result1311
+                pretty_min_monoid(pp, unwrapped1312)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("max_monoid"))
-                    _t1729 = _get_oneof_field(_dollar_dollar, :max_monoid)
+                    _t1739 = _get_oneof_field(_dollar_dollar, :max_monoid)
                 else
-                    _t1729 = nothing
+                    _t1739 = nothing
                 end
-                deconstruct_result1301 = _t1729
-                if !isnothing(deconstruct_result1301)
-                    unwrapped1302 = deconstruct_result1301
-                    pretty_max_monoid(pp, unwrapped1302)
+                deconstruct_result1309 = _t1739
+                if !isnothing(deconstruct_result1309)
+                    unwrapped1310 = deconstruct_result1309
+                    pretty_max_monoid(pp, unwrapped1310)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("sum_monoid"))
-                        _t1730 = _get_oneof_field(_dollar_dollar, :sum_monoid)
+                        _t1740 = _get_oneof_field(_dollar_dollar, :sum_monoid)
                     else
-                        _t1730 = nothing
+                        _t1740 = nothing
                     end
-                    deconstruct_result1299 = _t1730
-                    if !isnothing(deconstruct_result1299)
-                        unwrapped1300 = deconstruct_result1299
-                        pretty_sum_monoid(pp, unwrapped1300)
+                    deconstruct_result1307 = _t1740
+                    if !isnothing(deconstruct_result1307)
+                        unwrapped1308 = deconstruct_result1307
+                        pretty_sum_monoid(pp, unwrapped1308)
                     else
                         throw(ParseError("No matching rule for monoid"))
                     end
@@ -3417,24 +3439,24 @@ function pretty_monoid(pp::PrettyPrinter, msg::Proto.Monoid)
 end
 
 function pretty_or_monoid(pp::PrettyPrinter, msg::Proto.OrMonoid)
-    fields1308 = msg
+    fields1316 = msg
     write(pp, "(or)")
     return nothing
 end
 
 function pretty_min_monoid(pp::PrettyPrinter, msg::Proto.MinMonoid)
-    flat1311 = try_flat(pp, msg, pretty_min_monoid)
-    if !isnothing(flat1311)
-        write(pp, flat1311)
+    flat1319 = try_flat(pp, msg, pretty_min_monoid)
+    if !isnothing(flat1319)
+        write(pp, flat1319)
         return nothing
     else
         _dollar_dollar = msg
-        fields1309 = _dollar_dollar.var"#type"
-        unwrapped_fields1310 = fields1309
+        fields1317 = _dollar_dollar.var"#type"
+        unwrapped_fields1318 = fields1317
         write(pp, "(min")
         indent_sexp!(pp)
         newline(pp)
-        pretty_type(pp, unwrapped_fields1310)
+        pretty_type(pp, unwrapped_fields1318)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3442,18 +3464,18 @@ function pretty_min_monoid(pp::PrettyPrinter, msg::Proto.MinMonoid)
 end
 
 function pretty_max_monoid(pp::PrettyPrinter, msg::Proto.MaxMonoid)
-    flat1314 = try_flat(pp, msg, pretty_max_monoid)
-    if !isnothing(flat1314)
-        write(pp, flat1314)
+    flat1322 = try_flat(pp, msg, pretty_max_monoid)
+    if !isnothing(flat1322)
+        write(pp, flat1322)
         return nothing
     else
         _dollar_dollar = msg
-        fields1312 = _dollar_dollar.var"#type"
-        unwrapped_fields1313 = fields1312
+        fields1320 = _dollar_dollar.var"#type"
+        unwrapped_fields1321 = fields1320
         write(pp, "(max")
         indent_sexp!(pp)
         newline(pp)
-        pretty_type(pp, unwrapped_fields1313)
+        pretty_type(pp, unwrapped_fields1321)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3461,18 +3483,18 @@ function pretty_max_monoid(pp::PrettyPrinter, msg::Proto.MaxMonoid)
 end
 
 function pretty_sum_monoid(pp::PrettyPrinter, msg::Proto.SumMonoid)
-    flat1317 = try_flat(pp, msg, pretty_sum_monoid)
-    if !isnothing(flat1317)
-        write(pp, flat1317)
+    flat1325 = try_flat(pp, msg, pretty_sum_monoid)
+    if !isnothing(flat1325)
+        write(pp, flat1325)
         return nothing
     else
         _dollar_dollar = msg
-        fields1315 = _dollar_dollar.var"#type"
-        unwrapped_fields1316 = fields1315
+        fields1323 = _dollar_dollar.var"#type"
+        unwrapped_fields1324 = fields1323
         write(pp, "(sum")
         indent_sexp!(pp)
         newline(pp)
-        pretty_type(pp, unwrapped_fields1316)
+        pretty_type(pp, unwrapped_fields1324)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3480,35 +3502,35 @@ function pretty_sum_monoid(pp::PrettyPrinter, msg::Proto.SumMonoid)
 end
 
 function pretty_monus_def(pp::PrettyPrinter, msg::Proto.MonusDef)
-    flat1325 = try_flat(pp, msg, pretty_monus_def)
-    if !isnothing(flat1325)
-        write(pp, flat1325)
+    flat1333 = try_flat(pp, msg, pretty_monus_def)
+    if !isnothing(flat1333)
+        write(pp, flat1333)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.attrs)
-            _t1731 = _dollar_dollar.attrs
+            _t1741 = _dollar_dollar.attrs
         else
-            _t1731 = nothing
+            _t1741 = nothing
         end
-        fields1318 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1731,)
-        unwrapped_fields1319 = fields1318
+        fields1326 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1741,)
+        unwrapped_fields1327 = fields1326
         write(pp, "(monus")
         indent_sexp!(pp)
         newline(pp)
-        field1320 = unwrapped_fields1319[1]
-        pretty_monoid(pp, field1320)
+        field1328 = unwrapped_fields1327[1]
+        pretty_monoid(pp, field1328)
         newline(pp)
-        field1321 = unwrapped_fields1319[2]
-        pretty_relation_id(pp, field1321)
+        field1329 = unwrapped_fields1327[2]
+        pretty_relation_id(pp, field1329)
         newline(pp)
-        field1322 = unwrapped_fields1319[3]
-        pretty_abstraction_with_arity(pp, field1322)
-        field1323 = unwrapped_fields1319[4]
-        if !isnothing(field1323)
+        field1330 = unwrapped_fields1327[3]
+        pretty_abstraction_with_arity(pp, field1330)
+        field1331 = unwrapped_fields1327[4]
+        if !isnothing(field1331)
             newline(pp)
-            opt_val1324 = field1323
-            pretty_attrs(pp, opt_val1324)
+            opt_val1332 = field1331
+            pretty_attrs(pp, opt_val1332)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3517,28 +3539,28 @@ function pretty_monus_def(pp::PrettyPrinter, msg::Proto.MonusDef)
 end
 
 function pretty_constraint(pp::PrettyPrinter, msg::Proto.Constraint)
-    flat1332 = try_flat(pp, msg, pretty_constraint)
-    if !isnothing(flat1332)
-        write(pp, flat1332)
+    flat1340 = try_flat(pp, msg, pretty_constraint)
+    if !isnothing(flat1340)
+        write(pp, flat1340)
         return nothing
     else
         _dollar_dollar = msg
-        fields1326 = (_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_fields1327 = fields1326
+        fields1334 = (_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_fields1335 = fields1334
         write(pp, "(functional_dependency")
         indent_sexp!(pp)
         newline(pp)
-        field1328 = unwrapped_fields1327[1]
-        pretty_relation_id(pp, field1328)
+        field1336 = unwrapped_fields1335[1]
+        pretty_relation_id(pp, field1336)
         newline(pp)
-        field1329 = unwrapped_fields1327[2]
-        pretty_abstraction(pp, field1329)
+        field1337 = unwrapped_fields1335[2]
+        pretty_abstraction(pp, field1337)
         newline(pp)
-        field1330 = unwrapped_fields1327[3]
-        pretty_functional_dependency_keys(pp, field1330)
+        field1338 = unwrapped_fields1335[3]
+        pretty_functional_dependency_keys(pp, field1338)
         newline(pp)
-        field1331 = unwrapped_fields1327[4]
-        pretty_functional_dependency_values(pp, field1331)
+        field1339 = unwrapped_fields1335[4]
+        pretty_functional_dependency_values(pp, field1339)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3546,22 +3568,22 @@ function pretty_constraint(pp::PrettyPrinter, msg::Proto.Constraint)
 end
 
 function pretty_functional_dependency_keys(pp::PrettyPrinter, msg::Vector{Proto.Var})
-    flat1336 = try_flat(pp, msg, pretty_functional_dependency_keys)
-    if !isnothing(flat1336)
-        write(pp, flat1336)
+    flat1344 = try_flat(pp, msg, pretty_functional_dependency_keys)
+    if !isnothing(flat1344)
+        write(pp, flat1344)
         return nothing
     else
-        fields1333 = msg
+        fields1341 = msg
         write(pp, "(keys")
         indent_sexp!(pp)
-        if !isempty(fields1333)
+        if !isempty(fields1341)
             newline(pp)
-            for (i1732, elem1334) in enumerate(fields1333)
-                i1335 = i1732 - 1
-                if (i1335 > 0)
+            for (i1742, elem1342) in enumerate(fields1341)
+                i1343 = i1742 - 1
+                if (i1343 > 0)
                     newline(pp)
                 end
-                pretty_var(pp, elem1334)
+                pretty_var(pp, elem1342)
             end
         end
         dedent!(pp)
@@ -3571,22 +3593,22 @@ function pretty_functional_dependency_keys(pp::PrettyPrinter, msg::Vector{Proto.
 end
 
 function pretty_functional_dependency_values(pp::PrettyPrinter, msg::Vector{Proto.Var})
-    flat1340 = try_flat(pp, msg, pretty_functional_dependency_values)
-    if !isnothing(flat1340)
-        write(pp, flat1340)
+    flat1348 = try_flat(pp, msg, pretty_functional_dependency_values)
+    if !isnothing(flat1348)
+        write(pp, flat1348)
         return nothing
     else
-        fields1337 = msg
+        fields1345 = msg
         write(pp, "(values")
         indent_sexp!(pp)
-        if !isempty(fields1337)
+        if !isempty(fields1345)
             newline(pp)
-            for (i1733, elem1338) in enumerate(fields1337)
-                i1339 = i1733 - 1
-                if (i1339 > 0)
+            for (i1743, elem1346) in enumerate(fields1345)
+                i1347 = i1743 - 1
+                if (i1347 > 0)
                     newline(pp)
                 end
-                pretty_var(pp, elem1338)
+                pretty_var(pp, elem1346)
             end
         end
         dedent!(pp)
@@ -3596,54 +3618,54 @@ function pretty_functional_dependency_values(pp::PrettyPrinter, msg::Vector{Prot
 end
 
 function pretty_data(pp::PrettyPrinter, msg::Proto.Data)
-    flat1349 = try_flat(pp, msg, pretty_data)
-    if !isnothing(flat1349)
-        write(pp, flat1349)
+    flat1357 = try_flat(pp, msg, pretty_data)
+    if !isnothing(flat1357)
+        write(pp, flat1357)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("edb"))
-            _t1734 = _get_oneof_field(_dollar_dollar, :edb)
+            _t1744 = _get_oneof_field(_dollar_dollar, :edb)
         else
-            _t1734 = nothing
+            _t1744 = nothing
         end
-        deconstruct_result1347 = _t1734
-        if !isnothing(deconstruct_result1347)
-            unwrapped1348 = deconstruct_result1347
-            pretty_edb(pp, unwrapped1348)
+        deconstruct_result1355 = _t1744
+        if !isnothing(deconstruct_result1355)
+            unwrapped1356 = deconstruct_result1355
+            pretty_edb(pp, unwrapped1356)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("betree_relation"))
-                _t1735 = _get_oneof_field(_dollar_dollar, :betree_relation)
+                _t1745 = _get_oneof_field(_dollar_dollar, :betree_relation)
             else
-                _t1735 = nothing
+                _t1745 = nothing
             end
-            deconstruct_result1345 = _t1735
-            if !isnothing(deconstruct_result1345)
-                unwrapped1346 = deconstruct_result1345
-                pretty_betree_relation(pp, unwrapped1346)
+            deconstruct_result1353 = _t1745
+            if !isnothing(deconstruct_result1353)
+                unwrapped1354 = deconstruct_result1353
+                pretty_betree_relation(pp, unwrapped1354)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("csv_data"))
-                    _t1736 = _get_oneof_field(_dollar_dollar, :csv_data)
+                    _t1746 = _get_oneof_field(_dollar_dollar, :csv_data)
                 else
-                    _t1736 = nothing
+                    _t1746 = nothing
                 end
-                deconstruct_result1343 = _t1736
-                if !isnothing(deconstruct_result1343)
-                    unwrapped1344 = deconstruct_result1343
-                    pretty_csv_data(pp, unwrapped1344)
+                deconstruct_result1351 = _t1746
+                if !isnothing(deconstruct_result1351)
+                    unwrapped1352 = deconstruct_result1351
+                    pretty_csv_data(pp, unwrapped1352)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("iceberg_data"))
-                        _t1737 = _get_oneof_field(_dollar_dollar, :iceberg_data)
+                        _t1747 = _get_oneof_field(_dollar_dollar, :iceberg_data)
                     else
-                        _t1737 = nothing
+                        _t1747 = nothing
                     end
-                    deconstruct_result1341 = _t1737
-                    if !isnothing(deconstruct_result1341)
-                        unwrapped1342 = deconstruct_result1341
-                        pretty_iceberg_data(pp, unwrapped1342)
+                    deconstruct_result1349 = _t1747
+                    if !isnothing(deconstruct_result1349)
+                        unwrapped1350 = deconstruct_result1349
+                        pretty_iceberg_data(pp, unwrapped1350)
                     else
                         throw(ParseError("No matching rule for data"))
                     end
@@ -3655,25 +3677,25 @@ function pretty_data(pp::PrettyPrinter, msg::Proto.Data)
 end
 
 function pretty_edb(pp::PrettyPrinter, msg::Proto.EDB)
-    flat1355 = try_flat(pp, msg, pretty_edb)
-    if !isnothing(flat1355)
-        write(pp, flat1355)
+    flat1363 = try_flat(pp, msg, pretty_edb)
+    if !isnothing(flat1363)
+        write(pp, flat1363)
         return nothing
     else
         _dollar_dollar = msg
-        fields1350 = (_dollar_dollar.target_id, _dollar_dollar.path, _dollar_dollar.types,)
-        unwrapped_fields1351 = fields1350
+        fields1358 = (_dollar_dollar.target_id, _dollar_dollar.path, _dollar_dollar.types,)
+        unwrapped_fields1359 = fields1358
         write(pp, "(edb")
         indent_sexp!(pp)
         newline(pp)
-        field1352 = unwrapped_fields1351[1]
-        pretty_relation_id(pp, field1352)
+        field1360 = unwrapped_fields1359[1]
+        pretty_relation_id(pp, field1360)
         newline(pp)
-        field1353 = unwrapped_fields1351[2]
-        pretty_edb_path(pp, field1353)
+        field1361 = unwrapped_fields1359[2]
+        pretty_edb_path(pp, field1361)
         newline(pp)
-        field1354 = unwrapped_fields1351[3]
-        pretty_edb_types(pp, field1354)
+        field1362 = unwrapped_fields1359[3]
+        pretty_edb_types(pp, field1362)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3681,20 +3703,20 @@ function pretty_edb(pp::PrettyPrinter, msg::Proto.EDB)
 end
 
 function pretty_edb_path(pp::PrettyPrinter, msg::Vector{String})
-    flat1359 = try_flat(pp, msg, pretty_edb_path)
-    if !isnothing(flat1359)
-        write(pp, flat1359)
+    flat1367 = try_flat(pp, msg, pretty_edb_path)
+    if !isnothing(flat1367)
+        write(pp, flat1367)
         return nothing
     else
-        fields1356 = msg
+        fields1364 = msg
         write(pp, "[")
         indent!(pp)
-        for (i1738, elem1357) in enumerate(fields1356)
-            i1358 = i1738 - 1
-            if (i1358 > 0)
+        for (i1748, elem1365) in enumerate(fields1364)
+            i1366 = i1748 - 1
+            if (i1366 > 0)
                 newline(pp)
             end
-            write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1357))
+            write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1365))
         end
         dedent!(pp)
         write(pp, "]")
@@ -3703,20 +3725,20 @@ function pretty_edb_path(pp::PrettyPrinter, msg::Vector{String})
 end
 
 function pretty_edb_types(pp::PrettyPrinter, msg::Vector{Proto.var"#Type"})
-    flat1363 = try_flat(pp, msg, pretty_edb_types)
-    if !isnothing(flat1363)
-        write(pp, flat1363)
+    flat1371 = try_flat(pp, msg, pretty_edb_types)
+    if !isnothing(flat1371)
+        write(pp, flat1371)
         return nothing
     else
-        fields1360 = msg
+        fields1368 = msg
         write(pp, "[")
         indent!(pp)
-        for (i1739, elem1361) in enumerate(fields1360)
-            i1362 = i1739 - 1
-            if (i1362 > 0)
+        for (i1749, elem1369) in enumerate(fields1368)
+            i1370 = i1749 - 1
+            if (i1370 > 0)
                 newline(pp)
             end
-            pretty_type(pp, elem1361)
+            pretty_type(pp, elem1369)
         end
         dedent!(pp)
         write(pp, "]")
@@ -3725,22 +3747,22 @@ function pretty_edb_types(pp::PrettyPrinter, msg::Vector{Proto.var"#Type"})
 end
 
 function pretty_betree_relation(pp::PrettyPrinter, msg::Proto.BeTreeRelation)
-    flat1368 = try_flat(pp, msg, pretty_betree_relation)
-    if !isnothing(flat1368)
-        write(pp, flat1368)
+    flat1376 = try_flat(pp, msg, pretty_betree_relation)
+    if !isnothing(flat1376)
+        write(pp, flat1376)
         return nothing
     else
         _dollar_dollar = msg
-        fields1364 = (_dollar_dollar.name, _dollar_dollar.relation_info,)
-        unwrapped_fields1365 = fields1364
+        fields1372 = (_dollar_dollar.name, _dollar_dollar.relation_info,)
+        unwrapped_fields1373 = fields1372
         write(pp, "(betree_relation")
         indent_sexp!(pp)
         newline(pp)
-        field1366 = unwrapped_fields1365[1]
-        pretty_relation_id(pp, field1366)
+        field1374 = unwrapped_fields1373[1]
+        pretty_relation_id(pp, field1374)
         newline(pp)
-        field1367 = unwrapped_fields1365[2]
-        pretty_betree_info(pp, field1367)
+        field1375 = unwrapped_fields1373[2]
+        pretty_betree_info(pp, field1375)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3748,26 +3770,26 @@ function pretty_betree_relation(pp::PrettyPrinter, msg::Proto.BeTreeRelation)
 end
 
 function pretty_betree_info(pp::PrettyPrinter, msg::Proto.BeTreeInfo)
-    flat1374 = try_flat(pp, msg, pretty_betree_info)
-    if !isnothing(flat1374)
-        write(pp, flat1374)
+    flat1382 = try_flat(pp, msg, pretty_betree_info)
+    if !isnothing(flat1382)
+        write(pp, flat1382)
         return nothing
     else
         _dollar_dollar = msg
-        _t1740 = deconstruct_betree_info_config(pp, _dollar_dollar)
-        fields1369 = (_dollar_dollar.key_types, _dollar_dollar.value_types, _t1740,)
-        unwrapped_fields1370 = fields1369
+        _t1750 = deconstruct_betree_info_config(pp, _dollar_dollar)
+        fields1377 = (_dollar_dollar.key_types, _dollar_dollar.value_types, _t1750,)
+        unwrapped_fields1378 = fields1377
         write(pp, "(betree_info")
         indent_sexp!(pp)
         newline(pp)
-        field1371 = unwrapped_fields1370[1]
-        pretty_betree_info_key_types(pp, field1371)
+        field1379 = unwrapped_fields1378[1]
+        pretty_betree_info_key_types(pp, field1379)
         newline(pp)
-        field1372 = unwrapped_fields1370[2]
-        pretty_betree_info_value_types(pp, field1372)
+        field1380 = unwrapped_fields1378[2]
+        pretty_betree_info_value_types(pp, field1380)
         newline(pp)
-        field1373 = unwrapped_fields1370[3]
-        pretty_config_dict(pp, field1373)
+        field1381 = unwrapped_fields1378[3]
+        pretty_config_dict(pp, field1381)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3775,22 +3797,22 @@ function pretty_betree_info(pp::PrettyPrinter, msg::Proto.BeTreeInfo)
 end
 
 function pretty_betree_info_key_types(pp::PrettyPrinter, msg::Vector{Proto.var"#Type"})
-    flat1378 = try_flat(pp, msg, pretty_betree_info_key_types)
-    if !isnothing(flat1378)
-        write(pp, flat1378)
+    flat1386 = try_flat(pp, msg, pretty_betree_info_key_types)
+    if !isnothing(flat1386)
+        write(pp, flat1386)
         return nothing
     else
-        fields1375 = msg
+        fields1383 = msg
         write(pp, "(key_types")
         indent_sexp!(pp)
-        if !isempty(fields1375)
+        if !isempty(fields1383)
             newline(pp)
-            for (i1741, elem1376) in enumerate(fields1375)
-                i1377 = i1741 - 1
-                if (i1377 > 0)
+            for (i1751, elem1384) in enumerate(fields1383)
+                i1385 = i1751 - 1
+                if (i1385 > 0)
                     newline(pp)
                 end
-                pretty_type(pp, elem1376)
+                pretty_type(pp, elem1384)
             end
         end
         dedent!(pp)
@@ -3800,22 +3822,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"})
-    flat1382 = try_flat(pp, msg, pretty_betree_info_value_types)
-    if !isnothing(flat1382)
-        write(pp, flat1382)
+    flat1390 = try_flat(pp, msg, pretty_betree_info_value_types)
+    if !isnothing(flat1390)
+        write(pp, flat1390)
         return nothing
     else
-        fields1379 = msg
+        fields1387 = msg
         write(pp, "(value_types")
         indent_sexp!(pp)
-        if !isempty(fields1379)
+        if !isempty(fields1387)
             newline(pp)
-            for (i1742, elem1380) in enumerate(fields1379)
-                i1381 = i1742 - 1
-                if (i1381 > 0)
+            for (i1752, elem1388) in enumerate(fields1387)
+                i1389 = i1752 - 1
+                if (i1389 > 0)
                     newline(pp)
                 end
-                pretty_type(pp, elem1380)
+                pretty_type(pp, elem1388)
             end
         end
         dedent!(pp)
@@ -3825,28 +3847,28 @@ function pretty_betree_info_value_types(pp::PrettyPrinter, msg::Vector{Proto.var
 end
 
 function pretty_csv_data(pp::PrettyPrinter, msg::Proto.CSVData)
-    flat1389 = try_flat(pp, msg, pretty_csv_data)
-    if !isnothing(flat1389)
-        write(pp, flat1389)
+    flat1397 = try_flat(pp, msg, pretty_csv_data)
+    if !isnothing(flat1397)
+        write(pp, flat1397)
         return nothing
     else
         _dollar_dollar = msg
-        fields1383 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _dollar_dollar.asof,)
-        unwrapped_fields1384 = fields1383
+        fields1391 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _dollar_dollar.asof,)
+        unwrapped_fields1392 = fields1391
         write(pp, "(csv_data")
         indent_sexp!(pp)
         newline(pp)
-        field1385 = unwrapped_fields1384[1]
-        pretty_csvlocator(pp, field1385)
+        field1393 = unwrapped_fields1392[1]
+        pretty_csvlocator(pp, field1393)
         newline(pp)
-        field1386 = unwrapped_fields1384[2]
-        pretty_csv_config(pp, field1386)
+        field1394 = unwrapped_fields1392[2]
+        pretty_csv_config(pp, field1394)
         newline(pp)
-        field1387 = unwrapped_fields1384[3]
-        pretty_gnf_columns(pp, field1387)
+        field1395 = unwrapped_fields1392[3]
+        pretty_gnf_columns(pp, field1395)
         newline(pp)
-        field1388 = unwrapped_fields1384[4]
-        pretty_csv_asof(pp, field1388)
+        field1396 = unwrapped_fields1392[4]
+        pretty_csv_asof(pp, field1396)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3854,37 +3876,37 @@ function pretty_csv_data(pp::PrettyPrinter, msg::Proto.CSVData)
 end
 
 function pretty_csvlocator(pp::PrettyPrinter, msg::Proto.CSVLocator)
-    flat1396 = try_flat(pp, msg, pretty_csvlocator)
-    if !isnothing(flat1396)
-        write(pp, flat1396)
+    flat1404 = try_flat(pp, msg, pretty_csvlocator)
+    if !isnothing(flat1404)
+        write(pp, flat1404)
         return nothing
     else
         _dollar_dollar = msg
         if !isempty(_dollar_dollar.paths)
-            _t1743 = _dollar_dollar.paths
+            _t1753 = _dollar_dollar.paths
         else
-            _t1743 = nothing
+            _t1753 = nothing
         end
         if String(copy(_dollar_dollar.inline_data)) != ""
-            _t1744 = String(copy(_dollar_dollar.inline_data))
+            _t1754 = String(copy(_dollar_dollar.inline_data))
         else
-            _t1744 = nothing
+            _t1754 = nothing
         end
-        fields1390 = (_t1743, _t1744,)
-        unwrapped_fields1391 = fields1390
+        fields1398 = (_t1753, _t1754,)
+        unwrapped_fields1399 = fields1398
         write(pp, "(csv_locator")
         indent_sexp!(pp)
-        field1392 = unwrapped_fields1391[1]
-        if !isnothing(field1392)
+        field1400 = unwrapped_fields1399[1]
+        if !isnothing(field1400)
             newline(pp)
-            opt_val1393 = field1392
-            pretty_csv_locator_paths(pp, opt_val1393)
+            opt_val1401 = field1400
+            pretty_csv_locator_paths(pp, opt_val1401)
         end
-        field1394 = unwrapped_fields1391[2]
-        if !isnothing(field1394)
+        field1402 = unwrapped_fields1399[2]
+        if !isnothing(field1402)
             newline(pp)
-            opt_val1395 = field1394
-            pretty_csv_locator_inline_data(pp, opt_val1395)
+            opt_val1403 = field1402
+            pretty_csv_locator_inline_data(pp, opt_val1403)
         end
         dedent!(pp)
         write(pp, ")")
@@ -3893,22 +3915,22 @@ function pretty_csvlocator(pp::PrettyPrinter, msg::Proto.CSVLocator)
 end
 
 function pretty_csv_locator_paths(pp::PrettyPrinter, msg::Vector{String})
-    flat1400 = try_flat(pp, msg, pretty_csv_locator_paths)
-    if !isnothing(flat1400)
-        write(pp, flat1400)
+    flat1408 = try_flat(pp, msg, pretty_csv_locator_paths)
+    if !isnothing(flat1408)
+        write(pp, flat1408)
         return nothing
     else
-        fields1397 = msg
+        fields1405 = msg
         write(pp, "(paths")
         indent_sexp!(pp)
-        if !isempty(fields1397)
+        if !isempty(fields1405)
             newline(pp)
-            for (i1745, elem1398) in enumerate(fields1397)
-                i1399 = i1745 - 1
-                if (i1399 > 0)
+            for (i1755, elem1406) in enumerate(fields1405)
+                i1407 = i1755 - 1
+                if (i1407 > 0)
                     newline(pp)
                 end
-                write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1398))
+                write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1406))
             end
         end
         dedent!(pp)
@@ -3918,16 +3940,16 @@ function pretty_csv_locator_paths(pp::PrettyPrinter, msg::Vector{String})
 end
 
 function pretty_csv_locator_inline_data(pp::PrettyPrinter, msg::String)
-    flat1402 = try_flat(pp, msg, pretty_csv_locator_inline_data)
-    if !isnothing(flat1402)
-        write(pp, flat1402)
+    flat1410 = try_flat(pp, msg, pretty_csv_locator_inline_data)
+    if !isnothing(flat1410)
+        write(pp, flat1410)
         return nothing
     else
-        fields1401 = msg
+        fields1409 = msg
         write(pp, "(inline_data")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1401))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1409))
         dedent!(pp)
         write(pp, ")")
     end
@@ -3935,19 +3957,19 @@ function pretty_csv_locator_inline_data(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_csv_config(pp::PrettyPrinter, msg::Proto.CSVConfig)
-    flat1405 = try_flat(pp, msg, pretty_csv_config)
-    if !isnothing(flat1405)
-        write(pp, flat1405)
+    flat1413 = try_flat(pp, msg, pretty_csv_config)
+    if !isnothing(flat1413)
+        write(pp, flat1413)
         return nothing
     else
         _dollar_dollar = msg
-        _t1746 = deconstruct_csv_config(pp, _dollar_dollar)
-        fields1403 = _t1746
-        unwrapped_fields1404 = fields1403
+        _t1756 = deconstruct_csv_config(pp, _dollar_dollar)
+        fields1411 = _t1756
+        unwrapped_fields1412 = fields1411
         write(pp, "(csv_config")
         indent_sexp!(pp)
         newline(pp)
-        pretty_config_dict(pp, unwrapped_fields1404)
+        pretty_config_dict(pp, unwrapped_fields1412)
         dedent!(pp)
         write(pp, ")")
     end
@@ -3955,22 +3977,22 @@ function pretty_csv_config(pp::PrettyPrinter, msg::Proto.CSVConfig)
 end
 
 function pretty_gnf_columns(pp::PrettyPrinter, msg::Vector{Proto.GNFColumn})
-    flat1409 = try_flat(pp, msg, pretty_gnf_columns)
-    if !isnothing(flat1409)
-        write(pp, flat1409)
+    flat1417 = try_flat(pp, msg, pretty_gnf_columns)
+    if !isnothing(flat1417)
+        write(pp, flat1417)
         return nothing
     else
-        fields1406 = msg
+        fields1414 = msg
         write(pp, "(columns")
         indent_sexp!(pp)
-        if !isempty(fields1406)
+        if !isempty(fields1414)
             newline(pp)
-            for (i1747, elem1407) in enumerate(fields1406)
-                i1408 = i1747 - 1
-                if (i1408 > 0)
+            for (i1757, elem1415) in enumerate(fields1414)
+                i1416 = i1757 - 1
+                if (i1416 > 0)
                     newline(pp)
                 end
-                pretty_gnf_column(pp, elem1407)
+                pretty_gnf_column(pp, elem1415)
             end
         end
         dedent!(pp)
@@ -3980,39 +4002,39 @@ function pretty_gnf_columns(pp::PrettyPrinter, msg::Vector{Proto.GNFColumn})
 end
 
 function pretty_gnf_column(pp::PrettyPrinter, msg::Proto.GNFColumn)
-    flat1418 = try_flat(pp, msg, pretty_gnf_column)
-    if !isnothing(flat1418)
-        write(pp, flat1418)
+    flat1426 = try_flat(pp, msg, pretty_gnf_column)
+    if !isnothing(flat1426)
+        write(pp, flat1426)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("target_id"))
-            _t1748 = _dollar_dollar.target_id
+            _t1758 = _dollar_dollar.target_id
         else
-            _t1748 = nothing
+            _t1758 = nothing
         end
-        fields1410 = (_dollar_dollar.column_path, _t1748, _dollar_dollar.types,)
-        unwrapped_fields1411 = fields1410
+        fields1418 = (_dollar_dollar.column_path, _t1758, _dollar_dollar.types,)
+        unwrapped_fields1419 = fields1418
         write(pp, "(column")
         indent_sexp!(pp)
         newline(pp)
-        field1412 = unwrapped_fields1411[1]
-        pretty_gnf_column_path(pp, field1412)
-        field1413 = unwrapped_fields1411[2]
-        if !isnothing(field1413)
+        field1420 = unwrapped_fields1419[1]
+        pretty_gnf_column_path(pp, field1420)
+        field1421 = unwrapped_fields1419[2]
+        if !isnothing(field1421)
             newline(pp)
-            opt_val1414 = field1413
-            pretty_relation_id(pp, opt_val1414)
+            opt_val1422 = field1421
+            pretty_relation_id(pp, opt_val1422)
         end
         newline(pp)
         write(pp, "[")
-        field1415 = unwrapped_fields1411[3]
-        for (i1749, elem1416) in enumerate(field1415)
-            i1417 = i1749 - 1
-            if (i1417 > 0)
+        field1423 = unwrapped_fields1419[3]
+        for (i1759, elem1424) in enumerate(field1423)
+            i1425 = i1759 - 1
+            if (i1425 > 0)
                 newline(pp)
             end
-            pretty_type(pp, elem1416)
+            pretty_type(pp, elem1424)
         end
         write(pp, "]")
         dedent!(pp)
@@ -4022,39 +4044,39 @@ function pretty_gnf_column(pp::PrettyPrinter, msg::Proto.GNFColumn)
 end
 
 function pretty_gnf_column_path(pp::PrettyPrinter, msg::Vector{String})
-    flat1425 = try_flat(pp, msg, pretty_gnf_column_path)
-    if !isnothing(flat1425)
-        write(pp, flat1425)
+    flat1433 = try_flat(pp, msg, pretty_gnf_column_path)
+    if !isnothing(flat1433)
+        write(pp, flat1433)
         return nothing
     else
         _dollar_dollar = msg
         if length(_dollar_dollar) == 1
-            _t1750 = _dollar_dollar[1]
+            _t1760 = _dollar_dollar[1]
         else
-            _t1750 = nothing
+            _t1760 = nothing
         end
-        deconstruct_result1423 = _t1750
-        if !isnothing(deconstruct_result1423)
-            unwrapped1424 = deconstruct_result1423
-            write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped1424))
+        deconstruct_result1431 = _t1760
+        if !isnothing(deconstruct_result1431)
+            unwrapped1432 = deconstruct_result1431
+            write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, unwrapped1432))
         else
             _dollar_dollar = msg
             if length(_dollar_dollar) != 1
-                _t1751 = _dollar_dollar
+                _t1761 = _dollar_dollar
             else
-                _t1751 = nothing
+                _t1761 = nothing
             end
-            deconstruct_result1419 = _t1751
-            if !isnothing(deconstruct_result1419)
-                unwrapped1420 = deconstruct_result1419
+            deconstruct_result1427 = _t1761
+            if !isnothing(deconstruct_result1427)
+                unwrapped1428 = deconstruct_result1427
                 write(pp, "[")
                 indent!(pp)
-                for (i1752, elem1421) in enumerate(unwrapped1420)
-                    i1422 = i1752 - 1
-                    if (i1422 > 0)
+                for (i1762, elem1429) in enumerate(unwrapped1428)
+                    i1430 = i1762 - 1
+                    if (i1430 > 0)
                         newline(pp)
                     end
-                    write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1421))
+                    write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1429))
                 end
                 dedent!(pp)
                 write(pp, "]")
@@ -4067,16 +4089,16 @@ function pretty_gnf_column_path(pp::PrettyPrinter, msg::Vector{String})
 end
 
 function pretty_csv_asof(pp::PrettyPrinter, msg::String)
-    flat1427 = try_flat(pp, msg, pretty_csv_asof)
-    if !isnothing(flat1427)
-        write(pp, flat1427)
+    flat1435 = try_flat(pp, msg, pretty_csv_asof)
+    if !isnothing(flat1435)
+        write(pp, flat1435)
         return nothing
     else
-        fields1426 = msg
+        fields1434 = msg
         write(pp, "(asof")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1426))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1434))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4084,42 +4106,42 @@ function pretty_csv_asof(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_data(pp::PrettyPrinter, msg::Proto.IcebergData)
-    flat1438 = try_flat(pp, msg, pretty_iceberg_data)
-    if !isnothing(flat1438)
-        write(pp, flat1438)
+    flat1446 = try_flat(pp, msg, pretty_iceberg_data)
+    if !isnothing(flat1446)
+        write(pp, flat1446)
         return nothing
     else
         _dollar_dollar = msg
-        _t1753 = deconstruct_iceberg_data_from_snapshot_optional(pp, _dollar_dollar)
-        _t1754 = deconstruct_iceberg_data_to_snapshot_optional(pp, _dollar_dollar)
-        fields1428 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _t1753, _t1754, _dollar_dollar.returns_delta,)
-        unwrapped_fields1429 = fields1428
+        _t1763 = deconstruct_iceberg_data_from_snapshot_optional(pp, _dollar_dollar)
+        _t1764 = deconstruct_iceberg_data_to_snapshot_optional(pp, _dollar_dollar)
+        fields1436 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _t1763, _t1764, _dollar_dollar.returns_delta,)
+        unwrapped_fields1437 = fields1436
         write(pp, "(iceberg_data")
         indent_sexp!(pp)
         newline(pp)
-        field1430 = unwrapped_fields1429[1]
-        pretty_iceberg_locator(pp, field1430)
+        field1438 = unwrapped_fields1437[1]
+        pretty_iceberg_locator(pp, field1438)
         newline(pp)
-        field1431 = unwrapped_fields1429[2]
-        pretty_iceberg_catalog_config(pp, field1431)
+        field1439 = unwrapped_fields1437[2]
+        pretty_iceberg_catalog_config(pp, field1439)
         newline(pp)
-        field1432 = unwrapped_fields1429[3]
-        pretty_gnf_columns(pp, field1432)
-        field1433 = unwrapped_fields1429[4]
-        if !isnothing(field1433)
+        field1440 = unwrapped_fields1437[3]
+        pretty_gnf_columns(pp, field1440)
+        field1441 = unwrapped_fields1437[4]
+        if !isnothing(field1441)
             newline(pp)
-            opt_val1434 = field1433
-            pretty_iceberg_from_snapshot(pp, opt_val1434)
+            opt_val1442 = field1441
+            pretty_iceberg_from_snapshot(pp, opt_val1442)
         end
-        field1435 = unwrapped_fields1429[5]
-        if !isnothing(field1435)
+        field1443 = unwrapped_fields1437[5]
+        if !isnothing(field1443)
             newline(pp)
-            opt_val1436 = field1435
-            pretty_iceberg_to_snapshot(pp, opt_val1436)
+            opt_val1444 = field1443
+            pretty_iceberg_to_snapshot(pp, opt_val1444)
         end
         newline(pp)
-        field1437 = unwrapped_fields1429[6]
-        pretty_boolean_value(pp, field1437)
+        field1445 = unwrapped_fields1437[6]
+        pretty_boolean_value(pp, field1445)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4127,25 +4149,25 @@ function pretty_iceberg_data(pp::PrettyPrinter, msg::Proto.IcebergData)
 end
 
 function pretty_iceberg_locator(pp::PrettyPrinter, msg::Proto.IcebergLocator)
-    flat1444 = try_flat(pp, msg, pretty_iceberg_locator)
-    if !isnothing(flat1444)
-        write(pp, flat1444)
+    flat1452 = try_flat(pp, msg, pretty_iceberg_locator)
+    if !isnothing(flat1452)
+        write(pp, flat1452)
         return nothing
     else
         _dollar_dollar = msg
-        fields1439 = (_dollar_dollar.table_name, _dollar_dollar.namespace, _dollar_dollar.warehouse,)
-        unwrapped_fields1440 = fields1439
+        fields1447 = (_dollar_dollar.table_name, _dollar_dollar.namespace, _dollar_dollar.warehouse,)
+        unwrapped_fields1448 = fields1447
         write(pp, "(iceberg_locator")
         indent_sexp!(pp)
         newline(pp)
-        field1441 = unwrapped_fields1440[1]
-        pretty_iceberg_locator_table_name(pp, field1441)
+        field1449 = unwrapped_fields1448[1]
+        pretty_iceberg_locator_table_name(pp, field1449)
         newline(pp)
-        field1442 = unwrapped_fields1440[2]
-        pretty_iceberg_locator_namespace(pp, field1442)
+        field1450 = unwrapped_fields1448[2]
+        pretty_iceberg_locator_namespace(pp, field1450)
         newline(pp)
-        field1443 = unwrapped_fields1440[3]
-        pretty_iceberg_locator_warehouse(pp, field1443)
+        field1451 = unwrapped_fields1448[3]
+        pretty_iceberg_locator_warehouse(pp, field1451)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4153,16 +4175,16 @@ function pretty_iceberg_locator(pp::PrettyPrinter, msg::Proto.IcebergLocator)
 end
 
 function pretty_iceberg_locator_table_name(pp::PrettyPrinter, msg::String)
-    flat1446 = try_flat(pp, msg, pretty_iceberg_locator_table_name)
-    if !isnothing(flat1446)
-        write(pp, flat1446)
+    flat1454 = try_flat(pp, msg, pretty_iceberg_locator_table_name)
+    if !isnothing(flat1454)
+        write(pp, flat1454)
         return nothing
     else
-        fields1445 = msg
+        fields1453 = msg
         write(pp, "(table_name")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1445))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1453))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4170,22 +4192,22 @@ function pretty_iceberg_locator_table_name(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_locator_namespace(pp::PrettyPrinter, msg::Vector{String})
-    flat1450 = try_flat(pp, msg, pretty_iceberg_locator_namespace)
-    if !isnothing(flat1450)
-        write(pp, flat1450)
+    flat1458 = try_flat(pp, msg, pretty_iceberg_locator_namespace)
+    if !isnothing(flat1458)
+        write(pp, flat1458)
         return nothing
     else
-        fields1447 = msg
+        fields1455 = msg
         write(pp, "(namespace")
         indent_sexp!(pp)
-        if !isempty(fields1447)
+        if !isempty(fields1455)
             newline(pp)
-            for (i1755, elem1448) in enumerate(fields1447)
-                i1449 = i1755 - 1
-                if (i1449 > 0)
+            for (i1765, elem1456) in enumerate(fields1455)
+                i1457 = i1765 - 1
+                if (i1457 > 0)
                     newline(pp)
                 end
-                write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1448))
+                write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, elem1456))
             end
         end
         dedent!(pp)
@@ -4195,16 +4217,16 @@ function pretty_iceberg_locator_namespace(pp::PrettyPrinter, msg::Vector{String}
 end
 
 function pretty_iceberg_locator_warehouse(pp::PrettyPrinter, msg::String)
-    flat1452 = try_flat(pp, msg, pretty_iceberg_locator_warehouse)
-    if !isnothing(flat1452)
-        write(pp, flat1452)
+    flat1460 = try_flat(pp, msg, pretty_iceberg_locator_warehouse)
+    if !isnothing(flat1460)
+        write(pp, flat1460)
         return nothing
     else
-        fields1451 = msg
+        fields1459 = msg
         write(pp, "(warehouse")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1451))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1459))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4212,32 +4234,32 @@ function pretty_iceberg_locator_warehouse(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_catalog_config(pp::PrettyPrinter, msg::Proto.IcebergCatalogConfig)
-    flat1460 = try_flat(pp, msg, pretty_iceberg_catalog_config)
-    if !isnothing(flat1460)
-        write(pp, flat1460)
+    flat1468 = try_flat(pp, msg, pretty_iceberg_catalog_config)
+    if !isnothing(flat1468)
+        write(pp, flat1468)
         return nothing
     else
         _dollar_dollar = msg
-        _t1756 = deconstruct_iceberg_catalog_config_scope_optional(pp, _dollar_dollar)
-        fields1453 = (_dollar_dollar.catalog_uri, _t1756, sort([(k, v) for (k, v) in _dollar_dollar.properties]), sort([(k, v) for (k, v) in _dollar_dollar.auth_properties]),)
-        unwrapped_fields1454 = fields1453
+        _t1766 = deconstruct_iceberg_catalog_config_scope_optional(pp, _dollar_dollar)
+        fields1461 = (_dollar_dollar.catalog_uri, _t1766, sort([(k, v) for (k, v) in _dollar_dollar.properties]), sort([(k, v) for (k, v) in _dollar_dollar.auth_properties]),)
+        unwrapped_fields1462 = fields1461
         write(pp, "(iceberg_catalog_config")
         indent_sexp!(pp)
         newline(pp)
-        field1455 = unwrapped_fields1454[1]
-        pretty_iceberg_catalog_uri(pp, field1455)
-        field1456 = unwrapped_fields1454[2]
-        if !isnothing(field1456)
+        field1463 = unwrapped_fields1462[1]
+        pretty_iceberg_catalog_uri(pp, field1463)
+        field1464 = unwrapped_fields1462[2]
+        if !isnothing(field1464)
             newline(pp)
-            opt_val1457 = field1456
-            pretty_iceberg_catalog_config_scope(pp, opt_val1457)
+            opt_val1465 = field1464
+            pretty_iceberg_catalog_config_scope(pp, opt_val1465)
         end
         newline(pp)
-        field1458 = unwrapped_fields1454[3]
-        pretty_iceberg_properties(pp, field1458)
+        field1466 = unwrapped_fields1462[3]
+        pretty_iceberg_properties(pp, field1466)
         newline(pp)
-        field1459 = unwrapped_fields1454[4]
-        pretty_iceberg_auth_properties(pp, field1459)
+        field1467 = unwrapped_fields1462[4]
+        pretty_iceberg_auth_properties(pp, field1467)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4245,16 +4267,16 @@ function pretty_iceberg_catalog_config(pp::PrettyPrinter, msg::Proto.IcebergCata
 end
 
 function pretty_iceberg_catalog_uri(pp::PrettyPrinter, msg::String)
-    flat1462 = try_flat(pp, msg, pretty_iceberg_catalog_uri)
-    if !isnothing(flat1462)
-        write(pp, flat1462)
+    flat1470 = try_flat(pp, msg, pretty_iceberg_catalog_uri)
+    if !isnothing(flat1470)
+        write(pp, flat1470)
         return nothing
     else
-        fields1461 = msg
+        fields1469 = msg
         write(pp, "(catalog_uri")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1461))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1469))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4262,16 +4284,16 @@ function pretty_iceberg_catalog_uri(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_catalog_config_scope(pp::PrettyPrinter, msg::String)
-    flat1464 = try_flat(pp, msg, pretty_iceberg_catalog_config_scope)
-    if !isnothing(flat1464)
-        write(pp, flat1464)
+    flat1472 = try_flat(pp, msg, pretty_iceberg_catalog_config_scope)
+    if !isnothing(flat1472)
+        write(pp, flat1472)
         return nothing
     else
-        fields1463 = msg
+        fields1471 = msg
         write(pp, "(scope")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1463))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1471))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4279,22 +4301,22 @@ function pretty_iceberg_catalog_config_scope(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_properties(pp::PrettyPrinter, msg::Vector{Tuple{String, String}})
-    flat1468 = try_flat(pp, msg, pretty_iceberg_properties)
-    if !isnothing(flat1468)
-        write(pp, flat1468)
+    flat1476 = try_flat(pp, msg, pretty_iceberg_properties)
+    if !isnothing(flat1476)
+        write(pp, flat1476)
         return nothing
     else
-        fields1465 = msg
+        fields1473 = msg
         write(pp, "(properties")
         indent_sexp!(pp)
-        if !isempty(fields1465)
+        if !isempty(fields1473)
             newline(pp)
-            for (i1757, elem1466) in enumerate(fields1465)
-                i1467 = i1757 - 1
-                if (i1467 > 0)
+            for (i1767, elem1474) in enumerate(fields1473)
+                i1475 = i1767 - 1
+                if (i1475 > 0)
                     newline(pp)
                 end
-                pretty_iceberg_property_entry(pp, elem1466)
+                pretty_iceberg_property_entry(pp, elem1474)
             end
         end
         dedent!(pp)
@@ -4304,22 +4326,22 @@ function pretty_iceberg_properties(pp::PrettyPrinter, msg::Vector{Tuple{String,
 end
 
 function pretty_iceberg_property_entry(pp::PrettyPrinter, msg::Tuple{String, String})
-    flat1473 = try_flat(pp, msg, pretty_iceberg_property_entry)
-    if !isnothing(flat1473)
-        write(pp, flat1473)
+    flat1481 = try_flat(pp, msg, pretty_iceberg_property_entry)
+    if !isnothing(flat1481)
+        write(pp, flat1481)
         return nothing
     else
         _dollar_dollar = msg
-        fields1469 = (_dollar_dollar[1], _dollar_dollar[2],)
-        unwrapped_fields1470 = fields1469
+        fields1477 = (_dollar_dollar[1], _dollar_dollar[2],)
+        unwrapped_fields1478 = fields1477
         write(pp, "(prop")
         indent_sexp!(pp)
         newline(pp)
-        field1471 = unwrapped_fields1470[1]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1471))
+        field1479 = unwrapped_fields1478[1]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1479))
         newline(pp)
-        field1472 = unwrapped_fields1470[2]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1472))
+        field1480 = unwrapped_fields1478[2]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1480))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4327,22 +4349,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}})
-    flat1477 = try_flat(pp, msg, pretty_iceberg_auth_properties)
-    if !isnothing(flat1477)
-        write(pp, flat1477)
+    flat1485 = try_flat(pp, msg, pretty_iceberg_auth_properties)
+    if !isnothing(flat1485)
+        write(pp, flat1485)
         return nothing
     else
-        fields1474 = msg
+        fields1482 = msg
         write(pp, "(auth_properties")
         indent_sexp!(pp)
-        if !isempty(fields1474)
+        if !isempty(fields1482)
             newline(pp)
-            for (i1758, elem1475) in enumerate(fields1474)
-                i1476 = i1758 - 1
-                if (i1476 > 0)
+            for (i1768, elem1483) in enumerate(fields1482)
+                i1484 = i1768 - 1
+                if (i1484 > 0)
                     newline(pp)
                 end
-                pretty_iceberg_masked_property_entry(pp, elem1475)
+                pretty_iceberg_masked_property_entry(pp, elem1483)
             end
         end
         dedent!(pp)
@@ -4352,23 +4374,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})
-    flat1482 = try_flat(pp, msg, pretty_iceberg_masked_property_entry)
-    if !isnothing(flat1482)
-        write(pp, flat1482)
+    flat1490 = try_flat(pp, msg, pretty_iceberg_masked_property_entry)
+    if !isnothing(flat1490)
+        write(pp, flat1490)
         return nothing
     else
         _dollar_dollar = msg
-        _t1759 = mask_secret_value(pp, _dollar_dollar)
-        fields1478 = (_dollar_dollar[1], _t1759,)
-        unwrapped_fields1479 = fields1478
+        _t1769 = mask_secret_value(pp, _dollar_dollar)
+        fields1486 = (_dollar_dollar[1], _t1769,)
+        unwrapped_fields1487 = fields1486
         write(pp, "(prop")
         indent_sexp!(pp)
         newline(pp)
-        field1480 = unwrapped_fields1479[1]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1480))
+        field1488 = unwrapped_fields1487[1]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1488))
         newline(pp)
-        field1481 = unwrapped_fields1479[2]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1481))
+        field1489 = unwrapped_fields1487[2]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1489))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4376,16 +4398,16 @@ function pretty_iceberg_masked_property_entry(pp::PrettyPrinter, msg::Tuple{Stri
 end
 
 function pretty_iceberg_from_snapshot(pp::PrettyPrinter, msg::String)
-    flat1484 = try_flat(pp, msg, pretty_iceberg_from_snapshot)
-    if !isnothing(flat1484)
-        write(pp, flat1484)
+    flat1492 = try_flat(pp, msg, pretty_iceberg_from_snapshot)
+    if !isnothing(flat1492)
+        write(pp, flat1492)
         return nothing
     else
-        fields1483 = msg
+        fields1491 = msg
         write(pp, "(from_snapshot")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1483))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1491))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4393,16 +4415,16 @@ function pretty_iceberg_from_snapshot(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_iceberg_to_snapshot(pp::PrettyPrinter, msg::String)
-    flat1486 = try_flat(pp, msg, pretty_iceberg_to_snapshot)
-    if !isnothing(flat1486)
-        write(pp, flat1486)
+    flat1494 = try_flat(pp, msg, pretty_iceberg_to_snapshot)
+    if !isnothing(flat1494)
+        write(pp, flat1494)
         return nothing
     else
-        fields1485 = msg
+        fields1493 = msg
         write(pp, "(to_snapshot")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1485))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1493))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4410,18 +4432,18 @@ function pretty_iceberg_to_snapshot(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_undefine(pp::PrettyPrinter, msg::Proto.Undefine)
-    flat1489 = try_flat(pp, msg, pretty_undefine)
-    if !isnothing(flat1489)
-        write(pp, flat1489)
+    flat1497 = try_flat(pp, msg, pretty_undefine)
+    if !isnothing(flat1497)
+        write(pp, flat1497)
         return nothing
     else
         _dollar_dollar = msg
-        fields1487 = _dollar_dollar.fragment_id
-        unwrapped_fields1488 = fields1487
+        fields1495 = _dollar_dollar.fragment_id
+        unwrapped_fields1496 = fields1495
         write(pp, "(undefine")
         indent_sexp!(pp)
         newline(pp)
-        pretty_fragment_id(pp, unwrapped_fields1488)
+        pretty_fragment_id(pp, unwrapped_fields1496)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4429,24 +4451,24 @@ function pretty_undefine(pp::PrettyPrinter, msg::Proto.Undefine)
 end
 
 function pretty_context(pp::PrettyPrinter, msg::Proto.Context)
-    flat1494 = try_flat(pp, msg, pretty_context)
-    if !isnothing(flat1494)
-        write(pp, flat1494)
+    flat1502 = try_flat(pp, msg, pretty_context)
+    if !isnothing(flat1502)
+        write(pp, flat1502)
         return nothing
     else
         _dollar_dollar = msg
-        fields1490 = _dollar_dollar.relations
-        unwrapped_fields1491 = fields1490
+        fields1498 = _dollar_dollar.relations
+        unwrapped_fields1499 = fields1498
         write(pp, "(context")
         indent_sexp!(pp)
-        if !isempty(unwrapped_fields1491)
+        if !isempty(unwrapped_fields1499)
             newline(pp)
-            for (i1760, elem1492) in enumerate(unwrapped_fields1491)
-                i1493 = i1760 - 1
-                if (i1493 > 0)
+            for (i1770, elem1500) in enumerate(unwrapped_fields1499)
+                i1501 = i1770 - 1
+                if (i1501 > 0)
                     newline(pp)
                 end
-                pretty_relation_id(pp, elem1492)
+                pretty_relation_id(pp, elem1500)
             end
         end
         dedent!(pp)
@@ -4456,28 +4478,28 @@ function pretty_context(pp::PrettyPrinter, msg::Proto.Context)
 end
 
 function pretty_snapshot(pp::PrettyPrinter, msg::Proto.Snapshot)
-    flat1501 = try_flat(pp, msg, pretty_snapshot)
-    if !isnothing(flat1501)
-        write(pp, flat1501)
+    flat1509 = try_flat(pp, msg, pretty_snapshot)
+    if !isnothing(flat1509)
+        write(pp, flat1509)
         return nothing
     else
         _dollar_dollar = msg
-        fields1495 = (_dollar_dollar.prefix, _dollar_dollar.mappings,)
-        unwrapped_fields1496 = fields1495
+        fields1503 = (_dollar_dollar.prefix, _dollar_dollar.mappings,)
+        unwrapped_fields1504 = fields1503
         write(pp, "(snapshot")
         indent_sexp!(pp)
         newline(pp)
-        field1497 = unwrapped_fields1496[1]
-        pretty_edb_path(pp, field1497)
-        field1498 = unwrapped_fields1496[2]
-        if !isempty(field1498)
+        field1505 = unwrapped_fields1504[1]
+        pretty_edb_path(pp, field1505)
+        field1506 = unwrapped_fields1504[2]
+        if !isempty(field1506)
             newline(pp)
-            for (i1761, elem1499) in enumerate(field1498)
-                i1500 = i1761 - 1
-                if (i1500 > 0)
+            for (i1771, elem1507) in enumerate(field1506)
+                i1508 = i1771 - 1
+                if (i1508 > 0)
                     newline(pp)
                 end
-                pretty_snapshot_mapping(pp, elem1499)
+                pretty_snapshot_mapping(pp, elem1507)
             end
         end
         dedent!(pp)
@@ -4487,40 +4509,40 @@ function pretty_snapshot(pp::PrettyPrinter, msg::Proto.Snapshot)
 end
 
 function pretty_snapshot_mapping(pp::PrettyPrinter, msg::Proto.SnapshotMapping)
-    flat1506 = try_flat(pp, msg, pretty_snapshot_mapping)
-    if !isnothing(flat1506)
-        write(pp, flat1506)
+    flat1514 = try_flat(pp, msg, pretty_snapshot_mapping)
+    if !isnothing(flat1514)
+        write(pp, flat1514)
         return nothing
     else
         _dollar_dollar = msg
-        fields1502 = (_dollar_dollar.destination_path, _dollar_dollar.source_relation,)
-        unwrapped_fields1503 = fields1502
-        field1504 = unwrapped_fields1503[1]
-        pretty_edb_path(pp, field1504)
+        fields1510 = (_dollar_dollar.destination_path, _dollar_dollar.source_relation,)
+        unwrapped_fields1511 = fields1510
+        field1512 = unwrapped_fields1511[1]
+        pretty_edb_path(pp, field1512)
         write(pp, " ")
-        field1505 = unwrapped_fields1503[2]
-        pretty_relation_id(pp, field1505)
+        field1513 = unwrapped_fields1511[2]
+        pretty_relation_id(pp, field1513)
     end
     return nothing
 end
 
 function pretty_epoch_reads(pp::PrettyPrinter, msg::Vector{Proto.Read})
-    flat1510 = try_flat(pp, msg, pretty_epoch_reads)
-    if !isnothing(flat1510)
-        write(pp, flat1510)
+    flat1518 = try_flat(pp, msg, pretty_epoch_reads)
+    if !isnothing(flat1518)
+        write(pp, flat1518)
         return nothing
     else
-        fields1507 = msg
+        fields1515 = msg
         write(pp, "(reads")
         indent_sexp!(pp)
-        if !isempty(fields1507)
+        if !isempty(fields1515)
             newline(pp)
-            for (i1762, elem1508) in enumerate(fields1507)
-                i1509 = i1762 - 1
-                if (i1509 > 0)
+            for (i1772, elem1516) in enumerate(fields1515)
+                i1517 = i1772 - 1
+                if (i1517 > 0)
                     newline(pp)
                 end
-                pretty_read(pp, elem1508)
+                pretty_read(pp, elem1516)
             end
         end
         dedent!(pp)
@@ -4530,65 +4552,65 @@ function pretty_epoch_reads(pp::PrettyPrinter, msg::Vector{Proto.Read})
 end
 
 function pretty_read(pp::PrettyPrinter, msg::Proto.Read)
-    flat1521 = try_flat(pp, msg, pretty_read)
-    if !isnothing(flat1521)
-        write(pp, flat1521)
+    flat1529 = try_flat(pp, msg, pretty_read)
+    if !isnothing(flat1529)
+        write(pp, flat1529)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("demand"))
-            _t1763 = _get_oneof_field(_dollar_dollar, :demand)
+            _t1773 = _get_oneof_field(_dollar_dollar, :demand)
         else
-            _t1763 = nothing
+            _t1773 = nothing
         end
-        deconstruct_result1519 = _t1763
-        if !isnothing(deconstruct_result1519)
-            unwrapped1520 = deconstruct_result1519
-            pretty_demand(pp, unwrapped1520)
+        deconstruct_result1527 = _t1773
+        if !isnothing(deconstruct_result1527)
+            unwrapped1528 = deconstruct_result1527
+            pretty_demand(pp, unwrapped1528)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("output"))
-                _t1764 = _get_oneof_field(_dollar_dollar, :output)
+                _t1774 = _get_oneof_field(_dollar_dollar, :output)
             else
-                _t1764 = nothing
+                _t1774 = nothing
             end
-            deconstruct_result1517 = _t1764
-            if !isnothing(deconstruct_result1517)
-                unwrapped1518 = deconstruct_result1517
-                pretty_output(pp, unwrapped1518)
+            deconstruct_result1525 = _t1774
+            if !isnothing(deconstruct_result1525)
+                unwrapped1526 = deconstruct_result1525
+                pretty_output(pp, unwrapped1526)
             else
                 _dollar_dollar = msg
                 if _has_proto_field(_dollar_dollar, Symbol("what_if"))
-                    _t1765 = _get_oneof_field(_dollar_dollar, :what_if)
+                    _t1775 = _get_oneof_field(_dollar_dollar, :what_if)
                 else
-                    _t1765 = nothing
+                    _t1775 = nothing
                 end
-                deconstruct_result1515 = _t1765
-                if !isnothing(deconstruct_result1515)
-                    unwrapped1516 = deconstruct_result1515
-                    pretty_what_if(pp, unwrapped1516)
+                deconstruct_result1523 = _t1775
+                if !isnothing(deconstruct_result1523)
+                    unwrapped1524 = deconstruct_result1523
+                    pretty_what_if(pp, unwrapped1524)
                 else
                     _dollar_dollar = msg
                     if _has_proto_field(_dollar_dollar, Symbol("abort"))
-                        _t1766 = _get_oneof_field(_dollar_dollar, :abort)
+                        _t1776 = _get_oneof_field(_dollar_dollar, :abort)
                     else
-                        _t1766 = nothing
+                        _t1776 = nothing
                     end
-                    deconstruct_result1513 = _t1766
-                    if !isnothing(deconstruct_result1513)
-                        unwrapped1514 = deconstruct_result1513
-                        pretty_abort(pp, unwrapped1514)
+                    deconstruct_result1521 = _t1776
+                    if !isnothing(deconstruct_result1521)
+                        unwrapped1522 = deconstruct_result1521
+                        pretty_abort(pp, unwrapped1522)
                     else
                         _dollar_dollar = msg
                         if _has_proto_field(_dollar_dollar, Symbol("#export"))
-                            _t1767 = _get_oneof_field(_dollar_dollar, :var"#export")
+                            _t1777 = _get_oneof_field(_dollar_dollar, :var"#export")
                         else
-                            _t1767 = nothing
+                            _t1777 = nothing
                         end
-                        deconstruct_result1511 = _t1767
-                        if !isnothing(deconstruct_result1511)
-                            unwrapped1512 = deconstruct_result1511
-                            pretty_export(pp, unwrapped1512)
+                        deconstruct_result1519 = _t1777
+                        if !isnothing(deconstruct_result1519)
+                            unwrapped1520 = deconstruct_result1519
+                            pretty_export(pp, unwrapped1520)
                         else
                             throw(ParseError("No matching rule for read"))
                         end
@@ -4601,18 +4623,18 @@ function pretty_read(pp::PrettyPrinter, msg::Proto.Read)
 end
 
 function pretty_demand(pp::PrettyPrinter, msg::Proto.Demand)
-    flat1524 = try_flat(pp, msg, pretty_demand)
-    if !isnothing(flat1524)
-        write(pp, flat1524)
+    flat1532 = try_flat(pp, msg, pretty_demand)
+    if !isnothing(flat1532)
+        write(pp, flat1532)
         return nothing
     else
         _dollar_dollar = msg
-        fields1522 = _dollar_dollar.relation_id
-        unwrapped_fields1523 = fields1522
+        fields1530 = _dollar_dollar.relation_id
+        unwrapped_fields1531 = fields1530
         write(pp, "(demand")
         indent_sexp!(pp)
         newline(pp)
-        pretty_relation_id(pp, unwrapped_fields1523)
+        pretty_relation_id(pp, unwrapped_fields1531)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4620,22 +4642,22 @@ function pretty_demand(pp::PrettyPrinter, msg::Proto.Demand)
 end
 
 function pretty_output(pp::PrettyPrinter, msg::Proto.Output)
-    flat1529 = try_flat(pp, msg, pretty_output)
-    if !isnothing(flat1529)
-        write(pp, flat1529)
+    flat1537 = try_flat(pp, msg, pretty_output)
+    if !isnothing(flat1537)
+        write(pp, flat1537)
         return nothing
     else
         _dollar_dollar = msg
-        fields1525 = (_dollar_dollar.name, _dollar_dollar.relation_id,)
-        unwrapped_fields1526 = fields1525
+        fields1533 = (_dollar_dollar.name, _dollar_dollar.relation_id,)
+        unwrapped_fields1534 = fields1533
         write(pp, "(output")
         indent_sexp!(pp)
         newline(pp)
-        field1527 = unwrapped_fields1526[1]
-        pretty_name(pp, field1527)
+        field1535 = unwrapped_fields1534[1]
+        pretty_name(pp, field1535)
         newline(pp)
-        field1528 = unwrapped_fields1526[2]
-        pretty_relation_id(pp, field1528)
+        field1536 = unwrapped_fields1534[2]
+        pretty_relation_id(pp, field1536)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4643,22 +4665,22 @@ function pretty_output(pp::PrettyPrinter, msg::Proto.Output)
 end
 
 function pretty_what_if(pp::PrettyPrinter, msg::Proto.WhatIf)
-    flat1534 = try_flat(pp, msg, pretty_what_if)
-    if !isnothing(flat1534)
-        write(pp, flat1534)
+    flat1542 = try_flat(pp, msg, pretty_what_if)
+    if !isnothing(flat1542)
+        write(pp, flat1542)
         return nothing
     else
         _dollar_dollar = msg
-        fields1530 = (_dollar_dollar.branch, _dollar_dollar.epoch,)
-        unwrapped_fields1531 = fields1530
+        fields1538 = (_dollar_dollar.branch, _dollar_dollar.epoch,)
+        unwrapped_fields1539 = fields1538
         write(pp, "(what_if")
         indent_sexp!(pp)
         newline(pp)
-        field1532 = unwrapped_fields1531[1]
-        pretty_name(pp, field1532)
+        field1540 = unwrapped_fields1539[1]
+        pretty_name(pp, field1540)
         newline(pp)
-        field1533 = unwrapped_fields1531[2]
-        pretty_epoch(pp, field1533)
+        field1541 = unwrapped_fields1539[2]
+        pretty_epoch(pp, field1541)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4666,30 +4688,30 @@ function pretty_what_if(pp::PrettyPrinter, msg::Proto.WhatIf)
 end
 
 function pretty_abort(pp::PrettyPrinter, msg::Proto.Abort)
-    flat1540 = try_flat(pp, msg, pretty_abort)
-    if !isnothing(flat1540)
-        write(pp, flat1540)
+    flat1548 = try_flat(pp, msg, pretty_abort)
+    if !isnothing(flat1548)
+        write(pp, flat1548)
         return nothing
     else
         _dollar_dollar = msg
         if _dollar_dollar.name != "abort"
-            _t1768 = _dollar_dollar.name
+            _t1778 = _dollar_dollar.name
         else
-            _t1768 = nothing
+            _t1778 = nothing
         end
-        fields1535 = (_t1768, _dollar_dollar.relation_id,)
-        unwrapped_fields1536 = fields1535
+        fields1543 = (_t1778, _dollar_dollar.relation_id,)
+        unwrapped_fields1544 = fields1543
         write(pp, "(abort")
         indent_sexp!(pp)
-        field1537 = unwrapped_fields1536[1]
-        if !isnothing(field1537)
+        field1545 = unwrapped_fields1544[1]
+        if !isnothing(field1545)
             newline(pp)
-            opt_val1538 = field1537
-            pretty_name(pp, opt_val1538)
+            opt_val1546 = field1545
+            pretty_name(pp, opt_val1546)
         end
         newline(pp)
-        field1539 = unwrapped_fields1536[2]
-        pretty_relation_id(pp, field1539)
+        field1547 = unwrapped_fields1544[2]
+        pretty_relation_id(pp, field1547)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4697,40 +4719,40 @@ function pretty_abort(pp::PrettyPrinter, msg::Proto.Abort)
 end
 
 function pretty_export(pp::PrettyPrinter, msg::Proto.Export)
-    flat1545 = try_flat(pp, msg, pretty_export)
-    if !isnothing(flat1545)
-        write(pp, flat1545)
+    flat1553 = try_flat(pp, msg, pretty_export)
+    if !isnothing(flat1553)
+        write(pp, flat1553)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("csv_config"))
-            _t1769 = _get_oneof_field(_dollar_dollar, :csv_config)
+            _t1779 = _get_oneof_field(_dollar_dollar, :csv_config)
         else
-            _t1769 = nothing
+            _t1779 = nothing
         end
-        deconstruct_result1543 = _t1769
-        if !isnothing(deconstruct_result1543)
-            unwrapped1544 = deconstruct_result1543
+        deconstruct_result1551 = _t1779
+        if !isnothing(deconstruct_result1551)
+            unwrapped1552 = deconstruct_result1551
             write(pp, "(export")
             indent_sexp!(pp)
             newline(pp)
-            pretty_export_csv_config(pp, unwrapped1544)
+            pretty_export_csv_config(pp, unwrapped1552)
             dedent!(pp)
             write(pp, ")")
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("iceberg_config"))
-                _t1770 = _get_oneof_field(_dollar_dollar, :iceberg_config)
+                _t1780 = _get_oneof_field(_dollar_dollar, :iceberg_config)
             else
-                _t1770 = nothing
+                _t1780 = nothing
             end
-            deconstruct_result1541 = _t1770
-            if !isnothing(deconstruct_result1541)
-                unwrapped1542 = deconstruct_result1541
+            deconstruct_result1549 = _t1780
+            if !isnothing(deconstruct_result1549)
+                unwrapped1550 = deconstruct_result1549
                 write(pp, "(export_iceberg")
                 indent_sexp!(pp)
                 newline(pp)
-                pretty_export_iceberg_config(pp, unwrapped1542)
+                pretty_export_iceberg_config(pp, unwrapped1550)
                 dedent!(pp)
                 write(pp, ")")
             else
@@ -4742,55 +4764,55 @@ function pretty_export(pp::PrettyPrinter, msg::Proto.Export)
 end
 
 function pretty_export_csv_config(pp::PrettyPrinter, msg::Proto.ExportCSVConfig)
-    flat1556 = try_flat(pp, msg, pretty_export_csv_config)
-    if !isnothing(flat1556)
-        write(pp, flat1556)
+    flat1564 = try_flat(pp, msg, pretty_export_csv_config)
+    if !isnothing(flat1564)
+        write(pp, flat1564)
         return nothing
     else
         _dollar_dollar = msg
         if length(_dollar_dollar.data_columns) == 0
-            _t1771 = (_dollar_dollar.path, _dollar_dollar.csv_source, _dollar_dollar.csv_config,)
+            _t1781 = (_dollar_dollar.path, _dollar_dollar.csv_source, _dollar_dollar.csv_config,)
         else
-            _t1771 = nothing
+            _t1781 = nothing
         end
-        deconstruct_result1551 = _t1771
-        if !isnothing(deconstruct_result1551)
-            unwrapped1552 = deconstruct_result1551
+        deconstruct_result1559 = _t1781
+        if !isnothing(deconstruct_result1559)
+            unwrapped1560 = deconstruct_result1559
             write(pp, "(export_csv_config_v2")
             indent_sexp!(pp)
             newline(pp)
-            field1553 = unwrapped1552[1]
-            pretty_export_csv_path(pp, field1553)
+            field1561 = unwrapped1560[1]
+            pretty_export_csv_path(pp, field1561)
             newline(pp)
-            field1554 = unwrapped1552[2]
-            pretty_export_csv_source(pp, field1554)
+            field1562 = unwrapped1560[2]
+            pretty_export_csv_source(pp, field1562)
             newline(pp)
-            field1555 = unwrapped1552[3]
-            pretty_csv_config(pp, field1555)
+            field1563 = unwrapped1560[3]
+            pretty_csv_config(pp, field1563)
             dedent!(pp)
             write(pp, ")")
         else
             _dollar_dollar = msg
             if length(_dollar_dollar.data_columns) != 0
-                _t1773 = deconstruct_export_csv_config(pp, _dollar_dollar)
-                _t1772 = (_dollar_dollar.path, _dollar_dollar.data_columns, _t1773,)
+                _t1783 = deconstruct_export_csv_config(pp, _dollar_dollar)
+                _t1782 = (_dollar_dollar.path, _dollar_dollar.data_columns, _t1783,)
             else
-                _t1772 = nothing
+                _t1782 = nothing
             end
-            deconstruct_result1546 = _t1772
-            if !isnothing(deconstruct_result1546)
-                unwrapped1547 = deconstruct_result1546
+            deconstruct_result1554 = _t1782
+            if !isnothing(deconstruct_result1554)
+                unwrapped1555 = deconstruct_result1554
                 write(pp, "(export_csv_config")
                 indent_sexp!(pp)
                 newline(pp)
-                field1548 = unwrapped1547[1]
-                pretty_export_csv_path(pp, field1548)
+                field1556 = unwrapped1555[1]
+                pretty_export_csv_path(pp, field1556)
                 newline(pp)
-                field1549 = unwrapped1547[2]
-                pretty_export_csv_columns_list(pp, field1549)
+                field1557 = unwrapped1555[2]
+                pretty_export_csv_columns_list(pp, field1557)
                 newline(pp)
-                field1550 = unwrapped1547[3]
-                pretty_config_dict(pp, field1550)
+                field1558 = unwrapped1555[3]
+                pretty_config_dict(pp, field1558)
                 dedent!(pp)
                 write(pp, ")")
             else
@@ -4802,16 +4824,16 @@ function pretty_export_csv_config(pp::PrettyPrinter, msg::Proto.ExportCSVConfig)
 end
 
 function pretty_export_csv_path(pp::PrettyPrinter, msg::String)
-    flat1558 = try_flat(pp, msg, pretty_export_csv_path)
-    if !isnothing(flat1558)
-        write(pp, flat1558)
+    flat1566 = try_flat(pp, msg, pretty_export_csv_path)
+    if !isnothing(flat1566)
+        write(pp, flat1566)
         return nothing
     else
-        fields1557 = msg
+        fields1565 = msg
         write(pp, "(path")
         indent_sexp!(pp)
         newline(pp)
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1557))
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, fields1565))
         dedent!(pp)
         write(pp, ")")
     end
@@ -4819,30 +4841,30 @@ function pretty_export_csv_path(pp::PrettyPrinter, msg::String)
 end
 
 function pretty_export_csv_source(pp::PrettyPrinter, msg::Proto.ExportCSVSource)
-    flat1565 = try_flat(pp, msg, pretty_export_csv_source)
-    if !isnothing(flat1565)
-        write(pp, flat1565)
+    flat1573 = try_flat(pp, msg, pretty_export_csv_source)
+    if !isnothing(flat1573)
+        write(pp, flat1573)
         return nothing
     else
         _dollar_dollar = msg
         if _has_proto_field(_dollar_dollar, Symbol("gnf_columns"))
-            _t1774 = _get_oneof_field(_dollar_dollar, :gnf_columns).columns
+            _t1784 = _get_oneof_field(_dollar_dollar, :gnf_columns).columns
         else
-            _t1774 = nothing
+            _t1784 = nothing
         end
-        deconstruct_result1561 = _t1774
-        if !isnothing(deconstruct_result1561)
-            unwrapped1562 = deconstruct_result1561
+        deconstruct_result1569 = _t1784
+        if !isnothing(deconstruct_result1569)
+            unwrapped1570 = deconstruct_result1569
             write(pp, "(gnf_columns")
             indent_sexp!(pp)
-            if !isempty(unwrapped1562)
+            if !isempty(unwrapped1570)
                 newline(pp)
-                for (i1775, elem1563) in enumerate(unwrapped1562)
-                    i1564 = i1775 - 1
-                    if (i1564 > 0)
+                for (i1785, elem1571) in enumerate(unwrapped1570)
+                    i1572 = i1785 - 1
+                    if (i1572 > 0)
                         newline(pp)
                     end
-                    pretty_export_csv_column(pp, elem1563)
+                    pretty_export_csv_column(pp, elem1571)
                 end
             end
             dedent!(pp)
@@ -4850,17 +4872,17 @@ function pretty_export_csv_source(pp::PrettyPrinter, msg::Proto.ExportCSVSource)
         else
             _dollar_dollar = msg
             if _has_proto_field(_dollar_dollar, Symbol("table_def"))
-                _t1776 = _get_oneof_field(_dollar_dollar, :table_def)
+                _t1786 = _get_oneof_field(_dollar_dollar, :table_def)
             else
-                _t1776 = nothing
+                _t1786 = nothing
             end
-            deconstruct_result1559 = _t1776
-            if !isnothing(deconstruct_result1559)
-                unwrapped1560 = deconstruct_result1559
+            deconstruct_result1567 = _t1786
+            if !isnothing(deconstruct_result1567)
+                unwrapped1568 = deconstruct_result1567
                 write(pp, "(table_def")
                 indent_sexp!(pp)
                 newline(pp)
-                pretty_relation_id(pp, unwrapped1560)
+                pretty_relation_id(pp, unwrapped1568)
                 dedent!(pp)
                 write(pp, ")")
             else
@@ -4872,22 +4894,22 @@ function pretty_export_csv_source(pp::PrettyPrinter, msg::Proto.ExportCSVSource)
 end
 
 function pretty_export_csv_column(pp::PrettyPrinter, msg::Proto.ExportCSVColumn)
-    flat1570 = try_flat(pp, msg, pretty_export_csv_column)
-    if !isnothing(flat1570)
-        write(pp, flat1570)
+    flat1578 = try_flat(pp, msg, pretty_export_csv_column)
+    if !isnothing(flat1578)
+        write(pp, flat1578)
         return nothing
     else
         _dollar_dollar = msg
-        fields1566 = (_dollar_dollar.column_name, _dollar_dollar.column_data,)
-        unwrapped_fields1567 = fields1566
+        fields1574 = (_dollar_dollar.column_name, _dollar_dollar.column_data,)
+        unwrapped_fields1575 = fields1574
         write(pp, "(column")
         indent_sexp!(pp)
         newline(pp)
-        field1568 = unwrapped_fields1567[1]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1568))
+        field1576 = unwrapped_fields1575[1]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1576))
         newline(pp)
-        field1569 = unwrapped_fields1567[2]
-        pretty_relation_id(pp, field1569)
+        field1577 = unwrapped_fields1575[2]
+        pretty_relation_id(pp, field1577)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4895,22 +4917,22 @@ function pretty_export_csv_column(pp::PrettyPrinter, msg::Proto.ExportCSVColumn)
 end
 
 function pretty_export_csv_columns_list(pp::PrettyPrinter, msg::Vector{Proto.ExportCSVColumn})
-    flat1574 = try_flat(pp, msg, pretty_export_csv_columns_list)
-    if !isnothing(flat1574)
-        write(pp, flat1574)
+    flat1582 = try_flat(pp, msg, pretty_export_csv_columns_list)
+    if !isnothing(flat1582)
+        write(pp, flat1582)
         return nothing
     else
-        fields1571 = msg
+        fields1579 = msg
         write(pp, "(columns")
         indent_sexp!(pp)
-        if !isempty(fields1571)
+        if !isempty(fields1579)
             newline(pp)
-            for (i1777, elem1572) in enumerate(fields1571)
-                i1573 = i1777 - 1
-                if (i1573 > 0)
+            for (i1787, elem1580) in enumerate(fields1579)
+                i1581 = i1787 - 1
+                if (i1581 > 0)
                     newline(pp)
                 end
-                pretty_export_csv_column(pp, elem1572)
+                pretty_export_csv_column(pp, elem1580)
             end
         end
         dedent!(pp)
@@ -4920,37 +4942,37 @@ function pretty_export_csv_columns_list(pp::PrettyPrinter, msg::Vector{Proto.Exp
 end
 
 function pretty_export_iceberg_config(pp::PrettyPrinter, msg::Proto.ExportIcebergConfig)
-    flat1584 = try_flat(pp, msg, pretty_export_iceberg_config)
-    if !isnothing(flat1584)
-        write(pp, flat1584)
+    flat1592 = try_flat(pp, msg, pretty_export_iceberg_config)
+    if !isnothing(flat1592)
+        write(pp, flat1592)
         return nothing
     else
         _dollar_dollar = msg
-        _t1778 = deconstruct_export_iceberg_config_optional(pp, _dollar_dollar)
-        fields1575 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.table_def, _dollar_dollar.columns, sort([(k, v) for (k, v) in _dollar_dollar.table_properties]), _t1778,)
-        unwrapped_fields1576 = fields1575
+        _t1788 = deconstruct_export_iceberg_config_optional(pp, _dollar_dollar)
+        fields1583 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.table_def, _dollar_dollar.columns, sort([(k, v) for (k, v) in _dollar_dollar.table_properties]), _t1788,)
+        unwrapped_fields1584 = fields1583
         write(pp, "(export_iceberg_config")
         indent_sexp!(pp)
         newline(pp)
-        field1577 = unwrapped_fields1576[1]
-        pretty_iceberg_locator(pp, field1577)
+        field1585 = unwrapped_fields1584[1]
+        pretty_iceberg_locator(pp, field1585)
         newline(pp)
-        field1578 = unwrapped_fields1576[2]
-        pretty_iceberg_catalog_config(pp, field1578)
+        field1586 = unwrapped_fields1584[2]
+        pretty_iceberg_catalog_config(pp, field1586)
         newline(pp)
-        field1579 = unwrapped_fields1576[3]
-        pretty_export_iceberg_table_def(pp, field1579)
+        field1587 = unwrapped_fields1584[3]
+        pretty_export_iceberg_table_def(pp, field1587)
         newline(pp)
-        field1580 = unwrapped_fields1576[4]
-        pretty_export_iceberg_columns(pp, field1580)
+        field1588 = unwrapped_fields1584[4]
+        pretty_export_iceberg_columns(pp, field1588)
         newline(pp)
-        field1581 = unwrapped_fields1576[5]
-        pretty_iceberg_table_properties(pp, field1581)
-        field1582 = unwrapped_fields1576[6]
-        if !isnothing(field1582)
+        field1589 = unwrapped_fields1584[5]
+        pretty_iceberg_table_properties(pp, field1589)
+        field1590 = unwrapped_fields1584[6]
+        if !isnothing(field1590)
             newline(pp)
-            opt_val1583 = field1582
-            pretty_config_dict(pp, opt_val1583)
+            opt_val1591 = field1590
+            pretty_config_dict(pp, opt_val1591)
         end
         dedent!(pp)
         write(pp, ")")
@@ -4959,16 +4981,16 @@ function pretty_export_iceberg_config(pp::PrettyPrinter, msg::Proto.ExportIceber
 end
 
 function pretty_export_iceberg_table_def(pp::PrettyPrinter, msg::Proto.RelationId)
-    flat1586 = try_flat(pp, msg, pretty_export_iceberg_table_def)
-    if !isnothing(flat1586)
-        write(pp, flat1586)
+    flat1594 = try_flat(pp, msg, pretty_export_iceberg_table_def)
+    if !isnothing(flat1594)
+        write(pp, flat1594)
         return nothing
     else
-        fields1585 = msg
+        fields1593 = msg
         write(pp, "(table_def")
         indent_sexp!(pp)
         newline(pp)
-        pretty_relation_id(pp, fields1585)
+        pretty_relation_id(pp, fields1593)
         dedent!(pp)
         write(pp, ")")
     end
@@ -4976,22 +4998,22 @@ function pretty_export_iceberg_table_def(pp::PrettyPrinter, msg::Proto.RelationI
 end
 
 function pretty_export_iceberg_columns(pp::PrettyPrinter, msg::Vector{Proto.ExportColumn})
-    flat1590 = try_flat(pp, msg, pretty_export_iceberg_columns)
-    if !isnothing(flat1590)
-        write(pp, flat1590)
+    flat1598 = try_flat(pp, msg, pretty_export_iceberg_columns)
+    if !isnothing(flat1598)
+        write(pp, flat1598)
         return nothing
     else
-        fields1587 = msg
+        fields1595 = msg
         write(pp, "(columns")
         indent_sexp!(pp)
-        if !isempty(fields1587)
+        if !isempty(fields1595)
             newline(pp)
-            for (i1779, elem1588) in enumerate(fields1587)
-                i1589 = i1779 - 1
-                if (i1589 > 0)
+            for (i1789, elem1596) in enumerate(fields1595)
+                i1597 = i1789 - 1
+                if (i1597 > 0)
                     newline(pp)
                 end
-                pretty_export_iceberg_column(pp, elem1588)
+                pretty_export_iceberg_column(pp, elem1596)
             end
         end
         dedent!(pp)
@@ -5001,22 +5023,22 @@ function pretty_export_iceberg_columns(pp::PrettyPrinter, msg::Vector{Proto.Expo
 end
 
 function pretty_export_iceberg_column(pp::PrettyPrinter, msg::Proto.ExportColumn)
-    flat1595 = try_flat(pp, msg, pretty_export_iceberg_column)
-    if !isnothing(flat1595)
-        write(pp, flat1595)
+    flat1603 = try_flat(pp, msg, pretty_export_iceberg_column)
+    if !isnothing(flat1603)
+        write(pp, flat1603)
         return nothing
     else
         _dollar_dollar = msg
-        fields1591 = (_dollar_dollar.name, _dollar_dollar.nullable,)
-        unwrapped_fields1592 = fields1591
+        fields1599 = (_dollar_dollar.name, _dollar_dollar.nullable,)
+        unwrapped_fields1600 = fields1599
         write(pp, "(column")
         indent_sexp!(pp)
         newline(pp)
-        field1593 = unwrapped_fields1592[1]
-        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1593))
+        field1601 = unwrapped_fields1600[1]
+        write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, field1601))
         newline(pp)
-        field1594 = unwrapped_fields1592[2]
-        pretty_boolean_value(pp, field1594)
+        field1602 = unwrapped_fields1600[2]
+        pretty_boolean_value(pp, field1602)
         dedent!(pp)
         write(pp, ")")
     end
@@ -5024,22 +5046,22 @@ function pretty_export_iceberg_column(pp::PrettyPrinter, msg::Proto.ExportColumn
 end
 
 function pretty_iceberg_table_properties(pp::PrettyPrinter, msg::Vector{Tuple{String, String}})
-    flat1599 = try_flat(pp, msg, pretty_iceberg_table_properties)
-    if !isnothing(flat1599)
-        write(pp, flat1599)
+    flat1607 = try_flat(pp, msg, pretty_iceberg_table_properties)
+    if !isnothing(flat1607)
+        write(pp, flat1607)
         return nothing
     else
-        fields1596 = msg
+        fields1604 = msg
         write(pp, "(table_properties")
         indent_sexp!(pp)
-        if !isempty(fields1596)
+        if !isempty(fields1604)
             newline(pp)
-            for (i1780, elem1597) in enumerate(fields1596)
-                i1598 = i1780 - 1
-                if (i1598 > 0)
+            for (i1790, elem1605) in enumerate(fields1604)
+                i1606 = i1790 - 1
+                if (i1606 > 0)
                     newline(pp)
                 end
-                pretty_iceberg_property_entry(pp, elem1597)
+                pretty_iceberg_property_entry(pp, elem1605)
             end
         end
         dedent!(pp)
@@ -5054,12 +5076,12 @@ end
 function pretty_debug_info(pp::PrettyPrinter, msg::Proto.DebugInfo)
     write(pp, "(debug_info")
     indent_sexp!(pp)
-    for (i1826, _rid) in enumerate(msg.ids)
-        _idx = i1826 - 1
+    for (i1836, _rid) in enumerate(msg.ids)
+        _idx = i1836 - 1
         newline(pp)
         write(pp, "(")
-        _t1827 = Proto.UInt128Value(low=_rid.id_low, high=_rid.id_high)
-        _pprint_dispatch(pp, _t1827)
+        _t1837 = Proto.UInt128Value(low=_rid.id_low, high=_rid.id_high)
+        _pprint_dispatch(pp, _t1837)
         write(pp, " ")
         write(pp, format_string(DEFAULT_CONSTANT_FORMATTER, pp, msg.orig_names[_idx + 1]))
         write(pp, ")")
@@ -5131,8 +5153,8 @@ function pretty_functional_dependency(pp::PrettyPrinter, msg::Proto.FunctionalDe
     _pprint_dispatch(pp, msg.guard)
     newline(pp)
     write(pp, ":keys (")
-    for (i1828, _elem) in enumerate(msg.keys)
-        _idx = i1828 - 1
+    for (i1838, _elem) in enumerate(msg.keys)
+        _idx = i1838 - 1
         if (_idx > 0)
             write(pp, " ")
         end
@@ -5141,8 +5163,8 @@ function pretty_functional_dependency(pp::PrettyPrinter, msg::Proto.FunctionalDe
     write(pp, ")")
     newline(pp)
     write(pp, ":values (")
-    for (i1829, _elem) in enumerate(msg.values)
-        _idx = i1829 - 1
+    for (i1839, _elem) in enumerate(msg.values)
+        _idx = i1839 - 1
         if (_idx > 0)
             write(pp, " ")
         end
@@ -5173,8 +5195,8 @@ function pretty_export_csv_columns(pp::PrettyPrinter, msg::Proto.ExportCSVColumn
     indent_sexp!(pp)
     newline(pp)
     write(pp, ":columns (")
-    for (i1830, _elem) in enumerate(msg.columns)
-        _idx = i1830 - 1
+    for (i1840, _elem) in enumerate(msg.columns)
+        _idx = i1840 - 1
         if (_idx > 0)
             write(pp, " ")
         end
diff --git a/sdks/python/src/lqp/gen/parser.py b/sdks/python/src/lqp/gen/parser.py
index d36fd581..f1a45123 100644
--- a/sdks/python/src/lqp/gen/parser.py
+++ b/sdks/python/src/lqp/gen/parser.py
@@ -424,179 +424,179 @@ 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
-            _t2095 = value.HasField("int32_value")
+            _t2103 = value.HasField("int32_value")
         else:
-            _t2095 = False
-        if _t2095:
+            _t2103 = False
+        if _t2103:
             assert value is not None
             return value.int32_value
         else:
-            _t2096 = None
+            _t2104 = 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
-            _t2097 = value.HasField("int_value")
+            _t2105 = value.HasField("int_value")
         else:
-            _t2097 = False
-        if _t2097:
+            _t2105 = False
+        if _t2105:
             assert value is not None
             return value.int_value
         else:
-            _t2098 = None
+            _t2106 = 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
-            _t2099 = value.HasField("string_value")
+            _t2107 = value.HasField("string_value")
         else:
-            _t2099 = False
-        if _t2099:
+            _t2107 = False
+        if _t2107:
             assert value is not None
             return value.string_value
         else:
-            _t2100 = None
+            _t2108 = 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
-            _t2101 = value.HasField("boolean_value")
+            _t2109 = value.HasField("boolean_value")
         else:
-            _t2101 = False
-        if _t2101:
+            _t2109 = False
+        if _t2109:
             assert value is not None
             return value.boolean_value
         else:
-            _t2102 = None
+            _t2110 = 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
-            _t2103 = value.HasField("string_value")
+            _t2111 = value.HasField("string_value")
         else:
-            _t2103 = False
-        if _t2103:
+            _t2111 = False
+        if _t2111:
             assert value is not None
             return [value.string_value]
         else:
-            _t2104 = None
+            _t2112 = 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
-            _t2105 = value.HasField("int_value")
+            _t2113 = value.HasField("int_value")
         else:
-            _t2105 = False
-        if _t2105:
+            _t2113 = False
+        if _t2113:
             assert value is not None
             return value.int_value
         else:
-            _t2106 = None
+            _t2114 = 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
-            _t2107 = value.HasField("float_value")
+            _t2115 = value.HasField("float_value")
         else:
-            _t2107 = False
-        if _t2107:
+            _t2115 = False
+        if _t2115:
             assert value is not None
             return value.float_value
         else:
-            _t2108 = None
+            _t2116 = 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
-            _t2109 = value.HasField("string_value")
+            _t2117 = value.HasField("string_value")
         else:
-            _t2109 = False
-        if _t2109:
+            _t2117 = False
+        if _t2117:
             assert value is not None
             return value.string_value.encode()
         else:
-            _t2110 = None
+            _t2118 = 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
-            _t2111 = value.HasField("uint128_value")
+            _t2119 = value.HasField("uint128_value")
         else:
-            _t2111 = False
-        if _t2111:
+            _t2119 = False
+        if _t2119:
             assert value is not None
             return value.uint128_value
         else:
-            _t2112 = None
+            _t2120 = None
         return None
 
     def construct_csv_config(self, config_dict: Sequence[tuple[str, logic_pb2.Value]]) -> logic_pb2.CSVConfig:
         config = dict(config_dict)
-        _t2113 = self._extract_value_int32(config.get("csv_header_row"), 1)
-        header_row = _t2113
-        _t2114 = self._extract_value_int64(config.get("csv_skip"), 0)
-        skip = _t2114
-        _t2115 = self._extract_value_string(config.get("csv_new_line"), "")
-        new_line = _t2115
-        _t2116 = self._extract_value_string(config.get("csv_delimiter"), ",")
-        delimiter = _t2116
-        _t2117 = self._extract_value_string(config.get("csv_quotechar"), '"')
-        quotechar = _t2117
-        _t2118 = self._extract_value_string(config.get("csv_escapechar"), '"')
-        escapechar = _t2118
-        _t2119 = self._extract_value_string(config.get("csv_comment"), "")
-        comment = _t2119
-        _t2120 = self._extract_value_string_list(config.get("csv_missing_strings"), [])
-        missing_strings = _t2120
-        _t2121 = self._extract_value_string(config.get("csv_decimal_separator"), ".")
-        decimal_separator = _t2121
-        _t2122 = self._extract_value_string(config.get("csv_encoding"), "utf-8")
-        encoding = _t2122
-        _t2123 = self._extract_value_string(config.get("csv_compression"), "auto")
-        compression = _t2123
-        _t2124 = self._extract_value_int64(config.get("csv_partition_size_mb"), 0)
-        partition_size_mb = _t2124
-        _t2125 = 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)
-        return _t2125
+        _t2121 = self._extract_value_int32(config.get("csv_header_row"), 1)
+        header_row = _t2121
+        _t2122 = self._extract_value_int64(config.get("csv_skip"), 0)
+        skip = _t2122
+        _t2123 = self._extract_value_string(config.get("csv_new_line"), "")
+        new_line = _t2123
+        _t2124 = self._extract_value_string(config.get("csv_delimiter"), ",")
+        delimiter = _t2124
+        _t2125 = self._extract_value_string(config.get("csv_quotechar"), '"')
+        quotechar = _t2125
+        _t2126 = self._extract_value_string(config.get("csv_escapechar"), '"')
+        escapechar = _t2126
+        _t2127 = self._extract_value_string(config.get("csv_comment"), "")
+        comment = _t2127
+        _t2128 = self._extract_value_string_list(config.get("csv_missing_strings"), [])
+        missing_strings = _t2128
+        _t2129 = self._extract_value_string(config.get("csv_decimal_separator"), ".")
+        decimal_separator = _t2129
+        _t2130 = self._extract_value_string(config.get("csv_encoding"), "utf-8")
+        encoding = _t2130
+        _t2131 = self._extract_value_string(config.get("csv_compression"), "auto")
+        compression = _t2131
+        _t2132 = self._extract_value_int64(config.get("csv_partition_size_mb"), 0)
+        partition_size_mb = _t2132
+        _t2133 = 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)
+        return _t2133
 
     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)
-        _t2126 = self._try_extract_value_float64(config.get("betree_config_epsilon"))
-        epsilon = _t2126
-        _t2127 = self._try_extract_value_int64(config.get("betree_config_max_pivots"))
-        max_pivots = _t2127
-        _t2128 = self._try_extract_value_int64(config.get("betree_config_max_deltas"))
-        max_deltas = _t2128
-        _t2129 = self._try_extract_value_int64(config.get("betree_config_max_leaf"))
-        max_leaf = _t2129
-        _t2130 = logic_pb2.BeTreeConfig(epsilon=epsilon, max_pivots=max_pivots, max_deltas=max_deltas, max_leaf=max_leaf)
-        storage_config = _t2130
-        _t2131 = self._try_extract_value_uint128(config.get("betree_locator_root_pageid"))
-        root_pageid = _t2131
-        _t2132 = self._try_extract_value_bytes(config.get("betree_locator_inline_data"))
-        inline_data = _t2132
-        _t2133 = self._try_extract_value_int64(config.get("betree_locator_element_count"))
-        element_count = _t2133
-        _t2134 = self._try_extract_value_int64(config.get("betree_locator_tree_height"))
-        tree_height = _t2134
-        _t2135 = logic_pb2.BeTreeLocator(root_pageid=root_pageid, inline_data=inline_data, element_count=element_count, tree_height=tree_height)
-        relation_locator = _t2135
-        _t2136 = logic_pb2.BeTreeInfo(key_types=key_types, value_types=value_types, storage_config=storage_config, relation_locator=relation_locator)
-        return _t2136
+        _t2134 = self._try_extract_value_float64(config.get("betree_config_epsilon"))
+        epsilon = _t2134
+        _t2135 = self._try_extract_value_int64(config.get("betree_config_max_pivots"))
+        max_pivots = _t2135
+        _t2136 = self._try_extract_value_int64(config.get("betree_config_max_deltas"))
+        max_deltas = _t2136
+        _t2137 = self._try_extract_value_int64(config.get("betree_config_max_leaf"))
+        max_leaf = _t2137
+        _t2138 = logic_pb2.BeTreeConfig(epsilon=epsilon, max_pivots=max_pivots, max_deltas=max_deltas, max_leaf=max_leaf)
+        storage_config = _t2138
+        _t2139 = self._try_extract_value_uint128(config.get("betree_locator_root_pageid"))
+        root_pageid = _t2139
+        _t2140 = self._try_extract_value_bytes(config.get("betree_locator_inline_data"))
+        inline_data = _t2140
+        _t2141 = self._try_extract_value_int64(config.get("betree_locator_element_count"))
+        element_count = _t2141
+        _t2142 = self._try_extract_value_int64(config.get("betree_locator_tree_height"))
+        tree_height = _t2142
+        _t2143 = logic_pb2.BeTreeLocator(root_pageid=root_pageid, inline_data=inline_data, element_count=element_count, tree_height=tree_height)
+        relation_locator = _t2143
+        _t2144 = logic_pb2.BeTreeInfo(key_types=key_types, value_types=value_types, storage_config=storage_config, relation_locator=relation_locator)
+        return _t2144
 
     def default_configure(self) -> transactions_pb2.Configure:
-        _t2137 = transactions_pb2.IVMConfig(level=transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_OFF)
-        ivm_config = _t2137
-        _t2138 = transactions_pb2.Configure(semantics_version=0, ivm_config=ivm_config)
-        return _t2138
+        _t2145 = transactions_pb2.IVMConfig(level=transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_OFF)
+        ivm_config = _t2145
+        _t2146 = transactions_pb2.Configure(semantics_version=0, ivm_config=ivm_config)
+        return _t2146
 
     def construct_configure(self, config_dict: Sequence[tuple[str, logic_pb2.Value]]) -> transactions_pb2.Configure:
         config = dict(config_dict)
@@ -613,3379 +613,3391 @@ 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
-        _t2139 = transactions_pb2.IVMConfig(level=maintenance_level)
-        ivm_config = _t2139
-        _t2140 = self._extract_value_int64(config.get("semantics_version"), 0)
-        semantics_version = _t2140
-        _t2141 = transactions_pb2.Configure(semantics_version=semantics_version, ivm_config=ivm_config)
-        return _t2141
+        _t2147 = transactions_pb2.IVMConfig(level=maintenance_level)
+        ivm_config = _t2147
+        _t2148 = self._extract_value_int64(config.get("semantics_version"), 0)
+        semantics_version = _t2148
+        _t2149 = transactions_pb2.Configure(semantics_version=semantics_version, ivm_config=ivm_config)
+        return _t2149
 
     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)
-        _t2142 = self._extract_value_int64(config.get("partition_size"), 0)
-        partition_size = _t2142
-        _t2143 = self._extract_value_string(config.get("compression"), "")
-        compression = _t2143
-        _t2144 = self._extract_value_boolean(config.get("syntax_header_row"), True)
-        syntax_header_row = _t2144
-        _t2145 = self._extract_value_string(config.get("syntax_missing_string"), "")
-        syntax_missing_string = _t2145
-        _t2146 = self._extract_value_string(config.get("syntax_delim"), ",")
-        syntax_delim = _t2146
-        _t2147 = self._extract_value_string(config.get("syntax_quotechar"), '"')
-        syntax_quotechar = _t2147
-        _t2148 = self._extract_value_string(config.get("syntax_escapechar"), "\\")
-        syntax_escapechar = _t2148
-        _t2149 = 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 _t2149
+        _t2150 = self._extract_value_int64(config.get("partition_size"), 0)
+        partition_size = _t2150
+        _t2151 = self._extract_value_string(config.get("compression"), "")
+        compression = _t2151
+        _t2152 = self._extract_value_boolean(config.get("syntax_header_row"), True)
+        syntax_header_row = _t2152
+        _t2153 = self._extract_value_string(config.get("syntax_missing_string"), "")
+        syntax_missing_string = _t2153
+        _t2154 = self._extract_value_string(config.get("syntax_delim"), ",")
+        syntax_delim = _t2154
+        _t2155 = self._extract_value_string(config.get("syntax_quotechar"), '"')
+        syntax_quotechar = _t2155
+        _t2156 = self._extract_value_string(config.get("syntax_escapechar"), "\\")
+        syntax_escapechar = _t2156
+        _t2157 = 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 _t2157
 
     def construct_export_csv_config_with_source(self, path: str, csv_source: transactions_pb2.ExportCSVSource, csv_config: logic_pb2.CSVConfig) -> transactions_pb2.ExportCSVConfig:
-        _t2150 = transactions_pb2.ExportCSVConfig(path=path, csv_source=csv_source, csv_config=csv_config)
-        return _t2150
+        _t2158 = transactions_pb2.ExportCSVConfig(path=path, csv_source=csv_source, csv_config=csv_config)
+        return _t2158
 
     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)
-        _t2151 = logic_pb2.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(scope_opt if scope_opt is not None else ""), properties=props, auth_properties=auth_props)
-        return _t2151
+        _t2159 = logic_pb2.IcebergCatalogConfig(catalog_uri=catalog_uri, scope=(scope_opt if scope_opt is not None else ""), properties=props, auth_properties=auth_props)
+        return _t2159
 
     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:
-        _t2152 = 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 _t2152
+        _t2160 = 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 _t2160
 
     def construct_export_iceberg_config_full(self, locator: logic_pb2.IcebergLocator, config: logic_pb2.IcebergCatalogConfig, table_def: logic_pb2.RelationId, columns: Sequence[transactions_pb2.ExportColumn], 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 []))
-        _t2153 = self._extract_value_string(cfg.get("prefix"), "")
-        prefix = _t2153
-        _t2154 = self._extract_value_int64(cfg.get("target_file_size_bytes"), 0)
-        target_file_size_bytes = _t2154
-        _t2155 = self._extract_value_string(cfg.get("compression"), "")
-        compression = _t2155
+        _t2161 = self._extract_value_string(cfg.get("prefix"), "")
+        prefix = _t2161
+        _t2162 = self._extract_value_int64(cfg.get("target_file_size_bytes"), 0)
+        target_file_size_bytes = _t2162
+        _t2163 = self._extract_value_string(cfg.get("compression"), "")
+        compression = _t2163
         table_props = dict(table_property_pairs)
-        _t2156 = transactions_pb2.ExportIcebergConfig(locator=locator, config=config, table_def=table_def, columns=columns, prefix=prefix, target_file_size_bytes=target_file_size_bytes, compression=compression, table_properties=table_props)
-        return _t2156
+        _t2164 = transactions_pb2.ExportIcebergConfig(locator=locator, config=config, table_def=table_def, columns=columns, prefix=prefix, target_file_size_bytes=target_file_size_bytes, compression=compression, table_properties=table_props)
+        return _t2164
 
     # --- Parse methods ---
 
     def parse_transaction(self) -> transactions_pb2.Transaction:
-        span_start678 = self.span_start()
+        span_start680 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("transaction")
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("configure", 1)):
-            _t1345 = self.parse_configure()
-            _t1344 = _t1345
+            _t1349 = self.parse_configure()
+            _t1348 = _t1349
         else:
-            _t1344 = None
-        configure672 = _t1344
+            _t1348 = None
+        configure674 = _t1348
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("sync", 1)):
-            _t1347 = self.parse_sync()
-            _t1346 = _t1347
-        else:
-            _t1346 = None
-        sync673 = _t1346
-        xs674 = []
-        cond675 = self.match_lookahead_literal("(", 0)
-        while cond675:
-            _t1348 = self.parse_epoch()
-            item676 = _t1348
-            xs674.append(item676)
-            cond675 = self.match_lookahead_literal("(", 0)
-        epochs677 = xs674
-        self.consume_literal(")")
-        _t1349 = self.default_configure()
-        _t1350 = transactions_pb2.Transaction(epochs=epochs677, configure=(configure672 if configure672 is not None else _t1349), sync=sync673)
-        result679 = _t1350
-        self.record_span(span_start678, "Transaction")
-        return result679
+            _t1351 = self.parse_sync()
+            _t1350 = _t1351
+        else:
+            _t1350 = None
+        sync675 = _t1350
+        xs676 = []
+        cond677 = self.match_lookahead_literal("(", 0)
+        while cond677:
+            _t1352 = self.parse_epoch()
+            item678 = _t1352
+            xs676.append(item678)
+            cond677 = self.match_lookahead_literal("(", 0)
+        epochs679 = xs676
+        self.consume_literal(")")
+        _t1353 = self.default_configure()
+        _t1354 = transactions_pb2.Transaction(epochs=epochs679, configure=(configure674 if configure674 is not None else _t1353), sync=sync675)
+        result681 = _t1354
+        self.record_span(span_start680, "Transaction")
+        return result681
 
     def parse_configure(self) -> transactions_pb2.Configure:
-        span_start681 = self.span_start()
+        span_start683 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("configure")
-        _t1351 = self.parse_config_dict()
-        config_dict680 = _t1351
+        _t1355 = self.parse_config_dict()
+        config_dict682 = _t1355
         self.consume_literal(")")
-        _t1352 = self.construct_configure(config_dict680)
-        result682 = _t1352
-        self.record_span(span_start681, "Configure")
-        return result682
+        _t1356 = self.construct_configure(config_dict682)
+        result684 = _t1356
+        self.record_span(span_start683, "Configure")
+        return result684
 
     def parse_config_dict(self) -> Sequence[tuple[str, logic_pb2.Value]]:
         self.consume_literal("{")
-        xs683 = []
-        cond684 = self.match_lookahead_literal(":", 0)
-        while cond684:
-            _t1353 = self.parse_config_key_value()
-            item685 = _t1353
-            xs683.append(item685)
-            cond684 = self.match_lookahead_literal(":", 0)
-        config_key_values686 = xs683
+        xs685 = []
+        cond686 = self.match_lookahead_literal(":", 0)
+        while cond686:
+            _t1357 = self.parse_config_key_value()
+            item687 = _t1357
+            xs685.append(item687)
+            cond686 = self.match_lookahead_literal(":", 0)
+        config_key_values688 = xs685
         self.consume_literal("}")
-        return config_key_values686
+        return config_key_values688
 
     def parse_config_key_value(self) -> tuple[str, logic_pb2.Value]:
         self.consume_literal(":")
-        symbol687 = self.consume_terminal("SYMBOL")
-        _t1354 = self.parse_raw_value()
-        raw_value688 = _t1354
-        return (symbol687, raw_value688,)
+        symbol689 = self.consume_terminal("SYMBOL")
+        _t1358 = self.parse_raw_value()
+        raw_value690 = _t1358
+        return (symbol689, raw_value690,)
 
     def parse_raw_value(self) -> logic_pb2.Value:
-        span_start702 = self.span_start()
+        span_start704 = self.span_start()
         if self.match_lookahead_literal("true", 0):
-            _t1355 = 12
+            _t1359 = 12
         else:
             if self.match_lookahead_literal("missing", 0):
-                _t1356 = 11
+                _t1360 = 11
             else:
                 if self.match_lookahead_literal("false", 0):
-                    _t1357 = 12
+                    _t1361 = 12
                 else:
                     if self.match_lookahead_literal("(", 0):
                         if self.match_lookahead_literal("datetime", 1):
-                            _t1359 = 1
+                            _t1363 = 1
                         else:
                             if self.match_lookahead_literal("date", 1):
-                                _t1360 = 0
+                                _t1364 = 0
                             else:
-                                _t1360 = -1
-                            _t1359 = _t1360
-                        _t1358 = _t1359
+                                _t1364 = -1
+                            _t1363 = _t1364
+                        _t1362 = _t1363
                     else:
                         if self.match_lookahead_terminal("UINT32", 0):
-                            _t1361 = 7
+                            _t1365 = 7
                         else:
                             if self.match_lookahead_terminal("UINT128", 0):
-                                _t1362 = 8
+                                _t1366 = 8
                             else:
                                 if self.match_lookahead_terminal("STRING", 0):
-                                    _t1363 = 2
+                                    _t1367 = 2
                                 else:
                                     if self.match_lookahead_terminal("INT32", 0):
-                                        _t1364 = 3
+                                        _t1368 = 3
                                     else:
                                         if self.match_lookahead_terminal("INT128", 0):
-                                            _t1365 = 9
+                                            _t1369 = 9
                                         else:
                                             if self.match_lookahead_terminal("INT", 0):
-                                                _t1366 = 4
+                                                _t1370 = 4
                                             else:
                                                 if self.match_lookahead_terminal("FLOAT32", 0):
-                                                    _t1367 = 5
+                                                    _t1371 = 5
                                                 else:
                                                     if self.match_lookahead_terminal("FLOAT", 0):
-                                                        _t1368 = 6
+                                                        _t1372 = 6
                                                     else:
                                                         if self.match_lookahead_terminal("DECIMAL", 0):
-                                                            _t1369 = 10
+                                                            _t1373 = 10
                                                         else:
-                                                            _t1369 = -1
-                                                        _t1368 = _t1369
-                                                    _t1367 = _t1368
-                                                _t1366 = _t1367
-                                            _t1365 = _t1366
-                                        _t1364 = _t1365
-                                    _t1363 = _t1364
-                                _t1362 = _t1363
-                            _t1361 = _t1362
-                        _t1358 = _t1361
-                    _t1357 = _t1358
-                _t1356 = _t1357
-            _t1355 = _t1356
-        prediction689 = _t1355
-        if prediction689 == 12:
-            _t1371 = self.parse_boolean_value()
-            boolean_value701 = _t1371
-            _t1372 = logic_pb2.Value(boolean_value=boolean_value701)
-            _t1370 = _t1372
-        else:
-            if prediction689 == 11:
+                                                            _t1373 = -1
+                                                        _t1372 = _t1373
+                                                    _t1371 = _t1372
+                                                _t1370 = _t1371
+                                            _t1369 = _t1370
+                                        _t1368 = _t1369
+                                    _t1367 = _t1368
+                                _t1366 = _t1367
+                            _t1365 = _t1366
+                        _t1362 = _t1365
+                    _t1361 = _t1362
+                _t1360 = _t1361
+            _t1359 = _t1360
+        prediction691 = _t1359
+        if prediction691 == 12:
+            _t1375 = self.parse_boolean_value()
+            boolean_value703 = _t1375
+            _t1376 = logic_pb2.Value(boolean_value=boolean_value703)
+            _t1374 = _t1376
+        else:
+            if prediction691 == 11:
                 self.consume_literal("missing")
-                _t1374 = logic_pb2.MissingValue()
-                _t1375 = logic_pb2.Value(missing_value=_t1374)
-                _t1373 = _t1375
+                _t1378 = logic_pb2.MissingValue()
+                _t1379 = logic_pb2.Value(missing_value=_t1378)
+                _t1377 = _t1379
             else:
-                if prediction689 == 10:
-                    decimal700 = self.consume_terminal("DECIMAL")
-                    _t1377 = logic_pb2.Value(decimal_value=decimal700)
-                    _t1376 = _t1377
+                if prediction691 == 10:
+                    decimal702 = self.consume_terminal("DECIMAL")
+                    _t1381 = logic_pb2.Value(decimal_value=decimal702)
+                    _t1380 = _t1381
                 else:
-                    if prediction689 == 9:
-                        int128699 = self.consume_terminal("INT128")
-                        _t1379 = logic_pb2.Value(int128_value=int128699)
-                        _t1378 = _t1379
+                    if prediction691 == 9:
+                        int128701 = self.consume_terminal("INT128")
+                        _t1383 = logic_pb2.Value(int128_value=int128701)
+                        _t1382 = _t1383
                     else:
-                        if prediction689 == 8:
-                            uint128698 = self.consume_terminal("UINT128")
-                            _t1381 = logic_pb2.Value(uint128_value=uint128698)
-                            _t1380 = _t1381
+                        if prediction691 == 8:
+                            uint128700 = self.consume_terminal("UINT128")
+                            _t1385 = logic_pb2.Value(uint128_value=uint128700)
+                            _t1384 = _t1385
                         else:
-                            if prediction689 == 7:
-                                uint32697 = self.consume_terminal("UINT32")
-                                _t1383 = logic_pb2.Value(uint32_value=uint32697)
-                                _t1382 = _t1383
+                            if prediction691 == 7:
+                                uint32699 = self.consume_terminal("UINT32")
+                                _t1387 = logic_pb2.Value(uint32_value=uint32699)
+                                _t1386 = _t1387
                             else:
-                                if prediction689 == 6:
-                                    float696 = self.consume_terminal("FLOAT")
-                                    _t1385 = logic_pb2.Value(float_value=float696)
-                                    _t1384 = _t1385
+                                if prediction691 == 6:
+                                    float698 = self.consume_terminal("FLOAT")
+                                    _t1389 = logic_pb2.Value(float_value=float698)
+                                    _t1388 = _t1389
                                 else:
-                                    if prediction689 == 5:
-                                        float32695 = self.consume_terminal("FLOAT32")
-                                        _t1387 = logic_pb2.Value(float32_value=float32695)
-                                        _t1386 = _t1387
+                                    if prediction691 == 5:
+                                        float32697 = self.consume_terminal("FLOAT32")
+                                        _t1391 = logic_pb2.Value(float32_value=float32697)
+                                        _t1390 = _t1391
                                     else:
-                                        if prediction689 == 4:
-                                            int694 = self.consume_terminal("INT")
-                                            _t1389 = logic_pb2.Value(int_value=int694)
-                                            _t1388 = _t1389
+                                        if prediction691 == 4:
+                                            int696 = self.consume_terminal("INT")
+                                            _t1393 = logic_pb2.Value(int_value=int696)
+                                            _t1392 = _t1393
                                         else:
-                                            if prediction689 == 3:
-                                                int32693 = self.consume_terminal("INT32")
-                                                _t1391 = logic_pb2.Value(int32_value=int32693)
-                                                _t1390 = _t1391
+                                            if prediction691 == 3:
+                                                int32695 = self.consume_terminal("INT32")
+                                                _t1395 = logic_pb2.Value(int32_value=int32695)
+                                                _t1394 = _t1395
                                             else:
-                                                if prediction689 == 2:
-                                                    string692 = self.consume_terminal("STRING")
-                                                    _t1393 = logic_pb2.Value(string_value=string692)
-                                                    _t1392 = _t1393
+                                                if prediction691 == 2:
+                                                    string694 = self.consume_terminal("STRING")
+                                                    _t1397 = logic_pb2.Value(string_value=string694)
+                                                    _t1396 = _t1397
                                                 else:
-                                                    if prediction689 == 1:
-                                                        _t1395 = self.parse_raw_datetime()
-                                                        raw_datetime691 = _t1395
-                                                        _t1396 = logic_pb2.Value(datetime_value=raw_datetime691)
-                                                        _t1394 = _t1396
+                                                    if prediction691 == 1:
+                                                        _t1399 = self.parse_raw_datetime()
+                                                        raw_datetime693 = _t1399
+                                                        _t1400 = logic_pb2.Value(datetime_value=raw_datetime693)
+                                                        _t1398 = _t1400
                                                     else:
-                                                        if prediction689 == 0:
-                                                            _t1398 = self.parse_raw_date()
-                                                            raw_date690 = _t1398
-                                                            _t1399 = logic_pb2.Value(date_value=raw_date690)
-                                                            _t1397 = _t1399
+                                                        if prediction691 == 0:
+                                                            _t1402 = self.parse_raw_date()
+                                                            raw_date692 = _t1402
+                                                            _t1403 = logic_pb2.Value(date_value=raw_date692)
+                                                            _t1401 = _t1403
                                                         else:
                                                             raise ParseError("Unexpected token in raw_value" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                                        _t1394 = _t1397
-                                                    _t1392 = _t1394
-                                                _t1390 = _t1392
-                                            _t1388 = _t1390
-                                        _t1386 = _t1388
-                                    _t1384 = _t1386
-                                _t1382 = _t1384
-                            _t1380 = _t1382
-                        _t1378 = _t1380
-                    _t1376 = _t1378
-                _t1373 = _t1376
-            _t1370 = _t1373
-        result703 = _t1370
-        self.record_span(span_start702, "Value")
-        return result703
+                                                        _t1398 = _t1401
+                                                    _t1396 = _t1398
+                                                _t1394 = _t1396
+                                            _t1392 = _t1394
+                                        _t1390 = _t1392
+                                    _t1388 = _t1390
+                                _t1386 = _t1388
+                            _t1384 = _t1386
+                        _t1382 = _t1384
+                    _t1380 = _t1382
+                _t1377 = _t1380
+            _t1374 = _t1377
+        result705 = _t1374
+        self.record_span(span_start704, "Value")
+        return result705
 
     def parse_raw_date(self) -> logic_pb2.DateValue:
-        span_start707 = self.span_start()
+        span_start709 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("date")
-        int704 = self.consume_terminal("INT")
-        int_3705 = self.consume_terminal("INT")
-        int_4706 = self.consume_terminal("INT")
+        int706 = self.consume_terminal("INT")
+        int_3707 = self.consume_terminal("INT")
+        int_4708 = self.consume_terminal("INT")
         self.consume_literal(")")
-        _t1400 = logic_pb2.DateValue(year=int(int704), month=int(int_3705), day=int(int_4706))
-        result708 = _t1400
-        self.record_span(span_start707, "DateValue")
-        return result708
+        _t1404 = logic_pb2.DateValue(year=int(int706), month=int(int_3707), day=int(int_4708))
+        result710 = _t1404
+        self.record_span(span_start709, "DateValue")
+        return result710
 
     def parse_raw_datetime(self) -> logic_pb2.DateTimeValue:
-        span_start716 = self.span_start()
+        span_start718 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("datetime")
-        int709 = self.consume_terminal("INT")
-        int_3710 = self.consume_terminal("INT")
-        int_4711 = self.consume_terminal("INT")
-        int_5712 = self.consume_terminal("INT")
-        int_6713 = self.consume_terminal("INT")
-        int_7714 = self.consume_terminal("INT")
+        int711 = self.consume_terminal("INT")
+        int_3712 = self.consume_terminal("INT")
+        int_4713 = self.consume_terminal("INT")
+        int_5714 = self.consume_terminal("INT")
+        int_6715 = self.consume_terminal("INT")
+        int_7716 = self.consume_terminal("INT")
         if self.match_lookahead_terminal("INT", 0):
-            _t1401 = self.consume_terminal("INT")
+            _t1405 = self.consume_terminal("INT")
         else:
-            _t1401 = None
-        int_8715 = _t1401
+            _t1405 = None
+        int_8717 = _t1405
         self.consume_literal(")")
-        _t1402 = logic_pb2.DateTimeValue(year=int(int709), month=int(int_3710), day=int(int_4711), hour=int(int_5712), minute=int(int_6713), second=int(int_7714), microsecond=int((int_8715 if int_8715 is not None else 0)))
-        result717 = _t1402
-        self.record_span(span_start716, "DateTimeValue")
-        return result717
+        _t1406 = logic_pb2.DateTimeValue(year=int(int711), month=int(int_3712), day=int(int_4713), hour=int(int_5714), minute=int(int_6715), second=int(int_7716), microsecond=int((int_8717 if int_8717 is not None else 0)))
+        result719 = _t1406
+        self.record_span(span_start718, "DateTimeValue")
+        return result719
 
     def parse_boolean_value(self) -> bool:
         if self.match_lookahead_literal("true", 0):
-            _t1403 = 0
+            _t1407 = 0
         else:
             if self.match_lookahead_literal("false", 0):
-                _t1404 = 1
+                _t1408 = 1
             else:
-                _t1404 = -1
-            _t1403 = _t1404
-        prediction718 = _t1403
-        if prediction718 == 1:
+                _t1408 = -1
+            _t1407 = _t1408
+        prediction720 = _t1407
+        if prediction720 == 1:
             self.consume_literal("false")
-            _t1405 = False
+            _t1409 = False
         else:
-            if prediction718 == 0:
+            if prediction720 == 0:
                 self.consume_literal("true")
-                _t1406 = True
+                _t1410 = True
             else:
                 raise ParseError("Unexpected token in boolean_value" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1405 = _t1406
-        return _t1405
+            _t1409 = _t1410
+        return _t1409
 
     def parse_sync(self) -> transactions_pb2.Sync:
-        span_start723 = self.span_start()
+        span_start725 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("sync")
-        xs719 = []
-        cond720 = self.match_lookahead_literal(":", 0)
-        while cond720:
-            _t1407 = self.parse_fragment_id()
-            item721 = _t1407
-            xs719.append(item721)
-            cond720 = self.match_lookahead_literal(":", 0)
-        fragment_ids722 = xs719
-        self.consume_literal(")")
-        _t1408 = transactions_pb2.Sync(fragments=fragment_ids722)
-        result724 = _t1408
-        self.record_span(span_start723, "Sync")
-        return result724
+        xs721 = []
+        cond722 = self.match_lookahead_literal(":", 0)
+        while cond722:
+            _t1411 = self.parse_fragment_id()
+            item723 = _t1411
+            xs721.append(item723)
+            cond722 = self.match_lookahead_literal(":", 0)
+        fragment_ids724 = xs721
+        self.consume_literal(")")
+        _t1412 = transactions_pb2.Sync(fragments=fragment_ids724)
+        result726 = _t1412
+        self.record_span(span_start725, "Sync")
+        return result726
 
     def parse_fragment_id(self) -> fragments_pb2.FragmentId:
-        span_start726 = self.span_start()
+        span_start728 = self.span_start()
         self.consume_literal(":")
-        symbol725 = self.consume_terminal("SYMBOL")
-        result727 = fragments_pb2.FragmentId(id=symbol725.encode())
-        self.record_span(span_start726, "FragmentId")
-        return result727
+        symbol727 = self.consume_terminal("SYMBOL")
+        result729 = fragments_pb2.FragmentId(id=symbol727.encode())
+        self.record_span(span_start728, "FragmentId")
+        return result729
 
     def parse_epoch(self) -> transactions_pb2.Epoch:
-        span_start730 = self.span_start()
+        span_start732 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("epoch")
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("writes", 1)):
-            _t1410 = self.parse_epoch_writes()
-            _t1409 = _t1410
+            _t1414 = self.parse_epoch_writes()
+            _t1413 = _t1414
         else:
-            _t1409 = None
-        epoch_writes728 = _t1409
+            _t1413 = None
+        epoch_writes730 = _t1413
         if self.match_lookahead_literal("(", 0):
-            _t1412 = self.parse_epoch_reads()
-            _t1411 = _t1412
+            _t1416 = self.parse_epoch_reads()
+            _t1415 = _t1416
         else:
-            _t1411 = None
-        epoch_reads729 = _t1411
+            _t1415 = None
+        epoch_reads731 = _t1415
         self.consume_literal(")")
-        _t1413 = transactions_pb2.Epoch(writes=(epoch_writes728 if epoch_writes728 is not None else []), reads=(epoch_reads729 if epoch_reads729 is not None else []))
-        result731 = _t1413
-        self.record_span(span_start730, "Epoch")
-        return result731
+        _t1417 = transactions_pb2.Epoch(writes=(epoch_writes730 if epoch_writes730 is not None else []), reads=(epoch_reads731 if epoch_reads731 is not None else []))
+        result733 = _t1417
+        self.record_span(span_start732, "Epoch")
+        return result733
 
     def parse_epoch_writes(self) -> Sequence[transactions_pb2.Write]:
         self.consume_literal("(")
         self.consume_literal("writes")
-        xs732 = []
-        cond733 = self.match_lookahead_literal("(", 0)
-        while cond733:
-            _t1414 = self.parse_write()
-            item734 = _t1414
-            xs732.append(item734)
-            cond733 = self.match_lookahead_literal("(", 0)
-        writes735 = xs732
+        xs734 = []
+        cond735 = self.match_lookahead_literal("(", 0)
+        while cond735:
+            _t1418 = self.parse_write()
+            item736 = _t1418
+            xs734.append(item736)
+            cond735 = self.match_lookahead_literal("(", 0)
+        writes737 = xs734
         self.consume_literal(")")
-        return writes735
+        return writes737
 
     def parse_write(self) -> transactions_pb2.Write:
-        span_start741 = self.span_start()
+        span_start743 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("undefine", 1):
-                _t1416 = 1
+                _t1420 = 1
             else:
                 if self.match_lookahead_literal("snapshot", 1):
-                    _t1417 = 3
+                    _t1421 = 3
                 else:
                     if self.match_lookahead_literal("define", 1):
-                        _t1418 = 0
+                        _t1422 = 0
                     else:
                         if self.match_lookahead_literal("context", 1):
-                            _t1419 = 2
+                            _t1423 = 2
                         else:
-                            _t1419 = -1
-                        _t1418 = _t1419
-                    _t1417 = _t1418
-                _t1416 = _t1417
-            _t1415 = _t1416
-        else:
-            _t1415 = -1
-        prediction736 = _t1415
-        if prediction736 == 3:
-            _t1421 = self.parse_snapshot()
-            snapshot740 = _t1421
-            _t1422 = transactions_pb2.Write(snapshot=snapshot740)
-            _t1420 = _t1422
-        else:
-            if prediction736 == 2:
-                _t1424 = self.parse_context()
-                context739 = _t1424
-                _t1425 = transactions_pb2.Write(context=context739)
-                _t1423 = _t1425
+                            _t1423 = -1
+                        _t1422 = _t1423
+                    _t1421 = _t1422
+                _t1420 = _t1421
+            _t1419 = _t1420
+        else:
+            _t1419 = -1
+        prediction738 = _t1419
+        if prediction738 == 3:
+            _t1425 = self.parse_snapshot()
+            snapshot742 = _t1425
+            _t1426 = transactions_pb2.Write(snapshot=snapshot742)
+            _t1424 = _t1426
+        else:
+            if prediction738 == 2:
+                _t1428 = self.parse_context()
+                context741 = _t1428
+                _t1429 = transactions_pb2.Write(context=context741)
+                _t1427 = _t1429
             else:
-                if prediction736 == 1:
-                    _t1427 = self.parse_undefine()
-                    undefine738 = _t1427
-                    _t1428 = transactions_pb2.Write(undefine=undefine738)
-                    _t1426 = _t1428
+                if prediction738 == 1:
+                    _t1431 = self.parse_undefine()
+                    undefine740 = _t1431
+                    _t1432 = transactions_pb2.Write(undefine=undefine740)
+                    _t1430 = _t1432
                 else:
-                    if prediction736 == 0:
-                        _t1430 = self.parse_define()
-                        define737 = _t1430
-                        _t1431 = transactions_pb2.Write(define=define737)
-                        _t1429 = _t1431
+                    if prediction738 == 0:
+                        _t1434 = self.parse_define()
+                        define739 = _t1434
+                        _t1435 = transactions_pb2.Write(define=define739)
+                        _t1433 = _t1435
                     else:
                         raise ParseError("Unexpected token in write" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                    _t1426 = _t1429
-                _t1423 = _t1426
-            _t1420 = _t1423
-        result742 = _t1420
-        self.record_span(span_start741, "Write")
-        return result742
+                    _t1430 = _t1433
+                _t1427 = _t1430
+            _t1424 = _t1427
+        result744 = _t1424
+        self.record_span(span_start743, "Write")
+        return result744
 
     def parse_define(self) -> transactions_pb2.Define:
-        span_start744 = self.span_start()
+        span_start746 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("define")
-        _t1432 = self.parse_fragment()
-        fragment743 = _t1432
+        _t1436 = self.parse_fragment()
+        fragment745 = _t1436
         self.consume_literal(")")
-        _t1433 = transactions_pb2.Define(fragment=fragment743)
-        result745 = _t1433
-        self.record_span(span_start744, "Define")
-        return result745
+        _t1437 = transactions_pb2.Define(fragment=fragment745)
+        result747 = _t1437
+        self.record_span(span_start746, "Define")
+        return result747
 
     def parse_fragment(self) -> fragments_pb2.Fragment:
-        span_start751 = self.span_start()
+        span_start753 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("fragment")
-        _t1434 = self.parse_new_fragment_id()
-        new_fragment_id746 = _t1434
-        xs747 = []
-        cond748 = self.match_lookahead_literal("(", 0)
-        while cond748:
-            _t1435 = self.parse_declaration()
-            item749 = _t1435
-            xs747.append(item749)
-            cond748 = self.match_lookahead_literal("(", 0)
-        declarations750 = xs747
-        self.consume_literal(")")
-        result752 = self.construct_fragment(new_fragment_id746, declarations750)
-        self.record_span(span_start751, "Fragment")
-        return result752
+        _t1438 = self.parse_new_fragment_id()
+        new_fragment_id748 = _t1438
+        xs749 = []
+        cond750 = self.match_lookahead_literal("(", 0)
+        while cond750:
+            _t1439 = self.parse_declaration()
+            item751 = _t1439
+            xs749.append(item751)
+            cond750 = self.match_lookahead_literal("(", 0)
+        declarations752 = xs749
+        self.consume_literal(")")
+        result754 = self.construct_fragment(new_fragment_id748, declarations752)
+        self.record_span(span_start753, "Fragment")
+        return result754
 
     def parse_new_fragment_id(self) -> fragments_pb2.FragmentId:
-        span_start754 = self.span_start()
-        _t1436 = self.parse_fragment_id()
-        fragment_id753 = _t1436
-        self.start_fragment(fragment_id753)
-        result755 = fragment_id753
-        self.record_span(span_start754, "FragmentId")
-        return result755
+        span_start756 = self.span_start()
+        _t1440 = self.parse_fragment_id()
+        fragment_id755 = _t1440
+        self.start_fragment(fragment_id755)
+        result757 = fragment_id755
+        self.record_span(span_start756, "FragmentId")
+        return result757
 
     def parse_declaration(self) -> logic_pb2.Declaration:
-        span_start761 = self.span_start()
+        span_start763 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("iceberg_data", 1):
-                _t1438 = 3
+                _t1442 = 3
             else:
                 if self.match_lookahead_literal("functional_dependency", 1):
-                    _t1439 = 2
+                    _t1443 = 2
                 else:
                     if self.match_lookahead_literal("edb", 1):
-                        _t1440 = 3
+                        _t1444 = 3
                     else:
                         if self.match_lookahead_literal("def", 1):
-                            _t1441 = 0
+                            _t1445 = 0
                         else:
                             if self.match_lookahead_literal("csv_data", 1):
-                                _t1442 = 3
+                                _t1446 = 3
                             else:
                                 if self.match_lookahead_literal("betree_relation", 1):
-                                    _t1443 = 3
+                                    _t1447 = 3
                                 else:
                                     if self.match_lookahead_literal("algorithm", 1):
-                                        _t1444 = 1
+                                        _t1448 = 1
                                     else:
-                                        _t1444 = -1
-                                    _t1443 = _t1444
-                                _t1442 = _t1443
-                            _t1441 = _t1442
-                        _t1440 = _t1441
-                    _t1439 = _t1440
-                _t1438 = _t1439
-            _t1437 = _t1438
-        else:
-            _t1437 = -1
-        prediction756 = _t1437
-        if prediction756 == 3:
-            _t1446 = self.parse_data()
-            data760 = _t1446
-            _t1447 = logic_pb2.Declaration(data=data760)
-            _t1445 = _t1447
-        else:
-            if prediction756 == 2:
-                _t1449 = self.parse_constraint()
-                constraint759 = _t1449
-                _t1450 = logic_pb2.Declaration(constraint=constraint759)
-                _t1448 = _t1450
+                                        _t1448 = -1
+                                    _t1447 = _t1448
+                                _t1446 = _t1447
+                            _t1445 = _t1446
+                        _t1444 = _t1445
+                    _t1443 = _t1444
+                _t1442 = _t1443
+            _t1441 = _t1442
+        else:
+            _t1441 = -1
+        prediction758 = _t1441
+        if prediction758 == 3:
+            _t1450 = self.parse_data()
+            data762 = _t1450
+            _t1451 = logic_pb2.Declaration(data=data762)
+            _t1449 = _t1451
+        else:
+            if prediction758 == 2:
+                _t1453 = self.parse_constraint()
+                constraint761 = _t1453
+                _t1454 = logic_pb2.Declaration(constraint=constraint761)
+                _t1452 = _t1454
             else:
-                if prediction756 == 1:
-                    _t1452 = self.parse_algorithm()
-                    algorithm758 = _t1452
-                    _t1453 = logic_pb2.Declaration(algorithm=algorithm758)
-                    _t1451 = _t1453
+                if prediction758 == 1:
+                    _t1456 = self.parse_algorithm()
+                    algorithm760 = _t1456
+                    _t1457 = logic_pb2.Declaration(algorithm=algorithm760)
+                    _t1455 = _t1457
                 else:
-                    if prediction756 == 0:
-                        _t1455 = self.parse_def()
-                        def757 = _t1455
-                        _t1456 = logic_pb2.Declaration()
-                        getattr(_t1456, 'def').CopyFrom(def757)
-                        _t1454 = _t1456
+                    if prediction758 == 0:
+                        _t1459 = self.parse_def()
+                        def759 = _t1459
+                        _t1460 = logic_pb2.Declaration()
+                        getattr(_t1460, 'def').CopyFrom(def759)
+                        _t1458 = _t1460
                     else:
                         raise ParseError("Unexpected token in declaration" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                    _t1451 = _t1454
-                _t1448 = _t1451
-            _t1445 = _t1448
-        result762 = _t1445
-        self.record_span(span_start761, "Declaration")
-        return result762
+                    _t1455 = _t1458
+                _t1452 = _t1455
+            _t1449 = _t1452
+        result764 = _t1449
+        self.record_span(span_start763, "Declaration")
+        return result764
 
     def parse_def(self) -> logic_pb2.Def:
-        span_start766 = self.span_start()
+        span_start768 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("def")
-        _t1457 = self.parse_relation_id()
-        relation_id763 = _t1457
-        _t1458 = self.parse_abstraction()
-        abstraction764 = _t1458
+        _t1461 = self.parse_relation_id()
+        relation_id765 = _t1461
+        _t1462 = self.parse_abstraction()
+        abstraction766 = _t1462
         if self.match_lookahead_literal("(", 0):
-            _t1460 = self.parse_attrs()
-            _t1459 = _t1460
+            _t1464 = self.parse_attrs()
+            _t1463 = _t1464
         else:
-            _t1459 = None
-        attrs765 = _t1459
+            _t1463 = None
+        attrs767 = _t1463
         self.consume_literal(")")
-        _t1461 = logic_pb2.Def(name=relation_id763, body=abstraction764, attrs=(attrs765 if attrs765 is not None else []))
-        result767 = _t1461
-        self.record_span(span_start766, "Def")
-        return result767
+        _t1465 = logic_pb2.Def(name=relation_id765, body=abstraction766, attrs=(attrs767 if attrs767 is not None else []))
+        result769 = _t1465
+        self.record_span(span_start768, "Def")
+        return result769
 
     def parse_relation_id(self) -> logic_pb2.RelationId:
-        span_start771 = self.span_start()
+        span_start773 = self.span_start()
         if self.match_lookahead_literal(":", 0):
-            _t1462 = 0
+            _t1466 = 0
         else:
             if self.match_lookahead_terminal("UINT128", 0):
-                _t1463 = 1
+                _t1467 = 1
             else:
-                _t1463 = -1
-            _t1462 = _t1463
-        prediction768 = _t1462
-        if prediction768 == 1:
-            uint128770 = self.consume_terminal("UINT128")
-            _t1464 = logic_pb2.RelationId(id_low=uint128770.low, id_high=uint128770.high)
-        else:
-            if prediction768 == 0:
+                _t1467 = -1
+            _t1466 = _t1467
+        prediction770 = _t1466
+        if prediction770 == 1:
+            uint128772 = self.consume_terminal("UINT128")
+            _t1468 = logic_pb2.RelationId(id_low=uint128772.low, id_high=uint128772.high)
+        else:
+            if prediction770 == 0:
                 self.consume_literal(":")
-                symbol769 = self.consume_terminal("SYMBOL")
-                _t1465 = self.relation_id_from_string(symbol769)
+                symbol771 = self.consume_terminal("SYMBOL")
+                _t1469 = self.relation_id_from_string(symbol771)
             else:
                 raise ParseError("Unexpected token in relation_id" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1464 = _t1465
-        result772 = _t1464
-        self.record_span(span_start771, "RelationId")
-        return result772
+            _t1468 = _t1469
+        result774 = _t1468
+        self.record_span(span_start773, "RelationId")
+        return result774
 
     def parse_abstraction(self) -> logic_pb2.Abstraction:
-        span_start775 = self.span_start()
+        span_start777 = self.span_start()
         self.consume_literal("(")
-        _t1466 = self.parse_bindings()
-        bindings773 = _t1466
-        _t1467 = self.parse_formula()
-        formula774 = _t1467
+        _t1470 = self.parse_bindings()
+        bindings775 = _t1470
+        _t1471 = self.parse_formula()
+        formula776 = _t1471
         self.consume_literal(")")
-        _t1468 = logic_pb2.Abstraction(vars=(list(bindings773[0]) + list(bindings773[1] if bindings773[1] is not None else [])), value=formula774)
-        result776 = _t1468
-        self.record_span(span_start775, "Abstraction")
-        return result776
+        _t1472 = logic_pb2.Abstraction(vars=(list(bindings775[0]) + list(bindings775[1] if bindings775[1] is not None else [])), value=formula776)
+        result778 = _t1472
+        self.record_span(span_start777, "Abstraction")
+        return result778
 
     def parse_bindings(self) -> tuple[Sequence[logic_pb2.Binding], Sequence[logic_pb2.Binding]]:
         self.consume_literal("[")
-        xs777 = []
-        cond778 = self.match_lookahead_terminal("SYMBOL", 0)
-        while cond778:
-            _t1469 = self.parse_binding()
-            item779 = _t1469
-            xs777.append(item779)
-            cond778 = self.match_lookahead_terminal("SYMBOL", 0)
-        bindings780 = xs777
+        xs779 = []
+        cond780 = self.match_lookahead_terminal("SYMBOL", 0)
+        while cond780:
+            _t1473 = self.parse_binding()
+            item781 = _t1473
+            xs779.append(item781)
+            cond780 = self.match_lookahead_terminal("SYMBOL", 0)
+        bindings782 = xs779
         if self.match_lookahead_literal("|", 0):
-            _t1471 = self.parse_value_bindings()
-            _t1470 = _t1471
+            _t1475 = self.parse_value_bindings()
+            _t1474 = _t1475
         else:
-            _t1470 = None
-        value_bindings781 = _t1470
+            _t1474 = None
+        value_bindings783 = _t1474
         self.consume_literal("]")
-        return (bindings780, (value_bindings781 if value_bindings781 is not None else []),)
+        return (bindings782, (value_bindings783 if value_bindings783 is not None else []),)
 
     def parse_binding(self) -> logic_pb2.Binding:
-        span_start784 = self.span_start()
-        symbol782 = self.consume_terminal("SYMBOL")
+        span_start786 = self.span_start()
+        symbol784 = self.consume_terminal("SYMBOL")
         self.consume_literal("::")
-        _t1472 = self.parse_type()
-        type783 = _t1472
-        _t1473 = logic_pb2.Var(name=symbol782)
-        _t1474 = logic_pb2.Binding(var=_t1473, type=type783)
-        result785 = _t1474
-        self.record_span(span_start784, "Binding")
-        return result785
+        _t1476 = self.parse_type()
+        type785 = _t1476
+        _t1477 = logic_pb2.Var(name=symbol784)
+        _t1478 = logic_pb2.Binding(var=_t1477, type=type785)
+        result787 = _t1478
+        self.record_span(span_start786, "Binding")
+        return result787
 
     def parse_type(self) -> logic_pb2.Type:
-        span_start801 = self.span_start()
+        span_start803 = self.span_start()
         if self.match_lookahead_literal("UNKNOWN", 0):
-            _t1475 = 0
+            _t1479 = 0
         else:
             if self.match_lookahead_literal("UINT32", 0):
-                _t1476 = 13
+                _t1480 = 13
             else:
                 if self.match_lookahead_literal("UINT128", 0):
-                    _t1477 = 4
+                    _t1481 = 4
                 else:
                     if self.match_lookahead_literal("STRING", 0):
-                        _t1478 = 1
+                        _t1482 = 1
                     else:
                         if self.match_lookahead_literal("MISSING", 0):
-                            _t1479 = 8
+                            _t1483 = 8
                         else:
                             if self.match_lookahead_literal("INT32", 0):
-                                _t1480 = 11
+                                _t1484 = 11
                             else:
                                 if self.match_lookahead_literal("INT128", 0):
-                                    _t1481 = 5
+                                    _t1485 = 5
                                 else:
                                     if self.match_lookahead_literal("INT", 0):
-                                        _t1482 = 2
+                                        _t1486 = 2
                                     else:
                                         if self.match_lookahead_literal("FLOAT32", 0):
-                                            _t1483 = 12
+                                            _t1487 = 12
                                         else:
                                             if self.match_lookahead_literal("FLOAT", 0):
-                                                _t1484 = 3
+                                                _t1488 = 3
                                             else:
                                                 if self.match_lookahead_literal("DATETIME", 0):
-                                                    _t1485 = 7
+                                                    _t1489 = 7
                                                 else:
                                                     if self.match_lookahead_literal("DATE", 0):
-                                                        _t1486 = 6
+                                                        _t1490 = 6
                                                     else:
                                                         if self.match_lookahead_literal("BOOLEAN", 0):
-                                                            _t1487 = 10
+                                                            _t1491 = 10
                                                         else:
                                                             if self.match_lookahead_literal("(", 0):
-                                                                _t1488 = 9
+                                                                _t1492 = 9
                                                             else:
-                                                                _t1488 = -1
-                                                            _t1487 = _t1488
-                                                        _t1486 = _t1487
-                                                    _t1485 = _t1486
-                                                _t1484 = _t1485
-                                            _t1483 = _t1484
-                                        _t1482 = _t1483
-                                    _t1481 = _t1482
-                                _t1480 = _t1481
-                            _t1479 = _t1480
-                        _t1478 = _t1479
-                    _t1477 = _t1478
-                _t1476 = _t1477
-            _t1475 = _t1476
-        prediction786 = _t1475
-        if prediction786 == 13:
-            _t1490 = self.parse_uint32_type()
-            uint32_type800 = _t1490
-            _t1491 = logic_pb2.Type(uint32_type=uint32_type800)
-            _t1489 = _t1491
-        else:
-            if prediction786 == 12:
-                _t1493 = self.parse_float32_type()
-                float32_type799 = _t1493
-                _t1494 = logic_pb2.Type(float32_type=float32_type799)
-                _t1492 = _t1494
+                                                                _t1492 = -1
+                                                            _t1491 = _t1492
+                                                        _t1490 = _t1491
+                                                    _t1489 = _t1490
+                                                _t1488 = _t1489
+                                            _t1487 = _t1488
+                                        _t1486 = _t1487
+                                    _t1485 = _t1486
+                                _t1484 = _t1485
+                            _t1483 = _t1484
+                        _t1482 = _t1483
+                    _t1481 = _t1482
+                _t1480 = _t1481
+            _t1479 = _t1480
+        prediction788 = _t1479
+        if prediction788 == 13:
+            _t1494 = self.parse_uint32_type()
+            uint32_type802 = _t1494
+            _t1495 = logic_pb2.Type(uint32_type=uint32_type802)
+            _t1493 = _t1495
+        else:
+            if prediction788 == 12:
+                _t1497 = self.parse_float32_type()
+                float32_type801 = _t1497
+                _t1498 = logic_pb2.Type(float32_type=float32_type801)
+                _t1496 = _t1498
             else:
-                if prediction786 == 11:
-                    _t1496 = self.parse_int32_type()
-                    int32_type798 = _t1496
-                    _t1497 = logic_pb2.Type(int32_type=int32_type798)
-                    _t1495 = _t1497
+                if prediction788 == 11:
+                    _t1500 = self.parse_int32_type()
+                    int32_type800 = _t1500
+                    _t1501 = logic_pb2.Type(int32_type=int32_type800)
+                    _t1499 = _t1501
                 else:
-                    if prediction786 == 10:
-                        _t1499 = self.parse_boolean_type()
-                        boolean_type797 = _t1499
-                        _t1500 = logic_pb2.Type(boolean_type=boolean_type797)
-                        _t1498 = _t1500
+                    if prediction788 == 10:
+                        _t1503 = self.parse_boolean_type()
+                        boolean_type799 = _t1503
+                        _t1504 = logic_pb2.Type(boolean_type=boolean_type799)
+                        _t1502 = _t1504
                     else:
-                        if prediction786 == 9:
-                            _t1502 = self.parse_decimal_type()
-                            decimal_type796 = _t1502
-                            _t1503 = logic_pb2.Type(decimal_type=decimal_type796)
-                            _t1501 = _t1503
+                        if prediction788 == 9:
+                            _t1506 = self.parse_decimal_type()
+                            decimal_type798 = _t1506
+                            _t1507 = logic_pb2.Type(decimal_type=decimal_type798)
+                            _t1505 = _t1507
                         else:
-                            if prediction786 == 8:
-                                _t1505 = self.parse_missing_type()
-                                missing_type795 = _t1505
-                                _t1506 = logic_pb2.Type(missing_type=missing_type795)
-                                _t1504 = _t1506
+                            if prediction788 == 8:
+                                _t1509 = self.parse_missing_type()
+                                missing_type797 = _t1509
+                                _t1510 = logic_pb2.Type(missing_type=missing_type797)
+                                _t1508 = _t1510
                             else:
-                                if prediction786 == 7:
-                                    _t1508 = self.parse_datetime_type()
-                                    datetime_type794 = _t1508
-                                    _t1509 = logic_pb2.Type(datetime_type=datetime_type794)
-                                    _t1507 = _t1509
+                                if prediction788 == 7:
+                                    _t1512 = self.parse_datetime_type()
+                                    datetime_type796 = _t1512
+                                    _t1513 = logic_pb2.Type(datetime_type=datetime_type796)
+                                    _t1511 = _t1513
                                 else:
-                                    if prediction786 == 6:
-                                        _t1511 = self.parse_date_type()
-                                        date_type793 = _t1511
-                                        _t1512 = logic_pb2.Type(date_type=date_type793)
-                                        _t1510 = _t1512
+                                    if prediction788 == 6:
+                                        _t1515 = self.parse_date_type()
+                                        date_type795 = _t1515
+                                        _t1516 = logic_pb2.Type(date_type=date_type795)
+                                        _t1514 = _t1516
                                     else:
-                                        if prediction786 == 5:
-                                            _t1514 = self.parse_int128_type()
-                                            int128_type792 = _t1514
-                                            _t1515 = logic_pb2.Type(int128_type=int128_type792)
-                                            _t1513 = _t1515
+                                        if prediction788 == 5:
+                                            _t1518 = self.parse_int128_type()
+                                            int128_type794 = _t1518
+                                            _t1519 = logic_pb2.Type(int128_type=int128_type794)
+                                            _t1517 = _t1519
                                         else:
-                                            if prediction786 == 4:
-                                                _t1517 = self.parse_uint128_type()
-                                                uint128_type791 = _t1517
-                                                _t1518 = logic_pb2.Type(uint128_type=uint128_type791)
-                                                _t1516 = _t1518
+                                            if prediction788 == 4:
+                                                _t1521 = self.parse_uint128_type()
+                                                uint128_type793 = _t1521
+                                                _t1522 = logic_pb2.Type(uint128_type=uint128_type793)
+                                                _t1520 = _t1522
                                             else:
-                                                if prediction786 == 3:
-                                                    _t1520 = self.parse_float_type()
-                                                    float_type790 = _t1520
-                                                    _t1521 = logic_pb2.Type(float_type=float_type790)
-                                                    _t1519 = _t1521
+                                                if prediction788 == 3:
+                                                    _t1524 = self.parse_float_type()
+                                                    float_type792 = _t1524
+                                                    _t1525 = logic_pb2.Type(float_type=float_type792)
+                                                    _t1523 = _t1525
                                                 else:
-                                                    if prediction786 == 2:
-                                                        _t1523 = self.parse_int_type()
-                                                        int_type789 = _t1523
-                                                        _t1524 = logic_pb2.Type(int_type=int_type789)
-                                                        _t1522 = _t1524
+                                                    if prediction788 == 2:
+                                                        _t1527 = self.parse_int_type()
+                                                        int_type791 = _t1527
+                                                        _t1528 = logic_pb2.Type(int_type=int_type791)
+                                                        _t1526 = _t1528
                                                     else:
-                                                        if prediction786 == 1:
-                                                            _t1526 = self.parse_string_type()
-                                                            string_type788 = _t1526
-                                                            _t1527 = logic_pb2.Type(string_type=string_type788)
-                                                            _t1525 = _t1527
+                                                        if prediction788 == 1:
+                                                            _t1530 = self.parse_string_type()
+                                                            string_type790 = _t1530
+                                                            _t1531 = logic_pb2.Type(string_type=string_type790)
+                                                            _t1529 = _t1531
                                                         else:
-                                                            if prediction786 == 0:
-                                                                _t1529 = self.parse_unspecified_type()
-                                                                unspecified_type787 = _t1529
-                                                                _t1530 = logic_pb2.Type(unspecified_type=unspecified_type787)
-                                                                _t1528 = _t1530
+                                                            if prediction788 == 0:
+                                                                _t1533 = self.parse_unspecified_type()
+                                                                unspecified_type789 = _t1533
+                                                                _t1534 = logic_pb2.Type(unspecified_type=unspecified_type789)
+                                                                _t1532 = _t1534
                                                             else:
                                                                 raise ParseError("Unexpected token in type" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                                            _t1525 = _t1528
-                                                        _t1522 = _t1525
-                                                    _t1519 = _t1522
-                                                _t1516 = _t1519
-                                            _t1513 = _t1516
-                                        _t1510 = _t1513
-                                    _t1507 = _t1510
-                                _t1504 = _t1507
-                            _t1501 = _t1504
-                        _t1498 = _t1501
-                    _t1495 = _t1498
-                _t1492 = _t1495
-            _t1489 = _t1492
-        result802 = _t1489
-        self.record_span(span_start801, "Type")
-        return result802
+                                                            _t1529 = _t1532
+                                                        _t1526 = _t1529
+                                                    _t1523 = _t1526
+                                                _t1520 = _t1523
+                                            _t1517 = _t1520
+                                        _t1514 = _t1517
+                                    _t1511 = _t1514
+                                _t1508 = _t1511
+                            _t1505 = _t1508
+                        _t1502 = _t1505
+                    _t1499 = _t1502
+                _t1496 = _t1499
+            _t1493 = _t1496
+        result804 = _t1493
+        self.record_span(span_start803, "Type")
+        return result804
 
     def parse_unspecified_type(self) -> logic_pb2.UnspecifiedType:
-        span_start803 = self.span_start()
+        span_start805 = self.span_start()
         self.consume_literal("UNKNOWN")
-        _t1531 = logic_pb2.UnspecifiedType()
-        result804 = _t1531
-        self.record_span(span_start803, "UnspecifiedType")
-        return result804
+        _t1535 = logic_pb2.UnspecifiedType()
+        result806 = _t1535
+        self.record_span(span_start805, "UnspecifiedType")
+        return result806
 
     def parse_string_type(self) -> logic_pb2.StringType:
-        span_start805 = self.span_start()
+        span_start807 = self.span_start()
         self.consume_literal("STRING")
-        _t1532 = logic_pb2.StringType()
-        result806 = _t1532
-        self.record_span(span_start805, "StringType")
-        return result806
+        _t1536 = logic_pb2.StringType()
+        result808 = _t1536
+        self.record_span(span_start807, "StringType")
+        return result808
 
     def parse_int_type(self) -> logic_pb2.IntType:
-        span_start807 = self.span_start()
+        span_start809 = self.span_start()
         self.consume_literal("INT")
-        _t1533 = logic_pb2.IntType()
-        result808 = _t1533
-        self.record_span(span_start807, "IntType")
-        return result808
+        _t1537 = logic_pb2.IntType()
+        result810 = _t1537
+        self.record_span(span_start809, "IntType")
+        return result810
 
     def parse_float_type(self) -> logic_pb2.FloatType:
-        span_start809 = self.span_start()
+        span_start811 = self.span_start()
         self.consume_literal("FLOAT")
-        _t1534 = logic_pb2.FloatType()
-        result810 = _t1534
-        self.record_span(span_start809, "FloatType")
-        return result810
+        _t1538 = logic_pb2.FloatType()
+        result812 = _t1538
+        self.record_span(span_start811, "FloatType")
+        return result812
 
     def parse_uint128_type(self) -> logic_pb2.UInt128Type:
-        span_start811 = self.span_start()
+        span_start813 = self.span_start()
         self.consume_literal("UINT128")
-        _t1535 = logic_pb2.UInt128Type()
-        result812 = _t1535
-        self.record_span(span_start811, "UInt128Type")
-        return result812
+        _t1539 = logic_pb2.UInt128Type()
+        result814 = _t1539
+        self.record_span(span_start813, "UInt128Type")
+        return result814
 
     def parse_int128_type(self) -> logic_pb2.Int128Type:
-        span_start813 = self.span_start()
+        span_start815 = self.span_start()
         self.consume_literal("INT128")
-        _t1536 = logic_pb2.Int128Type()
-        result814 = _t1536
-        self.record_span(span_start813, "Int128Type")
-        return result814
+        _t1540 = logic_pb2.Int128Type()
+        result816 = _t1540
+        self.record_span(span_start815, "Int128Type")
+        return result816
 
     def parse_date_type(self) -> logic_pb2.DateType:
-        span_start815 = self.span_start()
+        span_start817 = self.span_start()
         self.consume_literal("DATE")
-        _t1537 = logic_pb2.DateType()
-        result816 = _t1537
-        self.record_span(span_start815, "DateType")
-        return result816
+        _t1541 = logic_pb2.DateType()
+        result818 = _t1541
+        self.record_span(span_start817, "DateType")
+        return result818
 
     def parse_datetime_type(self) -> logic_pb2.DateTimeType:
-        span_start817 = self.span_start()
+        span_start819 = self.span_start()
         self.consume_literal("DATETIME")
-        _t1538 = logic_pb2.DateTimeType()
-        result818 = _t1538
-        self.record_span(span_start817, "DateTimeType")
-        return result818
+        _t1542 = logic_pb2.DateTimeType()
+        result820 = _t1542
+        self.record_span(span_start819, "DateTimeType")
+        return result820
 
     def parse_missing_type(self) -> logic_pb2.MissingType:
-        span_start819 = self.span_start()
+        span_start821 = self.span_start()
         self.consume_literal("MISSING")
-        _t1539 = logic_pb2.MissingType()
-        result820 = _t1539
-        self.record_span(span_start819, "MissingType")
-        return result820
+        _t1543 = logic_pb2.MissingType()
+        result822 = _t1543
+        self.record_span(span_start821, "MissingType")
+        return result822
 
     def parse_decimal_type(self) -> logic_pb2.DecimalType:
-        span_start823 = self.span_start()
+        span_start825 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("DECIMAL")
-        int821 = self.consume_terminal("INT")
-        int_3822 = self.consume_terminal("INT")
+        int823 = self.consume_terminal("INT")
+        int_3824 = self.consume_terminal("INT")
         self.consume_literal(")")
-        _t1540 = logic_pb2.DecimalType(precision=int(int821), scale=int(int_3822))
-        result824 = _t1540
-        self.record_span(span_start823, "DecimalType")
-        return result824
+        _t1544 = logic_pb2.DecimalType(precision=int(int823), scale=int(int_3824))
+        result826 = _t1544
+        self.record_span(span_start825, "DecimalType")
+        return result826
 
     def parse_boolean_type(self) -> logic_pb2.BooleanType:
-        span_start825 = self.span_start()
+        span_start827 = self.span_start()
         self.consume_literal("BOOLEAN")
-        _t1541 = logic_pb2.BooleanType()
-        result826 = _t1541
-        self.record_span(span_start825, "BooleanType")
-        return result826
+        _t1545 = logic_pb2.BooleanType()
+        result828 = _t1545
+        self.record_span(span_start827, "BooleanType")
+        return result828
 
     def parse_int32_type(self) -> logic_pb2.Int32Type:
-        span_start827 = self.span_start()
+        span_start829 = self.span_start()
         self.consume_literal("INT32")
-        _t1542 = logic_pb2.Int32Type()
-        result828 = _t1542
-        self.record_span(span_start827, "Int32Type")
-        return result828
+        _t1546 = logic_pb2.Int32Type()
+        result830 = _t1546
+        self.record_span(span_start829, "Int32Type")
+        return result830
 
     def parse_float32_type(self) -> logic_pb2.Float32Type:
-        span_start829 = self.span_start()
+        span_start831 = self.span_start()
         self.consume_literal("FLOAT32")
-        _t1543 = logic_pb2.Float32Type()
-        result830 = _t1543
-        self.record_span(span_start829, "Float32Type")
-        return result830
+        _t1547 = logic_pb2.Float32Type()
+        result832 = _t1547
+        self.record_span(span_start831, "Float32Type")
+        return result832
 
     def parse_uint32_type(self) -> logic_pb2.UInt32Type:
-        span_start831 = self.span_start()
+        span_start833 = self.span_start()
         self.consume_literal("UINT32")
-        _t1544 = logic_pb2.UInt32Type()
-        result832 = _t1544
-        self.record_span(span_start831, "UInt32Type")
-        return result832
+        _t1548 = logic_pb2.UInt32Type()
+        result834 = _t1548
+        self.record_span(span_start833, "UInt32Type")
+        return result834
 
     def parse_value_bindings(self) -> Sequence[logic_pb2.Binding]:
         self.consume_literal("|")
-        xs833 = []
-        cond834 = self.match_lookahead_terminal("SYMBOL", 0)
-        while cond834:
-            _t1545 = self.parse_binding()
-            item835 = _t1545
-            xs833.append(item835)
-            cond834 = self.match_lookahead_terminal("SYMBOL", 0)
-        bindings836 = xs833
-        return bindings836
+        xs835 = []
+        cond836 = self.match_lookahead_terminal("SYMBOL", 0)
+        while cond836:
+            _t1549 = self.parse_binding()
+            item837 = _t1549
+            xs835.append(item837)
+            cond836 = self.match_lookahead_terminal("SYMBOL", 0)
+        bindings838 = xs835
+        return bindings838
 
     def parse_formula(self) -> logic_pb2.Formula:
-        span_start851 = self.span_start()
+        span_start853 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("true", 1):
-                _t1547 = 0
+                _t1551 = 0
             else:
                 if self.match_lookahead_literal("relatom", 1):
-                    _t1548 = 11
+                    _t1552 = 11
                 else:
                     if self.match_lookahead_literal("reduce", 1):
-                        _t1549 = 3
+                        _t1553 = 3
                     else:
                         if self.match_lookahead_literal("primitive", 1):
-                            _t1550 = 10
+                            _t1554 = 10
                         else:
                             if self.match_lookahead_literal("pragma", 1):
-                                _t1551 = 9
+                                _t1555 = 9
                             else:
                                 if self.match_lookahead_literal("or", 1):
-                                    _t1552 = 5
+                                    _t1556 = 5
                                 else:
                                     if self.match_lookahead_literal("not", 1):
-                                        _t1553 = 6
+                                        _t1557 = 6
                                     else:
                                         if self.match_lookahead_literal("ffi", 1):
-                                            _t1554 = 7
+                                            _t1558 = 7
                                         else:
                                             if self.match_lookahead_literal("false", 1):
-                                                _t1555 = 1
+                                                _t1559 = 1
                                             else:
                                                 if self.match_lookahead_literal("exists", 1):
-                                                    _t1556 = 2
+                                                    _t1560 = 2
                                                 else:
                                                     if self.match_lookahead_literal("cast", 1):
-                                                        _t1557 = 12
+                                                        _t1561 = 12
                                                     else:
                                                         if self.match_lookahead_literal("atom", 1):
-                                                            _t1558 = 8
+                                                            _t1562 = 8
                                                         else:
                                                             if self.match_lookahead_literal("and", 1):
-                                                                _t1559 = 4
+                                                                _t1563 = 4
                                                             else:
                                                                 if self.match_lookahead_literal(">=", 1):
-                                                                    _t1560 = 10
+                                                                    _t1564 = 10
                                                                 else:
                                                                     if self.match_lookahead_literal(">", 1):
-                                                                        _t1561 = 10
+                                                                        _t1565 = 10
                                                                     else:
                                                                         if self.match_lookahead_literal("=", 1):
-                                                                            _t1562 = 10
+                                                                            _t1566 = 10
                                                                         else:
                                                                             if self.match_lookahead_literal("<=", 1):
-                                                                                _t1563 = 10
+                                                                                _t1567 = 10
                                                                             else:
                                                                                 if self.match_lookahead_literal("<", 1):
-                                                                                    _t1564 = 10
+                                                                                    _t1568 = 10
                                                                                 else:
                                                                                     if self.match_lookahead_literal("/", 1):
-                                                                                        _t1565 = 10
+                                                                                        _t1569 = 10
                                                                                     else:
                                                                                         if self.match_lookahead_literal("-", 1):
-                                                                                            _t1566 = 10
+                                                                                            _t1570 = 10
                                                                                         else:
                                                                                             if self.match_lookahead_literal("+", 1):
-                                                                                                _t1567 = 10
+                                                                                                _t1571 = 10
                                                                                             else:
                                                                                                 if self.match_lookahead_literal("*", 1):
-                                                                                                    _t1568 = 10
+                                                                                                    _t1572 = 10
                                                                                                 else:
-                                                                                                    _t1568 = -1
-                                                                                                _t1567 = _t1568
-                                                                                            _t1566 = _t1567
-                                                                                        _t1565 = _t1566
-                                                                                    _t1564 = _t1565
-                                                                                _t1563 = _t1564
-                                                                            _t1562 = _t1563
-                                                                        _t1561 = _t1562
-                                                                    _t1560 = _t1561
-                                                                _t1559 = _t1560
-                                                            _t1558 = _t1559
-                                                        _t1557 = _t1558
-                                                    _t1556 = _t1557
-                                                _t1555 = _t1556
-                                            _t1554 = _t1555
-                                        _t1553 = _t1554
-                                    _t1552 = _t1553
-                                _t1551 = _t1552
-                            _t1550 = _t1551
-                        _t1549 = _t1550
-                    _t1548 = _t1549
-                _t1547 = _t1548
-            _t1546 = _t1547
-        else:
-            _t1546 = -1
-        prediction837 = _t1546
-        if prediction837 == 12:
-            _t1570 = self.parse_cast()
-            cast850 = _t1570
-            _t1571 = logic_pb2.Formula(cast=cast850)
-            _t1569 = _t1571
-        else:
-            if prediction837 == 11:
-                _t1573 = self.parse_rel_atom()
-                rel_atom849 = _t1573
-                _t1574 = logic_pb2.Formula(rel_atom=rel_atom849)
-                _t1572 = _t1574
+                                                                                                    _t1572 = -1
+                                                                                                _t1571 = _t1572
+                                                                                            _t1570 = _t1571
+                                                                                        _t1569 = _t1570
+                                                                                    _t1568 = _t1569
+                                                                                _t1567 = _t1568
+                                                                            _t1566 = _t1567
+                                                                        _t1565 = _t1566
+                                                                    _t1564 = _t1565
+                                                                _t1563 = _t1564
+                                                            _t1562 = _t1563
+                                                        _t1561 = _t1562
+                                                    _t1560 = _t1561
+                                                _t1559 = _t1560
+                                            _t1558 = _t1559
+                                        _t1557 = _t1558
+                                    _t1556 = _t1557
+                                _t1555 = _t1556
+                            _t1554 = _t1555
+                        _t1553 = _t1554
+                    _t1552 = _t1553
+                _t1551 = _t1552
+            _t1550 = _t1551
+        else:
+            _t1550 = -1
+        prediction839 = _t1550
+        if prediction839 == 12:
+            _t1574 = self.parse_cast()
+            cast852 = _t1574
+            _t1575 = logic_pb2.Formula(cast=cast852)
+            _t1573 = _t1575
+        else:
+            if prediction839 == 11:
+                _t1577 = self.parse_rel_atom()
+                rel_atom851 = _t1577
+                _t1578 = logic_pb2.Formula(rel_atom=rel_atom851)
+                _t1576 = _t1578
             else:
-                if prediction837 == 10:
-                    _t1576 = self.parse_primitive()
-                    primitive848 = _t1576
-                    _t1577 = logic_pb2.Formula(primitive=primitive848)
-                    _t1575 = _t1577
+                if prediction839 == 10:
+                    _t1580 = self.parse_primitive()
+                    primitive850 = _t1580
+                    _t1581 = logic_pb2.Formula(primitive=primitive850)
+                    _t1579 = _t1581
                 else:
-                    if prediction837 == 9:
-                        _t1579 = self.parse_pragma()
-                        pragma847 = _t1579
-                        _t1580 = logic_pb2.Formula(pragma=pragma847)
-                        _t1578 = _t1580
+                    if prediction839 == 9:
+                        _t1583 = self.parse_pragma()
+                        pragma849 = _t1583
+                        _t1584 = logic_pb2.Formula(pragma=pragma849)
+                        _t1582 = _t1584
                     else:
-                        if prediction837 == 8:
-                            _t1582 = self.parse_atom()
-                            atom846 = _t1582
-                            _t1583 = logic_pb2.Formula(atom=atom846)
-                            _t1581 = _t1583
+                        if prediction839 == 8:
+                            _t1586 = self.parse_atom()
+                            atom848 = _t1586
+                            _t1587 = logic_pb2.Formula(atom=atom848)
+                            _t1585 = _t1587
                         else:
-                            if prediction837 == 7:
-                                _t1585 = self.parse_ffi()
-                                ffi845 = _t1585
-                                _t1586 = logic_pb2.Formula(ffi=ffi845)
-                                _t1584 = _t1586
+                            if prediction839 == 7:
+                                _t1589 = self.parse_ffi()
+                                ffi847 = _t1589
+                                _t1590 = logic_pb2.Formula(ffi=ffi847)
+                                _t1588 = _t1590
                             else:
-                                if prediction837 == 6:
-                                    _t1588 = self.parse_not()
-                                    not844 = _t1588
-                                    _t1589 = logic_pb2.Formula()
-                                    getattr(_t1589, 'not').CopyFrom(not844)
-                                    _t1587 = _t1589
+                                if prediction839 == 6:
+                                    _t1592 = self.parse_not()
+                                    not846 = _t1592
+                                    _t1593 = logic_pb2.Formula()
+                                    getattr(_t1593, 'not').CopyFrom(not846)
+                                    _t1591 = _t1593
                                 else:
-                                    if prediction837 == 5:
-                                        _t1591 = self.parse_disjunction()
-                                        disjunction843 = _t1591
-                                        _t1592 = logic_pb2.Formula(disjunction=disjunction843)
-                                        _t1590 = _t1592
+                                    if prediction839 == 5:
+                                        _t1595 = self.parse_disjunction()
+                                        disjunction845 = _t1595
+                                        _t1596 = logic_pb2.Formula(disjunction=disjunction845)
+                                        _t1594 = _t1596
                                     else:
-                                        if prediction837 == 4:
-                                            _t1594 = self.parse_conjunction()
-                                            conjunction842 = _t1594
-                                            _t1595 = logic_pb2.Formula(conjunction=conjunction842)
-                                            _t1593 = _t1595
+                                        if prediction839 == 4:
+                                            _t1598 = self.parse_conjunction()
+                                            conjunction844 = _t1598
+                                            _t1599 = logic_pb2.Formula(conjunction=conjunction844)
+                                            _t1597 = _t1599
                                         else:
-                                            if prediction837 == 3:
-                                                _t1597 = self.parse_reduce()
-                                                reduce841 = _t1597
-                                                _t1598 = logic_pb2.Formula(reduce=reduce841)
-                                                _t1596 = _t1598
+                                            if prediction839 == 3:
+                                                _t1601 = self.parse_reduce()
+                                                reduce843 = _t1601
+                                                _t1602 = logic_pb2.Formula(reduce=reduce843)
+                                                _t1600 = _t1602
                                             else:
-                                                if prediction837 == 2:
-                                                    _t1600 = self.parse_exists()
-                                                    exists840 = _t1600
-                                                    _t1601 = logic_pb2.Formula(exists=exists840)
-                                                    _t1599 = _t1601
+                                                if prediction839 == 2:
+                                                    _t1604 = self.parse_exists()
+                                                    exists842 = _t1604
+                                                    _t1605 = logic_pb2.Formula(exists=exists842)
+                                                    _t1603 = _t1605
                                                 else:
-                                                    if prediction837 == 1:
-                                                        _t1603 = self.parse_false()
-                                                        false839 = _t1603
-                                                        _t1604 = logic_pb2.Formula(disjunction=false839)
-                                                        _t1602 = _t1604
+                                                    if prediction839 == 1:
+                                                        _t1607 = self.parse_false()
+                                                        false841 = _t1607
+                                                        _t1608 = logic_pb2.Formula(disjunction=false841)
+                                                        _t1606 = _t1608
                                                     else:
-                                                        if prediction837 == 0:
-                                                            _t1606 = self.parse_true()
-                                                            true838 = _t1606
-                                                            _t1607 = logic_pb2.Formula(conjunction=true838)
-                                                            _t1605 = _t1607
+                                                        if prediction839 == 0:
+                                                            _t1610 = self.parse_true()
+                                                            true840 = _t1610
+                                                            _t1611 = logic_pb2.Formula(conjunction=true840)
+                                                            _t1609 = _t1611
                                                         else:
                                                             raise ParseError("Unexpected token in formula" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                                        _t1602 = _t1605
-                                                    _t1599 = _t1602
-                                                _t1596 = _t1599
-                                            _t1593 = _t1596
-                                        _t1590 = _t1593
-                                    _t1587 = _t1590
-                                _t1584 = _t1587
-                            _t1581 = _t1584
-                        _t1578 = _t1581
-                    _t1575 = _t1578
-                _t1572 = _t1575
-            _t1569 = _t1572
-        result852 = _t1569
-        self.record_span(span_start851, "Formula")
-        return result852
+                                                        _t1606 = _t1609
+                                                    _t1603 = _t1606
+                                                _t1600 = _t1603
+                                            _t1597 = _t1600
+                                        _t1594 = _t1597
+                                    _t1591 = _t1594
+                                _t1588 = _t1591
+                            _t1585 = _t1588
+                        _t1582 = _t1585
+                    _t1579 = _t1582
+                _t1576 = _t1579
+            _t1573 = _t1576
+        result854 = _t1573
+        self.record_span(span_start853, "Formula")
+        return result854
 
     def parse_true(self) -> logic_pb2.Conjunction:
-        span_start853 = self.span_start()
+        span_start855 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("true")
         self.consume_literal(")")
-        _t1608 = logic_pb2.Conjunction(args=[])
-        result854 = _t1608
-        self.record_span(span_start853, "Conjunction")
-        return result854
+        _t1612 = logic_pb2.Conjunction(args=[])
+        result856 = _t1612
+        self.record_span(span_start855, "Conjunction")
+        return result856
 
     def parse_false(self) -> logic_pb2.Disjunction:
-        span_start855 = self.span_start()
+        span_start857 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("false")
         self.consume_literal(")")
-        _t1609 = logic_pb2.Disjunction(args=[])
-        result856 = _t1609
-        self.record_span(span_start855, "Disjunction")
-        return result856
+        _t1613 = logic_pb2.Disjunction(args=[])
+        result858 = _t1613
+        self.record_span(span_start857, "Disjunction")
+        return result858
 
     def parse_exists(self) -> logic_pb2.Exists:
-        span_start859 = self.span_start()
+        span_start861 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("exists")
-        _t1610 = self.parse_bindings()
-        bindings857 = _t1610
-        _t1611 = self.parse_formula()
-        formula858 = _t1611
+        _t1614 = self.parse_bindings()
+        bindings859 = _t1614
+        _t1615 = self.parse_formula()
+        formula860 = _t1615
         self.consume_literal(")")
-        _t1612 = logic_pb2.Abstraction(vars=(list(bindings857[0]) + list(bindings857[1] if bindings857[1] is not None else [])), value=formula858)
-        _t1613 = logic_pb2.Exists(body=_t1612)
-        result860 = _t1613
-        self.record_span(span_start859, "Exists")
-        return result860
+        _t1616 = logic_pb2.Abstraction(vars=(list(bindings859[0]) + list(bindings859[1] if bindings859[1] is not None else [])), value=formula860)
+        _t1617 = logic_pb2.Exists(body=_t1616)
+        result862 = _t1617
+        self.record_span(span_start861, "Exists")
+        return result862
 
     def parse_reduce(self) -> logic_pb2.Reduce:
-        span_start864 = self.span_start()
+        span_start866 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("reduce")
-        _t1614 = self.parse_abstraction()
-        abstraction861 = _t1614
-        _t1615 = self.parse_abstraction()
-        abstraction_3862 = _t1615
-        _t1616 = self.parse_terms()
-        terms863 = _t1616
-        self.consume_literal(")")
-        _t1617 = logic_pb2.Reduce(op=abstraction861, body=abstraction_3862, terms=terms863)
-        result865 = _t1617
-        self.record_span(span_start864, "Reduce")
-        return result865
+        _t1618 = self.parse_abstraction()
+        abstraction863 = _t1618
+        _t1619 = self.parse_abstraction()
+        abstraction_3864 = _t1619
+        _t1620 = self.parse_terms()
+        terms865 = _t1620
+        self.consume_literal(")")
+        _t1621 = logic_pb2.Reduce(op=abstraction863, body=abstraction_3864, terms=terms865)
+        result867 = _t1621
+        self.record_span(span_start866, "Reduce")
+        return result867
 
     def parse_terms(self) -> Sequence[logic_pb2.Term]:
         self.consume_literal("(")
         self.consume_literal("terms")
-        xs866 = []
-        cond867 = (((((((((((((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 cond867:
-            _t1618 = self.parse_term()
-            item868 = _t1618
-            xs866.append(item868)
-            cond867 = (((((((((((((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))
-        terms869 = xs866
+        xs868 = []
+        cond869 = (((((((((((((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 cond869:
+            _t1622 = self.parse_term()
+            item870 = _t1622
+            xs868.append(item870)
+            cond869 = (((((((((((((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))
+        terms871 = xs868
         self.consume_literal(")")
-        return terms869
+        return terms871
 
     def parse_term(self) -> logic_pb2.Term:
-        span_start873 = self.span_start()
+        span_start875 = self.span_start()
         if self.match_lookahead_literal("true", 0):
-            _t1619 = 1
+            _t1623 = 1
         else:
             if self.match_lookahead_literal("missing", 0):
-                _t1620 = 1
+                _t1624 = 1
             else:
                 if self.match_lookahead_literal("false", 0):
-                    _t1621 = 1
+                    _t1625 = 1
                 else:
                     if self.match_lookahead_literal("(", 0):
-                        _t1622 = 1
+                        _t1626 = 1
                     else:
                         if self.match_lookahead_terminal("SYMBOL", 0):
-                            _t1623 = 0
+                            _t1627 = 0
                         else:
                             if self.match_lookahead_terminal("UINT32", 0):
-                                _t1624 = 1
+                                _t1628 = 1
                             else:
                                 if self.match_lookahead_terminal("UINT128", 0):
-                                    _t1625 = 1
+                                    _t1629 = 1
                                 else:
                                     if self.match_lookahead_terminal("STRING", 0):
-                                        _t1626 = 1
+                                        _t1630 = 1
                                     else:
                                         if self.match_lookahead_terminal("INT32", 0):
-                                            _t1627 = 1
+                                            _t1631 = 1
                                         else:
                                             if self.match_lookahead_terminal("INT128", 0):
-                                                _t1628 = 1
+                                                _t1632 = 1
                                             else:
                                                 if self.match_lookahead_terminal("INT", 0):
-                                                    _t1629 = 1
+                                                    _t1633 = 1
                                                 else:
                                                     if self.match_lookahead_terminal("FLOAT32", 0):
-                                                        _t1630 = 1
+                                                        _t1634 = 1
                                                     else:
                                                         if self.match_lookahead_terminal("FLOAT", 0):
-                                                            _t1631 = 1
+                                                            _t1635 = 1
                                                         else:
                                                             if self.match_lookahead_terminal("DECIMAL", 0):
-                                                                _t1632 = 1
+                                                                _t1636 = 1
                                                             else:
-                                                                _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
-        prediction870 = _t1619
-        if prediction870 == 1:
-            _t1634 = self.parse_value()
-            value872 = _t1634
-            _t1635 = logic_pb2.Term(constant=value872)
-            _t1633 = _t1635
-        else:
-            if prediction870 == 0:
-                _t1637 = self.parse_var()
-                var871 = _t1637
-                _t1638 = logic_pb2.Term(var=var871)
-                _t1636 = _t1638
+                                                                _t1636 = -1
+                                                            _t1635 = _t1636
+                                                        _t1634 = _t1635
+                                                    _t1633 = _t1634
+                                                _t1632 = _t1633
+                                            _t1631 = _t1632
+                                        _t1630 = _t1631
+                                    _t1629 = _t1630
+                                _t1628 = _t1629
+                            _t1627 = _t1628
+                        _t1626 = _t1627
+                    _t1625 = _t1626
+                _t1624 = _t1625
+            _t1623 = _t1624
+        prediction872 = _t1623
+        if prediction872 == 1:
+            _t1638 = self.parse_value()
+            value874 = _t1638
+            _t1639 = logic_pb2.Term(constant=value874)
+            _t1637 = _t1639
+        else:
+            if prediction872 == 0:
+                _t1641 = self.parse_var()
+                var873 = _t1641
+                _t1642 = logic_pb2.Term(var=var873)
+                _t1640 = _t1642
             else:
                 raise ParseError("Unexpected token in term" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1633 = _t1636
-        result874 = _t1633
-        self.record_span(span_start873, "Term")
-        return result874
+            _t1637 = _t1640
+        result876 = _t1637
+        self.record_span(span_start875, "Term")
+        return result876
 
     def parse_var(self) -> logic_pb2.Var:
-        span_start876 = self.span_start()
-        symbol875 = self.consume_terminal("SYMBOL")
-        _t1639 = logic_pb2.Var(name=symbol875)
-        result877 = _t1639
-        self.record_span(span_start876, "Var")
-        return result877
+        span_start878 = self.span_start()
+        symbol877 = self.consume_terminal("SYMBOL")
+        _t1643 = logic_pb2.Var(name=symbol877)
+        result879 = _t1643
+        self.record_span(span_start878, "Var")
+        return result879
 
     def parse_value(self) -> logic_pb2.Value:
-        span_start891 = self.span_start()
+        span_start893 = self.span_start()
         if self.match_lookahead_literal("true", 0):
-            _t1640 = 12
+            _t1644 = 12
         else:
             if self.match_lookahead_literal("missing", 0):
-                _t1641 = 11
+                _t1645 = 11
             else:
                 if self.match_lookahead_literal("false", 0):
-                    _t1642 = 12
+                    _t1646 = 12
                 else:
                     if self.match_lookahead_literal("(", 0):
                         if self.match_lookahead_literal("datetime", 1):
-                            _t1644 = 1
+                            _t1648 = 1
                         else:
                             if self.match_lookahead_literal("date", 1):
-                                _t1645 = 0
+                                _t1649 = 0
                             else:
-                                _t1645 = -1
-                            _t1644 = _t1645
-                        _t1643 = _t1644
+                                _t1649 = -1
+                            _t1648 = _t1649
+                        _t1647 = _t1648
                     else:
                         if self.match_lookahead_terminal("UINT32", 0):
-                            _t1646 = 7
+                            _t1650 = 7
                         else:
                             if self.match_lookahead_terminal("UINT128", 0):
-                                _t1647 = 8
+                                _t1651 = 8
                             else:
                                 if self.match_lookahead_terminal("STRING", 0):
-                                    _t1648 = 2
+                                    _t1652 = 2
                                 else:
                                     if self.match_lookahead_terminal("INT32", 0):
-                                        _t1649 = 3
+                                        _t1653 = 3
                                     else:
                                         if self.match_lookahead_terminal("INT128", 0):
-                                            _t1650 = 9
+                                            _t1654 = 9
                                         else:
                                             if self.match_lookahead_terminal("INT", 0):
-                                                _t1651 = 4
+                                                _t1655 = 4
                                             else:
                                                 if self.match_lookahead_terminal("FLOAT32", 0):
-                                                    _t1652 = 5
+                                                    _t1656 = 5
                                                 else:
                                                     if self.match_lookahead_terminal("FLOAT", 0):
-                                                        _t1653 = 6
+                                                        _t1657 = 6
                                                     else:
                                                         if self.match_lookahead_terminal("DECIMAL", 0):
-                                                            _t1654 = 10
+                                                            _t1658 = 10
                                                         else:
-                                                            _t1654 = -1
-                                                        _t1653 = _t1654
-                                                    _t1652 = _t1653
-                                                _t1651 = _t1652
-                                            _t1650 = _t1651
-                                        _t1649 = _t1650
-                                    _t1648 = _t1649
-                                _t1647 = _t1648
-                            _t1646 = _t1647
-                        _t1643 = _t1646
-                    _t1642 = _t1643
-                _t1641 = _t1642
-            _t1640 = _t1641
-        prediction878 = _t1640
-        if prediction878 == 12:
-            _t1656 = self.parse_boolean_value()
-            boolean_value890 = _t1656
-            _t1657 = logic_pb2.Value(boolean_value=boolean_value890)
-            _t1655 = _t1657
-        else:
-            if prediction878 == 11:
+                                                            _t1658 = -1
+                                                        _t1657 = _t1658
+                                                    _t1656 = _t1657
+                                                _t1655 = _t1656
+                                            _t1654 = _t1655
+                                        _t1653 = _t1654
+                                    _t1652 = _t1653
+                                _t1651 = _t1652
+                            _t1650 = _t1651
+                        _t1647 = _t1650
+                    _t1646 = _t1647
+                _t1645 = _t1646
+            _t1644 = _t1645
+        prediction880 = _t1644
+        if prediction880 == 12:
+            _t1660 = self.parse_boolean_value()
+            boolean_value892 = _t1660
+            _t1661 = logic_pb2.Value(boolean_value=boolean_value892)
+            _t1659 = _t1661
+        else:
+            if prediction880 == 11:
                 self.consume_literal("missing")
-                _t1659 = logic_pb2.MissingValue()
-                _t1660 = logic_pb2.Value(missing_value=_t1659)
-                _t1658 = _t1660
+                _t1663 = logic_pb2.MissingValue()
+                _t1664 = logic_pb2.Value(missing_value=_t1663)
+                _t1662 = _t1664
             else:
-                if prediction878 == 10:
-                    formatted_decimal889 = self.consume_terminal("DECIMAL")
-                    _t1662 = logic_pb2.Value(decimal_value=formatted_decimal889)
-                    _t1661 = _t1662
+                if prediction880 == 10:
+                    formatted_decimal891 = self.consume_terminal("DECIMAL")
+                    _t1666 = logic_pb2.Value(decimal_value=formatted_decimal891)
+                    _t1665 = _t1666
                 else:
-                    if prediction878 == 9:
-                        formatted_int128888 = self.consume_terminal("INT128")
-                        _t1664 = logic_pb2.Value(int128_value=formatted_int128888)
-                        _t1663 = _t1664
+                    if prediction880 == 9:
+                        formatted_int128890 = self.consume_terminal("INT128")
+                        _t1668 = logic_pb2.Value(int128_value=formatted_int128890)
+                        _t1667 = _t1668
                     else:
-                        if prediction878 == 8:
-                            formatted_uint128887 = self.consume_terminal("UINT128")
-                            _t1666 = logic_pb2.Value(uint128_value=formatted_uint128887)
-                            _t1665 = _t1666
+                        if prediction880 == 8:
+                            formatted_uint128889 = self.consume_terminal("UINT128")
+                            _t1670 = logic_pb2.Value(uint128_value=formatted_uint128889)
+                            _t1669 = _t1670
                         else:
-                            if prediction878 == 7:
-                                formatted_uint32886 = self.consume_terminal("UINT32")
-                                _t1668 = logic_pb2.Value(uint32_value=formatted_uint32886)
-                                _t1667 = _t1668
+                            if prediction880 == 7:
+                                formatted_uint32888 = self.consume_terminal("UINT32")
+                                _t1672 = logic_pb2.Value(uint32_value=formatted_uint32888)
+                                _t1671 = _t1672
                             else:
-                                if prediction878 == 6:
-                                    formatted_float885 = self.consume_terminal("FLOAT")
-                                    _t1670 = logic_pb2.Value(float_value=formatted_float885)
-                                    _t1669 = _t1670
+                                if prediction880 == 6:
+                                    formatted_float887 = self.consume_terminal("FLOAT")
+                                    _t1674 = logic_pb2.Value(float_value=formatted_float887)
+                                    _t1673 = _t1674
                                 else:
-                                    if prediction878 == 5:
-                                        formatted_float32884 = self.consume_terminal("FLOAT32")
-                                        _t1672 = logic_pb2.Value(float32_value=formatted_float32884)
-                                        _t1671 = _t1672
+                                    if prediction880 == 5:
+                                        formatted_float32886 = self.consume_terminal("FLOAT32")
+                                        _t1676 = logic_pb2.Value(float32_value=formatted_float32886)
+                                        _t1675 = _t1676
                                     else:
-                                        if prediction878 == 4:
-                                            formatted_int883 = self.consume_terminal("INT")
-                                            _t1674 = logic_pb2.Value(int_value=formatted_int883)
-                                            _t1673 = _t1674
+                                        if prediction880 == 4:
+                                            formatted_int885 = self.consume_terminal("INT")
+                                            _t1678 = logic_pb2.Value(int_value=formatted_int885)
+                                            _t1677 = _t1678
                                         else:
-                                            if prediction878 == 3:
-                                                formatted_int32882 = self.consume_terminal("INT32")
-                                                _t1676 = logic_pb2.Value(int32_value=formatted_int32882)
-                                                _t1675 = _t1676
+                                            if prediction880 == 3:
+                                                formatted_int32884 = self.consume_terminal("INT32")
+                                                _t1680 = logic_pb2.Value(int32_value=formatted_int32884)
+                                                _t1679 = _t1680
                                             else:
-                                                if prediction878 == 2:
-                                                    formatted_string881 = self.consume_terminal("STRING")
-                                                    _t1678 = logic_pb2.Value(string_value=formatted_string881)
-                                                    _t1677 = _t1678
+                                                if prediction880 == 2:
+                                                    formatted_string883 = self.consume_terminal("STRING")
+                                                    _t1682 = logic_pb2.Value(string_value=formatted_string883)
+                                                    _t1681 = _t1682
                                                 else:
-                                                    if prediction878 == 1:
-                                                        _t1680 = self.parse_datetime()
-                                                        datetime880 = _t1680
-                                                        _t1681 = logic_pb2.Value(datetime_value=datetime880)
-                                                        _t1679 = _t1681
+                                                    if prediction880 == 1:
+                                                        _t1684 = self.parse_datetime()
+                                                        datetime882 = _t1684
+                                                        _t1685 = logic_pb2.Value(datetime_value=datetime882)
+                                                        _t1683 = _t1685
                                                     else:
-                                                        if prediction878 == 0:
-                                                            _t1683 = self.parse_date()
-                                                            date879 = _t1683
-                                                            _t1684 = logic_pb2.Value(date_value=date879)
-                                                            _t1682 = _t1684
+                                                        if prediction880 == 0:
+                                                            _t1687 = self.parse_date()
+                                                            date881 = _t1687
+                                                            _t1688 = logic_pb2.Value(date_value=date881)
+                                                            _t1686 = _t1688
                                                         else:
                                                             raise ParseError("Unexpected token in value" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                                        _t1679 = _t1682
-                                                    _t1677 = _t1679
-                                                _t1675 = _t1677
-                                            _t1673 = _t1675
-                                        _t1671 = _t1673
-                                    _t1669 = _t1671
-                                _t1667 = _t1669
-                            _t1665 = _t1667
-                        _t1663 = _t1665
-                    _t1661 = _t1663
-                _t1658 = _t1661
-            _t1655 = _t1658
-        result892 = _t1655
-        self.record_span(span_start891, "Value")
-        return result892
+                                                        _t1683 = _t1686
+                                                    _t1681 = _t1683
+                                                _t1679 = _t1681
+                                            _t1677 = _t1679
+                                        _t1675 = _t1677
+                                    _t1673 = _t1675
+                                _t1671 = _t1673
+                            _t1669 = _t1671
+                        _t1667 = _t1669
+                    _t1665 = _t1667
+                _t1662 = _t1665
+            _t1659 = _t1662
+        result894 = _t1659
+        self.record_span(span_start893, "Value")
+        return result894
 
     def parse_date(self) -> logic_pb2.DateValue:
-        span_start896 = self.span_start()
+        span_start898 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("date")
-        formatted_int893 = self.consume_terminal("INT")
-        formatted_int_3894 = self.consume_terminal("INT")
-        formatted_int_4895 = self.consume_terminal("INT")
+        formatted_int895 = self.consume_terminal("INT")
+        formatted_int_3896 = self.consume_terminal("INT")
+        formatted_int_4897 = self.consume_terminal("INT")
         self.consume_literal(")")
-        _t1685 = logic_pb2.DateValue(year=int(formatted_int893), month=int(formatted_int_3894), day=int(formatted_int_4895))
-        result897 = _t1685
-        self.record_span(span_start896, "DateValue")
-        return result897
+        _t1689 = logic_pb2.DateValue(year=int(formatted_int895), month=int(formatted_int_3896), day=int(formatted_int_4897))
+        result899 = _t1689
+        self.record_span(span_start898, "DateValue")
+        return result899
 
     def parse_datetime(self) -> logic_pb2.DateTimeValue:
-        span_start905 = self.span_start()
+        span_start907 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("datetime")
-        formatted_int898 = self.consume_terminal("INT")
-        formatted_int_3899 = self.consume_terminal("INT")
-        formatted_int_4900 = self.consume_terminal("INT")
-        formatted_int_5901 = self.consume_terminal("INT")
-        formatted_int_6902 = self.consume_terminal("INT")
-        formatted_int_7903 = self.consume_terminal("INT")
+        formatted_int900 = self.consume_terminal("INT")
+        formatted_int_3901 = self.consume_terminal("INT")
+        formatted_int_4902 = self.consume_terminal("INT")
+        formatted_int_5903 = self.consume_terminal("INT")
+        formatted_int_6904 = self.consume_terminal("INT")
+        formatted_int_7905 = self.consume_terminal("INT")
         if self.match_lookahead_terminal("INT", 0):
-            _t1686 = self.consume_terminal("INT")
+            _t1690 = self.consume_terminal("INT")
         else:
-            _t1686 = None
-        formatted_int_8904 = _t1686
+            _t1690 = None
+        formatted_int_8906 = _t1690
         self.consume_literal(")")
-        _t1687 = logic_pb2.DateTimeValue(year=int(formatted_int898), month=int(formatted_int_3899), day=int(formatted_int_4900), hour=int(formatted_int_5901), minute=int(formatted_int_6902), second=int(formatted_int_7903), microsecond=int((formatted_int_8904 if formatted_int_8904 is not None else 0)))
-        result906 = _t1687
-        self.record_span(span_start905, "DateTimeValue")
-        return result906
+        _t1691 = logic_pb2.DateTimeValue(year=int(formatted_int900), month=int(formatted_int_3901), day=int(formatted_int_4902), hour=int(formatted_int_5903), minute=int(formatted_int_6904), second=int(formatted_int_7905), microsecond=int((formatted_int_8906 if formatted_int_8906 is not None else 0)))
+        result908 = _t1691
+        self.record_span(span_start907, "DateTimeValue")
+        return result908
 
     def parse_conjunction(self) -> logic_pb2.Conjunction:
-        span_start911 = self.span_start()
+        span_start913 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("and")
-        xs907 = []
-        cond908 = self.match_lookahead_literal("(", 0)
-        while cond908:
-            _t1688 = self.parse_formula()
-            item909 = _t1688
-            xs907.append(item909)
-            cond908 = self.match_lookahead_literal("(", 0)
-        formulas910 = xs907
-        self.consume_literal(")")
-        _t1689 = logic_pb2.Conjunction(args=formulas910)
-        result912 = _t1689
-        self.record_span(span_start911, "Conjunction")
-        return result912
+        xs909 = []
+        cond910 = self.match_lookahead_literal("(", 0)
+        while cond910:
+            _t1692 = self.parse_formula()
+            item911 = _t1692
+            xs909.append(item911)
+            cond910 = self.match_lookahead_literal("(", 0)
+        formulas912 = xs909
+        self.consume_literal(")")
+        _t1693 = logic_pb2.Conjunction(args=formulas912)
+        result914 = _t1693
+        self.record_span(span_start913, "Conjunction")
+        return result914
 
     def parse_disjunction(self) -> logic_pb2.Disjunction:
-        span_start917 = self.span_start()
+        span_start919 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("or")
-        xs913 = []
-        cond914 = self.match_lookahead_literal("(", 0)
-        while cond914:
-            _t1690 = self.parse_formula()
-            item915 = _t1690
-            xs913.append(item915)
-            cond914 = self.match_lookahead_literal("(", 0)
-        formulas916 = xs913
-        self.consume_literal(")")
-        _t1691 = logic_pb2.Disjunction(args=formulas916)
-        result918 = _t1691
-        self.record_span(span_start917, "Disjunction")
-        return result918
+        xs915 = []
+        cond916 = self.match_lookahead_literal("(", 0)
+        while cond916:
+            _t1694 = self.parse_formula()
+            item917 = _t1694
+            xs915.append(item917)
+            cond916 = self.match_lookahead_literal("(", 0)
+        formulas918 = xs915
+        self.consume_literal(")")
+        _t1695 = logic_pb2.Disjunction(args=formulas918)
+        result920 = _t1695
+        self.record_span(span_start919, "Disjunction")
+        return result920
 
     def parse_not(self) -> logic_pb2.Not:
-        span_start920 = self.span_start()
+        span_start922 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("not")
-        _t1692 = self.parse_formula()
-        formula919 = _t1692
+        _t1696 = self.parse_formula()
+        formula921 = _t1696
         self.consume_literal(")")
-        _t1693 = logic_pb2.Not(arg=formula919)
-        result921 = _t1693
-        self.record_span(span_start920, "Not")
-        return result921
+        _t1697 = logic_pb2.Not(arg=formula921)
+        result923 = _t1697
+        self.record_span(span_start922, "Not")
+        return result923
 
     def parse_ffi(self) -> logic_pb2.FFI:
-        span_start925 = self.span_start()
+        span_start927 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("ffi")
-        _t1694 = self.parse_name()
-        name922 = _t1694
-        _t1695 = self.parse_ffi_args()
-        ffi_args923 = _t1695
-        _t1696 = self.parse_terms()
-        terms924 = _t1696
-        self.consume_literal(")")
-        _t1697 = logic_pb2.FFI(name=name922, args=ffi_args923, terms=terms924)
-        result926 = _t1697
-        self.record_span(span_start925, "FFI")
-        return result926
+        _t1698 = self.parse_name()
+        name924 = _t1698
+        _t1699 = self.parse_ffi_args()
+        ffi_args925 = _t1699
+        _t1700 = self.parse_terms()
+        terms926 = _t1700
+        self.consume_literal(")")
+        _t1701 = logic_pb2.FFI(name=name924, args=ffi_args925, terms=terms926)
+        result928 = _t1701
+        self.record_span(span_start927, "FFI")
+        return result928
 
     def parse_name(self) -> str:
         self.consume_literal(":")
-        symbol927 = self.consume_terminal("SYMBOL")
-        return symbol927
+        symbol929 = self.consume_terminal("SYMBOL")
+        return symbol929
 
     def parse_ffi_args(self) -> Sequence[logic_pb2.Abstraction]:
         self.consume_literal("(")
         self.consume_literal("args")
-        xs928 = []
-        cond929 = self.match_lookahead_literal("(", 0)
-        while cond929:
-            _t1698 = self.parse_abstraction()
-            item930 = _t1698
-            xs928.append(item930)
-            cond929 = self.match_lookahead_literal("(", 0)
-        abstractions931 = xs928
+        xs930 = []
+        cond931 = self.match_lookahead_literal("(", 0)
+        while cond931:
+            _t1702 = self.parse_abstraction()
+            item932 = _t1702
+            xs930.append(item932)
+            cond931 = self.match_lookahead_literal("(", 0)
+        abstractions933 = xs930
         self.consume_literal(")")
-        return abstractions931
+        return abstractions933
 
     def parse_atom(self) -> logic_pb2.Atom:
-        span_start937 = self.span_start()
+        span_start939 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("atom")
-        _t1699 = self.parse_relation_id()
-        relation_id932 = _t1699
-        xs933 = []
-        cond934 = (((((((((((((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 cond934:
-            _t1700 = self.parse_term()
-            item935 = _t1700
-            xs933.append(item935)
-            cond934 = (((((((((((((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))
-        terms936 = xs933
-        self.consume_literal(")")
-        _t1701 = logic_pb2.Atom(name=relation_id932, terms=terms936)
-        result938 = _t1701
-        self.record_span(span_start937, "Atom")
-        return result938
+        _t1703 = self.parse_relation_id()
+        relation_id934 = _t1703
+        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:
+            _t1704 = self.parse_term()
+            item937 = _t1704
+            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(")")
+        _t1705 = logic_pb2.Atom(name=relation_id934, terms=terms938)
+        result940 = _t1705
+        self.record_span(span_start939, "Atom")
+        return result940
 
     def parse_pragma(self) -> logic_pb2.Pragma:
-        span_start944 = self.span_start()
+        span_start946 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("pragma")
-        _t1702 = self.parse_name()
-        name939 = _t1702
-        xs940 = []
-        cond941 = (((((((((((((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 cond941:
-            _t1703 = self.parse_term()
-            item942 = _t1703
-            xs940.append(item942)
-            cond941 = (((((((((((((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))
-        terms943 = xs940
-        self.consume_literal(")")
-        _t1704 = logic_pb2.Pragma(name=name939, terms=terms943)
-        result945 = _t1704
-        self.record_span(span_start944, "Pragma")
-        return result945
+        _t1706 = self.parse_name()
+        name941 = _t1706
+        xs942 = []
+        cond943 = (((((((((((((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 cond943:
+            _t1707 = self.parse_term()
+            item944 = _t1707
+            xs942.append(item944)
+            cond943 = (((((((((((((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))
+        terms945 = xs942
+        self.consume_literal(")")
+        _t1708 = logic_pb2.Pragma(name=name941, terms=terms945)
+        result947 = _t1708
+        self.record_span(span_start946, "Pragma")
+        return result947
 
     def parse_primitive(self) -> logic_pb2.Primitive:
-        span_start961 = self.span_start()
+        span_start963 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("primitive", 1):
-                _t1706 = 9
+                _t1710 = 9
             else:
                 if self.match_lookahead_literal(">=", 1):
-                    _t1707 = 4
+                    _t1711 = 4
                 else:
                     if self.match_lookahead_literal(">", 1):
-                        _t1708 = 3
+                        _t1712 = 3
                     else:
                         if self.match_lookahead_literal("=", 1):
-                            _t1709 = 0
+                            _t1713 = 0
                         else:
                             if self.match_lookahead_literal("<=", 1):
-                                _t1710 = 2
+                                _t1714 = 2
                             else:
                                 if self.match_lookahead_literal("<", 1):
-                                    _t1711 = 1
+                                    _t1715 = 1
                                 else:
                                     if self.match_lookahead_literal("/", 1):
-                                        _t1712 = 8
+                                        _t1716 = 8
                                     else:
                                         if self.match_lookahead_literal("-", 1):
-                                            _t1713 = 6
+                                            _t1717 = 6
                                         else:
                                             if self.match_lookahead_literal("+", 1):
-                                                _t1714 = 5
+                                                _t1718 = 5
                                             else:
                                                 if self.match_lookahead_literal("*", 1):
-                                                    _t1715 = 7
+                                                    _t1719 = 7
                                                 else:
-                                                    _t1715 = -1
-                                                _t1714 = _t1715
-                                            _t1713 = _t1714
-                                        _t1712 = _t1713
-                                    _t1711 = _t1712
-                                _t1710 = _t1711
-                            _t1709 = _t1710
-                        _t1708 = _t1709
-                    _t1707 = _t1708
-                _t1706 = _t1707
-            _t1705 = _t1706
-        else:
-            _t1705 = -1
-        prediction946 = _t1705
-        if prediction946 == 9:
+                                                    _t1719 = -1
+                                                _t1718 = _t1719
+                                            _t1717 = _t1718
+                                        _t1716 = _t1717
+                                    _t1715 = _t1716
+                                _t1714 = _t1715
+                            _t1713 = _t1714
+                        _t1712 = _t1713
+                    _t1711 = _t1712
+                _t1710 = _t1711
+            _t1709 = _t1710
+        else:
+            _t1709 = -1
+        prediction948 = _t1709
+        if prediction948 == 9:
             self.consume_literal("(")
             self.consume_literal("primitive")
-            _t1717 = self.parse_name()
-            name956 = _t1717
-            xs957 = []
-            cond958 = ((((((((((((((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 cond958:
-                _t1718 = self.parse_rel_term()
-                item959 = _t1718
-                xs957.append(item959)
-                cond958 = ((((((((((((((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_terms960 = xs957
+            _t1721 = self.parse_name()
+            name958 = _t1721
+            xs959 = []
+            cond960 = ((((((((((((((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 cond960:
+                _t1722 = self.parse_rel_term()
+                item961 = _t1722
+                xs959.append(item961)
+                cond960 = ((((((((((((((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_terms962 = xs959
             self.consume_literal(")")
-            _t1719 = logic_pb2.Primitive(name=name956, terms=rel_terms960)
-            _t1716 = _t1719
+            _t1723 = logic_pb2.Primitive(name=name958, terms=rel_terms962)
+            _t1720 = _t1723
         else:
-            if prediction946 == 8:
-                _t1721 = self.parse_divide()
-                divide955 = _t1721
-                _t1720 = divide955
+            if prediction948 == 8:
+                _t1725 = self.parse_divide()
+                divide957 = _t1725
+                _t1724 = divide957
             else:
-                if prediction946 == 7:
-                    _t1723 = self.parse_multiply()
-                    multiply954 = _t1723
-                    _t1722 = multiply954
+                if prediction948 == 7:
+                    _t1727 = self.parse_multiply()
+                    multiply956 = _t1727
+                    _t1726 = multiply956
                 else:
-                    if prediction946 == 6:
-                        _t1725 = self.parse_minus()
-                        minus953 = _t1725
-                        _t1724 = minus953
+                    if prediction948 == 6:
+                        _t1729 = self.parse_minus()
+                        minus955 = _t1729
+                        _t1728 = minus955
                     else:
-                        if prediction946 == 5:
-                            _t1727 = self.parse_add()
-                            add952 = _t1727
-                            _t1726 = add952
+                        if prediction948 == 5:
+                            _t1731 = self.parse_add()
+                            add954 = _t1731
+                            _t1730 = add954
                         else:
-                            if prediction946 == 4:
-                                _t1729 = self.parse_gt_eq()
-                                gt_eq951 = _t1729
-                                _t1728 = gt_eq951
+                            if prediction948 == 4:
+                                _t1733 = self.parse_gt_eq()
+                                gt_eq953 = _t1733
+                                _t1732 = gt_eq953
                             else:
-                                if prediction946 == 3:
-                                    _t1731 = self.parse_gt()
-                                    gt950 = _t1731
-                                    _t1730 = gt950
+                                if prediction948 == 3:
+                                    _t1735 = self.parse_gt()
+                                    gt952 = _t1735
+                                    _t1734 = gt952
                                 else:
-                                    if prediction946 == 2:
-                                        _t1733 = self.parse_lt_eq()
-                                        lt_eq949 = _t1733
-                                        _t1732 = lt_eq949
+                                    if prediction948 == 2:
+                                        _t1737 = self.parse_lt_eq()
+                                        lt_eq951 = _t1737
+                                        _t1736 = lt_eq951
                                     else:
-                                        if prediction946 == 1:
-                                            _t1735 = self.parse_lt()
-                                            lt948 = _t1735
-                                            _t1734 = lt948
+                                        if prediction948 == 1:
+                                            _t1739 = self.parse_lt()
+                                            lt950 = _t1739
+                                            _t1738 = lt950
                                         else:
-                                            if prediction946 == 0:
-                                                _t1737 = self.parse_eq()
-                                                eq947 = _t1737
-                                                _t1736 = eq947
+                                            if prediction948 == 0:
+                                                _t1741 = self.parse_eq()
+                                                eq949 = _t1741
+                                                _t1740 = eq949
                                             else:
                                                 raise ParseError("Unexpected token in primitive" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                                            _t1734 = _t1736
-                                        _t1732 = _t1734
-                                    _t1730 = _t1732
-                                _t1728 = _t1730
-                            _t1726 = _t1728
-                        _t1724 = _t1726
-                    _t1722 = _t1724
-                _t1720 = _t1722
-            _t1716 = _t1720
-        result962 = _t1716
-        self.record_span(span_start961, "Primitive")
-        return result962
+                                            _t1738 = _t1740
+                                        _t1736 = _t1738
+                                    _t1734 = _t1736
+                                _t1732 = _t1734
+                            _t1730 = _t1732
+                        _t1728 = _t1730
+                    _t1726 = _t1728
+                _t1724 = _t1726
+            _t1720 = _t1724
+        result964 = _t1720
+        self.record_span(span_start963, "Primitive")
+        return result964
 
     def parse_eq(self) -> logic_pb2.Primitive:
-        span_start965 = self.span_start()
+        span_start967 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("=")
-        _t1738 = self.parse_term()
-        term963 = _t1738
-        _t1739 = self.parse_term()
-        term_3964 = _t1739
-        self.consume_literal(")")
-        _t1740 = logic_pb2.RelTerm(term=term963)
-        _t1741 = logic_pb2.RelTerm(term=term_3964)
-        _t1742 = logic_pb2.Primitive(name="rel_primitive_eq", terms=[_t1740, _t1741])
-        result966 = _t1742
-        self.record_span(span_start965, "Primitive")
-        return result966
+        _t1742 = self.parse_term()
+        term965 = _t1742
+        _t1743 = self.parse_term()
+        term_3966 = _t1743
+        self.consume_literal(")")
+        _t1744 = logic_pb2.RelTerm(term=term965)
+        _t1745 = logic_pb2.RelTerm(term=term_3966)
+        _t1746 = logic_pb2.Primitive(name="rel_primitive_eq", terms=[_t1744, _t1745])
+        result968 = _t1746
+        self.record_span(span_start967, "Primitive")
+        return result968
 
     def parse_lt(self) -> logic_pb2.Primitive:
-        span_start969 = self.span_start()
+        span_start971 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("<")
-        _t1743 = self.parse_term()
-        term967 = _t1743
-        _t1744 = self.parse_term()
-        term_3968 = _t1744
+        _t1747 = self.parse_term()
+        term969 = _t1747
+        _t1748 = self.parse_term()
+        term_3970 = _t1748
         self.consume_literal(")")
-        _t1745 = logic_pb2.RelTerm(term=term967)
-        _t1746 = logic_pb2.RelTerm(term=term_3968)
-        _t1747 = logic_pb2.Primitive(name="rel_primitive_lt_monotype", terms=[_t1745, _t1746])
-        result970 = _t1747
-        self.record_span(span_start969, "Primitive")
-        return result970
+        _t1749 = logic_pb2.RelTerm(term=term969)
+        _t1750 = logic_pb2.RelTerm(term=term_3970)
+        _t1751 = logic_pb2.Primitive(name="rel_primitive_lt_monotype", terms=[_t1749, _t1750])
+        result972 = _t1751
+        self.record_span(span_start971, "Primitive")
+        return result972
 
     def parse_lt_eq(self) -> logic_pb2.Primitive:
-        span_start973 = self.span_start()
+        span_start975 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("<=")
-        _t1748 = self.parse_term()
-        term971 = _t1748
-        _t1749 = self.parse_term()
-        term_3972 = _t1749
+        _t1752 = self.parse_term()
+        term973 = _t1752
+        _t1753 = self.parse_term()
+        term_3974 = _t1753
         self.consume_literal(")")
-        _t1750 = logic_pb2.RelTerm(term=term971)
-        _t1751 = logic_pb2.RelTerm(term=term_3972)
-        _t1752 = logic_pb2.Primitive(name="rel_primitive_lt_eq_monotype", terms=[_t1750, _t1751])
-        result974 = _t1752
-        self.record_span(span_start973, "Primitive")
-        return result974
+        _t1754 = logic_pb2.RelTerm(term=term973)
+        _t1755 = logic_pb2.RelTerm(term=term_3974)
+        _t1756 = logic_pb2.Primitive(name="rel_primitive_lt_eq_monotype", terms=[_t1754, _t1755])
+        result976 = _t1756
+        self.record_span(span_start975, "Primitive")
+        return result976
 
     def parse_gt(self) -> logic_pb2.Primitive:
-        span_start977 = self.span_start()
+        span_start979 = self.span_start()
         self.consume_literal("(")
         self.consume_literal(">")
-        _t1753 = self.parse_term()
-        term975 = _t1753
-        _t1754 = self.parse_term()
-        term_3976 = _t1754
+        _t1757 = self.parse_term()
+        term977 = _t1757
+        _t1758 = self.parse_term()
+        term_3978 = _t1758
         self.consume_literal(")")
-        _t1755 = logic_pb2.RelTerm(term=term975)
-        _t1756 = logic_pb2.RelTerm(term=term_3976)
-        _t1757 = logic_pb2.Primitive(name="rel_primitive_gt_monotype", terms=[_t1755, _t1756])
-        result978 = _t1757
-        self.record_span(span_start977, "Primitive")
-        return result978
+        _t1759 = logic_pb2.RelTerm(term=term977)
+        _t1760 = logic_pb2.RelTerm(term=term_3978)
+        _t1761 = logic_pb2.Primitive(name="rel_primitive_gt_monotype", terms=[_t1759, _t1760])
+        result980 = _t1761
+        self.record_span(span_start979, "Primitive")
+        return result980
 
     def parse_gt_eq(self) -> logic_pb2.Primitive:
-        span_start981 = self.span_start()
+        span_start983 = self.span_start()
         self.consume_literal("(")
         self.consume_literal(">=")
-        _t1758 = self.parse_term()
-        term979 = _t1758
-        _t1759 = self.parse_term()
-        term_3980 = _t1759
+        _t1762 = self.parse_term()
+        term981 = _t1762
+        _t1763 = self.parse_term()
+        term_3982 = _t1763
         self.consume_literal(")")
-        _t1760 = logic_pb2.RelTerm(term=term979)
-        _t1761 = logic_pb2.RelTerm(term=term_3980)
-        _t1762 = logic_pb2.Primitive(name="rel_primitive_gt_eq_monotype", terms=[_t1760, _t1761])
-        result982 = _t1762
-        self.record_span(span_start981, "Primitive")
-        return result982
+        _t1764 = logic_pb2.RelTerm(term=term981)
+        _t1765 = logic_pb2.RelTerm(term=term_3982)
+        _t1766 = logic_pb2.Primitive(name="rel_primitive_gt_eq_monotype", terms=[_t1764, _t1765])
+        result984 = _t1766
+        self.record_span(span_start983, "Primitive")
+        return result984
 
     def parse_add(self) -> logic_pb2.Primitive:
-        span_start986 = self.span_start()
+        span_start988 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("+")
-        _t1763 = self.parse_term()
-        term983 = _t1763
-        _t1764 = self.parse_term()
-        term_3984 = _t1764
-        _t1765 = self.parse_term()
-        term_4985 = _t1765
-        self.consume_literal(")")
-        _t1766 = logic_pb2.RelTerm(term=term983)
-        _t1767 = logic_pb2.RelTerm(term=term_3984)
-        _t1768 = logic_pb2.RelTerm(term=term_4985)
-        _t1769 = logic_pb2.Primitive(name="rel_primitive_add_monotype", terms=[_t1766, _t1767, _t1768])
-        result987 = _t1769
-        self.record_span(span_start986, "Primitive")
-        return result987
+        _t1767 = self.parse_term()
+        term985 = _t1767
+        _t1768 = self.parse_term()
+        term_3986 = _t1768
+        _t1769 = self.parse_term()
+        term_4987 = _t1769
+        self.consume_literal(")")
+        _t1770 = logic_pb2.RelTerm(term=term985)
+        _t1771 = logic_pb2.RelTerm(term=term_3986)
+        _t1772 = logic_pb2.RelTerm(term=term_4987)
+        _t1773 = logic_pb2.Primitive(name="rel_primitive_add_monotype", terms=[_t1770, _t1771, _t1772])
+        result989 = _t1773
+        self.record_span(span_start988, "Primitive")
+        return result989
 
     def parse_minus(self) -> logic_pb2.Primitive:
-        span_start991 = self.span_start()
+        span_start993 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("-")
-        _t1770 = self.parse_term()
-        term988 = _t1770
-        _t1771 = self.parse_term()
-        term_3989 = _t1771
-        _t1772 = self.parse_term()
-        term_4990 = _t1772
-        self.consume_literal(")")
-        _t1773 = logic_pb2.RelTerm(term=term988)
-        _t1774 = logic_pb2.RelTerm(term=term_3989)
-        _t1775 = logic_pb2.RelTerm(term=term_4990)
-        _t1776 = logic_pb2.Primitive(name="rel_primitive_subtract_monotype", terms=[_t1773, _t1774, _t1775])
-        result992 = _t1776
-        self.record_span(span_start991, "Primitive")
-        return result992
+        _t1774 = self.parse_term()
+        term990 = _t1774
+        _t1775 = self.parse_term()
+        term_3991 = _t1775
+        _t1776 = self.parse_term()
+        term_4992 = _t1776
+        self.consume_literal(")")
+        _t1777 = logic_pb2.RelTerm(term=term990)
+        _t1778 = logic_pb2.RelTerm(term=term_3991)
+        _t1779 = logic_pb2.RelTerm(term=term_4992)
+        _t1780 = logic_pb2.Primitive(name="rel_primitive_subtract_monotype", terms=[_t1777, _t1778, _t1779])
+        result994 = _t1780
+        self.record_span(span_start993, "Primitive")
+        return result994
 
     def parse_multiply(self) -> logic_pb2.Primitive:
-        span_start996 = self.span_start()
+        span_start998 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("*")
-        _t1777 = self.parse_term()
-        term993 = _t1777
-        _t1778 = self.parse_term()
-        term_3994 = _t1778
-        _t1779 = self.parse_term()
-        term_4995 = _t1779
-        self.consume_literal(")")
-        _t1780 = logic_pb2.RelTerm(term=term993)
-        _t1781 = logic_pb2.RelTerm(term=term_3994)
-        _t1782 = logic_pb2.RelTerm(term=term_4995)
-        _t1783 = logic_pb2.Primitive(name="rel_primitive_multiply_monotype", terms=[_t1780, _t1781, _t1782])
-        result997 = _t1783
-        self.record_span(span_start996, "Primitive")
-        return result997
+        _t1781 = self.parse_term()
+        term995 = _t1781
+        _t1782 = self.parse_term()
+        term_3996 = _t1782
+        _t1783 = self.parse_term()
+        term_4997 = _t1783
+        self.consume_literal(")")
+        _t1784 = logic_pb2.RelTerm(term=term995)
+        _t1785 = logic_pb2.RelTerm(term=term_3996)
+        _t1786 = logic_pb2.RelTerm(term=term_4997)
+        _t1787 = logic_pb2.Primitive(name="rel_primitive_multiply_monotype", terms=[_t1784, _t1785, _t1786])
+        result999 = _t1787
+        self.record_span(span_start998, "Primitive")
+        return result999
 
     def parse_divide(self) -> logic_pb2.Primitive:
-        span_start1001 = self.span_start()
+        span_start1003 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("/")
-        _t1784 = self.parse_term()
-        term998 = _t1784
-        _t1785 = self.parse_term()
-        term_3999 = _t1785
-        _t1786 = self.parse_term()
-        term_41000 = _t1786
-        self.consume_literal(")")
-        _t1787 = logic_pb2.RelTerm(term=term998)
-        _t1788 = logic_pb2.RelTerm(term=term_3999)
-        _t1789 = logic_pb2.RelTerm(term=term_41000)
-        _t1790 = logic_pb2.Primitive(name="rel_primitive_divide_monotype", terms=[_t1787, _t1788, _t1789])
-        result1002 = _t1790
-        self.record_span(span_start1001, "Primitive")
-        return result1002
+        _t1788 = self.parse_term()
+        term1000 = _t1788
+        _t1789 = self.parse_term()
+        term_31001 = _t1789
+        _t1790 = self.parse_term()
+        term_41002 = _t1790
+        self.consume_literal(")")
+        _t1791 = logic_pb2.RelTerm(term=term1000)
+        _t1792 = logic_pb2.RelTerm(term=term_31001)
+        _t1793 = logic_pb2.RelTerm(term=term_41002)
+        _t1794 = logic_pb2.Primitive(name="rel_primitive_divide_monotype", terms=[_t1791, _t1792, _t1793])
+        result1004 = _t1794
+        self.record_span(span_start1003, "Primitive")
+        return result1004
 
     def parse_rel_term(self) -> logic_pb2.RelTerm:
-        span_start1006 = self.span_start()
+        span_start1008 = self.span_start()
         if self.match_lookahead_literal("true", 0):
-            _t1791 = 1
+            _t1795 = 1
         else:
             if self.match_lookahead_literal("missing", 0):
-                _t1792 = 1
+                _t1796 = 1
             else:
                 if self.match_lookahead_literal("false", 0):
-                    _t1793 = 1
+                    _t1797 = 1
                 else:
                     if self.match_lookahead_literal("(", 0):
-                        _t1794 = 1
+                        _t1798 = 1
                     else:
                         if self.match_lookahead_literal("#", 0):
-                            _t1795 = 0
+                            _t1799 = 0
                         else:
                             if self.match_lookahead_terminal("SYMBOL", 0):
-                                _t1796 = 1
+                                _t1800 = 1
                             else:
                                 if self.match_lookahead_terminal("UINT32", 0):
-                                    _t1797 = 1
+                                    _t1801 = 1
                                 else:
                                     if self.match_lookahead_terminal("UINT128", 0):
-                                        _t1798 = 1
+                                        _t1802 = 1
                                     else:
                                         if self.match_lookahead_terminal("STRING", 0):
-                                            _t1799 = 1
+                                            _t1803 = 1
                                         else:
                                             if self.match_lookahead_terminal("INT32", 0):
-                                                _t1800 = 1
+                                                _t1804 = 1
                                             else:
                                                 if self.match_lookahead_terminal("INT128", 0):
-                                                    _t1801 = 1
+                                                    _t1805 = 1
                                                 else:
                                                     if self.match_lookahead_terminal("INT", 0):
-                                                        _t1802 = 1
+                                                        _t1806 = 1
                                                     else:
                                                         if self.match_lookahead_terminal("FLOAT32", 0):
-                                                            _t1803 = 1
+                                                            _t1807 = 1
                                                         else:
                                                             if self.match_lookahead_terminal("FLOAT", 0):
-                                                                _t1804 = 1
+                                                                _t1808 = 1
                                                             else:
                                                                 if self.match_lookahead_terminal("DECIMAL", 0):
-                                                                    _t1805 = 1
+                                                                    _t1809 = 1
                                                                 else:
-                                                                    _t1805 = -1
-                                                                _t1804 = _t1805
-                                                            _t1803 = _t1804
-                                                        _t1802 = _t1803
-                                                    _t1801 = _t1802
-                                                _t1800 = _t1801
-                                            _t1799 = _t1800
-                                        _t1798 = _t1799
-                                    _t1797 = _t1798
-                                _t1796 = _t1797
-                            _t1795 = _t1796
-                        _t1794 = _t1795
-                    _t1793 = _t1794
-                _t1792 = _t1793
-            _t1791 = _t1792
-        prediction1003 = _t1791
-        if prediction1003 == 1:
-            _t1807 = self.parse_term()
-            term1005 = _t1807
-            _t1808 = logic_pb2.RelTerm(term=term1005)
-            _t1806 = _t1808
-        else:
-            if prediction1003 == 0:
-                _t1810 = self.parse_specialized_value()
-                specialized_value1004 = _t1810
-                _t1811 = logic_pb2.RelTerm(specialized_value=specialized_value1004)
-                _t1809 = _t1811
+                                                                    _t1809 = -1
+                                                                _t1808 = _t1809
+                                                            _t1807 = _t1808
+                                                        _t1806 = _t1807
+                                                    _t1805 = _t1806
+                                                _t1804 = _t1805
+                                            _t1803 = _t1804
+                                        _t1802 = _t1803
+                                    _t1801 = _t1802
+                                _t1800 = _t1801
+                            _t1799 = _t1800
+                        _t1798 = _t1799
+                    _t1797 = _t1798
+                _t1796 = _t1797
+            _t1795 = _t1796
+        prediction1005 = _t1795
+        if prediction1005 == 1:
+            _t1811 = self.parse_term()
+            term1007 = _t1811
+            _t1812 = logic_pb2.RelTerm(term=term1007)
+            _t1810 = _t1812
+        else:
+            if prediction1005 == 0:
+                _t1814 = self.parse_specialized_value()
+                specialized_value1006 = _t1814
+                _t1815 = logic_pb2.RelTerm(specialized_value=specialized_value1006)
+                _t1813 = _t1815
             else:
                 raise ParseError("Unexpected token in rel_term" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1806 = _t1809
-        result1007 = _t1806
-        self.record_span(span_start1006, "RelTerm")
-        return result1007
+            _t1810 = _t1813
+        result1009 = _t1810
+        self.record_span(span_start1008, "RelTerm")
+        return result1009
 
     def parse_specialized_value(self) -> logic_pb2.Value:
-        span_start1009 = self.span_start()
+        span_start1011 = self.span_start()
         self.consume_literal("#")
-        _t1812 = self.parse_raw_value()
-        raw_value1008 = _t1812
-        result1010 = raw_value1008
-        self.record_span(span_start1009, "Value")
-        return result1010
+        _t1816 = self.parse_raw_value()
+        raw_value1010 = _t1816
+        result1012 = raw_value1010
+        self.record_span(span_start1011, "Value")
+        return result1012
 
     def parse_rel_atom(self) -> logic_pb2.RelAtom:
-        span_start1016 = self.span_start()
+        span_start1018 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("relatom")
-        _t1813 = self.parse_name()
-        name1011 = _t1813
-        xs1012 = []
-        cond1013 = ((((((((((((((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 cond1013:
-            _t1814 = self.parse_rel_term()
-            item1014 = _t1814
-            xs1012.append(item1014)
-            cond1013 = ((((((((((((((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_terms1015 = xs1012
-        self.consume_literal(")")
-        _t1815 = logic_pb2.RelAtom(name=name1011, terms=rel_terms1015)
-        result1017 = _t1815
-        self.record_span(span_start1016, "RelAtom")
-        return result1017
+        _t1817 = self.parse_name()
+        name1013 = _t1817
+        xs1014 = []
+        cond1015 = ((((((((((((((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 cond1015:
+            _t1818 = self.parse_rel_term()
+            item1016 = _t1818
+            xs1014.append(item1016)
+            cond1015 = ((((((((((((((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_terms1017 = xs1014
+        self.consume_literal(")")
+        _t1819 = logic_pb2.RelAtom(name=name1013, terms=rel_terms1017)
+        result1019 = _t1819
+        self.record_span(span_start1018, "RelAtom")
+        return result1019
 
     def parse_cast(self) -> logic_pb2.Cast:
-        span_start1020 = self.span_start()
+        span_start1022 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("cast")
-        _t1816 = self.parse_term()
-        term1018 = _t1816
-        _t1817 = self.parse_term()
-        term_31019 = _t1817
+        _t1820 = self.parse_term()
+        term1020 = _t1820
+        _t1821 = self.parse_term()
+        term_31021 = _t1821
         self.consume_literal(")")
-        _t1818 = logic_pb2.Cast(input=term1018, result=term_31019)
-        result1021 = _t1818
-        self.record_span(span_start1020, "Cast")
-        return result1021
+        _t1822 = logic_pb2.Cast(input=term1020, result=term_31021)
+        result1023 = _t1822
+        self.record_span(span_start1022, "Cast")
+        return result1023
 
     def parse_attrs(self) -> Sequence[logic_pb2.Attribute]:
         self.consume_literal("(")
         self.consume_literal("attrs")
-        xs1022 = []
-        cond1023 = self.match_lookahead_literal("(", 0)
-        while cond1023:
-            _t1819 = self.parse_attribute()
-            item1024 = _t1819
-            xs1022.append(item1024)
-            cond1023 = self.match_lookahead_literal("(", 0)
-        attributes1025 = xs1022
+        xs1024 = []
+        cond1025 = self.match_lookahead_literal("(", 0)
+        while cond1025:
+            _t1823 = self.parse_attribute()
+            item1026 = _t1823
+            xs1024.append(item1026)
+            cond1025 = self.match_lookahead_literal("(", 0)
+        attributes1027 = xs1024
         self.consume_literal(")")
-        return attributes1025
+        return attributes1027
 
     def parse_attribute(self) -> logic_pb2.Attribute:
-        span_start1031 = self.span_start()
+        span_start1033 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("attribute")
-        _t1820 = self.parse_name()
-        name1026 = _t1820
-        xs1027 = []
-        cond1028 = ((((((((((((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 cond1028:
-            _t1821 = self.parse_raw_value()
-            item1029 = _t1821
-            xs1027.append(item1029)
-            cond1028 = ((((((((((((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_values1030 = xs1027
-        self.consume_literal(")")
-        _t1822 = logic_pb2.Attribute(name=name1026, args=raw_values1030)
-        result1032 = _t1822
-        self.record_span(span_start1031, "Attribute")
-        return result1032
+        _t1824 = self.parse_name()
+        name1028 = _t1824
+        xs1029 = []
+        cond1030 = ((((((((((((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 cond1030:
+            _t1825 = self.parse_raw_value()
+            item1031 = _t1825
+            xs1029.append(item1031)
+            cond1030 = ((((((((((((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_values1032 = xs1029
+        self.consume_literal(")")
+        _t1826 = logic_pb2.Attribute(name=name1028, args=raw_values1032)
+        result1034 = _t1826
+        self.record_span(span_start1033, "Attribute")
+        return result1034
 
     def parse_algorithm(self) -> logic_pb2.Algorithm:
-        span_start1038 = self.span_start()
+        span_start1041 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("algorithm")
-        xs1033 = []
-        cond1034 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
-        while cond1034:
-            _t1823 = self.parse_relation_id()
-            item1035 = _t1823
-            xs1033.append(item1035)
-            cond1034 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
-        relation_ids1036 = xs1033
-        _t1824 = self.parse_script()
-        script1037 = _t1824
-        self.consume_literal(")")
-        _t1825 = logic_pb2.Algorithm(body=script1037)
-        getattr(_t1825, 'global').extend(relation_ids1036)
-        result1039 = _t1825
-        self.record_span(span_start1038, "Algorithm")
-        return result1039
+        xs1035 = []
+        cond1036 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
+        while cond1036:
+            _t1827 = self.parse_relation_id()
+            item1037 = _t1827
+            xs1035.append(item1037)
+            cond1036 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
+        relation_ids1038 = xs1035
+        _t1828 = self.parse_script()
+        script1039 = _t1828
+        if self.match_lookahead_literal("(", 0):
+            _t1830 = self.parse_attrs()
+            _t1829 = _t1830
+        else:
+            _t1829 = None
+        attrs1040 = _t1829
+        self.consume_literal(")")
+        _t1831 = logic_pb2.Algorithm(body=script1039, attrs=(attrs1040 if attrs1040 is not None else []))
+        getattr(_t1831, 'global').extend(relation_ids1038)
+        result1042 = _t1831
+        self.record_span(span_start1041, "Algorithm")
+        return result1042
 
     def parse_script(self) -> logic_pb2.Script:
-        span_start1044 = self.span_start()
+        span_start1047 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("script")
-        xs1040 = []
-        cond1041 = self.match_lookahead_literal("(", 0)
-        while cond1041:
-            _t1826 = self.parse_construct()
-            item1042 = _t1826
-            xs1040.append(item1042)
-            cond1041 = self.match_lookahead_literal("(", 0)
-        constructs1043 = xs1040
-        self.consume_literal(")")
-        _t1827 = logic_pb2.Script(constructs=constructs1043)
-        result1045 = _t1827
-        self.record_span(span_start1044, "Script")
-        return result1045
+        xs1043 = []
+        cond1044 = self.match_lookahead_literal("(", 0)
+        while cond1044:
+            _t1832 = self.parse_construct()
+            item1045 = _t1832
+            xs1043.append(item1045)
+            cond1044 = self.match_lookahead_literal("(", 0)
+        constructs1046 = xs1043
+        self.consume_literal(")")
+        _t1833 = logic_pb2.Script(constructs=constructs1046)
+        result1048 = _t1833
+        self.record_span(span_start1047, "Script")
+        return result1048
 
     def parse_construct(self) -> logic_pb2.Construct:
-        span_start1049 = self.span_start()
+        span_start1052 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("upsert", 1):
-                _t1829 = 1
+                _t1835 = 1
             else:
                 if self.match_lookahead_literal("monus", 1):
-                    _t1830 = 1
+                    _t1836 = 1
                 else:
                     if self.match_lookahead_literal("monoid", 1):
-                        _t1831 = 1
+                        _t1837 = 1
                     else:
                         if self.match_lookahead_literal("loop", 1):
-                            _t1832 = 0
+                            _t1838 = 0
                         else:
                             if self.match_lookahead_literal("break", 1):
-                                _t1833 = 1
+                                _t1839 = 1
                             else:
                                 if self.match_lookahead_literal("assign", 1):
-                                    _t1834 = 1
+                                    _t1840 = 1
                                 else:
-                                    _t1834 = -1
-                                _t1833 = _t1834
-                            _t1832 = _t1833
-                        _t1831 = _t1832
-                    _t1830 = _t1831
-                _t1829 = _t1830
-            _t1828 = _t1829
-        else:
-            _t1828 = -1
-        prediction1046 = _t1828
-        if prediction1046 == 1:
-            _t1836 = self.parse_instruction()
-            instruction1048 = _t1836
-            _t1837 = logic_pb2.Construct(instruction=instruction1048)
-            _t1835 = _t1837
-        else:
-            if prediction1046 == 0:
-                _t1839 = self.parse_loop()
-                loop1047 = _t1839
-                _t1840 = logic_pb2.Construct(loop=loop1047)
-                _t1838 = _t1840
+                                    _t1840 = -1
+                                _t1839 = _t1840
+                            _t1838 = _t1839
+                        _t1837 = _t1838
+                    _t1836 = _t1837
+                _t1835 = _t1836
+            _t1834 = _t1835
+        else:
+            _t1834 = -1
+        prediction1049 = _t1834
+        if prediction1049 == 1:
+            _t1842 = self.parse_instruction()
+            instruction1051 = _t1842
+            _t1843 = logic_pb2.Construct(instruction=instruction1051)
+            _t1841 = _t1843
+        else:
+            if prediction1049 == 0:
+                _t1845 = self.parse_loop()
+                loop1050 = _t1845
+                _t1846 = logic_pb2.Construct(loop=loop1050)
+                _t1844 = _t1846
             else:
                 raise ParseError("Unexpected token in construct" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1835 = _t1838
-        result1050 = _t1835
-        self.record_span(span_start1049, "Construct")
-        return result1050
+            _t1841 = _t1844
+        result1053 = _t1841
+        self.record_span(span_start1052, "Construct")
+        return result1053
 
     def parse_loop(self) -> logic_pb2.Loop:
-        span_start1053 = self.span_start()
+        span_start1057 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("loop")
-        _t1841 = self.parse_init()
-        init1051 = _t1841
-        _t1842 = self.parse_script()
-        script1052 = _t1842
+        _t1847 = self.parse_init()
+        init1054 = _t1847
+        _t1848 = self.parse_script()
+        script1055 = _t1848
+        if self.match_lookahead_literal("(", 0):
+            _t1850 = self.parse_attrs()
+            _t1849 = _t1850
+        else:
+            _t1849 = None
+        attrs1056 = _t1849
         self.consume_literal(")")
-        _t1843 = logic_pb2.Loop(init=init1051, body=script1052)
-        result1054 = _t1843
-        self.record_span(span_start1053, "Loop")
-        return result1054
+        _t1851 = logic_pb2.Loop(init=init1054, body=script1055, attrs=(attrs1056 if attrs1056 is not None else []))
+        result1058 = _t1851
+        self.record_span(span_start1057, "Loop")
+        return result1058
 
     def parse_init(self) -> Sequence[logic_pb2.Instruction]:
         self.consume_literal("(")
         self.consume_literal("init")
-        xs1055 = []
-        cond1056 = self.match_lookahead_literal("(", 0)
-        while cond1056:
-            _t1844 = self.parse_instruction()
-            item1057 = _t1844
-            xs1055.append(item1057)
-            cond1056 = self.match_lookahead_literal("(", 0)
-        instructions1058 = xs1055
+        xs1059 = []
+        cond1060 = self.match_lookahead_literal("(", 0)
+        while cond1060:
+            _t1852 = self.parse_instruction()
+            item1061 = _t1852
+            xs1059.append(item1061)
+            cond1060 = self.match_lookahead_literal("(", 0)
+        instructions1062 = xs1059
         self.consume_literal(")")
-        return instructions1058
+        return instructions1062
 
     def parse_instruction(self) -> logic_pb2.Instruction:
-        span_start1065 = self.span_start()
+        span_start1069 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("upsert", 1):
-                _t1846 = 1
+                _t1854 = 1
             else:
                 if self.match_lookahead_literal("monus", 1):
-                    _t1847 = 4
+                    _t1855 = 4
                 else:
                     if self.match_lookahead_literal("monoid", 1):
-                        _t1848 = 3
+                        _t1856 = 3
                     else:
                         if self.match_lookahead_literal("break", 1):
-                            _t1849 = 2
+                            _t1857 = 2
                         else:
                             if self.match_lookahead_literal("assign", 1):
-                                _t1850 = 0
+                                _t1858 = 0
                             else:
-                                _t1850 = -1
-                            _t1849 = _t1850
-                        _t1848 = _t1849
-                    _t1847 = _t1848
-                _t1846 = _t1847
-            _t1845 = _t1846
-        else:
-            _t1845 = -1
-        prediction1059 = _t1845
-        if prediction1059 == 4:
-            _t1852 = self.parse_monus_def()
-            monus_def1064 = _t1852
-            _t1853 = logic_pb2.Instruction(monus_def=monus_def1064)
-            _t1851 = _t1853
-        else:
-            if prediction1059 == 3:
-                _t1855 = self.parse_monoid_def()
-                monoid_def1063 = _t1855
-                _t1856 = logic_pb2.Instruction(monoid_def=monoid_def1063)
-                _t1854 = _t1856
+                                _t1858 = -1
+                            _t1857 = _t1858
+                        _t1856 = _t1857
+                    _t1855 = _t1856
+                _t1854 = _t1855
+            _t1853 = _t1854
+        else:
+            _t1853 = -1
+        prediction1063 = _t1853
+        if prediction1063 == 4:
+            _t1860 = self.parse_monus_def()
+            monus_def1068 = _t1860
+            _t1861 = logic_pb2.Instruction(monus_def=monus_def1068)
+            _t1859 = _t1861
+        else:
+            if prediction1063 == 3:
+                _t1863 = self.parse_monoid_def()
+                monoid_def1067 = _t1863
+                _t1864 = logic_pb2.Instruction(monoid_def=monoid_def1067)
+                _t1862 = _t1864
             else:
-                if prediction1059 == 2:
-                    _t1858 = self.parse_break()
-                    break1062 = _t1858
-                    _t1859 = logic_pb2.Instruction()
-                    getattr(_t1859, 'break').CopyFrom(break1062)
-                    _t1857 = _t1859
+                if prediction1063 == 2:
+                    _t1866 = self.parse_break()
+                    break1066 = _t1866
+                    _t1867 = logic_pb2.Instruction()
+                    getattr(_t1867, 'break').CopyFrom(break1066)
+                    _t1865 = _t1867
                 else:
-                    if prediction1059 == 1:
-                        _t1861 = self.parse_upsert()
-                        upsert1061 = _t1861
-                        _t1862 = logic_pb2.Instruction(upsert=upsert1061)
-                        _t1860 = _t1862
+                    if prediction1063 == 1:
+                        _t1869 = self.parse_upsert()
+                        upsert1065 = _t1869
+                        _t1870 = logic_pb2.Instruction(upsert=upsert1065)
+                        _t1868 = _t1870
                     else:
-                        if prediction1059 == 0:
-                            _t1864 = self.parse_assign()
-                            assign1060 = _t1864
-                            _t1865 = logic_pb2.Instruction(assign=assign1060)
-                            _t1863 = _t1865
+                        if prediction1063 == 0:
+                            _t1872 = self.parse_assign()
+                            assign1064 = _t1872
+                            _t1873 = logic_pb2.Instruction(assign=assign1064)
+                            _t1871 = _t1873
                         else:
                             raise ParseError("Unexpected token in instruction" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                        _t1860 = _t1863
-                    _t1857 = _t1860
-                _t1854 = _t1857
-            _t1851 = _t1854
-        result1066 = _t1851
-        self.record_span(span_start1065, "Instruction")
-        return result1066
+                        _t1868 = _t1871
+                    _t1865 = _t1868
+                _t1862 = _t1865
+            _t1859 = _t1862
+        result1070 = _t1859
+        self.record_span(span_start1069, "Instruction")
+        return result1070
 
     def parse_assign(self) -> logic_pb2.Assign:
-        span_start1070 = self.span_start()
+        span_start1074 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("assign")
-        _t1866 = self.parse_relation_id()
-        relation_id1067 = _t1866
-        _t1867 = self.parse_abstraction()
-        abstraction1068 = _t1867
+        _t1874 = self.parse_relation_id()
+        relation_id1071 = _t1874
+        _t1875 = self.parse_abstraction()
+        abstraction1072 = _t1875
         if self.match_lookahead_literal("(", 0):
-            _t1869 = self.parse_attrs()
-            _t1868 = _t1869
+            _t1877 = self.parse_attrs()
+            _t1876 = _t1877
         else:
-            _t1868 = None
-        attrs1069 = _t1868
+            _t1876 = None
+        attrs1073 = _t1876
         self.consume_literal(")")
-        _t1870 = logic_pb2.Assign(name=relation_id1067, body=abstraction1068, attrs=(attrs1069 if attrs1069 is not None else []))
-        result1071 = _t1870
-        self.record_span(span_start1070, "Assign")
-        return result1071
+        _t1878 = logic_pb2.Assign(name=relation_id1071, body=abstraction1072, attrs=(attrs1073 if attrs1073 is not None else []))
+        result1075 = _t1878
+        self.record_span(span_start1074, "Assign")
+        return result1075
 
     def parse_upsert(self) -> logic_pb2.Upsert:
-        span_start1075 = self.span_start()
+        span_start1079 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("upsert")
-        _t1871 = self.parse_relation_id()
-        relation_id1072 = _t1871
-        _t1872 = self.parse_abstraction_with_arity()
-        abstraction_with_arity1073 = _t1872
+        _t1879 = self.parse_relation_id()
+        relation_id1076 = _t1879
+        _t1880 = self.parse_abstraction_with_arity()
+        abstraction_with_arity1077 = _t1880
         if self.match_lookahead_literal("(", 0):
-            _t1874 = self.parse_attrs()
-            _t1873 = _t1874
+            _t1882 = self.parse_attrs()
+            _t1881 = _t1882
         else:
-            _t1873 = None
-        attrs1074 = _t1873
+            _t1881 = None
+        attrs1078 = _t1881
         self.consume_literal(")")
-        _t1875 = logic_pb2.Upsert(name=relation_id1072, body=abstraction_with_arity1073[0], attrs=(attrs1074 if attrs1074 is not None else []), value_arity=abstraction_with_arity1073[1])
-        result1076 = _t1875
-        self.record_span(span_start1075, "Upsert")
-        return result1076
+        _t1883 = logic_pb2.Upsert(name=relation_id1076, body=abstraction_with_arity1077[0], attrs=(attrs1078 if attrs1078 is not None else []), value_arity=abstraction_with_arity1077[1])
+        result1080 = _t1883
+        self.record_span(span_start1079, "Upsert")
+        return result1080
 
     def parse_abstraction_with_arity(self) -> tuple[logic_pb2.Abstraction, int]:
         self.consume_literal("(")
-        _t1876 = self.parse_bindings()
-        bindings1077 = _t1876
-        _t1877 = self.parse_formula()
-        formula1078 = _t1877
+        _t1884 = self.parse_bindings()
+        bindings1081 = _t1884
+        _t1885 = self.parse_formula()
+        formula1082 = _t1885
         self.consume_literal(")")
-        _t1878 = logic_pb2.Abstraction(vars=(list(bindings1077[0]) + list(bindings1077[1] if bindings1077[1] is not None else [])), value=formula1078)
-        return (_t1878, len(bindings1077[1]),)
+        _t1886 = logic_pb2.Abstraction(vars=(list(bindings1081[0]) + list(bindings1081[1] if bindings1081[1] is not None else [])), value=formula1082)
+        return (_t1886, len(bindings1081[1]),)
 
     def parse_break(self) -> logic_pb2.Break:
-        span_start1082 = self.span_start()
+        span_start1086 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("break")
-        _t1879 = self.parse_relation_id()
-        relation_id1079 = _t1879
-        _t1880 = self.parse_abstraction()
-        abstraction1080 = _t1880
+        _t1887 = self.parse_relation_id()
+        relation_id1083 = _t1887
+        _t1888 = self.parse_abstraction()
+        abstraction1084 = _t1888
         if self.match_lookahead_literal("(", 0):
-            _t1882 = self.parse_attrs()
-            _t1881 = _t1882
+            _t1890 = self.parse_attrs()
+            _t1889 = _t1890
         else:
-            _t1881 = None
-        attrs1081 = _t1881
+            _t1889 = None
+        attrs1085 = _t1889
         self.consume_literal(")")
-        _t1883 = logic_pb2.Break(name=relation_id1079, body=abstraction1080, attrs=(attrs1081 if attrs1081 is not None else []))
-        result1083 = _t1883
-        self.record_span(span_start1082, "Break")
-        return result1083
+        _t1891 = logic_pb2.Break(name=relation_id1083, body=abstraction1084, attrs=(attrs1085 if attrs1085 is not None else []))
+        result1087 = _t1891
+        self.record_span(span_start1086, "Break")
+        return result1087
 
     def parse_monoid_def(self) -> logic_pb2.MonoidDef:
-        span_start1088 = self.span_start()
+        span_start1092 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("monoid")
-        _t1884 = self.parse_monoid()
-        monoid1084 = _t1884
-        _t1885 = self.parse_relation_id()
-        relation_id1085 = _t1885
-        _t1886 = self.parse_abstraction_with_arity()
-        abstraction_with_arity1086 = _t1886
+        _t1892 = self.parse_monoid()
+        monoid1088 = _t1892
+        _t1893 = self.parse_relation_id()
+        relation_id1089 = _t1893
+        _t1894 = self.parse_abstraction_with_arity()
+        abstraction_with_arity1090 = _t1894
         if self.match_lookahead_literal("(", 0):
-            _t1888 = self.parse_attrs()
-            _t1887 = _t1888
+            _t1896 = self.parse_attrs()
+            _t1895 = _t1896
         else:
-            _t1887 = None
-        attrs1087 = _t1887
+            _t1895 = None
+        attrs1091 = _t1895
         self.consume_literal(")")
-        _t1889 = logic_pb2.MonoidDef(monoid=monoid1084, name=relation_id1085, body=abstraction_with_arity1086[0], attrs=(attrs1087 if attrs1087 is not None else []), value_arity=abstraction_with_arity1086[1])
-        result1089 = _t1889
-        self.record_span(span_start1088, "MonoidDef")
-        return result1089
+        _t1897 = logic_pb2.MonoidDef(monoid=monoid1088, name=relation_id1089, body=abstraction_with_arity1090[0], attrs=(attrs1091 if attrs1091 is not None else []), value_arity=abstraction_with_arity1090[1])
+        result1093 = _t1897
+        self.record_span(span_start1092, "MonoidDef")
+        return result1093
 
     def parse_monoid(self) -> logic_pb2.Monoid:
-        span_start1095 = self.span_start()
+        span_start1099 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("sum", 1):
-                _t1891 = 3
+                _t1899 = 3
             else:
                 if self.match_lookahead_literal("or", 1):
-                    _t1892 = 0
+                    _t1900 = 0
                 else:
                     if self.match_lookahead_literal("min", 1):
-                        _t1893 = 1
+                        _t1901 = 1
                     else:
                         if self.match_lookahead_literal("max", 1):
-                            _t1894 = 2
+                            _t1902 = 2
                         else:
-                            _t1894 = -1
-                        _t1893 = _t1894
-                    _t1892 = _t1893
-                _t1891 = _t1892
-            _t1890 = _t1891
-        else:
-            _t1890 = -1
-        prediction1090 = _t1890
-        if prediction1090 == 3:
-            _t1896 = self.parse_sum_monoid()
-            sum_monoid1094 = _t1896
-            _t1897 = logic_pb2.Monoid(sum_monoid=sum_monoid1094)
-            _t1895 = _t1897
-        else:
-            if prediction1090 == 2:
-                _t1899 = self.parse_max_monoid()
-                max_monoid1093 = _t1899
-                _t1900 = logic_pb2.Monoid(max_monoid=max_monoid1093)
-                _t1898 = _t1900
+                            _t1902 = -1
+                        _t1901 = _t1902
+                    _t1900 = _t1901
+                _t1899 = _t1900
+            _t1898 = _t1899
+        else:
+            _t1898 = -1
+        prediction1094 = _t1898
+        if prediction1094 == 3:
+            _t1904 = self.parse_sum_monoid()
+            sum_monoid1098 = _t1904
+            _t1905 = logic_pb2.Monoid(sum_monoid=sum_monoid1098)
+            _t1903 = _t1905
+        else:
+            if prediction1094 == 2:
+                _t1907 = self.parse_max_monoid()
+                max_monoid1097 = _t1907
+                _t1908 = logic_pb2.Monoid(max_monoid=max_monoid1097)
+                _t1906 = _t1908
             else:
-                if prediction1090 == 1:
-                    _t1902 = self.parse_min_monoid()
-                    min_monoid1092 = _t1902
-                    _t1903 = logic_pb2.Monoid(min_monoid=min_monoid1092)
-                    _t1901 = _t1903
+                if prediction1094 == 1:
+                    _t1910 = self.parse_min_monoid()
+                    min_monoid1096 = _t1910
+                    _t1911 = logic_pb2.Monoid(min_monoid=min_monoid1096)
+                    _t1909 = _t1911
                 else:
-                    if prediction1090 == 0:
-                        _t1905 = self.parse_or_monoid()
-                        or_monoid1091 = _t1905
-                        _t1906 = logic_pb2.Monoid(or_monoid=or_monoid1091)
-                        _t1904 = _t1906
+                    if prediction1094 == 0:
+                        _t1913 = self.parse_or_monoid()
+                        or_monoid1095 = _t1913
+                        _t1914 = logic_pb2.Monoid(or_monoid=or_monoid1095)
+                        _t1912 = _t1914
                     else:
                         raise ParseError("Unexpected token in monoid" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                    _t1901 = _t1904
-                _t1898 = _t1901
-            _t1895 = _t1898
-        result1096 = _t1895
-        self.record_span(span_start1095, "Monoid")
-        return result1096
+                    _t1909 = _t1912
+                _t1906 = _t1909
+            _t1903 = _t1906
+        result1100 = _t1903
+        self.record_span(span_start1099, "Monoid")
+        return result1100
 
     def parse_or_monoid(self) -> logic_pb2.OrMonoid:
-        span_start1097 = self.span_start()
+        span_start1101 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("or")
         self.consume_literal(")")
-        _t1907 = logic_pb2.OrMonoid()
-        result1098 = _t1907
-        self.record_span(span_start1097, "OrMonoid")
-        return result1098
+        _t1915 = logic_pb2.OrMonoid()
+        result1102 = _t1915
+        self.record_span(span_start1101, "OrMonoid")
+        return result1102
 
     def parse_min_monoid(self) -> logic_pb2.MinMonoid:
-        span_start1100 = self.span_start()
+        span_start1104 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("min")
-        _t1908 = self.parse_type()
-        type1099 = _t1908
+        _t1916 = self.parse_type()
+        type1103 = _t1916
         self.consume_literal(")")
-        _t1909 = logic_pb2.MinMonoid(type=type1099)
-        result1101 = _t1909
-        self.record_span(span_start1100, "MinMonoid")
-        return result1101
+        _t1917 = logic_pb2.MinMonoid(type=type1103)
+        result1105 = _t1917
+        self.record_span(span_start1104, "MinMonoid")
+        return result1105
 
     def parse_max_monoid(self) -> logic_pb2.MaxMonoid:
-        span_start1103 = self.span_start()
+        span_start1107 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("max")
-        _t1910 = self.parse_type()
-        type1102 = _t1910
+        _t1918 = self.parse_type()
+        type1106 = _t1918
         self.consume_literal(")")
-        _t1911 = logic_pb2.MaxMonoid(type=type1102)
-        result1104 = _t1911
-        self.record_span(span_start1103, "MaxMonoid")
-        return result1104
+        _t1919 = logic_pb2.MaxMonoid(type=type1106)
+        result1108 = _t1919
+        self.record_span(span_start1107, "MaxMonoid")
+        return result1108
 
     def parse_sum_monoid(self) -> logic_pb2.SumMonoid:
-        span_start1106 = self.span_start()
+        span_start1110 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("sum")
-        _t1912 = self.parse_type()
-        type1105 = _t1912
+        _t1920 = self.parse_type()
+        type1109 = _t1920
         self.consume_literal(")")
-        _t1913 = logic_pb2.SumMonoid(type=type1105)
-        result1107 = _t1913
-        self.record_span(span_start1106, "SumMonoid")
-        return result1107
+        _t1921 = logic_pb2.SumMonoid(type=type1109)
+        result1111 = _t1921
+        self.record_span(span_start1110, "SumMonoid")
+        return result1111
 
     def parse_monus_def(self) -> logic_pb2.MonusDef:
-        span_start1112 = self.span_start()
+        span_start1116 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("monus")
-        _t1914 = self.parse_monoid()
-        monoid1108 = _t1914
-        _t1915 = self.parse_relation_id()
-        relation_id1109 = _t1915
-        _t1916 = self.parse_abstraction_with_arity()
-        abstraction_with_arity1110 = _t1916
+        _t1922 = self.parse_monoid()
+        monoid1112 = _t1922
+        _t1923 = self.parse_relation_id()
+        relation_id1113 = _t1923
+        _t1924 = self.parse_abstraction_with_arity()
+        abstraction_with_arity1114 = _t1924
         if self.match_lookahead_literal("(", 0):
-            _t1918 = self.parse_attrs()
-            _t1917 = _t1918
+            _t1926 = self.parse_attrs()
+            _t1925 = _t1926
         else:
-            _t1917 = None
-        attrs1111 = _t1917
+            _t1925 = None
+        attrs1115 = _t1925
         self.consume_literal(")")
-        _t1919 = logic_pb2.MonusDef(monoid=monoid1108, name=relation_id1109, body=abstraction_with_arity1110[0], attrs=(attrs1111 if attrs1111 is not None else []), value_arity=abstraction_with_arity1110[1])
-        result1113 = _t1919
-        self.record_span(span_start1112, "MonusDef")
-        return result1113
+        _t1927 = logic_pb2.MonusDef(monoid=monoid1112, name=relation_id1113, body=abstraction_with_arity1114[0], attrs=(attrs1115 if attrs1115 is not None else []), value_arity=abstraction_with_arity1114[1])
+        result1117 = _t1927
+        self.record_span(span_start1116, "MonusDef")
+        return result1117
 
     def parse_constraint(self) -> logic_pb2.Constraint:
-        span_start1118 = self.span_start()
+        span_start1122 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("functional_dependency")
-        _t1920 = self.parse_relation_id()
-        relation_id1114 = _t1920
-        _t1921 = self.parse_abstraction()
-        abstraction1115 = _t1921
-        _t1922 = self.parse_functional_dependency_keys()
-        functional_dependency_keys1116 = _t1922
-        _t1923 = self.parse_functional_dependency_values()
-        functional_dependency_values1117 = _t1923
-        self.consume_literal(")")
-        _t1924 = logic_pb2.FunctionalDependency(guard=abstraction1115, keys=functional_dependency_keys1116, values=functional_dependency_values1117)
-        _t1925 = logic_pb2.Constraint(name=relation_id1114, functional_dependency=_t1924)
-        result1119 = _t1925
-        self.record_span(span_start1118, "Constraint")
-        return result1119
+        _t1928 = self.parse_relation_id()
+        relation_id1118 = _t1928
+        _t1929 = self.parse_abstraction()
+        abstraction1119 = _t1929
+        _t1930 = self.parse_functional_dependency_keys()
+        functional_dependency_keys1120 = _t1930
+        _t1931 = self.parse_functional_dependency_values()
+        functional_dependency_values1121 = _t1931
+        self.consume_literal(")")
+        _t1932 = logic_pb2.FunctionalDependency(guard=abstraction1119, keys=functional_dependency_keys1120, values=functional_dependency_values1121)
+        _t1933 = logic_pb2.Constraint(name=relation_id1118, functional_dependency=_t1932)
+        result1123 = _t1933
+        self.record_span(span_start1122, "Constraint")
+        return result1123
 
     def parse_functional_dependency_keys(self) -> Sequence[logic_pb2.Var]:
         self.consume_literal("(")
         self.consume_literal("keys")
-        xs1120 = []
-        cond1121 = self.match_lookahead_terminal("SYMBOL", 0)
-        while cond1121:
-            _t1926 = self.parse_var()
-            item1122 = _t1926
-            xs1120.append(item1122)
-            cond1121 = self.match_lookahead_terminal("SYMBOL", 0)
-        vars1123 = xs1120
-        self.consume_literal(")")
-        return vars1123
-
-    def parse_functional_dependency_values(self) -> Sequence[logic_pb2.Var]:
-        self.consume_literal("(")
-        self.consume_literal("values")
         xs1124 = []
         cond1125 = self.match_lookahead_terminal("SYMBOL", 0)
         while cond1125:
-            _t1927 = self.parse_var()
-            item1126 = _t1927
+            _t1934 = self.parse_var()
+            item1126 = _t1934
             xs1124.append(item1126)
             cond1125 = self.match_lookahead_terminal("SYMBOL", 0)
         vars1127 = xs1124
         self.consume_literal(")")
         return vars1127
 
+    def parse_functional_dependency_values(self) -> Sequence[logic_pb2.Var]:
+        self.consume_literal("(")
+        self.consume_literal("values")
+        xs1128 = []
+        cond1129 = self.match_lookahead_terminal("SYMBOL", 0)
+        while cond1129:
+            _t1935 = self.parse_var()
+            item1130 = _t1935
+            xs1128.append(item1130)
+            cond1129 = self.match_lookahead_terminal("SYMBOL", 0)
+        vars1131 = xs1128
+        self.consume_literal(")")
+        return vars1131
+
     def parse_data(self) -> logic_pb2.Data:
-        span_start1133 = self.span_start()
+        span_start1137 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("iceberg_data", 1):
-                _t1929 = 3
+                _t1937 = 3
             else:
                 if self.match_lookahead_literal("edb", 1):
-                    _t1930 = 0
+                    _t1938 = 0
                 else:
                     if self.match_lookahead_literal("csv_data", 1):
-                        _t1931 = 2
+                        _t1939 = 2
                     else:
                         if self.match_lookahead_literal("betree_relation", 1):
-                            _t1932 = 1
+                            _t1940 = 1
                         else:
-                            _t1932 = -1
-                        _t1931 = _t1932
-                    _t1930 = _t1931
-                _t1929 = _t1930
-            _t1928 = _t1929
-        else:
-            _t1928 = -1
-        prediction1128 = _t1928
-        if prediction1128 == 3:
-            _t1934 = self.parse_iceberg_data()
-            iceberg_data1132 = _t1934
-            _t1935 = logic_pb2.Data(iceberg_data=iceberg_data1132)
-            _t1933 = _t1935
-        else:
-            if prediction1128 == 2:
-                _t1937 = self.parse_csv_data()
-                csv_data1131 = _t1937
-                _t1938 = logic_pb2.Data(csv_data=csv_data1131)
-                _t1936 = _t1938
+                            _t1940 = -1
+                        _t1939 = _t1940
+                    _t1938 = _t1939
+                _t1937 = _t1938
+            _t1936 = _t1937
+        else:
+            _t1936 = -1
+        prediction1132 = _t1936
+        if prediction1132 == 3:
+            _t1942 = self.parse_iceberg_data()
+            iceberg_data1136 = _t1942
+            _t1943 = logic_pb2.Data(iceberg_data=iceberg_data1136)
+            _t1941 = _t1943
+        else:
+            if prediction1132 == 2:
+                _t1945 = self.parse_csv_data()
+                csv_data1135 = _t1945
+                _t1946 = logic_pb2.Data(csv_data=csv_data1135)
+                _t1944 = _t1946
             else:
-                if prediction1128 == 1:
-                    _t1940 = self.parse_betree_relation()
-                    betree_relation1130 = _t1940
-                    _t1941 = logic_pb2.Data(betree_relation=betree_relation1130)
-                    _t1939 = _t1941
+                if prediction1132 == 1:
+                    _t1948 = self.parse_betree_relation()
+                    betree_relation1134 = _t1948
+                    _t1949 = logic_pb2.Data(betree_relation=betree_relation1134)
+                    _t1947 = _t1949
                 else:
-                    if prediction1128 == 0:
-                        _t1943 = self.parse_edb()
-                        edb1129 = _t1943
-                        _t1944 = logic_pb2.Data(edb=edb1129)
-                        _t1942 = _t1944
+                    if prediction1132 == 0:
+                        _t1951 = self.parse_edb()
+                        edb1133 = _t1951
+                        _t1952 = logic_pb2.Data(edb=edb1133)
+                        _t1950 = _t1952
                     else:
                         raise ParseError("Unexpected token in data" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                    _t1939 = _t1942
-                _t1936 = _t1939
-            _t1933 = _t1936
-        result1134 = _t1933
-        self.record_span(span_start1133, "Data")
-        return result1134
+                    _t1947 = _t1950
+                _t1944 = _t1947
+            _t1941 = _t1944
+        result1138 = _t1941
+        self.record_span(span_start1137, "Data")
+        return result1138
 
     def parse_edb(self) -> logic_pb2.EDB:
-        span_start1138 = self.span_start()
+        span_start1142 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("edb")
-        _t1945 = self.parse_relation_id()
-        relation_id1135 = _t1945
-        _t1946 = self.parse_edb_path()
-        edb_path1136 = _t1946
-        _t1947 = self.parse_edb_types()
-        edb_types1137 = _t1947
-        self.consume_literal(")")
-        _t1948 = logic_pb2.EDB(target_id=relation_id1135, path=edb_path1136, types=edb_types1137)
-        result1139 = _t1948
-        self.record_span(span_start1138, "EDB")
-        return result1139
+        _t1953 = self.parse_relation_id()
+        relation_id1139 = _t1953
+        _t1954 = self.parse_edb_path()
+        edb_path1140 = _t1954
+        _t1955 = self.parse_edb_types()
+        edb_types1141 = _t1955
+        self.consume_literal(")")
+        _t1956 = logic_pb2.EDB(target_id=relation_id1139, path=edb_path1140, types=edb_types1141)
+        result1143 = _t1956
+        self.record_span(span_start1142, "EDB")
+        return result1143
 
     def parse_edb_path(self) -> Sequence[str]:
         self.consume_literal("[")
-        xs1140 = []
-        cond1141 = self.match_lookahead_terminal("STRING", 0)
-        while cond1141:
-            item1142 = self.consume_terminal("STRING")
-            xs1140.append(item1142)
-            cond1141 = self.match_lookahead_terminal("STRING", 0)
-        strings1143 = xs1140
+        xs1144 = []
+        cond1145 = self.match_lookahead_terminal("STRING", 0)
+        while cond1145:
+            item1146 = self.consume_terminal("STRING")
+            xs1144.append(item1146)
+            cond1145 = self.match_lookahead_terminal("STRING", 0)
+        strings1147 = xs1144
         self.consume_literal("]")
-        return strings1143
+        return strings1147
 
     def parse_edb_types(self) -> Sequence[logic_pb2.Type]:
         self.consume_literal("[")
-        xs1144 = []
-        cond1145 = (((((((((((((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 cond1145:
-            _t1949 = self.parse_type()
-            item1146 = _t1949
-            xs1144.append(item1146)
-            cond1145 = (((((((((((((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))
-        types1147 = xs1144
+        xs1148 = []
+        cond1149 = (((((((((((((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 cond1149:
+            _t1957 = self.parse_type()
+            item1150 = _t1957
+            xs1148.append(item1150)
+            cond1149 = (((((((((((((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))
+        types1151 = xs1148
         self.consume_literal("]")
-        return types1147
+        return types1151
 
     def parse_betree_relation(self) -> logic_pb2.BeTreeRelation:
-        span_start1150 = self.span_start()
+        span_start1154 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("betree_relation")
-        _t1950 = self.parse_relation_id()
-        relation_id1148 = _t1950
-        _t1951 = self.parse_betree_info()
-        betree_info1149 = _t1951
+        _t1958 = self.parse_relation_id()
+        relation_id1152 = _t1958
+        _t1959 = self.parse_betree_info()
+        betree_info1153 = _t1959
         self.consume_literal(")")
-        _t1952 = logic_pb2.BeTreeRelation(name=relation_id1148, relation_info=betree_info1149)
-        result1151 = _t1952
-        self.record_span(span_start1150, "BeTreeRelation")
-        return result1151
+        _t1960 = logic_pb2.BeTreeRelation(name=relation_id1152, relation_info=betree_info1153)
+        result1155 = _t1960
+        self.record_span(span_start1154, "BeTreeRelation")
+        return result1155
 
     def parse_betree_info(self) -> logic_pb2.BeTreeInfo:
-        span_start1155 = self.span_start()
+        span_start1159 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("betree_info")
-        _t1953 = self.parse_betree_info_key_types()
-        betree_info_key_types1152 = _t1953
-        _t1954 = self.parse_betree_info_value_types()
-        betree_info_value_types1153 = _t1954
-        _t1955 = self.parse_config_dict()
-        config_dict1154 = _t1955
-        self.consume_literal(")")
-        _t1956 = self.construct_betree_info(betree_info_key_types1152, betree_info_value_types1153, config_dict1154)
-        result1156 = _t1956
-        self.record_span(span_start1155, "BeTreeInfo")
-        return result1156
+        _t1961 = self.parse_betree_info_key_types()
+        betree_info_key_types1156 = _t1961
+        _t1962 = self.parse_betree_info_value_types()
+        betree_info_value_types1157 = _t1962
+        _t1963 = self.parse_config_dict()
+        config_dict1158 = _t1963
+        self.consume_literal(")")
+        _t1964 = self.construct_betree_info(betree_info_key_types1156, betree_info_value_types1157, config_dict1158)
+        result1160 = _t1964
+        self.record_span(span_start1159, "BeTreeInfo")
+        return result1160
 
     def parse_betree_info_key_types(self) -> Sequence[logic_pb2.Type]:
         self.consume_literal("(")
         self.consume_literal("key_types")
-        xs1157 = []
-        cond1158 = (((((((((((((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 cond1158:
-            _t1957 = self.parse_type()
-            item1159 = _t1957
-            xs1157.append(item1159)
-            cond1158 = (((((((((((((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))
-        types1160 = xs1157
-        self.consume_literal(")")
-        return types1160
-
-    def parse_betree_info_value_types(self) -> Sequence[logic_pb2.Type]:
-        self.consume_literal("(")
-        self.consume_literal("value_types")
         xs1161 = []
         cond1162 = (((((((((((((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 cond1162:
-            _t1958 = self.parse_type()
-            item1163 = _t1958
+            _t1965 = self.parse_type()
+            item1163 = _t1965
             xs1161.append(item1163)
             cond1162 = (((((((((((((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))
         types1164 = xs1161
         self.consume_literal(")")
         return types1164
 
+    def parse_betree_info_value_types(self) -> Sequence[logic_pb2.Type]:
+        self.consume_literal("(")
+        self.consume_literal("value_types")
+        xs1165 = []
+        cond1166 = (((((((((((((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 cond1166:
+            _t1966 = self.parse_type()
+            item1167 = _t1966
+            xs1165.append(item1167)
+            cond1166 = (((((((((((((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))
+        types1168 = xs1165
+        self.consume_literal(")")
+        return types1168
+
     def parse_csv_data(self) -> logic_pb2.CSVData:
-        span_start1169 = self.span_start()
+        span_start1173 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("csv_data")
-        _t1959 = self.parse_csvlocator()
-        csvlocator1165 = _t1959
-        _t1960 = self.parse_csv_config()
-        csv_config1166 = _t1960
-        _t1961 = self.parse_gnf_columns()
-        gnf_columns1167 = _t1961
-        _t1962 = self.parse_csv_asof()
-        csv_asof1168 = _t1962
-        self.consume_literal(")")
-        _t1963 = logic_pb2.CSVData(locator=csvlocator1165, config=csv_config1166, columns=gnf_columns1167, asof=csv_asof1168)
-        result1170 = _t1963
-        self.record_span(span_start1169, "CSVData")
-        return result1170
+        _t1967 = self.parse_csvlocator()
+        csvlocator1169 = _t1967
+        _t1968 = self.parse_csv_config()
+        csv_config1170 = _t1968
+        _t1969 = self.parse_gnf_columns()
+        gnf_columns1171 = _t1969
+        _t1970 = self.parse_csv_asof()
+        csv_asof1172 = _t1970
+        self.consume_literal(")")
+        _t1971 = logic_pb2.CSVData(locator=csvlocator1169, config=csv_config1170, columns=gnf_columns1171, asof=csv_asof1172)
+        result1174 = _t1971
+        self.record_span(span_start1173, "CSVData")
+        return result1174
 
     def parse_csvlocator(self) -> logic_pb2.CSVLocator:
-        span_start1173 = self.span_start()
+        span_start1177 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("csv_locator")
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("paths", 1)):
-            _t1965 = self.parse_csv_locator_paths()
-            _t1964 = _t1965
+            _t1973 = self.parse_csv_locator_paths()
+            _t1972 = _t1973
         else:
-            _t1964 = None
-        csv_locator_paths1171 = _t1964
+            _t1972 = None
+        csv_locator_paths1175 = _t1972
         if self.match_lookahead_literal("(", 0):
-            _t1967 = self.parse_csv_locator_inline_data()
-            _t1966 = _t1967
+            _t1975 = self.parse_csv_locator_inline_data()
+            _t1974 = _t1975
         else:
-            _t1966 = None
-        csv_locator_inline_data1172 = _t1966
+            _t1974 = None
+        csv_locator_inline_data1176 = _t1974
         self.consume_literal(")")
-        _t1968 = logic_pb2.CSVLocator(paths=(csv_locator_paths1171 if csv_locator_paths1171 is not None else []), inline_data=(csv_locator_inline_data1172 if csv_locator_inline_data1172 is not None else "").encode())
-        result1174 = _t1968
-        self.record_span(span_start1173, "CSVLocator")
-        return result1174
+        _t1976 = logic_pb2.CSVLocator(paths=(csv_locator_paths1175 if csv_locator_paths1175 is not None else []), inline_data=(csv_locator_inline_data1176 if csv_locator_inline_data1176 is not None else "").encode())
+        result1178 = _t1976
+        self.record_span(span_start1177, "CSVLocator")
+        return result1178
 
     def parse_csv_locator_paths(self) -> Sequence[str]:
         self.consume_literal("(")
         self.consume_literal("paths")
-        xs1175 = []
-        cond1176 = self.match_lookahead_terminal("STRING", 0)
-        while cond1176:
-            item1177 = self.consume_terminal("STRING")
-            xs1175.append(item1177)
-            cond1176 = self.match_lookahead_terminal("STRING", 0)
-        strings1178 = xs1175
+        xs1179 = []
+        cond1180 = self.match_lookahead_terminal("STRING", 0)
+        while cond1180:
+            item1181 = self.consume_terminal("STRING")
+            xs1179.append(item1181)
+            cond1180 = self.match_lookahead_terminal("STRING", 0)
+        strings1182 = xs1179
         self.consume_literal(")")
-        return strings1178
+        return strings1182
 
     def parse_csv_locator_inline_data(self) -> str:
         self.consume_literal("(")
         self.consume_literal("inline_data")
-        string1179 = self.consume_terminal("STRING")
+        string1183 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1179
+        return string1183
 
     def parse_csv_config(self) -> logic_pb2.CSVConfig:
-        span_start1181 = self.span_start()
+        span_start1185 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("csv_config")
-        _t1969 = self.parse_config_dict()
-        config_dict1180 = _t1969
+        _t1977 = self.parse_config_dict()
+        config_dict1184 = _t1977
         self.consume_literal(")")
-        _t1970 = self.construct_csv_config(config_dict1180)
-        result1182 = _t1970
-        self.record_span(span_start1181, "CSVConfig")
-        return result1182
+        _t1978 = self.construct_csv_config(config_dict1184)
+        result1186 = _t1978
+        self.record_span(span_start1185, "CSVConfig")
+        return result1186
 
     def parse_gnf_columns(self) -> Sequence[logic_pb2.GNFColumn]:
         self.consume_literal("(")
         self.consume_literal("columns")
-        xs1183 = []
-        cond1184 = self.match_lookahead_literal("(", 0)
-        while cond1184:
-            _t1971 = self.parse_gnf_column()
-            item1185 = _t1971
-            xs1183.append(item1185)
-            cond1184 = self.match_lookahead_literal("(", 0)
-        gnf_columns1186 = xs1183
+        xs1187 = []
+        cond1188 = self.match_lookahead_literal("(", 0)
+        while cond1188:
+            _t1979 = self.parse_gnf_column()
+            item1189 = _t1979
+            xs1187.append(item1189)
+            cond1188 = self.match_lookahead_literal("(", 0)
+        gnf_columns1190 = xs1187
         self.consume_literal(")")
-        return gnf_columns1186
+        return gnf_columns1190
 
     def parse_gnf_column(self) -> logic_pb2.GNFColumn:
-        span_start1193 = self.span_start()
+        span_start1197 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("column")
-        _t1972 = self.parse_gnf_column_path()
-        gnf_column_path1187 = _t1972
+        _t1980 = self.parse_gnf_column_path()
+        gnf_column_path1191 = _t1980
         if (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0)):
-            _t1974 = self.parse_relation_id()
-            _t1973 = _t1974
+            _t1982 = self.parse_relation_id()
+            _t1981 = _t1982
         else:
-            _t1973 = None
-        relation_id1188 = _t1973
+            _t1981 = None
+        relation_id1192 = _t1981
         self.consume_literal("[")
-        xs1189 = []
-        cond1190 = (((((((((((((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 cond1190:
-            _t1975 = self.parse_type()
-            item1191 = _t1975
-            xs1189.append(item1191)
-            cond1190 = (((((((((((((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))
-        types1192 = xs1189
+        xs1193 = []
+        cond1194 = (((((((((((((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 cond1194:
+            _t1983 = self.parse_type()
+            item1195 = _t1983
+            xs1193.append(item1195)
+            cond1194 = (((((((((((((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))
+        types1196 = xs1193
         self.consume_literal("]")
         self.consume_literal(")")
-        _t1976 = logic_pb2.GNFColumn(column_path=gnf_column_path1187, target_id=relation_id1188, types=types1192)
-        result1194 = _t1976
-        self.record_span(span_start1193, "GNFColumn")
-        return result1194
+        _t1984 = logic_pb2.GNFColumn(column_path=gnf_column_path1191, target_id=relation_id1192, types=types1196)
+        result1198 = _t1984
+        self.record_span(span_start1197, "GNFColumn")
+        return result1198
 
     def parse_gnf_column_path(self) -> Sequence[str]:
         if self.match_lookahead_literal("[", 0):
-            _t1977 = 1
+            _t1985 = 1
         else:
             if self.match_lookahead_terminal("STRING", 0):
-                _t1978 = 0
+                _t1986 = 0
             else:
-                _t1978 = -1
-            _t1977 = _t1978
-        prediction1195 = _t1977
-        if prediction1195 == 1:
+                _t1986 = -1
+            _t1985 = _t1986
+        prediction1199 = _t1985
+        if prediction1199 == 1:
             self.consume_literal("[")
-            xs1197 = []
-            cond1198 = self.match_lookahead_terminal("STRING", 0)
-            while cond1198:
-                item1199 = self.consume_terminal("STRING")
-                xs1197.append(item1199)
-                cond1198 = self.match_lookahead_terminal("STRING", 0)
-            strings1200 = xs1197
+            xs1201 = []
+            cond1202 = self.match_lookahead_terminal("STRING", 0)
+            while cond1202:
+                item1203 = self.consume_terminal("STRING")
+                xs1201.append(item1203)
+                cond1202 = self.match_lookahead_terminal("STRING", 0)
+            strings1204 = xs1201
             self.consume_literal("]")
-            _t1979 = strings1200
+            _t1987 = strings1204
         else:
-            if prediction1195 == 0:
-                string1196 = self.consume_terminal("STRING")
-                _t1980 = [string1196]
+            if prediction1199 == 0:
+                string1200 = self.consume_terminal("STRING")
+                _t1988 = [string1200]
             else:
                 raise ParseError("Unexpected token in gnf_column_path" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t1979 = _t1980
-        return _t1979
+            _t1987 = _t1988
+        return _t1987
 
     def parse_csv_asof(self) -> str:
         self.consume_literal("(")
         self.consume_literal("asof")
-        string1201 = self.consume_terminal("STRING")
+        string1205 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1201
+        return string1205
 
     def parse_iceberg_data(self) -> logic_pb2.IcebergData:
-        span_start1208 = self.span_start()
+        span_start1212 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("iceberg_data")
-        _t1981 = self.parse_iceberg_locator()
-        iceberg_locator1202 = _t1981
-        _t1982 = self.parse_iceberg_catalog_config()
-        iceberg_catalog_config1203 = _t1982
-        _t1983 = self.parse_gnf_columns()
-        gnf_columns1204 = _t1983
+        _t1989 = self.parse_iceberg_locator()
+        iceberg_locator1206 = _t1989
+        _t1990 = self.parse_iceberg_catalog_config()
+        iceberg_catalog_config1207 = _t1990
+        _t1991 = self.parse_gnf_columns()
+        gnf_columns1208 = _t1991
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("from_snapshot", 1)):
-            _t1985 = self.parse_iceberg_from_snapshot()
-            _t1984 = _t1985
+            _t1993 = self.parse_iceberg_from_snapshot()
+            _t1992 = _t1993
         else:
-            _t1984 = None
-        iceberg_from_snapshot1205 = _t1984
+            _t1992 = None
+        iceberg_from_snapshot1209 = _t1992
         if self.match_lookahead_literal("(", 0):
-            _t1987 = self.parse_iceberg_to_snapshot()
-            _t1986 = _t1987
+            _t1995 = self.parse_iceberg_to_snapshot()
+            _t1994 = _t1995
         else:
-            _t1986 = None
-        iceberg_to_snapshot1206 = _t1986
-        _t1988 = self.parse_boolean_value()
-        boolean_value1207 = _t1988
+            _t1994 = None
+        iceberg_to_snapshot1210 = _t1994
+        _t1996 = self.parse_boolean_value()
+        boolean_value1211 = _t1996
         self.consume_literal(")")
-        _t1989 = self.construct_iceberg_data(iceberg_locator1202, iceberg_catalog_config1203, gnf_columns1204, iceberg_from_snapshot1205, iceberg_to_snapshot1206, boolean_value1207)
-        result1209 = _t1989
-        self.record_span(span_start1208, "IcebergData")
-        return result1209
+        _t1997 = self.construct_iceberg_data(iceberg_locator1206, iceberg_catalog_config1207, gnf_columns1208, iceberg_from_snapshot1209, iceberg_to_snapshot1210, boolean_value1211)
+        result1213 = _t1997
+        self.record_span(span_start1212, "IcebergData")
+        return result1213
 
     def parse_iceberg_locator(self) -> logic_pb2.IcebergLocator:
-        span_start1213 = self.span_start()
+        span_start1217 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("iceberg_locator")
-        _t1990 = self.parse_iceberg_locator_table_name()
-        iceberg_locator_table_name1210 = _t1990
-        _t1991 = self.parse_iceberg_locator_namespace()
-        iceberg_locator_namespace1211 = _t1991
-        _t1992 = self.parse_iceberg_locator_warehouse()
-        iceberg_locator_warehouse1212 = _t1992
-        self.consume_literal(")")
-        _t1993 = logic_pb2.IcebergLocator(table_name=iceberg_locator_table_name1210, namespace=iceberg_locator_namespace1211, warehouse=iceberg_locator_warehouse1212)
-        result1214 = _t1993
-        self.record_span(span_start1213, "IcebergLocator")
-        return result1214
+        _t1998 = self.parse_iceberg_locator_table_name()
+        iceberg_locator_table_name1214 = _t1998
+        _t1999 = self.parse_iceberg_locator_namespace()
+        iceberg_locator_namespace1215 = _t1999
+        _t2000 = self.parse_iceberg_locator_warehouse()
+        iceberg_locator_warehouse1216 = _t2000
+        self.consume_literal(")")
+        _t2001 = logic_pb2.IcebergLocator(table_name=iceberg_locator_table_name1214, namespace=iceberg_locator_namespace1215, warehouse=iceberg_locator_warehouse1216)
+        result1218 = _t2001
+        self.record_span(span_start1217, "IcebergLocator")
+        return result1218
 
     def parse_iceberg_locator_table_name(self) -> str:
         self.consume_literal("(")
         self.consume_literal("table_name")
-        string1215 = self.consume_terminal("STRING")
+        string1219 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1215
+        return string1219
 
     def parse_iceberg_locator_namespace(self) -> Sequence[str]:
         self.consume_literal("(")
         self.consume_literal("namespace")
-        xs1216 = []
-        cond1217 = self.match_lookahead_terminal("STRING", 0)
-        while cond1217:
-            item1218 = self.consume_terminal("STRING")
-            xs1216.append(item1218)
-            cond1217 = self.match_lookahead_terminal("STRING", 0)
-        strings1219 = xs1216
+        xs1220 = []
+        cond1221 = self.match_lookahead_terminal("STRING", 0)
+        while cond1221:
+            item1222 = self.consume_terminal("STRING")
+            xs1220.append(item1222)
+            cond1221 = self.match_lookahead_terminal("STRING", 0)
+        strings1223 = xs1220
         self.consume_literal(")")
-        return strings1219
+        return strings1223
 
     def parse_iceberg_locator_warehouse(self) -> str:
         self.consume_literal("(")
         self.consume_literal("warehouse")
-        string1220 = self.consume_terminal("STRING")
+        string1224 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1220
+        return string1224
 
     def parse_iceberg_catalog_config(self) -> logic_pb2.IcebergCatalogConfig:
-        span_start1225 = self.span_start()
+        span_start1229 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("iceberg_catalog_config")
-        _t1994 = self.parse_iceberg_catalog_uri()
-        iceberg_catalog_uri1221 = _t1994
+        _t2002 = self.parse_iceberg_catalog_uri()
+        iceberg_catalog_uri1225 = _t2002
         if (self.match_lookahead_literal("(", 0) and self.match_lookahead_literal("scope", 1)):
-            _t1996 = self.parse_iceberg_catalog_config_scope()
-            _t1995 = _t1996
+            _t2004 = self.parse_iceberg_catalog_config_scope()
+            _t2003 = _t2004
         else:
-            _t1995 = None
-        iceberg_catalog_config_scope1222 = _t1995
-        _t1997 = self.parse_iceberg_properties()
-        iceberg_properties1223 = _t1997
-        _t1998 = self.parse_iceberg_auth_properties()
-        iceberg_auth_properties1224 = _t1998
+            _t2003 = None
+        iceberg_catalog_config_scope1226 = _t2003
+        _t2005 = self.parse_iceberg_properties()
+        iceberg_properties1227 = _t2005
+        _t2006 = self.parse_iceberg_auth_properties()
+        iceberg_auth_properties1228 = _t2006
         self.consume_literal(")")
-        _t1999 = self.construct_iceberg_catalog_config(iceberg_catalog_uri1221, iceberg_catalog_config_scope1222, iceberg_properties1223, iceberg_auth_properties1224)
-        result1226 = _t1999
-        self.record_span(span_start1225, "IcebergCatalogConfig")
-        return result1226
+        _t2007 = self.construct_iceberg_catalog_config(iceberg_catalog_uri1225, iceberg_catalog_config_scope1226, iceberg_properties1227, iceberg_auth_properties1228)
+        result1230 = _t2007
+        self.record_span(span_start1229, "IcebergCatalogConfig")
+        return result1230
 
     def parse_iceberg_catalog_uri(self) -> str:
         self.consume_literal("(")
         self.consume_literal("catalog_uri")
-        string1227 = self.consume_terminal("STRING")
+        string1231 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1227
+        return string1231
 
     def parse_iceberg_catalog_config_scope(self) -> str:
         self.consume_literal("(")
         self.consume_literal("scope")
-        string1228 = self.consume_terminal("STRING")
+        string1232 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1228
+        return string1232
 
     def parse_iceberg_properties(self) -> Sequence[tuple[str, str]]:
         self.consume_literal("(")
         self.consume_literal("properties")
-        xs1229 = []
-        cond1230 = self.match_lookahead_literal("(", 0)
-        while cond1230:
-            _t2000 = self.parse_iceberg_property_entry()
-            item1231 = _t2000
-            xs1229.append(item1231)
-            cond1230 = self.match_lookahead_literal("(", 0)
-        iceberg_property_entrys1232 = xs1229
+        xs1233 = []
+        cond1234 = self.match_lookahead_literal("(", 0)
+        while cond1234:
+            _t2008 = self.parse_iceberg_property_entry()
+            item1235 = _t2008
+            xs1233.append(item1235)
+            cond1234 = self.match_lookahead_literal("(", 0)
+        iceberg_property_entrys1236 = xs1233
         self.consume_literal(")")
-        return iceberg_property_entrys1232
+        return iceberg_property_entrys1236
 
     def parse_iceberg_property_entry(self) -> tuple[str, str]:
         self.consume_literal("(")
         self.consume_literal("prop")
-        string1233 = self.consume_terminal("STRING")
-        string_31234 = self.consume_terminal("STRING")
+        string1237 = self.consume_terminal("STRING")
+        string_31238 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return (string1233, string_31234,)
+        return (string1237, string_31238,)
 
     def parse_iceberg_auth_properties(self) -> Sequence[tuple[str, str]]:
         self.consume_literal("(")
         self.consume_literal("auth_properties")
-        xs1235 = []
-        cond1236 = self.match_lookahead_literal("(", 0)
-        while cond1236:
-            _t2001 = self.parse_iceberg_masked_property_entry()
-            item1237 = _t2001
-            xs1235.append(item1237)
-            cond1236 = self.match_lookahead_literal("(", 0)
-        iceberg_masked_property_entrys1238 = xs1235
+        xs1239 = []
+        cond1240 = self.match_lookahead_literal("(", 0)
+        while cond1240:
+            _t2009 = self.parse_iceberg_masked_property_entry()
+            item1241 = _t2009
+            xs1239.append(item1241)
+            cond1240 = self.match_lookahead_literal("(", 0)
+        iceberg_masked_property_entrys1242 = xs1239
         self.consume_literal(")")
-        return iceberg_masked_property_entrys1238
+        return iceberg_masked_property_entrys1242
 
     def parse_iceberg_masked_property_entry(self) -> tuple[str, str]:
         self.consume_literal("(")
         self.consume_literal("prop")
-        string1239 = self.consume_terminal("STRING")
-        string_31240 = self.consume_terminal("STRING")
+        string1243 = self.consume_terminal("STRING")
+        string_31244 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return (string1239, string_31240,)
+        return (string1243, string_31244,)
 
     def parse_iceberg_from_snapshot(self) -> str:
         self.consume_literal("(")
         self.consume_literal("from_snapshot")
-        string1241 = self.consume_terminal("STRING")
+        string1245 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1241
+        return string1245
 
     def parse_iceberg_to_snapshot(self) -> str:
         self.consume_literal("(")
         self.consume_literal("to_snapshot")
-        string1242 = self.consume_terminal("STRING")
+        string1246 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1242
+        return string1246
 
     def parse_undefine(self) -> transactions_pb2.Undefine:
-        span_start1244 = self.span_start()
+        span_start1248 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("undefine")
-        _t2002 = self.parse_fragment_id()
-        fragment_id1243 = _t2002
+        _t2010 = self.parse_fragment_id()
+        fragment_id1247 = _t2010
         self.consume_literal(")")
-        _t2003 = transactions_pb2.Undefine(fragment_id=fragment_id1243)
-        result1245 = _t2003
-        self.record_span(span_start1244, "Undefine")
-        return result1245
+        _t2011 = transactions_pb2.Undefine(fragment_id=fragment_id1247)
+        result1249 = _t2011
+        self.record_span(span_start1248, "Undefine")
+        return result1249
 
     def parse_context(self) -> transactions_pb2.Context:
-        span_start1250 = self.span_start()
+        span_start1254 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("context")
-        xs1246 = []
-        cond1247 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
-        while cond1247:
-            _t2004 = self.parse_relation_id()
-            item1248 = _t2004
-            xs1246.append(item1248)
-            cond1247 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
-        relation_ids1249 = xs1246
-        self.consume_literal(")")
-        _t2005 = transactions_pb2.Context(relations=relation_ids1249)
-        result1251 = _t2005
-        self.record_span(span_start1250, "Context")
-        return result1251
+        xs1250 = []
+        cond1251 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
+        while cond1251:
+            _t2012 = self.parse_relation_id()
+            item1252 = _t2012
+            xs1250.append(item1252)
+            cond1251 = (self.match_lookahead_literal(":", 0) or self.match_lookahead_terminal("UINT128", 0))
+        relation_ids1253 = xs1250
+        self.consume_literal(")")
+        _t2013 = transactions_pb2.Context(relations=relation_ids1253)
+        result1255 = _t2013
+        self.record_span(span_start1254, "Context")
+        return result1255
 
     def parse_snapshot(self) -> transactions_pb2.Snapshot:
-        span_start1257 = self.span_start()
+        span_start1261 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("snapshot")
-        _t2006 = self.parse_edb_path()
-        edb_path1252 = _t2006
-        xs1253 = []
-        cond1254 = self.match_lookahead_literal("[", 0)
-        while cond1254:
-            _t2007 = self.parse_snapshot_mapping()
-            item1255 = _t2007
-            xs1253.append(item1255)
-            cond1254 = self.match_lookahead_literal("[", 0)
-        snapshot_mappings1256 = xs1253
-        self.consume_literal(")")
-        _t2008 = transactions_pb2.Snapshot(prefix=edb_path1252, mappings=snapshot_mappings1256)
-        result1258 = _t2008
-        self.record_span(span_start1257, "Snapshot")
-        return result1258
+        _t2014 = self.parse_edb_path()
+        edb_path1256 = _t2014
+        xs1257 = []
+        cond1258 = self.match_lookahead_literal("[", 0)
+        while cond1258:
+            _t2015 = self.parse_snapshot_mapping()
+            item1259 = _t2015
+            xs1257.append(item1259)
+            cond1258 = self.match_lookahead_literal("[", 0)
+        snapshot_mappings1260 = xs1257
+        self.consume_literal(")")
+        _t2016 = transactions_pb2.Snapshot(prefix=edb_path1256, mappings=snapshot_mappings1260)
+        result1262 = _t2016
+        self.record_span(span_start1261, "Snapshot")
+        return result1262
 
     def parse_snapshot_mapping(self) -> transactions_pb2.SnapshotMapping:
-        span_start1261 = self.span_start()
-        _t2009 = self.parse_edb_path()
-        edb_path1259 = _t2009
-        _t2010 = self.parse_relation_id()
-        relation_id1260 = _t2010
-        _t2011 = transactions_pb2.SnapshotMapping(destination_path=edb_path1259, source_relation=relation_id1260)
-        result1262 = _t2011
-        self.record_span(span_start1261, "SnapshotMapping")
-        return result1262
+        span_start1265 = self.span_start()
+        _t2017 = self.parse_edb_path()
+        edb_path1263 = _t2017
+        _t2018 = self.parse_relation_id()
+        relation_id1264 = _t2018
+        _t2019 = transactions_pb2.SnapshotMapping(destination_path=edb_path1263, source_relation=relation_id1264)
+        result1266 = _t2019
+        self.record_span(span_start1265, "SnapshotMapping")
+        return result1266
 
     def parse_epoch_reads(self) -> Sequence[transactions_pb2.Read]:
         self.consume_literal("(")
         self.consume_literal("reads")
-        xs1263 = []
-        cond1264 = self.match_lookahead_literal("(", 0)
-        while cond1264:
-            _t2012 = self.parse_read()
-            item1265 = _t2012
-            xs1263.append(item1265)
-            cond1264 = self.match_lookahead_literal("(", 0)
-        reads1266 = xs1263
+        xs1267 = []
+        cond1268 = self.match_lookahead_literal("(", 0)
+        while cond1268:
+            _t2020 = self.parse_read()
+            item1269 = _t2020
+            xs1267.append(item1269)
+            cond1268 = self.match_lookahead_literal("(", 0)
+        reads1270 = xs1267
         self.consume_literal(")")
-        return reads1266
+        return reads1270
 
     def parse_read(self) -> transactions_pb2.Read:
-        span_start1273 = self.span_start()
+        span_start1277 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("what_if", 1):
-                _t2014 = 2
+                _t2022 = 2
             else:
                 if self.match_lookahead_literal("output", 1):
-                    _t2015 = 1
+                    _t2023 = 1
                 else:
                     if self.match_lookahead_literal("export_iceberg", 1):
-                        _t2016 = 4
+                        _t2024 = 4
                     else:
                         if self.match_lookahead_literal("export", 1):
-                            _t2017 = 4
+                            _t2025 = 4
                         else:
                             if self.match_lookahead_literal("demand", 1):
-                                _t2018 = 0
+                                _t2026 = 0
                             else:
                                 if self.match_lookahead_literal("abort", 1):
-                                    _t2019 = 3
+                                    _t2027 = 3
                                 else:
-                                    _t2019 = -1
-                                _t2018 = _t2019
-                            _t2017 = _t2018
-                        _t2016 = _t2017
-                    _t2015 = _t2016
-                _t2014 = _t2015
-            _t2013 = _t2014
-        else:
-            _t2013 = -1
-        prediction1267 = _t2013
-        if prediction1267 == 4:
-            _t2021 = self.parse_export()
-            export1272 = _t2021
-            _t2022 = transactions_pb2.Read(export=export1272)
-            _t2020 = _t2022
-        else:
-            if prediction1267 == 3:
-                _t2024 = self.parse_abort()
-                abort1271 = _t2024
-                _t2025 = transactions_pb2.Read(abort=abort1271)
-                _t2023 = _t2025
+                                    _t2027 = -1
+                                _t2026 = _t2027
+                            _t2025 = _t2026
+                        _t2024 = _t2025
+                    _t2023 = _t2024
+                _t2022 = _t2023
+            _t2021 = _t2022
+        else:
+            _t2021 = -1
+        prediction1271 = _t2021
+        if prediction1271 == 4:
+            _t2029 = self.parse_export()
+            export1276 = _t2029
+            _t2030 = transactions_pb2.Read(export=export1276)
+            _t2028 = _t2030
+        else:
+            if prediction1271 == 3:
+                _t2032 = self.parse_abort()
+                abort1275 = _t2032
+                _t2033 = transactions_pb2.Read(abort=abort1275)
+                _t2031 = _t2033
             else:
-                if prediction1267 == 2:
-                    _t2027 = self.parse_what_if()
-                    what_if1270 = _t2027
-                    _t2028 = transactions_pb2.Read(what_if=what_if1270)
-                    _t2026 = _t2028
+                if prediction1271 == 2:
+                    _t2035 = self.parse_what_if()
+                    what_if1274 = _t2035
+                    _t2036 = transactions_pb2.Read(what_if=what_if1274)
+                    _t2034 = _t2036
                 else:
-                    if prediction1267 == 1:
-                        _t2030 = self.parse_output()
-                        output1269 = _t2030
-                        _t2031 = transactions_pb2.Read(output=output1269)
-                        _t2029 = _t2031
+                    if prediction1271 == 1:
+                        _t2038 = self.parse_output()
+                        output1273 = _t2038
+                        _t2039 = transactions_pb2.Read(output=output1273)
+                        _t2037 = _t2039
                     else:
-                        if prediction1267 == 0:
-                            _t2033 = self.parse_demand()
-                            demand1268 = _t2033
-                            _t2034 = transactions_pb2.Read(demand=demand1268)
-                            _t2032 = _t2034
+                        if prediction1271 == 0:
+                            _t2041 = self.parse_demand()
+                            demand1272 = _t2041
+                            _t2042 = transactions_pb2.Read(demand=demand1272)
+                            _t2040 = _t2042
                         else:
                             raise ParseError("Unexpected token in read" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-                        _t2029 = _t2032
-                    _t2026 = _t2029
-                _t2023 = _t2026
-            _t2020 = _t2023
-        result1274 = _t2020
-        self.record_span(span_start1273, "Read")
-        return result1274
+                        _t2037 = _t2040
+                    _t2034 = _t2037
+                _t2031 = _t2034
+            _t2028 = _t2031
+        result1278 = _t2028
+        self.record_span(span_start1277, "Read")
+        return result1278
 
     def parse_demand(self) -> transactions_pb2.Demand:
-        span_start1276 = self.span_start()
+        span_start1280 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("demand")
-        _t2035 = self.parse_relation_id()
-        relation_id1275 = _t2035
+        _t2043 = self.parse_relation_id()
+        relation_id1279 = _t2043
         self.consume_literal(")")
-        _t2036 = transactions_pb2.Demand(relation_id=relation_id1275)
-        result1277 = _t2036
-        self.record_span(span_start1276, "Demand")
-        return result1277
+        _t2044 = transactions_pb2.Demand(relation_id=relation_id1279)
+        result1281 = _t2044
+        self.record_span(span_start1280, "Demand")
+        return result1281
 
     def parse_output(self) -> transactions_pb2.Output:
-        span_start1280 = self.span_start()
+        span_start1284 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("output")
-        _t2037 = self.parse_name()
-        name1278 = _t2037
-        _t2038 = self.parse_relation_id()
-        relation_id1279 = _t2038
-        self.consume_literal(")")
-        _t2039 = transactions_pb2.Output(name=name1278, relation_id=relation_id1279)
-        result1281 = _t2039
-        self.record_span(span_start1280, "Output")
-        return result1281
+        _t2045 = self.parse_name()
+        name1282 = _t2045
+        _t2046 = self.parse_relation_id()
+        relation_id1283 = _t2046
+        self.consume_literal(")")
+        _t2047 = transactions_pb2.Output(name=name1282, relation_id=relation_id1283)
+        result1285 = _t2047
+        self.record_span(span_start1284, "Output")
+        return result1285
 
     def parse_what_if(self) -> transactions_pb2.WhatIf:
-        span_start1284 = self.span_start()
+        span_start1288 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("what_if")
-        _t2040 = self.parse_name()
-        name1282 = _t2040
-        _t2041 = self.parse_epoch()
-        epoch1283 = _t2041
-        self.consume_literal(")")
-        _t2042 = transactions_pb2.WhatIf(branch=name1282, epoch=epoch1283)
-        result1285 = _t2042
-        self.record_span(span_start1284, "WhatIf")
-        return result1285
+        _t2048 = self.parse_name()
+        name1286 = _t2048
+        _t2049 = self.parse_epoch()
+        epoch1287 = _t2049
+        self.consume_literal(")")
+        _t2050 = transactions_pb2.WhatIf(branch=name1286, epoch=epoch1287)
+        result1289 = _t2050
+        self.record_span(span_start1288, "WhatIf")
+        return result1289
 
     def parse_abort(self) -> transactions_pb2.Abort:
-        span_start1288 = self.span_start()
+        span_start1292 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("abort")
         if (self.match_lookahead_literal(":", 0) and self.match_lookahead_terminal("SYMBOL", 1)):
-            _t2044 = self.parse_name()
-            _t2043 = _t2044
+            _t2052 = self.parse_name()
+            _t2051 = _t2052
         else:
-            _t2043 = None
-        name1286 = _t2043
-        _t2045 = self.parse_relation_id()
-        relation_id1287 = _t2045
+            _t2051 = None
+        name1290 = _t2051
+        _t2053 = self.parse_relation_id()
+        relation_id1291 = _t2053
         self.consume_literal(")")
-        _t2046 = transactions_pb2.Abort(name=(name1286 if name1286 is not None else "abort"), relation_id=relation_id1287)
-        result1289 = _t2046
-        self.record_span(span_start1288, "Abort")
-        return result1289
+        _t2054 = transactions_pb2.Abort(name=(name1290 if name1290 is not None else "abort"), relation_id=relation_id1291)
+        result1293 = _t2054
+        self.record_span(span_start1292, "Abort")
+        return result1293
 
     def parse_export(self) -> transactions_pb2.Export:
-        span_start1293 = self.span_start()
+        span_start1297 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("export_iceberg", 1):
-                _t2048 = 1
+                _t2056 = 1
             else:
                 if self.match_lookahead_literal("export", 1):
-                    _t2049 = 0
+                    _t2057 = 0
                 else:
-                    _t2049 = -1
-                _t2048 = _t2049
-            _t2047 = _t2048
+                    _t2057 = -1
+                _t2056 = _t2057
+            _t2055 = _t2056
         else:
-            _t2047 = -1
-        prediction1290 = _t2047
-        if prediction1290 == 1:
+            _t2055 = -1
+        prediction1294 = _t2055
+        if prediction1294 == 1:
             self.consume_literal("(")
             self.consume_literal("export_iceberg")
-            _t2051 = self.parse_export_iceberg_config()
-            export_iceberg_config1292 = _t2051
+            _t2059 = self.parse_export_iceberg_config()
+            export_iceberg_config1296 = _t2059
             self.consume_literal(")")
-            _t2052 = transactions_pb2.Export(iceberg_config=export_iceberg_config1292)
-            _t2050 = _t2052
+            _t2060 = transactions_pb2.Export(iceberg_config=export_iceberg_config1296)
+            _t2058 = _t2060
         else:
-            if prediction1290 == 0:
+            if prediction1294 == 0:
                 self.consume_literal("(")
                 self.consume_literal("export")
-                _t2054 = self.parse_export_csv_config()
-                export_csv_config1291 = _t2054
+                _t2062 = self.parse_export_csv_config()
+                export_csv_config1295 = _t2062
                 self.consume_literal(")")
-                _t2055 = transactions_pb2.Export(csv_config=export_csv_config1291)
-                _t2053 = _t2055
+                _t2063 = transactions_pb2.Export(csv_config=export_csv_config1295)
+                _t2061 = _t2063
             else:
                 raise ParseError("Unexpected token in export" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t2050 = _t2053
-        result1294 = _t2050
-        self.record_span(span_start1293, "Export")
-        return result1294
+            _t2058 = _t2061
+        result1298 = _t2058
+        self.record_span(span_start1297, "Export")
+        return result1298
 
     def parse_export_csv_config(self) -> transactions_pb2.ExportCSVConfig:
-        span_start1302 = self.span_start()
+        span_start1306 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("export_csv_config_v2", 1):
-                _t2057 = 0
+                _t2065 = 0
             else:
                 if self.match_lookahead_literal("export_csv_config", 1):
-                    _t2058 = 1
+                    _t2066 = 1
                 else:
-                    _t2058 = -1
-                _t2057 = _t2058
-            _t2056 = _t2057
+                    _t2066 = -1
+                _t2065 = _t2066
+            _t2064 = _t2065
         else:
-            _t2056 = -1
-        prediction1295 = _t2056
-        if prediction1295 == 1:
+            _t2064 = -1
+        prediction1299 = _t2064
+        if prediction1299 == 1:
             self.consume_literal("(")
             self.consume_literal("export_csv_config")
-            _t2060 = self.parse_export_csv_path()
-            export_csv_path1299 = _t2060
-            _t2061 = self.parse_export_csv_columns_list()
-            export_csv_columns_list1300 = _t2061
-            _t2062 = self.parse_config_dict()
-            config_dict1301 = _t2062
+            _t2068 = self.parse_export_csv_path()
+            export_csv_path1303 = _t2068
+            _t2069 = self.parse_export_csv_columns_list()
+            export_csv_columns_list1304 = _t2069
+            _t2070 = self.parse_config_dict()
+            config_dict1305 = _t2070
             self.consume_literal(")")
-            _t2063 = self.construct_export_csv_config(export_csv_path1299, export_csv_columns_list1300, config_dict1301)
-            _t2059 = _t2063
+            _t2071 = self.construct_export_csv_config(export_csv_path1303, export_csv_columns_list1304, config_dict1305)
+            _t2067 = _t2071
         else:
-            if prediction1295 == 0:
+            if prediction1299 == 0:
                 self.consume_literal("(")
                 self.consume_literal("export_csv_config_v2")
-                _t2065 = self.parse_export_csv_path()
-                export_csv_path1296 = _t2065
-                _t2066 = self.parse_export_csv_source()
-                export_csv_source1297 = _t2066
-                _t2067 = self.parse_csv_config()
-                csv_config1298 = _t2067
+                _t2073 = self.parse_export_csv_path()
+                export_csv_path1300 = _t2073
+                _t2074 = self.parse_export_csv_source()
+                export_csv_source1301 = _t2074
+                _t2075 = self.parse_csv_config()
+                csv_config1302 = _t2075
                 self.consume_literal(")")
-                _t2068 = self.construct_export_csv_config_with_source(export_csv_path1296, export_csv_source1297, csv_config1298)
-                _t2064 = _t2068
+                _t2076 = self.construct_export_csv_config_with_source(export_csv_path1300, export_csv_source1301, csv_config1302)
+                _t2072 = _t2076
             else:
                 raise ParseError("Unexpected token in export_csv_config" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t2059 = _t2064
-        result1303 = _t2059
-        self.record_span(span_start1302, "ExportCSVConfig")
-        return result1303
+            _t2067 = _t2072
+        result1307 = _t2067
+        self.record_span(span_start1306, "ExportCSVConfig")
+        return result1307
 
     def parse_export_csv_path(self) -> str:
         self.consume_literal("(")
         self.consume_literal("path")
-        string1304 = self.consume_terminal("STRING")
+        string1308 = self.consume_terminal("STRING")
         self.consume_literal(")")
-        return string1304
+        return string1308
 
     def parse_export_csv_source(self) -> transactions_pb2.ExportCSVSource:
-        span_start1311 = self.span_start()
+        span_start1315 = self.span_start()
         if self.match_lookahead_literal("(", 0):
             if self.match_lookahead_literal("table_def", 1):
-                _t2070 = 1
+                _t2078 = 1
             else:
                 if self.match_lookahead_literal("gnf_columns", 1):
-                    _t2071 = 0
+                    _t2079 = 0
                 else:
-                    _t2071 = -1
-                _t2070 = _t2071
-            _t2069 = _t2070
+                    _t2079 = -1
+                _t2078 = _t2079
+            _t2077 = _t2078
         else:
-            _t2069 = -1
-        prediction1305 = _t2069
-        if prediction1305 == 1:
+            _t2077 = -1
+        prediction1309 = _t2077
+        if prediction1309 == 1:
             self.consume_literal("(")
             self.consume_literal("table_def")
-            _t2073 = self.parse_relation_id()
-            relation_id1310 = _t2073
+            _t2081 = self.parse_relation_id()
+            relation_id1314 = _t2081
             self.consume_literal(")")
-            _t2074 = transactions_pb2.ExportCSVSource(table_def=relation_id1310)
-            _t2072 = _t2074
+            _t2082 = transactions_pb2.ExportCSVSource(table_def=relation_id1314)
+            _t2080 = _t2082
         else:
-            if prediction1305 == 0:
+            if prediction1309 == 0:
                 self.consume_literal("(")
                 self.consume_literal("gnf_columns")
-                xs1306 = []
-                cond1307 = self.match_lookahead_literal("(", 0)
-                while cond1307:
-                    _t2076 = self.parse_export_csv_column()
-                    item1308 = _t2076
-                    xs1306.append(item1308)
-                    cond1307 = self.match_lookahead_literal("(", 0)
-                export_csv_columns1309 = xs1306
+                xs1310 = []
+                cond1311 = self.match_lookahead_literal("(", 0)
+                while cond1311:
+                    _t2084 = self.parse_export_csv_column()
+                    item1312 = _t2084
+                    xs1310.append(item1312)
+                    cond1311 = self.match_lookahead_literal("(", 0)
+                export_csv_columns1313 = xs1310
                 self.consume_literal(")")
-                _t2077 = transactions_pb2.ExportCSVColumns(columns=export_csv_columns1309)
-                _t2078 = transactions_pb2.ExportCSVSource(gnf_columns=_t2077)
-                _t2075 = _t2078
+                _t2085 = transactions_pb2.ExportCSVColumns(columns=export_csv_columns1313)
+                _t2086 = transactions_pb2.ExportCSVSource(gnf_columns=_t2085)
+                _t2083 = _t2086
             else:
                 raise ParseError("Unexpected token in export_csv_source" + f": {self.lookahead(0).type}=`{self.lookahead(0).value}`")
-            _t2072 = _t2075
-        result1312 = _t2072
-        self.record_span(span_start1311, "ExportCSVSource")
-        return result1312
+            _t2080 = _t2083
+        result1316 = _t2080
+        self.record_span(span_start1315, "ExportCSVSource")
+        return result1316
 
     def parse_export_csv_column(self) -> transactions_pb2.ExportCSVColumn:
-        span_start1315 = self.span_start()
+        span_start1319 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("column")
-        string1313 = self.consume_terminal("STRING")
-        _t2079 = self.parse_relation_id()
-        relation_id1314 = _t2079
+        string1317 = self.consume_terminal("STRING")
+        _t2087 = self.parse_relation_id()
+        relation_id1318 = _t2087
         self.consume_literal(")")
-        _t2080 = transactions_pb2.ExportCSVColumn(column_name=string1313, column_data=relation_id1314)
-        result1316 = _t2080
-        self.record_span(span_start1315, "ExportCSVColumn")
-        return result1316
+        _t2088 = transactions_pb2.ExportCSVColumn(column_name=string1317, column_data=relation_id1318)
+        result1320 = _t2088
+        self.record_span(span_start1319, "ExportCSVColumn")
+        return result1320
 
     def parse_export_csv_columns_list(self) -> Sequence[transactions_pb2.ExportCSVColumn]:
         self.consume_literal("(")
         self.consume_literal("columns")
-        xs1317 = []
-        cond1318 = self.match_lookahead_literal("(", 0)
-        while cond1318:
-            _t2081 = self.parse_export_csv_column()
-            item1319 = _t2081
-            xs1317.append(item1319)
-            cond1318 = self.match_lookahead_literal("(", 0)
-        export_csv_columns1320 = xs1317
+        xs1321 = []
+        cond1322 = self.match_lookahead_literal("(", 0)
+        while cond1322:
+            _t2089 = self.parse_export_csv_column()
+            item1323 = _t2089
+            xs1321.append(item1323)
+            cond1322 = self.match_lookahead_literal("(", 0)
+        export_csv_columns1324 = xs1321
         self.consume_literal(")")
-        return export_csv_columns1320
+        return export_csv_columns1324
 
     def parse_export_iceberg_config(self) -> transactions_pb2.ExportIcebergConfig:
-        span_start1327 = self.span_start()
+        span_start1331 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("export_iceberg_config")
-        _t2082 = self.parse_iceberg_locator()
-        iceberg_locator1321 = _t2082
-        _t2083 = self.parse_iceberg_catalog_config()
-        iceberg_catalog_config1322 = _t2083
-        _t2084 = self.parse_export_iceberg_table_def()
-        export_iceberg_table_def1323 = _t2084
-        _t2085 = self.parse_export_iceberg_columns()
-        export_iceberg_columns1324 = _t2085
-        _t2086 = self.parse_iceberg_table_properties()
-        iceberg_table_properties1325 = _t2086
+        _t2090 = self.parse_iceberg_locator()
+        iceberg_locator1325 = _t2090
+        _t2091 = self.parse_iceberg_catalog_config()
+        iceberg_catalog_config1326 = _t2091
+        _t2092 = self.parse_export_iceberg_table_def()
+        export_iceberg_table_def1327 = _t2092
+        _t2093 = self.parse_export_iceberg_columns()
+        export_iceberg_columns1328 = _t2093
+        _t2094 = self.parse_iceberg_table_properties()
+        iceberg_table_properties1329 = _t2094
         if self.match_lookahead_literal("{", 0):
-            _t2088 = self.parse_config_dict()
-            _t2087 = _t2088
+            _t2096 = self.parse_config_dict()
+            _t2095 = _t2096
         else:
-            _t2087 = None
-        config_dict1326 = _t2087
+            _t2095 = None
+        config_dict1330 = _t2095
         self.consume_literal(")")
-        _t2089 = self.construct_export_iceberg_config_full(iceberg_locator1321, iceberg_catalog_config1322, export_iceberg_table_def1323, export_iceberg_columns1324, iceberg_table_properties1325, config_dict1326)
-        result1328 = _t2089
-        self.record_span(span_start1327, "ExportIcebergConfig")
-        return result1328
+        _t2097 = self.construct_export_iceberg_config_full(iceberg_locator1325, iceberg_catalog_config1326, export_iceberg_table_def1327, export_iceberg_columns1328, iceberg_table_properties1329, config_dict1330)
+        result1332 = _t2097
+        self.record_span(span_start1331, "ExportIcebergConfig")
+        return result1332
 
     def parse_export_iceberg_table_def(self) -> logic_pb2.RelationId:
-        span_start1330 = self.span_start()
+        span_start1334 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("table_def")
-        _t2090 = self.parse_relation_id()
-        relation_id1329 = _t2090
+        _t2098 = self.parse_relation_id()
+        relation_id1333 = _t2098
         self.consume_literal(")")
-        result1331 = relation_id1329
-        self.record_span(span_start1330, "RelationId")
-        return result1331
+        result1335 = relation_id1333
+        self.record_span(span_start1334, "RelationId")
+        return result1335
 
     def parse_export_iceberg_columns(self) -> Sequence[transactions_pb2.ExportColumn]:
         self.consume_literal("(")
         self.consume_literal("columns")
-        xs1332 = []
-        cond1333 = self.match_lookahead_literal("(", 0)
-        while cond1333:
-            _t2091 = self.parse_export_iceberg_column()
-            item1334 = _t2091
-            xs1332.append(item1334)
-            cond1333 = self.match_lookahead_literal("(", 0)
-        export_iceberg_columns1335 = xs1332
+        xs1336 = []
+        cond1337 = self.match_lookahead_literal("(", 0)
+        while cond1337:
+            _t2099 = self.parse_export_iceberg_column()
+            item1338 = _t2099
+            xs1336.append(item1338)
+            cond1337 = self.match_lookahead_literal("(", 0)
+        export_iceberg_columns1339 = xs1336
         self.consume_literal(")")
-        return export_iceberg_columns1335
+        return export_iceberg_columns1339
 
     def parse_export_iceberg_column(self) -> transactions_pb2.ExportColumn:
-        span_start1338 = self.span_start()
+        span_start1342 = self.span_start()
         self.consume_literal("(")
         self.consume_literal("column")
-        string1336 = self.consume_terminal("STRING")
-        _t2092 = self.parse_boolean_value()
-        boolean_value1337 = _t2092
+        string1340 = self.consume_terminal("STRING")
+        _t2100 = self.parse_boolean_value()
+        boolean_value1341 = _t2100
         self.consume_literal(")")
-        _t2093 = transactions_pb2.ExportColumn(name=string1336, nullable=boolean_value1337)
-        result1339 = _t2093
-        self.record_span(span_start1338, "ExportColumn")
-        return result1339
+        _t2101 = transactions_pb2.ExportColumn(name=string1340, nullable=boolean_value1341)
+        result1343 = _t2101
+        self.record_span(span_start1342, "ExportColumn")
+        return result1343
 
     def parse_iceberg_table_properties(self) -> Sequence[tuple[str, str]]:
         self.consume_literal("(")
         self.consume_literal("table_properties")
-        xs1340 = []
-        cond1341 = self.match_lookahead_literal("(", 0)
-        while cond1341:
-            _t2094 = self.parse_iceberg_property_entry()
-            item1342 = _t2094
-            xs1340.append(item1342)
-            cond1341 = self.match_lookahead_literal("(", 0)
-        iceberg_property_entrys1343 = xs1340
-        self.consume_literal(")")
-        return iceberg_property_entrys1343
+        xs1344 = []
+        cond1345 = self.match_lookahead_literal("(", 0)
+        while cond1345:
+            _t2102 = self.parse_iceberg_property_entry()
+            item1346 = _t2102
+            xs1344.append(item1346)
+            cond1345 = self.match_lookahead_literal("(", 0)
+        iceberg_property_entrys1347 = xs1344
+        self.consume_literal(")")
+        return iceberg_property_entrys1347
 
 
 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 7895b67e..40c0c12c 100644
--- a/sdks/python/src/lqp/gen/pretty.py
+++ b/sdks/python/src/lqp/gen/pretty.py
@@ -217,134 +217,134 @@ def write_debug_info(self) -> None:
     # --- Helper functions ---
 
     def _make_value_int32(self, v: int) -> logic_pb2.Value:
-        _t1741 = logic_pb2.Value(int32_value=v)
-        return _t1741
+        _t1751 = logic_pb2.Value(int32_value=v)
+        return _t1751
 
     def _make_value_int64(self, v: int) -> logic_pb2.Value:
-        _t1742 = logic_pb2.Value(int_value=v)
-        return _t1742
+        _t1752 = logic_pb2.Value(int_value=v)
+        return _t1752
 
     def _make_value_float64(self, v: float) -> logic_pb2.Value:
-        _t1743 = logic_pb2.Value(float_value=v)
-        return _t1743
+        _t1753 = logic_pb2.Value(float_value=v)
+        return _t1753
 
     def _make_value_string(self, v: str) -> logic_pb2.Value:
-        _t1744 = logic_pb2.Value(string_value=v)
-        return _t1744
+        _t1754 = logic_pb2.Value(string_value=v)
+        return _t1754
 
     def _make_value_boolean(self, v: bool) -> logic_pb2.Value:
-        _t1745 = logic_pb2.Value(boolean_value=v)
-        return _t1745
+        _t1755 = logic_pb2.Value(boolean_value=v)
+        return _t1755
 
     def _make_value_uint128(self, v: logic_pb2.UInt128Value) -> logic_pb2.Value:
-        _t1746 = logic_pb2.Value(uint128_value=v)
-        return _t1746
+        _t1756 = logic_pb2.Value(uint128_value=v)
+        return _t1756
 
     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:
-            _t1747 = self._make_value_string("auto")
-            result.append(("ivm.maintenance_level", _t1747,))
+            _t1757 = self._make_value_string("auto")
+            result.append(("ivm.maintenance_level", _t1757,))
         else:
             if msg.ivm_config.level == transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_ALL:
-                _t1748 = self._make_value_string("all")
-                result.append(("ivm.maintenance_level", _t1748,))
+                _t1758 = self._make_value_string("all")
+                result.append(("ivm.maintenance_level", _t1758,))
             else:
                 if msg.ivm_config.level == transactions_pb2.MaintenanceLevel.MAINTENANCE_LEVEL_OFF:
-                    _t1749 = self._make_value_string("off")
-                    result.append(("ivm.maintenance_level", _t1749,))
-        _t1750 = self._make_value_int64(msg.semantics_version)
-        result.append(("semantics_version", _t1750,))
+                    _t1759 = self._make_value_string("off")
+                    result.append(("ivm.maintenance_level", _t1759,))
+        _t1760 = self._make_value_int64(msg.semantics_version)
+        result.append(("semantics_version", _t1760,))
         return sorted(result)
 
     def deconstruct_csv_config(self, msg: logic_pb2.CSVConfig) -> list[tuple[str, logic_pb2.Value]]:
         result = []
-        _t1751 = self._make_value_int32(msg.header_row)
-        result.append(("csv_header_row", _t1751,))
-        _t1752 = self._make_value_int64(msg.skip)
-        result.append(("csv_skip", _t1752,))
+        _t1761 = self._make_value_int32(msg.header_row)
+        result.append(("csv_header_row", _t1761,))
+        _t1762 = self._make_value_int64(msg.skip)
+        result.append(("csv_skip", _t1762,))
         if msg.new_line != "":
-            _t1753 = self._make_value_string(msg.new_line)
-            result.append(("csv_new_line", _t1753,))
-        _t1754 = self._make_value_string(msg.delimiter)
-        result.append(("csv_delimiter", _t1754,))
-        _t1755 = self._make_value_string(msg.quotechar)
-        result.append(("csv_quotechar", _t1755,))
-        _t1756 = self._make_value_string(msg.escapechar)
-        result.append(("csv_escapechar", _t1756,))
+            _t1763 = self._make_value_string(msg.new_line)
+            result.append(("csv_new_line", _t1763,))
+        _t1764 = self._make_value_string(msg.delimiter)
+        result.append(("csv_delimiter", _t1764,))
+        _t1765 = self._make_value_string(msg.quotechar)
+        result.append(("csv_quotechar", _t1765,))
+        _t1766 = self._make_value_string(msg.escapechar)
+        result.append(("csv_escapechar", _t1766,))
         if msg.comment != "":
-            _t1757 = self._make_value_string(msg.comment)
-            result.append(("csv_comment", _t1757,))
+            _t1767 = self._make_value_string(msg.comment)
+            result.append(("csv_comment", _t1767,))
         for missing_string in msg.missing_strings:
-            _t1758 = self._make_value_string(missing_string)
-            result.append(("csv_missing_strings", _t1758,))
-        _t1759 = self._make_value_string(msg.decimal_separator)
-        result.append(("csv_decimal_separator", _t1759,))
-        _t1760 = self._make_value_string(msg.encoding)
-        result.append(("csv_encoding", _t1760,))
-        _t1761 = self._make_value_string(msg.compression)
-        result.append(("csv_compression", _t1761,))
+            _t1768 = self._make_value_string(missing_string)
+            result.append(("csv_missing_strings", _t1768,))
+        _t1769 = self._make_value_string(msg.decimal_separator)
+        result.append(("csv_decimal_separator", _t1769,))
+        _t1770 = self._make_value_string(msg.encoding)
+        result.append(("csv_encoding", _t1770,))
+        _t1771 = self._make_value_string(msg.compression)
+        result.append(("csv_compression", _t1771,))
         if msg.partition_size_mb != 0:
-            _t1762 = self._make_value_int64(msg.partition_size_mb)
-            result.append(("csv_partition_size_mb", _t1762,))
+            _t1772 = self._make_value_int64(msg.partition_size_mb)
+            result.append(("csv_partition_size_mb", _t1772,))
         return sorted(result)
 
     def deconstruct_betree_info_config(self, msg: logic_pb2.BeTreeInfo) -> list[tuple[str, logic_pb2.Value]]:
         result = []
-        _t1763 = self._make_value_float64(msg.storage_config.epsilon)
-        result.append(("betree_config_epsilon", _t1763,))
-        _t1764 = self._make_value_int64(msg.storage_config.max_pivots)
-        result.append(("betree_config_max_pivots", _t1764,))
-        _t1765 = self._make_value_int64(msg.storage_config.max_deltas)
-        result.append(("betree_config_max_deltas", _t1765,))
-        _t1766 = self._make_value_int64(msg.storage_config.max_leaf)
-        result.append(("betree_config_max_leaf", _t1766,))
+        _t1773 = self._make_value_float64(msg.storage_config.epsilon)
+        result.append(("betree_config_epsilon", _t1773,))
+        _t1774 = self._make_value_int64(msg.storage_config.max_pivots)
+        result.append(("betree_config_max_pivots", _t1774,))
+        _t1775 = self._make_value_int64(msg.storage_config.max_deltas)
+        result.append(("betree_config_max_deltas", _t1775,))
+        _t1776 = self._make_value_int64(msg.storage_config.max_leaf)
+        result.append(("betree_config_max_leaf", _t1776,))
         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
-                _t1767 = self._make_value_uint128(msg.relation_locator.root_pageid)
-                result.append(("betree_locator_root_pageid", _t1767,))
+                _t1777 = self._make_value_uint128(msg.relation_locator.root_pageid)
+                result.append(("betree_locator_root_pageid", _t1777,))
         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
-                _t1768 = self._make_value_string(msg.relation_locator.inline_data.decode('utf-8'))
-                result.append(("betree_locator_inline_data", _t1768,))
-        _t1769 = self._make_value_int64(msg.relation_locator.element_count)
-        result.append(("betree_locator_element_count", _t1769,))
-        _t1770 = self._make_value_int64(msg.relation_locator.tree_height)
-        result.append(("betree_locator_tree_height", _t1770,))
+                _t1778 = self._make_value_string(msg.relation_locator.inline_data.decode('utf-8'))
+                result.append(("betree_locator_inline_data", _t1778,))
+        _t1779 = self._make_value_int64(msg.relation_locator.element_count)
+        result.append(("betree_locator_element_count", _t1779,))
+        _t1780 = self._make_value_int64(msg.relation_locator.tree_height)
+        result.append(("betree_locator_tree_height", _t1780,))
         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
-            _t1771 = self._make_value_int64(msg.partition_size)
-            result.append(("partition_size", _t1771,))
+            _t1781 = self._make_value_int64(msg.partition_size)
+            result.append(("partition_size", _t1781,))
         if msg.compression is not None:
             assert msg.compression is not None
-            _t1772 = self._make_value_string(msg.compression)
-            result.append(("compression", _t1772,))
+            _t1782 = self._make_value_string(msg.compression)
+            result.append(("compression", _t1782,))
         if msg.syntax_header_row is not None:
             assert msg.syntax_header_row is not None
-            _t1773 = self._make_value_boolean(msg.syntax_header_row)
-            result.append(("syntax_header_row", _t1773,))
+            _t1783 = self._make_value_boolean(msg.syntax_header_row)
+            result.append(("syntax_header_row", _t1783,))
         if msg.syntax_missing_string is not None:
             assert msg.syntax_missing_string is not None
-            _t1774 = self._make_value_string(msg.syntax_missing_string)
-            result.append(("syntax_missing_string", _t1774,))
+            _t1784 = self._make_value_string(msg.syntax_missing_string)
+            result.append(("syntax_missing_string", _t1784,))
         if msg.syntax_delim is not None:
             assert msg.syntax_delim is not None
-            _t1775 = self._make_value_string(msg.syntax_delim)
-            result.append(("syntax_delim", _t1775,))
+            _t1785 = self._make_value_string(msg.syntax_delim)
+            result.append(("syntax_delim", _t1785,))
         if msg.syntax_quotechar is not None:
             assert msg.syntax_quotechar is not None
-            _t1776 = self._make_value_string(msg.syntax_quotechar)
-            result.append(("syntax_quotechar", _t1776,))
+            _t1786 = self._make_value_string(msg.syntax_quotechar)
+            result.append(("syntax_quotechar", _t1786,))
         if msg.syntax_escapechar is not None:
             assert msg.syntax_escapechar is not None
-            _t1777 = self._make_value_string(msg.syntax_escapechar)
-            result.append(("syntax_escapechar", _t1777,))
+            _t1787 = self._make_value_string(msg.syntax_escapechar)
+            result.append(("syntax_escapechar", _t1787,))
         return sorted(result)
 
     def mask_secret_value(self, pair: tuple[str, str]) -> str:
@@ -356,7 +356,7 @@ def deconstruct_iceberg_catalog_config_scope_optional(self, msg: logic_pb2.Icebe
             assert msg.scope is not None
             return msg.scope
         else:
-            _t1778 = None
+            _t1788 = None
         return None
 
     def deconstruct_iceberg_data_from_snapshot_optional(self, msg: logic_pb2.IcebergData) -> str | None:
@@ -365,7 +365,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:
-            _t1779 = None
+            _t1789 = None
         return None
 
     def deconstruct_iceberg_data_to_snapshot_optional(self, msg: logic_pb2.IcebergData) -> str | None:
@@ -374,7 +374,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:
-            _t1780 = None
+            _t1790 = None
         return None
 
     def deconstruct_export_iceberg_config_optional(self, msg: transactions_pb2.ExportIcebergConfig) -> Sequence[tuple[str, logic_pb2.Value]] | None:
@@ -382,20 +382,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
-            _t1781 = self._make_value_string(msg.prefix)
-            result.append(("prefix", _t1781,))
+            _t1791 = self._make_value_string(msg.prefix)
+            result.append(("prefix", _t1791,))
         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
-            _t1782 = self._make_value_int64(msg.target_file_size_bytes)
-            result.append(("target_file_size_bytes", _t1782,))
+            _t1792 = self._make_value_int64(msg.target_file_size_bytes)
+            result.append(("target_file_size_bytes", _t1792,))
         if msg.compression != "":
-            _t1783 = self._make_value_string(msg.compression)
-            result.append(("compression", _t1783,))
+            _t1793 = self._make_value_string(msg.compression)
+            result.append(("compression", _t1793,))
         if len(result) == 0:
             return None
         else:
-            _t1784 = None
+            _t1794 = None
         return sorted(result)
 
     def deconstruct_relation_id_string(self, msg: logic_pb2.RelationId) -> str:
@@ -408,7 +408,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:
-            _t1785 = None
+            _t1795 = None
         return None
 
     def deconstruct_bindings(self, abs: logic_pb2.Abstraction) -> tuple[Sequence[logic_pb2.Binding], Sequence[logic_pb2.Binding]]:
@@ -423,3937 +423,3957 @@ def deconstruct_bindings_with_arity(self, abs: logic_pb2.Abstraction, value_arit
     # --- Pretty-print methods ---
 
     def pretty_transaction(self, msg: transactions_pb2.Transaction):
-        flat809 = self._try_flat(msg, self.pretty_transaction)
-        if flat809 is not None:
-            assert flat809 is not None
-            self.write(flat809)
+        flat813 = self._try_flat(msg, self.pretty_transaction)
+        if flat813 is not None:
+            assert flat813 is not None
+            self.write(flat813)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("configure"):
-                _t1600 = _dollar_dollar.configure
+                _t1608 = _dollar_dollar.configure
             else:
-                _t1600 = None
+                _t1608 = None
             if _dollar_dollar.HasField("sync"):
-                _t1601 = _dollar_dollar.sync
+                _t1609 = _dollar_dollar.sync
             else:
-                _t1601 = None
-            fields800 = (_t1600, _t1601, _dollar_dollar.epochs,)
-            assert fields800 is not None
-            unwrapped_fields801 = fields800
+                _t1609 = None
+            fields804 = (_t1608, _t1609, _dollar_dollar.epochs,)
+            assert fields804 is not None
+            unwrapped_fields805 = fields804
             self.write("(transaction")
             self.indent_sexp()
-            field802 = unwrapped_fields801[0]
-            if field802 is not None:
+            field806 = unwrapped_fields805[0]
+            if field806 is not None:
                 self.newline()
-                assert field802 is not None
-                opt_val803 = field802
-                self.pretty_configure(opt_val803)
-            field804 = unwrapped_fields801[1]
-            if field804 is not None:
+                assert field806 is not None
+                opt_val807 = field806
+                self.pretty_configure(opt_val807)
+            field808 = unwrapped_fields805[1]
+            if field808 is not None:
                 self.newline()
-                assert field804 is not None
-                opt_val805 = field804
-                self.pretty_sync(opt_val805)
-            field806 = unwrapped_fields801[2]
-            if not len(field806) == 0:
+                assert field808 is not None
+                opt_val809 = field808
+                self.pretty_sync(opt_val809)
+            field810 = unwrapped_fields805[2]
+            if not len(field810) == 0:
                 self.newline()
-                for i808, elem807 in enumerate(field806):
-                    if (i808 > 0):
+                for i812, elem811 in enumerate(field810):
+                    if (i812 > 0):
                         self.newline()
-                    self.pretty_epoch(elem807)
+                    self.pretty_epoch(elem811)
             self.dedent()
             self.write(")")
 
     def pretty_configure(self, msg: transactions_pb2.Configure):
-        flat812 = self._try_flat(msg, self.pretty_configure)
-        if flat812 is not None:
-            assert flat812 is not None
-            self.write(flat812)
+        flat816 = self._try_flat(msg, self.pretty_configure)
+        if flat816 is not None:
+            assert flat816 is not None
+            self.write(flat816)
             return None
         else:
             _dollar_dollar = msg
-            _t1602 = self.deconstruct_configure(_dollar_dollar)
-            fields810 = _t1602
-            assert fields810 is not None
-            unwrapped_fields811 = fields810
+            _t1610 = self.deconstruct_configure(_dollar_dollar)
+            fields814 = _t1610
+            assert fields814 is not None
+            unwrapped_fields815 = fields814
             self.write("(configure")
             self.indent_sexp()
             self.newline()
-            self.pretty_config_dict(unwrapped_fields811)
+            self.pretty_config_dict(unwrapped_fields815)
             self.dedent()
             self.write(")")
 
     def pretty_config_dict(self, msg: Sequence[tuple[str, logic_pb2.Value]]):
-        flat816 = self._try_flat(msg, self.pretty_config_dict)
-        if flat816 is not None:
-            assert flat816 is not None
-            self.write(flat816)
+        flat820 = self._try_flat(msg, self.pretty_config_dict)
+        if flat820 is not None:
+            assert flat820 is not None
+            self.write(flat820)
             return None
         else:
-            fields813 = msg
+            fields817 = msg
             self.write("{")
             self.indent()
-            if not len(fields813) == 0:
+            if not len(fields817) == 0:
                 self.newline()
-                for i815, elem814 in enumerate(fields813):
-                    if (i815 > 0):
+                for i819, elem818 in enumerate(fields817):
+                    if (i819 > 0):
                         self.newline()
-                    self.pretty_config_key_value(elem814)
+                    self.pretty_config_key_value(elem818)
             self.dedent()
             self.write("}")
 
     def pretty_config_key_value(self, msg: tuple[str, logic_pb2.Value]):
-        flat821 = self._try_flat(msg, self.pretty_config_key_value)
-        if flat821 is not None:
-            assert flat821 is not None
-            self.write(flat821)
+        flat825 = self._try_flat(msg, self.pretty_config_key_value)
+        if flat825 is not None:
+            assert flat825 is not None
+            self.write(flat825)
             return None
         else:
             _dollar_dollar = msg
-            fields817 = (_dollar_dollar[0], _dollar_dollar[1],)
-            assert fields817 is not None
-            unwrapped_fields818 = fields817
+            fields821 = (_dollar_dollar[0], _dollar_dollar[1],)
+            assert fields821 is not None
+            unwrapped_fields822 = fields821
             self.write(":")
-            field819 = unwrapped_fields818[0]
-            self.write(field819)
+            field823 = unwrapped_fields822[0]
+            self.write(field823)
             self.write(" ")
-            field820 = unwrapped_fields818[1]
-            self.pretty_raw_value(field820)
+            field824 = unwrapped_fields822[1]
+            self.pretty_raw_value(field824)
 
     def pretty_raw_value(self, msg: logic_pb2.Value):
-        flat847 = self._try_flat(msg, self.pretty_raw_value)
-        if flat847 is not None:
-            assert flat847 is not None
-            self.write(flat847)
+        flat851 = self._try_flat(msg, self.pretty_raw_value)
+        if flat851 is not None:
+            assert flat851 is not None
+            self.write(flat851)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("date_value"):
-                _t1603 = _dollar_dollar.date_value
+                _t1611 = _dollar_dollar.date_value
             else:
-                _t1603 = None
-            deconstruct_result845 = _t1603
-            if deconstruct_result845 is not None:
-                assert deconstruct_result845 is not None
-                unwrapped846 = deconstruct_result845
-                self.pretty_raw_date(unwrapped846)
+                _t1611 = None
+            deconstruct_result849 = _t1611
+            if deconstruct_result849 is not None:
+                assert deconstruct_result849 is not None
+                unwrapped850 = deconstruct_result849
+                self.pretty_raw_date(unwrapped850)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("datetime_value"):
-                    _t1604 = _dollar_dollar.datetime_value
+                    _t1612 = _dollar_dollar.datetime_value
                 else:
-                    _t1604 = None
-                deconstruct_result843 = _t1604
-                if deconstruct_result843 is not None:
-                    assert deconstruct_result843 is not None
-                    unwrapped844 = deconstruct_result843
-                    self.pretty_raw_datetime(unwrapped844)
+                    _t1612 = None
+                deconstruct_result847 = _t1612
+                if deconstruct_result847 is not None:
+                    assert deconstruct_result847 is not None
+                    unwrapped848 = deconstruct_result847
+                    self.pretty_raw_datetime(unwrapped848)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("string_value"):
-                        _t1605 = _dollar_dollar.string_value
+                        _t1613 = _dollar_dollar.string_value
                     else:
-                        _t1605 = None
-                    deconstruct_result841 = _t1605
-                    if deconstruct_result841 is not None:
-                        assert deconstruct_result841 is not None
-                        unwrapped842 = deconstruct_result841
-                        self.write(self.format_string_value(unwrapped842))
+                        _t1613 = None
+                    deconstruct_result845 = _t1613
+                    if deconstruct_result845 is not None:
+                        assert deconstruct_result845 is not None
+                        unwrapped846 = deconstruct_result845
+                        self.write(self.format_string_value(unwrapped846))
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("int32_value"):
-                            _t1606 = _dollar_dollar.int32_value
+                            _t1614 = _dollar_dollar.int32_value
                         else:
-                            _t1606 = None
-                        deconstruct_result839 = _t1606
-                        if deconstruct_result839 is not None:
-                            assert deconstruct_result839 is not None
-                            unwrapped840 = deconstruct_result839
-                            self.write((str(unwrapped840) + 'i32'))
+                            _t1614 = None
+                        deconstruct_result843 = _t1614
+                        if deconstruct_result843 is not None:
+                            assert deconstruct_result843 is not None
+                            unwrapped844 = deconstruct_result843
+                            self.write((str(unwrapped844) + 'i32'))
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("int_value"):
-                                _t1607 = _dollar_dollar.int_value
+                                _t1615 = _dollar_dollar.int_value
                             else:
-                                _t1607 = None
-                            deconstruct_result837 = _t1607
-                            if deconstruct_result837 is not None:
-                                assert deconstruct_result837 is not None
-                                unwrapped838 = deconstruct_result837
-                                self.write(str(unwrapped838))
+                                _t1615 = None
+                            deconstruct_result841 = _t1615
+                            if deconstruct_result841 is not None:
+                                assert deconstruct_result841 is not None
+                                unwrapped842 = deconstruct_result841
+                                self.write(str(unwrapped842))
                             else:
                                 _dollar_dollar = msg
                                 if _dollar_dollar.HasField("float32_value"):
-                                    _t1608 = _dollar_dollar.float32_value
+                                    _t1616 = _dollar_dollar.float32_value
                                 else:
-                                    _t1608 = None
-                                deconstruct_result835 = _t1608
-                                if deconstruct_result835 is not None:
-                                    assert deconstruct_result835 is not None
-                                    unwrapped836 = deconstruct_result835
-                                    self.write(self.format_float32_literal(unwrapped836))
+                                    _t1616 = None
+                                deconstruct_result839 = _t1616
+                                if deconstruct_result839 is not None:
+                                    assert deconstruct_result839 is not None
+                                    unwrapped840 = deconstruct_result839
+                                    self.write(self.format_float32_literal(unwrapped840))
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.HasField("float_value"):
-                                        _t1609 = _dollar_dollar.float_value
+                                        _t1617 = _dollar_dollar.float_value
                                     else:
-                                        _t1609 = None
-                                    deconstruct_result833 = _t1609
-                                    if deconstruct_result833 is not None:
-                                        assert deconstruct_result833 is not None
-                                        unwrapped834 = deconstruct_result833
-                                        self.write(str(unwrapped834))
+                                        _t1617 = None
+                                    deconstruct_result837 = _t1617
+                                    if deconstruct_result837 is not None:
+                                        assert deconstruct_result837 is not None
+                                        unwrapped838 = deconstruct_result837
+                                        self.write(str(unwrapped838))
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.HasField("uint32_value"):
-                                            _t1610 = _dollar_dollar.uint32_value
+                                            _t1618 = _dollar_dollar.uint32_value
                                         else:
-                                            _t1610 = None
-                                        deconstruct_result831 = _t1610
-                                        if deconstruct_result831 is not None:
-                                            assert deconstruct_result831 is not None
-                                            unwrapped832 = deconstruct_result831
-                                            self.write((str(unwrapped832) + 'u32'))
+                                            _t1618 = None
+                                        deconstruct_result835 = _t1618
+                                        if deconstruct_result835 is not None:
+                                            assert deconstruct_result835 is not None
+                                            unwrapped836 = deconstruct_result835
+                                            self.write((str(unwrapped836) + 'u32'))
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.HasField("uint128_value"):
-                                                _t1611 = _dollar_dollar.uint128_value
+                                                _t1619 = _dollar_dollar.uint128_value
                                             else:
-                                                _t1611 = None
-                                            deconstruct_result829 = _t1611
-                                            if deconstruct_result829 is not None:
-                                                assert deconstruct_result829 is not None
-                                                unwrapped830 = deconstruct_result829
-                                                self.write(self.format_uint128(unwrapped830))
+                                                _t1619 = None
+                                            deconstruct_result833 = _t1619
+                                            if deconstruct_result833 is not None:
+                                                assert deconstruct_result833 is not None
+                                                unwrapped834 = deconstruct_result833
+                                                self.write(self.format_uint128(unwrapped834))
                                             else:
                                                 _dollar_dollar = msg
                                                 if _dollar_dollar.HasField("int128_value"):
-                                                    _t1612 = _dollar_dollar.int128_value
+                                                    _t1620 = _dollar_dollar.int128_value
                                                 else:
-                                                    _t1612 = None
-                                                deconstruct_result827 = _t1612
-                                                if deconstruct_result827 is not None:
-                                                    assert deconstruct_result827 is not None
-                                                    unwrapped828 = deconstruct_result827
-                                                    self.write(self.format_int128(unwrapped828))
+                                                    _t1620 = None
+                                                deconstruct_result831 = _t1620
+                                                if deconstruct_result831 is not None:
+                                                    assert deconstruct_result831 is not None
+                                                    unwrapped832 = deconstruct_result831
+                                                    self.write(self.format_int128(unwrapped832))
                                                 else:
                                                     _dollar_dollar = msg
                                                     if _dollar_dollar.HasField("decimal_value"):
-                                                        _t1613 = _dollar_dollar.decimal_value
+                                                        _t1621 = _dollar_dollar.decimal_value
                                                     else:
-                                                        _t1613 = None
-                                                    deconstruct_result825 = _t1613
-                                                    if deconstruct_result825 is not None:
-                                                        assert deconstruct_result825 is not None
-                                                        unwrapped826 = deconstruct_result825
-                                                        self.write(self.format_decimal(unwrapped826))
+                                                        _t1621 = None
+                                                    deconstruct_result829 = _t1621
+                                                    if deconstruct_result829 is not None:
+                                                        assert deconstruct_result829 is not None
+                                                        unwrapped830 = deconstruct_result829
+                                                        self.write(self.format_decimal(unwrapped830))
                                                     else:
                                                         _dollar_dollar = msg
                                                         if _dollar_dollar.HasField("boolean_value"):
-                                                            _t1614 = _dollar_dollar.boolean_value
+                                                            _t1622 = _dollar_dollar.boolean_value
                                                         else:
-                                                            _t1614 = None
-                                                        deconstruct_result823 = _t1614
-                                                        if deconstruct_result823 is not None:
-                                                            assert deconstruct_result823 is not None
-                                                            unwrapped824 = deconstruct_result823
-                                                            self.pretty_boolean_value(unwrapped824)
+                                                            _t1622 = None
+                                                        deconstruct_result827 = _t1622
+                                                        if deconstruct_result827 is not None:
+                                                            assert deconstruct_result827 is not None
+                                                            unwrapped828 = deconstruct_result827
+                                                            self.pretty_boolean_value(unwrapped828)
                                                         else:
-                                                            fields822 = msg
+                                                            fields826 = msg
                                                             self.write("missing")
 
     def pretty_raw_date(self, msg: logic_pb2.DateValue):
-        flat853 = self._try_flat(msg, self.pretty_raw_date)
-        if flat853 is not None:
-            assert flat853 is not None
-            self.write(flat853)
+        flat857 = self._try_flat(msg, self.pretty_raw_date)
+        if flat857 is not None:
+            assert flat857 is not None
+            self.write(flat857)
             return None
         else:
             _dollar_dollar = msg
-            fields848 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day),)
-            assert fields848 is not None
-            unwrapped_fields849 = fields848
+            fields852 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day),)
+            assert fields852 is not None
+            unwrapped_fields853 = fields852
             self.write("(date")
             self.indent_sexp()
             self.newline()
-            field850 = unwrapped_fields849[0]
-            self.write(str(field850))
+            field854 = unwrapped_fields853[0]
+            self.write(str(field854))
             self.newline()
-            field851 = unwrapped_fields849[1]
-            self.write(str(field851))
+            field855 = unwrapped_fields853[1]
+            self.write(str(field855))
             self.newline()
-            field852 = unwrapped_fields849[2]
-            self.write(str(field852))
+            field856 = unwrapped_fields853[2]
+            self.write(str(field856))
             self.dedent()
             self.write(")")
 
     def pretty_raw_datetime(self, msg: logic_pb2.DateTimeValue):
-        flat864 = self._try_flat(msg, self.pretty_raw_datetime)
-        if flat864 is not None:
-            assert flat864 is not None
-            self.write(flat864)
+        flat868 = self._try_flat(msg, self.pretty_raw_datetime)
+        if flat868 is not None:
+            assert flat868 is not None
+            self.write(flat868)
             return None
         else:
             _dollar_dollar = msg
-            fields854 = (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 fields854 is not None
-            unwrapped_fields855 = fields854
+            fields858 = (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 fields858 is not None
+            unwrapped_fields859 = fields858
             self.write("(datetime")
             self.indent_sexp()
             self.newline()
-            field856 = unwrapped_fields855[0]
-            self.write(str(field856))
+            field860 = unwrapped_fields859[0]
+            self.write(str(field860))
             self.newline()
-            field857 = unwrapped_fields855[1]
-            self.write(str(field857))
+            field861 = unwrapped_fields859[1]
+            self.write(str(field861))
             self.newline()
-            field858 = unwrapped_fields855[2]
-            self.write(str(field858))
+            field862 = unwrapped_fields859[2]
+            self.write(str(field862))
             self.newline()
-            field859 = unwrapped_fields855[3]
-            self.write(str(field859))
+            field863 = unwrapped_fields859[3]
+            self.write(str(field863))
             self.newline()
-            field860 = unwrapped_fields855[4]
-            self.write(str(field860))
+            field864 = unwrapped_fields859[4]
+            self.write(str(field864))
             self.newline()
-            field861 = unwrapped_fields855[5]
-            self.write(str(field861))
-            field862 = unwrapped_fields855[6]
-            if field862 is not None:
+            field865 = unwrapped_fields859[5]
+            self.write(str(field865))
+            field866 = unwrapped_fields859[6]
+            if field866 is not None:
                 self.newline()
-                assert field862 is not None
-                opt_val863 = field862
-                self.write(str(opt_val863))
+                assert field866 is not None
+                opt_val867 = field866
+                self.write(str(opt_val867))
             self.dedent()
             self.write(")")
 
     def pretty_boolean_value(self, msg: bool):
         _dollar_dollar = msg
         if _dollar_dollar:
-            _t1615 = ()
+            _t1623 = ()
         else:
-            _t1615 = None
-        deconstruct_result867 = _t1615
-        if deconstruct_result867 is not None:
-            assert deconstruct_result867 is not None
-            unwrapped868 = deconstruct_result867
+            _t1623 = None
+        deconstruct_result871 = _t1623
+        if deconstruct_result871 is not None:
+            assert deconstruct_result871 is not None
+            unwrapped872 = deconstruct_result871
             self.write("true")
         else:
             _dollar_dollar = msg
             if not _dollar_dollar:
-                _t1616 = ()
+                _t1624 = ()
             else:
-                _t1616 = None
-            deconstruct_result865 = _t1616
-            if deconstruct_result865 is not None:
-                assert deconstruct_result865 is not None
-                unwrapped866 = deconstruct_result865
+                _t1624 = None
+            deconstruct_result869 = _t1624
+            if deconstruct_result869 is not None:
+                assert deconstruct_result869 is not None
+                unwrapped870 = deconstruct_result869
                 self.write("false")
             else:
                 raise ParseError("No matching rule for boolean_value")
 
     def pretty_sync(self, msg: transactions_pb2.Sync):
-        flat873 = self._try_flat(msg, self.pretty_sync)
-        if flat873 is not None:
-            assert flat873 is not None
-            self.write(flat873)
+        flat877 = self._try_flat(msg, self.pretty_sync)
+        if flat877 is not None:
+            assert flat877 is not None
+            self.write(flat877)
             return None
         else:
             _dollar_dollar = msg
-            fields869 = _dollar_dollar.fragments
-            assert fields869 is not None
-            unwrapped_fields870 = fields869
+            fields873 = _dollar_dollar.fragments
+            assert fields873 is not None
+            unwrapped_fields874 = fields873
             self.write("(sync")
             self.indent_sexp()
-            if not len(unwrapped_fields870) == 0:
+            if not len(unwrapped_fields874) == 0:
                 self.newline()
-                for i872, elem871 in enumerate(unwrapped_fields870):
-                    if (i872 > 0):
+                for i876, elem875 in enumerate(unwrapped_fields874):
+                    if (i876 > 0):
                         self.newline()
-                    self.pretty_fragment_id(elem871)
+                    self.pretty_fragment_id(elem875)
             self.dedent()
             self.write(")")
 
     def pretty_fragment_id(self, msg: fragments_pb2.FragmentId):
-        flat876 = self._try_flat(msg, self.pretty_fragment_id)
-        if flat876 is not None:
-            assert flat876 is not None
-            self.write(flat876)
+        flat880 = self._try_flat(msg, self.pretty_fragment_id)
+        if flat880 is not None:
+            assert flat880 is not None
+            self.write(flat880)
             return None
         else:
             _dollar_dollar = msg
-            fields874 = self.fragment_id_to_string(_dollar_dollar)
-            assert fields874 is not None
-            unwrapped_fields875 = fields874
+            fields878 = self.fragment_id_to_string(_dollar_dollar)
+            assert fields878 is not None
+            unwrapped_fields879 = fields878
             self.write(":")
-            self.write(unwrapped_fields875)
+            self.write(unwrapped_fields879)
 
     def pretty_epoch(self, msg: transactions_pb2.Epoch):
-        flat883 = self._try_flat(msg, self.pretty_epoch)
-        if flat883 is not None:
-            assert flat883 is not None
-            self.write(flat883)
+        flat887 = self._try_flat(msg, self.pretty_epoch)
+        if flat887 is not None:
+            assert flat887 is not None
+            self.write(flat887)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.writes) == 0:
-                _t1617 = _dollar_dollar.writes
+                _t1625 = _dollar_dollar.writes
             else:
-                _t1617 = None
+                _t1625 = None
             if not len(_dollar_dollar.reads) == 0:
-                _t1618 = _dollar_dollar.reads
+                _t1626 = _dollar_dollar.reads
             else:
-                _t1618 = None
-            fields877 = (_t1617, _t1618,)
-            assert fields877 is not None
-            unwrapped_fields878 = fields877
+                _t1626 = None
+            fields881 = (_t1625, _t1626,)
+            assert fields881 is not None
+            unwrapped_fields882 = fields881
             self.write("(epoch")
             self.indent_sexp()
-            field879 = unwrapped_fields878[0]
-            if field879 is not None:
+            field883 = unwrapped_fields882[0]
+            if field883 is not None:
                 self.newline()
-                assert field879 is not None
-                opt_val880 = field879
-                self.pretty_epoch_writes(opt_val880)
-            field881 = unwrapped_fields878[1]
-            if field881 is not None:
+                assert field883 is not None
+                opt_val884 = field883
+                self.pretty_epoch_writes(opt_val884)
+            field885 = unwrapped_fields882[1]
+            if field885 is not None:
                 self.newline()
-                assert field881 is not None
-                opt_val882 = field881
-                self.pretty_epoch_reads(opt_val882)
+                assert field885 is not None
+                opt_val886 = field885
+                self.pretty_epoch_reads(opt_val886)
             self.dedent()
             self.write(")")
 
     def pretty_epoch_writes(self, msg: Sequence[transactions_pb2.Write]):
-        flat887 = self._try_flat(msg, self.pretty_epoch_writes)
-        if flat887 is not None:
-            assert flat887 is not None
-            self.write(flat887)
+        flat891 = self._try_flat(msg, self.pretty_epoch_writes)
+        if flat891 is not None:
+            assert flat891 is not None
+            self.write(flat891)
             return None
         else:
-            fields884 = msg
+            fields888 = msg
             self.write("(writes")
             self.indent_sexp()
-            if not len(fields884) == 0:
+            if not len(fields888) == 0:
                 self.newline()
-                for i886, elem885 in enumerate(fields884):
-                    if (i886 > 0):
+                for i890, elem889 in enumerate(fields888):
+                    if (i890 > 0):
                         self.newline()
-                    self.pretty_write(elem885)
+                    self.pretty_write(elem889)
             self.dedent()
             self.write(")")
 
     def pretty_write(self, msg: transactions_pb2.Write):
-        flat896 = self._try_flat(msg, self.pretty_write)
-        if flat896 is not None:
-            assert flat896 is not None
-            self.write(flat896)
+        flat900 = self._try_flat(msg, self.pretty_write)
+        if flat900 is not None:
+            assert flat900 is not None
+            self.write(flat900)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("define"):
-                _t1619 = _dollar_dollar.define
+                _t1627 = _dollar_dollar.define
             else:
-                _t1619 = None
-            deconstruct_result894 = _t1619
-            if deconstruct_result894 is not None:
-                assert deconstruct_result894 is not None
-                unwrapped895 = deconstruct_result894
-                self.pretty_define(unwrapped895)
+                _t1627 = None
+            deconstruct_result898 = _t1627
+            if deconstruct_result898 is not None:
+                assert deconstruct_result898 is not None
+                unwrapped899 = deconstruct_result898
+                self.pretty_define(unwrapped899)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("undefine"):
-                    _t1620 = _dollar_dollar.undefine
+                    _t1628 = _dollar_dollar.undefine
                 else:
-                    _t1620 = None
-                deconstruct_result892 = _t1620
-                if deconstruct_result892 is not None:
-                    assert deconstruct_result892 is not None
-                    unwrapped893 = deconstruct_result892
-                    self.pretty_undefine(unwrapped893)
+                    _t1628 = None
+                deconstruct_result896 = _t1628
+                if deconstruct_result896 is not None:
+                    assert deconstruct_result896 is not None
+                    unwrapped897 = deconstruct_result896
+                    self.pretty_undefine(unwrapped897)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("context"):
-                        _t1621 = _dollar_dollar.context
+                        _t1629 = _dollar_dollar.context
                     else:
-                        _t1621 = None
-                    deconstruct_result890 = _t1621
-                    if deconstruct_result890 is not None:
-                        assert deconstruct_result890 is not None
-                        unwrapped891 = deconstruct_result890
-                        self.pretty_context(unwrapped891)
+                        _t1629 = None
+                    deconstruct_result894 = _t1629
+                    if deconstruct_result894 is not None:
+                        assert deconstruct_result894 is not None
+                        unwrapped895 = deconstruct_result894
+                        self.pretty_context(unwrapped895)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("snapshot"):
-                            _t1622 = _dollar_dollar.snapshot
+                            _t1630 = _dollar_dollar.snapshot
                         else:
-                            _t1622 = None
-                        deconstruct_result888 = _t1622
-                        if deconstruct_result888 is not None:
-                            assert deconstruct_result888 is not None
-                            unwrapped889 = deconstruct_result888
-                            self.pretty_snapshot(unwrapped889)
+                            _t1630 = None
+                        deconstruct_result892 = _t1630
+                        if deconstruct_result892 is not None:
+                            assert deconstruct_result892 is not None
+                            unwrapped893 = deconstruct_result892
+                            self.pretty_snapshot(unwrapped893)
                         else:
                             raise ParseError("No matching rule for write")
 
     def pretty_define(self, msg: transactions_pb2.Define):
-        flat899 = self._try_flat(msg, self.pretty_define)
-        if flat899 is not None:
-            assert flat899 is not None
-            self.write(flat899)
+        flat903 = self._try_flat(msg, self.pretty_define)
+        if flat903 is not None:
+            assert flat903 is not None
+            self.write(flat903)
             return None
         else:
             _dollar_dollar = msg
-            fields897 = _dollar_dollar.fragment
-            assert fields897 is not None
-            unwrapped_fields898 = fields897
+            fields901 = _dollar_dollar.fragment
+            assert fields901 is not None
+            unwrapped_fields902 = fields901
             self.write("(define")
             self.indent_sexp()
             self.newline()
-            self.pretty_fragment(unwrapped_fields898)
+            self.pretty_fragment(unwrapped_fields902)
             self.dedent()
             self.write(")")
 
     def pretty_fragment(self, msg: fragments_pb2.Fragment):
-        flat906 = self._try_flat(msg, self.pretty_fragment)
-        if flat906 is not None:
-            assert flat906 is not None
-            self.write(flat906)
+        flat910 = self._try_flat(msg, self.pretty_fragment)
+        if flat910 is not None:
+            assert flat910 is not None
+            self.write(flat910)
             return None
         else:
             _dollar_dollar = msg
             self.start_pretty_fragment(_dollar_dollar)
-            fields900 = (_dollar_dollar.id, _dollar_dollar.declarations,)
-            assert fields900 is not None
-            unwrapped_fields901 = fields900
+            fields904 = (_dollar_dollar.id, _dollar_dollar.declarations,)
+            assert fields904 is not None
+            unwrapped_fields905 = fields904
             self.write("(fragment")
             self.indent_sexp()
             self.newline()
-            field902 = unwrapped_fields901[0]
-            self.pretty_new_fragment_id(field902)
-            field903 = unwrapped_fields901[1]
-            if not len(field903) == 0:
+            field906 = unwrapped_fields905[0]
+            self.pretty_new_fragment_id(field906)
+            field907 = unwrapped_fields905[1]
+            if not len(field907) == 0:
                 self.newline()
-                for i905, elem904 in enumerate(field903):
-                    if (i905 > 0):
+                for i909, elem908 in enumerate(field907):
+                    if (i909 > 0):
                         self.newline()
-                    self.pretty_declaration(elem904)
+                    self.pretty_declaration(elem908)
             self.dedent()
             self.write(")")
 
     def pretty_new_fragment_id(self, msg: fragments_pb2.FragmentId):
-        flat908 = self._try_flat(msg, self.pretty_new_fragment_id)
-        if flat908 is not None:
-            assert flat908 is not None
-            self.write(flat908)
+        flat912 = self._try_flat(msg, self.pretty_new_fragment_id)
+        if flat912 is not None:
+            assert flat912 is not None
+            self.write(flat912)
             return None
         else:
-            fields907 = msg
-            self.pretty_fragment_id(fields907)
+            fields911 = msg
+            self.pretty_fragment_id(fields911)
 
     def pretty_declaration(self, msg: logic_pb2.Declaration):
-        flat917 = self._try_flat(msg, self.pretty_declaration)
-        if flat917 is not None:
-            assert flat917 is not None
-            self.write(flat917)
+        flat921 = self._try_flat(msg, self.pretty_declaration)
+        if flat921 is not None:
+            assert flat921 is not None
+            self.write(flat921)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("def"):
-                _t1623 = getattr(_dollar_dollar, 'def')
+                _t1631 = getattr(_dollar_dollar, 'def')
             else:
-                _t1623 = None
-            deconstruct_result915 = _t1623
-            if deconstruct_result915 is not None:
-                assert deconstruct_result915 is not None
-                unwrapped916 = deconstruct_result915
-                self.pretty_def(unwrapped916)
+                _t1631 = None
+            deconstruct_result919 = _t1631
+            if deconstruct_result919 is not None:
+                assert deconstruct_result919 is not None
+                unwrapped920 = deconstruct_result919
+                self.pretty_def(unwrapped920)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("algorithm"):
-                    _t1624 = _dollar_dollar.algorithm
+                    _t1632 = _dollar_dollar.algorithm
                 else:
-                    _t1624 = None
-                deconstruct_result913 = _t1624
-                if deconstruct_result913 is not None:
-                    assert deconstruct_result913 is not None
-                    unwrapped914 = deconstruct_result913
-                    self.pretty_algorithm(unwrapped914)
+                    _t1632 = None
+                deconstruct_result917 = _t1632
+                if deconstruct_result917 is not None:
+                    assert deconstruct_result917 is not None
+                    unwrapped918 = deconstruct_result917
+                    self.pretty_algorithm(unwrapped918)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("constraint"):
-                        _t1625 = _dollar_dollar.constraint
+                        _t1633 = _dollar_dollar.constraint
                     else:
-                        _t1625 = None
-                    deconstruct_result911 = _t1625
-                    if deconstruct_result911 is not None:
-                        assert deconstruct_result911 is not None
-                        unwrapped912 = deconstruct_result911
-                        self.pretty_constraint(unwrapped912)
+                        _t1633 = None
+                    deconstruct_result915 = _t1633
+                    if deconstruct_result915 is not None:
+                        assert deconstruct_result915 is not None
+                        unwrapped916 = deconstruct_result915
+                        self.pretty_constraint(unwrapped916)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("data"):
-                            _t1626 = _dollar_dollar.data
+                            _t1634 = _dollar_dollar.data
                         else:
-                            _t1626 = None
-                        deconstruct_result909 = _t1626
-                        if deconstruct_result909 is not None:
-                            assert deconstruct_result909 is not None
-                            unwrapped910 = deconstruct_result909
-                            self.pretty_data(unwrapped910)
+                            _t1634 = None
+                        deconstruct_result913 = _t1634
+                        if deconstruct_result913 is not None:
+                            assert deconstruct_result913 is not None
+                            unwrapped914 = deconstruct_result913
+                            self.pretty_data(unwrapped914)
                         else:
                             raise ParseError("No matching rule for declaration")
 
     def pretty_def(self, msg: logic_pb2.Def):
-        flat924 = self._try_flat(msg, self.pretty_def)
-        if flat924 is not None:
-            assert flat924 is not None
-            self.write(flat924)
+        flat928 = self._try_flat(msg, self.pretty_def)
+        if flat928 is not None:
+            assert flat928 is not None
+            self.write(flat928)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1627 = _dollar_dollar.attrs
+                _t1635 = _dollar_dollar.attrs
             else:
-                _t1627 = None
-            fields918 = (_dollar_dollar.name, _dollar_dollar.body, _t1627,)
-            assert fields918 is not None
-            unwrapped_fields919 = fields918
+                _t1635 = None
+            fields922 = (_dollar_dollar.name, _dollar_dollar.body, _t1635,)
+            assert fields922 is not None
+            unwrapped_fields923 = fields922
             self.write("(def")
             self.indent_sexp()
             self.newline()
-            field920 = unwrapped_fields919[0]
-            self.pretty_relation_id(field920)
+            field924 = unwrapped_fields923[0]
+            self.pretty_relation_id(field924)
             self.newline()
-            field921 = unwrapped_fields919[1]
-            self.pretty_abstraction(field921)
-            field922 = unwrapped_fields919[2]
-            if field922 is not None:
+            field925 = unwrapped_fields923[1]
+            self.pretty_abstraction(field925)
+            field926 = unwrapped_fields923[2]
+            if field926 is not None:
                 self.newline()
-                assert field922 is not None
-                opt_val923 = field922
-                self.pretty_attrs(opt_val923)
+                assert field926 is not None
+                opt_val927 = field926
+                self.pretty_attrs(opt_val927)
             self.dedent()
             self.write(")")
 
     def pretty_relation_id(self, msg: logic_pb2.RelationId):
-        flat929 = self._try_flat(msg, self.pretty_relation_id)
-        if flat929 is not None:
-            assert flat929 is not None
-            self.write(flat929)
+        flat933 = self._try_flat(msg, self.pretty_relation_id)
+        if flat933 is not None:
+            assert flat933 is not None
+            self.write(flat933)
             return None
         else:
             _dollar_dollar = msg
             if self.relation_id_to_string(_dollar_dollar) is not None:
-                _t1629 = self.deconstruct_relation_id_string(_dollar_dollar)
-                _t1628 = _t1629
+                _t1637 = self.deconstruct_relation_id_string(_dollar_dollar)
+                _t1636 = _t1637
             else:
-                _t1628 = None
-            deconstruct_result927 = _t1628
-            if deconstruct_result927 is not None:
-                assert deconstruct_result927 is not None
-                unwrapped928 = deconstruct_result927
+                _t1636 = None
+            deconstruct_result931 = _t1636
+            if deconstruct_result931 is not None:
+                assert deconstruct_result931 is not None
+                unwrapped932 = deconstruct_result931
                 self.write(":")
-                self.write(unwrapped928)
+                self.write(unwrapped932)
             else:
                 _dollar_dollar = msg
-                _t1630 = self.deconstruct_relation_id_uint128(_dollar_dollar)
-                deconstruct_result925 = _t1630
-                if deconstruct_result925 is not None:
-                    assert deconstruct_result925 is not None
-                    unwrapped926 = deconstruct_result925
-                    self.write(self.format_uint128(unwrapped926))
+                _t1638 = self.deconstruct_relation_id_uint128(_dollar_dollar)
+                deconstruct_result929 = _t1638
+                if deconstruct_result929 is not None:
+                    assert deconstruct_result929 is not None
+                    unwrapped930 = deconstruct_result929
+                    self.write(self.format_uint128(unwrapped930))
                 else:
                     raise ParseError("No matching rule for relation_id")
 
     def pretty_abstraction(self, msg: logic_pb2.Abstraction):
-        flat934 = self._try_flat(msg, self.pretty_abstraction)
-        if flat934 is not None:
-            assert flat934 is not None
-            self.write(flat934)
+        flat938 = self._try_flat(msg, self.pretty_abstraction)
+        if flat938 is not None:
+            assert flat938 is not None
+            self.write(flat938)
             return None
         else:
             _dollar_dollar = msg
-            _t1631 = self.deconstruct_bindings(_dollar_dollar)
-            fields930 = (_t1631, _dollar_dollar.value,)
-            assert fields930 is not None
-            unwrapped_fields931 = fields930
+            _t1639 = self.deconstruct_bindings(_dollar_dollar)
+            fields934 = (_t1639, _dollar_dollar.value,)
+            assert fields934 is not None
+            unwrapped_fields935 = fields934
             self.write("(")
             self.indent()
-            field932 = unwrapped_fields931[0]
-            self.pretty_bindings(field932)
+            field936 = unwrapped_fields935[0]
+            self.pretty_bindings(field936)
             self.newline()
-            field933 = unwrapped_fields931[1]
-            self.pretty_formula(field933)
+            field937 = unwrapped_fields935[1]
+            self.pretty_formula(field937)
             self.dedent()
             self.write(")")
 
     def pretty_bindings(self, msg: tuple[Sequence[logic_pb2.Binding], Sequence[logic_pb2.Binding]]):
-        flat942 = self._try_flat(msg, self.pretty_bindings)
-        if flat942 is not None:
-            assert flat942 is not None
-            self.write(flat942)
+        flat946 = self._try_flat(msg, self.pretty_bindings)
+        if flat946 is not None:
+            assert flat946 is not None
+            self.write(flat946)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar[1]) == 0:
-                _t1632 = _dollar_dollar[1]
+                _t1640 = _dollar_dollar[1]
             else:
-                _t1632 = None
-            fields935 = (_dollar_dollar[0], _t1632,)
-            assert fields935 is not None
-            unwrapped_fields936 = fields935
+                _t1640 = None
+            fields939 = (_dollar_dollar[0], _t1640,)
+            assert fields939 is not None
+            unwrapped_fields940 = fields939
             self.write("[")
             self.indent()
-            field937 = unwrapped_fields936[0]
-            for i939, elem938 in enumerate(field937):
-                if (i939 > 0):
+            field941 = unwrapped_fields940[0]
+            for i943, elem942 in enumerate(field941):
+                if (i943 > 0):
                     self.newline()
-                self.pretty_binding(elem938)
-            field940 = unwrapped_fields936[1]
-            if field940 is not None:
+                self.pretty_binding(elem942)
+            field944 = unwrapped_fields940[1]
+            if field944 is not None:
                 self.newline()
-                assert field940 is not None
-                opt_val941 = field940
-                self.pretty_value_bindings(opt_val941)
+                assert field944 is not None
+                opt_val945 = field944
+                self.pretty_value_bindings(opt_val945)
             self.dedent()
             self.write("]")
 
     def pretty_binding(self, msg: logic_pb2.Binding):
-        flat947 = self._try_flat(msg, self.pretty_binding)
-        if flat947 is not None:
-            assert flat947 is not None
-            self.write(flat947)
+        flat951 = self._try_flat(msg, self.pretty_binding)
+        if flat951 is not None:
+            assert flat951 is not None
+            self.write(flat951)
             return None
         else:
             _dollar_dollar = msg
-            fields943 = (_dollar_dollar.var.name, _dollar_dollar.type,)
-            assert fields943 is not None
-            unwrapped_fields944 = fields943
-            field945 = unwrapped_fields944[0]
-            self.write(field945)
+            fields947 = (_dollar_dollar.var.name, _dollar_dollar.type,)
+            assert fields947 is not None
+            unwrapped_fields948 = fields947
+            field949 = unwrapped_fields948[0]
+            self.write(field949)
             self.write("::")
-            field946 = unwrapped_fields944[1]
-            self.pretty_type(field946)
+            field950 = unwrapped_fields948[1]
+            self.pretty_type(field950)
 
     def pretty_type(self, msg: logic_pb2.Type):
-        flat976 = self._try_flat(msg, self.pretty_type)
-        if flat976 is not None:
-            assert flat976 is not None
-            self.write(flat976)
+        flat980 = self._try_flat(msg, self.pretty_type)
+        if flat980 is not None:
+            assert flat980 is not None
+            self.write(flat980)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("unspecified_type"):
-                _t1633 = _dollar_dollar.unspecified_type
+                _t1641 = _dollar_dollar.unspecified_type
             else:
-                _t1633 = None
-            deconstruct_result974 = _t1633
-            if deconstruct_result974 is not None:
-                assert deconstruct_result974 is not None
-                unwrapped975 = deconstruct_result974
-                self.pretty_unspecified_type(unwrapped975)
+                _t1641 = None
+            deconstruct_result978 = _t1641
+            if deconstruct_result978 is not None:
+                assert deconstruct_result978 is not None
+                unwrapped979 = deconstruct_result978
+                self.pretty_unspecified_type(unwrapped979)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("string_type"):
-                    _t1634 = _dollar_dollar.string_type
+                    _t1642 = _dollar_dollar.string_type
                 else:
-                    _t1634 = None
-                deconstruct_result972 = _t1634
-                if deconstruct_result972 is not None:
-                    assert deconstruct_result972 is not None
-                    unwrapped973 = deconstruct_result972
-                    self.pretty_string_type(unwrapped973)
+                    _t1642 = None
+                deconstruct_result976 = _t1642
+                if deconstruct_result976 is not None:
+                    assert deconstruct_result976 is not None
+                    unwrapped977 = deconstruct_result976
+                    self.pretty_string_type(unwrapped977)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("int_type"):
-                        _t1635 = _dollar_dollar.int_type
+                        _t1643 = _dollar_dollar.int_type
                     else:
-                        _t1635 = None
-                    deconstruct_result970 = _t1635
-                    if deconstruct_result970 is not None:
-                        assert deconstruct_result970 is not None
-                        unwrapped971 = deconstruct_result970
-                        self.pretty_int_type(unwrapped971)
+                        _t1643 = None
+                    deconstruct_result974 = _t1643
+                    if deconstruct_result974 is not None:
+                        assert deconstruct_result974 is not None
+                        unwrapped975 = deconstruct_result974
+                        self.pretty_int_type(unwrapped975)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("float_type"):
-                            _t1636 = _dollar_dollar.float_type
+                            _t1644 = _dollar_dollar.float_type
                         else:
-                            _t1636 = None
-                        deconstruct_result968 = _t1636
-                        if deconstruct_result968 is not None:
-                            assert deconstruct_result968 is not None
-                            unwrapped969 = deconstruct_result968
-                            self.pretty_float_type(unwrapped969)
+                            _t1644 = None
+                        deconstruct_result972 = _t1644
+                        if deconstruct_result972 is not None:
+                            assert deconstruct_result972 is not None
+                            unwrapped973 = deconstruct_result972
+                            self.pretty_float_type(unwrapped973)
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("uint128_type"):
-                                _t1637 = _dollar_dollar.uint128_type
+                                _t1645 = _dollar_dollar.uint128_type
                             else:
-                                _t1637 = None
-                            deconstruct_result966 = _t1637
-                            if deconstruct_result966 is not None:
-                                assert deconstruct_result966 is not None
-                                unwrapped967 = deconstruct_result966
-                                self.pretty_uint128_type(unwrapped967)
+                                _t1645 = None
+                            deconstruct_result970 = _t1645
+                            if deconstruct_result970 is not None:
+                                assert deconstruct_result970 is not None
+                                unwrapped971 = deconstruct_result970
+                                self.pretty_uint128_type(unwrapped971)
                             else:
                                 _dollar_dollar = msg
                                 if _dollar_dollar.HasField("int128_type"):
-                                    _t1638 = _dollar_dollar.int128_type
+                                    _t1646 = _dollar_dollar.int128_type
                                 else:
-                                    _t1638 = None
-                                deconstruct_result964 = _t1638
-                                if deconstruct_result964 is not None:
-                                    assert deconstruct_result964 is not None
-                                    unwrapped965 = deconstruct_result964
-                                    self.pretty_int128_type(unwrapped965)
+                                    _t1646 = None
+                                deconstruct_result968 = _t1646
+                                if deconstruct_result968 is not None:
+                                    assert deconstruct_result968 is not None
+                                    unwrapped969 = deconstruct_result968
+                                    self.pretty_int128_type(unwrapped969)
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.HasField("date_type"):
-                                        _t1639 = _dollar_dollar.date_type
+                                        _t1647 = _dollar_dollar.date_type
                                     else:
-                                        _t1639 = None
-                                    deconstruct_result962 = _t1639
-                                    if deconstruct_result962 is not None:
-                                        assert deconstruct_result962 is not None
-                                        unwrapped963 = deconstruct_result962
-                                        self.pretty_date_type(unwrapped963)
+                                        _t1647 = None
+                                    deconstruct_result966 = _t1647
+                                    if deconstruct_result966 is not None:
+                                        assert deconstruct_result966 is not None
+                                        unwrapped967 = deconstruct_result966
+                                        self.pretty_date_type(unwrapped967)
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.HasField("datetime_type"):
-                                            _t1640 = _dollar_dollar.datetime_type
+                                            _t1648 = _dollar_dollar.datetime_type
                                         else:
-                                            _t1640 = None
-                                        deconstruct_result960 = _t1640
-                                        if deconstruct_result960 is not None:
-                                            assert deconstruct_result960 is not None
-                                            unwrapped961 = deconstruct_result960
-                                            self.pretty_datetime_type(unwrapped961)
+                                            _t1648 = None
+                                        deconstruct_result964 = _t1648
+                                        if deconstruct_result964 is not None:
+                                            assert deconstruct_result964 is not None
+                                            unwrapped965 = deconstruct_result964
+                                            self.pretty_datetime_type(unwrapped965)
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.HasField("missing_type"):
-                                                _t1641 = _dollar_dollar.missing_type
+                                                _t1649 = _dollar_dollar.missing_type
                                             else:
-                                                _t1641 = None
-                                            deconstruct_result958 = _t1641
-                                            if deconstruct_result958 is not None:
-                                                assert deconstruct_result958 is not None
-                                                unwrapped959 = deconstruct_result958
-                                                self.pretty_missing_type(unwrapped959)
+                                                _t1649 = None
+                                            deconstruct_result962 = _t1649
+                                            if deconstruct_result962 is not None:
+                                                assert deconstruct_result962 is not None
+                                                unwrapped963 = deconstruct_result962
+                                                self.pretty_missing_type(unwrapped963)
                                             else:
                                                 _dollar_dollar = msg
                                                 if _dollar_dollar.HasField("decimal_type"):
-                                                    _t1642 = _dollar_dollar.decimal_type
+                                                    _t1650 = _dollar_dollar.decimal_type
                                                 else:
-                                                    _t1642 = None
-                                                deconstruct_result956 = _t1642
-                                                if deconstruct_result956 is not None:
-                                                    assert deconstruct_result956 is not None
-                                                    unwrapped957 = deconstruct_result956
-                                                    self.pretty_decimal_type(unwrapped957)
+                                                    _t1650 = None
+                                                deconstruct_result960 = _t1650
+                                                if deconstruct_result960 is not None:
+                                                    assert deconstruct_result960 is not None
+                                                    unwrapped961 = deconstruct_result960
+                                                    self.pretty_decimal_type(unwrapped961)
                                                 else:
                                                     _dollar_dollar = msg
                                                     if _dollar_dollar.HasField("boolean_type"):
-                                                        _t1643 = _dollar_dollar.boolean_type
+                                                        _t1651 = _dollar_dollar.boolean_type
                                                     else:
-                                                        _t1643 = None
-                                                    deconstruct_result954 = _t1643
-                                                    if deconstruct_result954 is not None:
-                                                        assert deconstruct_result954 is not None
-                                                        unwrapped955 = deconstruct_result954
-                                                        self.pretty_boolean_type(unwrapped955)
+                                                        _t1651 = None
+                                                    deconstruct_result958 = _t1651
+                                                    if deconstruct_result958 is not None:
+                                                        assert deconstruct_result958 is not None
+                                                        unwrapped959 = deconstruct_result958
+                                                        self.pretty_boolean_type(unwrapped959)
                                                     else:
                                                         _dollar_dollar = msg
                                                         if _dollar_dollar.HasField("int32_type"):
-                                                            _t1644 = _dollar_dollar.int32_type
+                                                            _t1652 = _dollar_dollar.int32_type
                                                         else:
-                                                            _t1644 = None
-                                                        deconstruct_result952 = _t1644
-                                                        if deconstruct_result952 is not None:
-                                                            assert deconstruct_result952 is not None
-                                                            unwrapped953 = deconstruct_result952
-                                                            self.pretty_int32_type(unwrapped953)
+                                                            _t1652 = None
+                                                        deconstruct_result956 = _t1652
+                                                        if deconstruct_result956 is not None:
+                                                            assert deconstruct_result956 is not None
+                                                            unwrapped957 = deconstruct_result956
+                                                            self.pretty_int32_type(unwrapped957)
                                                         else:
                                                             _dollar_dollar = msg
                                                             if _dollar_dollar.HasField("float32_type"):
-                                                                _t1645 = _dollar_dollar.float32_type
+                                                                _t1653 = _dollar_dollar.float32_type
                                                             else:
-                                                                _t1645 = None
-                                                            deconstruct_result950 = _t1645
-                                                            if deconstruct_result950 is not None:
-                                                                assert deconstruct_result950 is not None
-                                                                unwrapped951 = deconstruct_result950
-                                                                self.pretty_float32_type(unwrapped951)
+                                                                _t1653 = None
+                                                            deconstruct_result954 = _t1653
+                                                            if deconstruct_result954 is not None:
+                                                                assert deconstruct_result954 is not None
+                                                                unwrapped955 = deconstruct_result954
+                                                                self.pretty_float32_type(unwrapped955)
                                                             else:
                                                                 _dollar_dollar = msg
                                                                 if _dollar_dollar.HasField("uint32_type"):
-                                                                    _t1646 = _dollar_dollar.uint32_type
+                                                                    _t1654 = _dollar_dollar.uint32_type
                                                                 else:
-                                                                    _t1646 = None
-                                                                deconstruct_result948 = _t1646
-                                                                if deconstruct_result948 is not None:
-                                                                    assert deconstruct_result948 is not None
-                                                                    unwrapped949 = deconstruct_result948
-                                                                    self.pretty_uint32_type(unwrapped949)
+                                                                    _t1654 = None
+                                                                deconstruct_result952 = _t1654
+                                                                if deconstruct_result952 is not None:
+                                                                    assert deconstruct_result952 is not None
+                                                                    unwrapped953 = deconstruct_result952
+                                                                    self.pretty_uint32_type(unwrapped953)
                                                                 else:
                                                                     raise ParseError("No matching rule for type")
 
     def pretty_unspecified_type(self, msg: logic_pb2.UnspecifiedType):
-        fields977 = msg
+        fields981 = msg
         self.write("UNKNOWN")
 
     def pretty_string_type(self, msg: logic_pb2.StringType):
-        fields978 = msg
+        fields982 = msg
         self.write("STRING")
 
     def pretty_int_type(self, msg: logic_pb2.IntType):
-        fields979 = msg
+        fields983 = msg
         self.write("INT")
 
     def pretty_float_type(self, msg: logic_pb2.FloatType):
-        fields980 = msg
+        fields984 = msg
         self.write("FLOAT")
 
     def pretty_uint128_type(self, msg: logic_pb2.UInt128Type):
-        fields981 = msg
+        fields985 = msg
         self.write("UINT128")
 
     def pretty_int128_type(self, msg: logic_pb2.Int128Type):
-        fields982 = msg
+        fields986 = msg
         self.write("INT128")
 
     def pretty_date_type(self, msg: logic_pb2.DateType):
-        fields983 = msg
+        fields987 = msg
         self.write("DATE")
 
     def pretty_datetime_type(self, msg: logic_pb2.DateTimeType):
-        fields984 = msg
+        fields988 = msg
         self.write("DATETIME")
 
     def pretty_missing_type(self, msg: logic_pb2.MissingType):
-        fields985 = msg
+        fields989 = msg
         self.write("MISSING")
 
     def pretty_decimal_type(self, msg: logic_pb2.DecimalType):
-        flat990 = self._try_flat(msg, self.pretty_decimal_type)
-        if flat990 is not None:
-            assert flat990 is not None
-            self.write(flat990)
+        flat994 = self._try_flat(msg, self.pretty_decimal_type)
+        if flat994 is not None:
+            assert flat994 is not None
+            self.write(flat994)
             return None
         else:
             _dollar_dollar = msg
-            fields986 = (int(_dollar_dollar.precision), int(_dollar_dollar.scale),)
-            assert fields986 is not None
-            unwrapped_fields987 = fields986
+            fields990 = (int(_dollar_dollar.precision), int(_dollar_dollar.scale),)
+            assert fields990 is not None
+            unwrapped_fields991 = fields990
             self.write("(DECIMAL")
             self.indent_sexp()
             self.newline()
-            field988 = unwrapped_fields987[0]
-            self.write(str(field988))
+            field992 = unwrapped_fields991[0]
+            self.write(str(field992))
             self.newline()
-            field989 = unwrapped_fields987[1]
-            self.write(str(field989))
+            field993 = unwrapped_fields991[1]
+            self.write(str(field993))
             self.dedent()
             self.write(")")
 
     def pretty_boolean_type(self, msg: logic_pb2.BooleanType):
-        fields991 = msg
+        fields995 = msg
         self.write("BOOLEAN")
 
     def pretty_int32_type(self, msg: logic_pb2.Int32Type):
-        fields992 = msg
+        fields996 = msg
         self.write("INT32")
 
     def pretty_float32_type(self, msg: logic_pb2.Float32Type):
-        fields993 = msg
+        fields997 = msg
         self.write("FLOAT32")
 
     def pretty_uint32_type(self, msg: logic_pb2.UInt32Type):
-        fields994 = msg
+        fields998 = msg
         self.write("UINT32")
 
     def pretty_value_bindings(self, msg: Sequence[logic_pb2.Binding]):
-        flat998 = self._try_flat(msg, self.pretty_value_bindings)
-        if flat998 is not None:
-            assert flat998 is not None
-            self.write(flat998)
+        flat1002 = self._try_flat(msg, self.pretty_value_bindings)
+        if flat1002 is not None:
+            assert flat1002 is not None
+            self.write(flat1002)
             return None
         else:
-            fields995 = msg
+            fields999 = msg
             self.write("|")
-            if not len(fields995) == 0:
+            if not len(fields999) == 0:
                 self.write(" ")
-                for i997, elem996 in enumerate(fields995):
-                    if (i997 > 0):
+                for i1001, elem1000 in enumerate(fields999):
+                    if (i1001 > 0):
                         self.newline()
-                    self.pretty_binding(elem996)
+                    self.pretty_binding(elem1000)
 
     def pretty_formula(self, msg: logic_pb2.Formula):
-        flat1025 = self._try_flat(msg, self.pretty_formula)
-        if flat1025 is not None:
-            assert flat1025 is not None
-            self.write(flat1025)
+        flat1029 = self._try_flat(msg, self.pretty_formula)
+        if flat1029 is not None:
+            assert flat1029 is not None
+            self.write(flat1029)
             return None
         else:
             _dollar_dollar = msg
             if (_dollar_dollar.HasField("conjunction") and len(_dollar_dollar.conjunction.args) == 0):
-                _t1647 = _dollar_dollar.conjunction
+                _t1655 = _dollar_dollar.conjunction
             else:
-                _t1647 = None
-            deconstruct_result1023 = _t1647
-            if deconstruct_result1023 is not None:
-                assert deconstruct_result1023 is not None
-                unwrapped1024 = deconstruct_result1023
-                self.pretty_true(unwrapped1024)
+                _t1655 = None
+            deconstruct_result1027 = _t1655
+            if deconstruct_result1027 is not None:
+                assert deconstruct_result1027 is not None
+                unwrapped1028 = deconstruct_result1027
+                self.pretty_true(unwrapped1028)
             else:
                 _dollar_dollar = msg
                 if (_dollar_dollar.HasField("disjunction") and len(_dollar_dollar.disjunction.args) == 0):
-                    _t1648 = _dollar_dollar.disjunction
+                    _t1656 = _dollar_dollar.disjunction
                 else:
-                    _t1648 = None
-                deconstruct_result1021 = _t1648
-                if deconstruct_result1021 is not None:
-                    assert deconstruct_result1021 is not None
-                    unwrapped1022 = deconstruct_result1021
-                    self.pretty_false(unwrapped1022)
+                    _t1656 = None
+                deconstruct_result1025 = _t1656
+                if deconstruct_result1025 is not None:
+                    assert deconstruct_result1025 is not None
+                    unwrapped1026 = deconstruct_result1025
+                    self.pretty_false(unwrapped1026)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("exists"):
-                        _t1649 = _dollar_dollar.exists
+                        _t1657 = _dollar_dollar.exists
                     else:
-                        _t1649 = None
-                    deconstruct_result1019 = _t1649
-                    if deconstruct_result1019 is not None:
-                        assert deconstruct_result1019 is not None
-                        unwrapped1020 = deconstruct_result1019
-                        self.pretty_exists(unwrapped1020)
+                        _t1657 = None
+                    deconstruct_result1023 = _t1657
+                    if deconstruct_result1023 is not None:
+                        assert deconstruct_result1023 is not None
+                        unwrapped1024 = deconstruct_result1023
+                        self.pretty_exists(unwrapped1024)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("reduce"):
-                            _t1650 = _dollar_dollar.reduce
+                            _t1658 = _dollar_dollar.reduce
                         else:
-                            _t1650 = None
-                        deconstruct_result1017 = _t1650
-                        if deconstruct_result1017 is not None:
-                            assert deconstruct_result1017 is not None
-                            unwrapped1018 = deconstruct_result1017
-                            self.pretty_reduce(unwrapped1018)
+                            _t1658 = None
+                        deconstruct_result1021 = _t1658
+                        if deconstruct_result1021 is not None:
+                            assert deconstruct_result1021 is not None
+                            unwrapped1022 = deconstruct_result1021
+                            self.pretty_reduce(unwrapped1022)
                         else:
                             _dollar_dollar = msg
                             if (_dollar_dollar.HasField("conjunction") and not len(_dollar_dollar.conjunction.args) == 0):
-                                _t1651 = _dollar_dollar.conjunction
+                                _t1659 = _dollar_dollar.conjunction
                             else:
-                                _t1651 = None
-                            deconstruct_result1015 = _t1651
-                            if deconstruct_result1015 is not None:
-                                assert deconstruct_result1015 is not None
-                                unwrapped1016 = deconstruct_result1015
-                                self.pretty_conjunction(unwrapped1016)
+                                _t1659 = None
+                            deconstruct_result1019 = _t1659
+                            if deconstruct_result1019 is not None:
+                                assert deconstruct_result1019 is not None
+                                unwrapped1020 = deconstruct_result1019
+                                self.pretty_conjunction(unwrapped1020)
                             else:
                                 _dollar_dollar = msg
                                 if (_dollar_dollar.HasField("disjunction") and not len(_dollar_dollar.disjunction.args) == 0):
-                                    _t1652 = _dollar_dollar.disjunction
+                                    _t1660 = _dollar_dollar.disjunction
                                 else:
-                                    _t1652 = None
-                                deconstruct_result1013 = _t1652
-                                if deconstruct_result1013 is not None:
-                                    assert deconstruct_result1013 is not None
-                                    unwrapped1014 = deconstruct_result1013
-                                    self.pretty_disjunction(unwrapped1014)
+                                    _t1660 = None
+                                deconstruct_result1017 = _t1660
+                                if deconstruct_result1017 is not None:
+                                    assert deconstruct_result1017 is not None
+                                    unwrapped1018 = deconstruct_result1017
+                                    self.pretty_disjunction(unwrapped1018)
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.HasField("not"):
-                                        _t1653 = getattr(_dollar_dollar, 'not')
+                                        _t1661 = getattr(_dollar_dollar, 'not')
                                     else:
-                                        _t1653 = None
-                                    deconstruct_result1011 = _t1653
-                                    if deconstruct_result1011 is not None:
-                                        assert deconstruct_result1011 is not None
-                                        unwrapped1012 = deconstruct_result1011
-                                        self.pretty_not(unwrapped1012)
+                                        _t1661 = None
+                                    deconstruct_result1015 = _t1661
+                                    if deconstruct_result1015 is not None:
+                                        assert deconstruct_result1015 is not None
+                                        unwrapped1016 = deconstruct_result1015
+                                        self.pretty_not(unwrapped1016)
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.HasField("ffi"):
-                                            _t1654 = _dollar_dollar.ffi
+                                            _t1662 = _dollar_dollar.ffi
                                         else:
-                                            _t1654 = None
-                                        deconstruct_result1009 = _t1654
-                                        if deconstruct_result1009 is not None:
-                                            assert deconstruct_result1009 is not None
-                                            unwrapped1010 = deconstruct_result1009
-                                            self.pretty_ffi(unwrapped1010)
+                                            _t1662 = None
+                                        deconstruct_result1013 = _t1662
+                                        if deconstruct_result1013 is not None:
+                                            assert deconstruct_result1013 is not None
+                                            unwrapped1014 = deconstruct_result1013
+                                            self.pretty_ffi(unwrapped1014)
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.HasField("atom"):
-                                                _t1655 = _dollar_dollar.atom
+                                                _t1663 = _dollar_dollar.atom
                                             else:
-                                                _t1655 = None
-                                            deconstruct_result1007 = _t1655
-                                            if deconstruct_result1007 is not None:
-                                                assert deconstruct_result1007 is not None
-                                                unwrapped1008 = deconstruct_result1007
-                                                self.pretty_atom(unwrapped1008)
+                                                _t1663 = None
+                                            deconstruct_result1011 = _t1663
+                                            if deconstruct_result1011 is not None:
+                                                assert deconstruct_result1011 is not None
+                                                unwrapped1012 = deconstruct_result1011
+                                                self.pretty_atom(unwrapped1012)
                                             else:
                                                 _dollar_dollar = msg
                                                 if _dollar_dollar.HasField("pragma"):
-                                                    _t1656 = _dollar_dollar.pragma
+                                                    _t1664 = _dollar_dollar.pragma
                                                 else:
-                                                    _t1656 = None
-                                                deconstruct_result1005 = _t1656
-                                                if deconstruct_result1005 is not None:
-                                                    assert deconstruct_result1005 is not None
-                                                    unwrapped1006 = deconstruct_result1005
-                                                    self.pretty_pragma(unwrapped1006)
+                                                    _t1664 = None
+                                                deconstruct_result1009 = _t1664
+                                                if deconstruct_result1009 is not None:
+                                                    assert deconstruct_result1009 is not None
+                                                    unwrapped1010 = deconstruct_result1009
+                                                    self.pretty_pragma(unwrapped1010)
                                                 else:
                                                     _dollar_dollar = msg
                                                     if _dollar_dollar.HasField("primitive"):
-                                                        _t1657 = _dollar_dollar.primitive
+                                                        _t1665 = _dollar_dollar.primitive
                                                     else:
-                                                        _t1657 = None
-                                                    deconstruct_result1003 = _t1657
-                                                    if deconstruct_result1003 is not None:
-                                                        assert deconstruct_result1003 is not None
-                                                        unwrapped1004 = deconstruct_result1003
-                                                        self.pretty_primitive(unwrapped1004)
+                                                        _t1665 = None
+                                                    deconstruct_result1007 = _t1665
+                                                    if deconstruct_result1007 is not None:
+                                                        assert deconstruct_result1007 is not None
+                                                        unwrapped1008 = deconstruct_result1007
+                                                        self.pretty_primitive(unwrapped1008)
                                                     else:
                                                         _dollar_dollar = msg
                                                         if _dollar_dollar.HasField("rel_atom"):
-                                                            _t1658 = _dollar_dollar.rel_atom
+                                                            _t1666 = _dollar_dollar.rel_atom
                                                         else:
-                                                            _t1658 = None
-                                                        deconstruct_result1001 = _t1658
-                                                        if deconstruct_result1001 is not None:
-                                                            assert deconstruct_result1001 is not None
-                                                            unwrapped1002 = deconstruct_result1001
-                                                            self.pretty_rel_atom(unwrapped1002)
+                                                            _t1666 = None
+                                                        deconstruct_result1005 = _t1666
+                                                        if deconstruct_result1005 is not None:
+                                                            assert deconstruct_result1005 is not None
+                                                            unwrapped1006 = deconstruct_result1005
+                                                            self.pretty_rel_atom(unwrapped1006)
                                                         else:
                                                             _dollar_dollar = msg
                                                             if _dollar_dollar.HasField("cast"):
-                                                                _t1659 = _dollar_dollar.cast
+                                                                _t1667 = _dollar_dollar.cast
                                                             else:
-                                                                _t1659 = None
-                                                            deconstruct_result999 = _t1659
-                                                            if deconstruct_result999 is not None:
-                                                                assert deconstruct_result999 is not None
-                                                                unwrapped1000 = deconstruct_result999
-                                                                self.pretty_cast(unwrapped1000)
+                                                                _t1667 = None
+                                                            deconstruct_result1003 = _t1667
+                                                            if deconstruct_result1003 is not None:
+                                                                assert deconstruct_result1003 is not None
+                                                                unwrapped1004 = deconstruct_result1003
+                                                                self.pretty_cast(unwrapped1004)
                                                             else:
                                                                 raise ParseError("No matching rule for formula")
 
     def pretty_true(self, msg: logic_pb2.Conjunction):
-        fields1026 = msg
+        fields1030 = msg
         self.write("(true)")
 
     def pretty_false(self, msg: logic_pb2.Disjunction):
-        fields1027 = msg
+        fields1031 = msg
         self.write("(false)")
 
     def pretty_exists(self, msg: logic_pb2.Exists):
-        flat1032 = self._try_flat(msg, self.pretty_exists)
-        if flat1032 is not None:
-            assert flat1032 is not None
-            self.write(flat1032)
+        flat1036 = self._try_flat(msg, self.pretty_exists)
+        if flat1036 is not None:
+            assert flat1036 is not None
+            self.write(flat1036)
             return None
         else:
             _dollar_dollar = msg
-            _t1660 = self.deconstruct_bindings(_dollar_dollar.body)
-            fields1028 = (_t1660, _dollar_dollar.body.value,)
-            assert fields1028 is not None
-            unwrapped_fields1029 = fields1028
+            _t1668 = self.deconstruct_bindings(_dollar_dollar.body)
+            fields1032 = (_t1668, _dollar_dollar.body.value,)
+            assert fields1032 is not None
+            unwrapped_fields1033 = fields1032
             self.write("(exists")
             self.indent_sexp()
             self.newline()
-            field1030 = unwrapped_fields1029[0]
-            self.pretty_bindings(field1030)
+            field1034 = unwrapped_fields1033[0]
+            self.pretty_bindings(field1034)
             self.newline()
-            field1031 = unwrapped_fields1029[1]
-            self.pretty_formula(field1031)
+            field1035 = unwrapped_fields1033[1]
+            self.pretty_formula(field1035)
             self.dedent()
             self.write(")")
 
     def pretty_reduce(self, msg: logic_pb2.Reduce):
-        flat1038 = self._try_flat(msg, self.pretty_reduce)
-        if flat1038 is not None:
-            assert flat1038 is not None
-            self.write(flat1038)
+        flat1042 = self._try_flat(msg, self.pretty_reduce)
+        if flat1042 is not None:
+            assert flat1042 is not None
+            self.write(flat1042)
             return None
         else:
             _dollar_dollar = msg
-            fields1033 = (_dollar_dollar.op, _dollar_dollar.body, _dollar_dollar.terms,)
-            assert fields1033 is not None
-            unwrapped_fields1034 = fields1033
+            fields1037 = (_dollar_dollar.op, _dollar_dollar.body, _dollar_dollar.terms,)
+            assert fields1037 is not None
+            unwrapped_fields1038 = fields1037
             self.write("(reduce")
             self.indent_sexp()
             self.newline()
-            field1035 = unwrapped_fields1034[0]
-            self.pretty_abstraction(field1035)
+            field1039 = unwrapped_fields1038[0]
+            self.pretty_abstraction(field1039)
             self.newline()
-            field1036 = unwrapped_fields1034[1]
-            self.pretty_abstraction(field1036)
+            field1040 = unwrapped_fields1038[1]
+            self.pretty_abstraction(field1040)
             self.newline()
-            field1037 = unwrapped_fields1034[2]
-            self.pretty_terms(field1037)
+            field1041 = unwrapped_fields1038[2]
+            self.pretty_terms(field1041)
             self.dedent()
             self.write(")")
 
     def pretty_terms(self, msg: Sequence[logic_pb2.Term]):
-        flat1042 = self._try_flat(msg, self.pretty_terms)
-        if flat1042 is not None:
-            assert flat1042 is not None
-            self.write(flat1042)
+        flat1046 = self._try_flat(msg, self.pretty_terms)
+        if flat1046 is not None:
+            assert flat1046 is not None
+            self.write(flat1046)
             return None
         else:
-            fields1039 = msg
+            fields1043 = msg
             self.write("(terms")
             self.indent_sexp()
-            if not len(fields1039) == 0:
+            if not len(fields1043) == 0:
                 self.newline()
-                for i1041, elem1040 in enumerate(fields1039):
-                    if (i1041 > 0):
+                for i1045, elem1044 in enumerate(fields1043):
+                    if (i1045 > 0):
                         self.newline()
-                    self.pretty_term(elem1040)
+                    self.pretty_term(elem1044)
             self.dedent()
             self.write(")")
 
     def pretty_term(self, msg: logic_pb2.Term):
-        flat1047 = self._try_flat(msg, self.pretty_term)
-        if flat1047 is not None:
-            assert flat1047 is not None
-            self.write(flat1047)
+        flat1051 = self._try_flat(msg, self.pretty_term)
+        if flat1051 is not None:
+            assert flat1051 is not None
+            self.write(flat1051)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("var"):
-                _t1661 = _dollar_dollar.var
+                _t1669 = _dollar_dollar.var
             else:
-                _t1661 = None
-            deconstruct_result1045 = _t1661
-            if deconstruct_result1045 is not None:
-                assert deconstruct_result1045 is not None
-                unwrapped1046 = deconstruct_result1045
-                self.pretty_var(unwrapped1046)
+                _t1669 = None
+            deconstruct_result1049 = _t1669
+            if deconstruct_result1049 is not None:
+                assert deconstruct_result1049 is not None
+                unwrapped1050 = deconstruct_result1049
+                self.pretty_var(unwrapped1050)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("constant"):
-                    _t1662 = _dollar_dollar.constant
+                    _t1670 = _dollar_dollar.constant
                 else:
-                    _t1662 = None
-                deconstruct_result1043 = _t1662
-                if deconstruct_result1043 is not None:
-                    assert deconstruct_result1043 is not None
-                    unwrapped1044 = deconstruct_result1043
-                    self.pretty_value(unwrapped1044)
+                    _t1670 = None
+                deconstruct_result1047 = _t1670
+                if deconstruct_result1047 is not None:
+                    assert deconstruct_result1047 is not None
+                    unwrapped1048 = deconstruct_result1047
+                    self.pretty_value(unwrapped1048)
                 else:
                     raise ParseError("No matching rule for term")
 
     def pretty_var(self, msg: logic_pb2.Var):
-        flat1050 = self._try_flat(msg, self.pretty_var)
-        if flat1050 is not None:
-            assert flat1050 is not None
-            self.write(flat1050)
+        flat1054 = self._try_flat(msg, self.pretty_var)
+        if flat1054 is not None:
+            assert flat1054 is not None
+            self.write(flat1054)
             return None
         else:
             _dollar_dollar = msg
-            fields1048 = _dollar_dollar.name
-            assert fields1048 is not None
-            unwrapped_fields1049 = fields1048
-            self.write(unwrapped_fields1049)
+            fields1052 = _dollar_dollar.name
+            assert fields1052 is not None
+            unwrapped_fields1053 = fields1052
+            self.write(unwrapped_fields1053)
 
     def pretty_value(self, msg: logic_pb2.Value):
-        flat1076 = self._try_flat(msg, self.pretty_value)
-        if flat1076 is not None:
-            assert flat1076 is not None
-            self.write(flat1076)
+        flat1080 = self._try_flat(msg, self.pretty_value)
+        if flat1080 is not None:
+            assert flat1080 is not None
+            self.write(flat1080)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("date_value"):
-                _t1663 = _dollar_dollar.date_value
+                _t1671 = _dollar_dollar.date_value
             else:
-                _t1663 = None
-            deconstruct_result1074 = _t1663
-            if deconstruct_result1074 is not None:
-                assert deconstruct_result1074 is not None
-                unwrapped1075 = deconstruct_result1074
-                self.pretty_date(unwrapped1075)
+                _t1671 = None
+            deconstruct_result1078 = _t1671
+            if deconstruct_result1078 is not None:
+                assert deconstruct_result1078 is not None
+                unwrapped1079 = deconstruct_result1078
+                self.pretty_date(unwrapped1079)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("datetime_value"):
-                    _t1664 = _dollar_dollar.datetime_value
+                    _t1672 = _dollar_dollar.datetime_value
                 else:
-                    _t1664 = None
-                deconstruct_result1072 = _t1664
-                if deconstruct_result1072 is not None:
-                    assert deconstruct_result1072 is not None
-                    unwrapped1073 = deconstruct_result1072
-                    self.pretty_datetime(unwrapped1073)
+                    _t1672 = None
+                deconstruct_result1076 = _t1672
+                if deconstruct_result1076 is not None:
+                    assert deconstruct_result1076 is not None
+                    unwrapped1077 = deconstruct_result1076
+                    self.pretty_datetime(unwrapped1077)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("string_value"):
-                        _t1665 = _dollar_dollar.string_value
+                        _t1673 = _dollar_dollar.string_value
                     else:
-                        _t1665 = None
-                    deconstruct_result1070 = _t1665
-                    if deconstruct_result1070 is not None:
-                        assert deconstruct_result1070 is not None
-                        unwrapped1071 = deconstruct_result1070
-                        self.write(self.format_string_value(unwrapped1071))
+                        _t1673 = None
+                    deconstruct_result1074 = _t1673
+                    if deconstruct_result1074 is not None:
+                        assert deconstruct_result1074 is not None
+                        unwrapped1075 = deconstruct_result1074
+                        self.write(self.format_string_value(unwrapped1075))
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("int32_value"):
-                            _t1666 = _dollar_dollar.int32_value
+                            _t1674 = _dollar_dollar.int32_value
                         else:
-                            _t1666 = None
-                        deconstruct_result1068 = _t1666
-                        if deconstruct_result1068 is not None:
-                            assert deconstruct_result1068 is not None
-                            unwrapped1069 = deconstruct_result1068
-                            self.write((str(unwrapped1069) + 'i32'))
+                            _t1674 = None
+                        deconstruct_result1072 = _t1674
+                        if deconstruct_result1072 is not None:
+                            assert deconstruct_result1072 is not None
+                            unwrapped1073 = deconstruct_result1072
+                            self.write((str(unwrapped1073) + 'i32'))
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("int_value"):
-                                _t1667 = _dollar_dollar.int_value
+                                _t1675 = _dollar_dollar.int_value
                             else:
-                                _t1667 = None
-                            deconstruct_result1066 = _t1667
-                            if deconstruct_result1066 is not None:
-                                assert deconstruct_result1066 is not None
-                                unwrapped1067 = deconstruct_result1066
-                                self.write(str(unwrapped1067))
+                                _t1675 = None
+                            deconstruct_result1070 = _t1675
+                            if deconstruct_result1070 is not None:
+                                assert deconstruct_result1070 is not None
+                                unwrapped1071 = deconstruct_result1070
+                                self.write(str(unwrapped1071))
                             else:
                                 _dollar_dollar = msg
                                 if _dollar_dollar.HasField("float32_value"):
-                                    _t1668 = _dollar_dollar.float32_value
+                                    _t1676 = _dollar_dollar.float32_value
                                 else:
-                                    _t1668 = None
-                                deconstruct_result1064 = _t1668
-                                if deconstruct_result1064 is not None:
-                                    assert deconstruct_result1064 is not None
-                                    unwrapped1065 = deconstruct_result1064
-                                    self.write(self.format_float32_literal(unwrapped1065))
+                                    _t1676 = None
+                                deconstruct_result1068 = _t1676
+                                if deconstruct_result1068 is not None:
+                                    assert deconstruct_result1068 is not None
+                                    unwrapped1069 = deconstruct_result1068
+                                    self.write(self.format_float32_literal(unwrapped1069))
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.HasField("float_value"):
-                                        _t1669 = _dollar_dollar.float_value
+                                        _t1677 = _dollar_dollar.float_value
                                     else:
-                                        _t1669 = None
-                                    deconstruct_result1062 = _t1669
-                                    if deconstruct_result1062 is not None:
-                                        assert deconstruct_result1062 is not None
-                                        unwrapped1063 = deconstruct_result1062
-                                        self.write(str(unwrapped1063))
+                                        _t1677 = None
+                                    deconstruct_result1066 = _t1677
+                                    if deconstruct_result1066 is not None:
+                                        assert deconstruct_result1066 is not None
+                                        unwrapped1067 = deconstruct_result1066
+                                        self.write(str(unwrapped1067))
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.HasField("uint32_value"):
-                                            _t1670 = _dollar_dollar.uint32_value
+                                            _t1678 = _dollar_dollar.uint32_value
                                         else:
-                                            _t1670 = None
-                                        deconstruct_result1060 = _t1670
-                                        if deconstruct_result1060 is not None:
-                                            assert deconstruct_result1060 is not None
-                                            unwrapped1061 = deconstruct_result1060
-                                            self.write((str(unwrapped1061) + 'u32'))
+                                            _t1678 = None
+                                        deconstruct_result1064 = _t1678
+                                        if deconstruct_result1064 is not None:
+                                            assert deconstruct_result1064 is not None
+                                            unwrapped1065 = deconstruct_result1064
+                                            self.write((str(unwrapped1065) + 'u32'))
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.HasField("uint128_value"):
-                                                _t1671 = _dollar_dollar.uint128_value
+                                                _t1679 = _dollar_dollar.uint128_value
                                             else:
-                                                _t1671 = None
-                                            deconstruct_result1058 = _t1671
-                                            if deconstruct_result1058 is not None:
-                                                assert deconstruct_result1058 is not None
-                                                unwrapped1059 = deconstruct_result1058
-                                                self.write(self.format_uint128(unwrapped1059))
+                                                _t1679 = None
+                                            deconstruct_result1062 = _t1679
+                                            if deconstruct_result1062 is not None:
+                                                assert deconstruct_result1062 is not None
+                                                unwrapped1063 = deconstruct_result1062
+                                                self.write(self.format_uint128(unwrapped1063))
                                             else:
                                                 _dollar_dollar = msg
                                                 if _dollar_dollar.HasField("int128_value"):
-                                                    _t1672 = _dollar_dollar.int128_value
+                                                    _t1680 = _dollar_dollar.int128_value
                                                 else:
-                                                    _t1672 = None
-                                                deconstruct_result1056 = _t1672
-                                                if deconstruct_result1056 is not None:
-                                                    assert deconstruct_result1056 is not None
-                                                    unwrapped1057 = deconstruct_result1056
-                                                    self.write(self.format_int128(unwrapped1057))
+                                                    _t1680 = None
+                                                deconstruct_result1060 = _t1680
+                                                if deconstruct_result1060 is not None:
+                                                    assert deconstruct_result1060 is not None
+                                                    unwrapped1061 = deconstruct_result1060
+                                                    self.write(self.format_int128(unwrapped1061))
                                                 else:
                                                     _dollar_dollar = msg
                                                     if _dollar_dollar.HasField("decimal_value"):
-                                                        _t1673 = _dollar_dollar.decimal_value
+                                                        _t1681 = _dollar_dollar.decimal_value
                                                     else:
-                                                        _t1673 = None
-                                                    deconstruct_result1054 = _t1673
-                                                    if deconstruct_result1054 is not None:
-                                                        assert deconstruct_result1054 is not None
-                                                        unwrapped1055 = deconstruct_result1054
-                                                        self.write(self.format_decimal(unwrapped1055))
+                                                        _t1681 = None
+                                                    deconstruct_result1058 = _t1681
+                                                    if deconstruct_result1058 is not None:
+                                                        assert deconstruct_result1058 is not None
+                                                        unwrapped1059 = deconstruct_result1058
+                                                        self.write(self.format_decimal(unwrapped1059))
                                                     else:
                                                         _dollar_dollar = msg
                                                         if _dollar_dollar.HasField("boolean_value"):
-                                                            _t1674 = _dollar_dollar.boolean_value
+                                                            _t1682 = _dollar_dollar.boolean_value
                                                         else:
-                                                            _t1674 = None
-                                                        deconstruct_result1052 = _t1674
-                                                        if deconstruct_result1052 is not None:
-                                                            assert deconstruct_result1052 is not None
-                                                            unwrapped1053 = deconstruct_result1052
-                                                            self.pretty_boolean_value(unwrapped1053)
+                                                            _t1682 = None
+                                                        deconstruct_result1056 = _t1682
+                                                        if deconstruct_result1056 is not None:
+                                                            assert deconstruct_result1056 is not None
+                                                            unwrapped1057 = deconstruct_result1056
+                                                            self.pretty_boolean_value(unwrapped1057)
                                                         else:
-                                                            fields1051 = msg
+                                                            fields1055 = msg
                                                             self.write("missing")
 
     def pretty_date(self, msg: logic_pb2.DateValue):
-        flat1082 = self._try_flat(msg, self.pretty_date)
-        if flat1082 is not None:
-            assert flat1082 is not None
-            self.write(flat1082)
+        flat1086 = self._try_flat(msg, self.pretty_date)
+        if flat1086 is not None:
+            assert flat1086 is not None
+            self.write(flat1086)
             return None
         else:
             _dollar_dollar = msg
-            fields1077 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day),)
-            assert fields1077 is not None
-            unwrapped_fields1078 = fields1077
+            fields1081 = (int(_dollar_dollar.year), int(_dollar_dollar.month), int(_dollar_dollar.day),)
+            assert fields1081 is not None
+            unwrapped_fields1082 = fields1081
             self.write("(date")
             self.indent_sexp()
             self.newline()
-            field1079 = unwrapped_fields1078[0]
-            self.write(str(field1079))
+            field1083 = unwrapped_fields1082[0]
+            self.write(str(field1083))
             self.newline()
-            field1080 = unwrapped_fields1078[1]
-            self.write(str(field1080))
+            field1084 = unwrapped_fields1082[1]
+            self.write(str(field1084))
             self.newline()
-            field1081 = unwrapped_fields1078[2]
-            self.write(str(field1081))
+            field1085 = unwrapped_fields1082[2]
+            self.write(str(field1085))
             self.dedent()
             self.write(")")
 
     def pretty_datetime(self, msg: logic_pb2.DateTimeValue):
-        flat1093 = self._try_flat(msg, self.pretty_datetime)
-        if flat1093 is not None:
-            assert flat1093 is not None
-            self.write(flat1093)
+        flat1097 = self._try_flat(msg, self.pretty_datetime)
+        if flat1097 is not None:
+            assert flat1097 is not None
+            self.write(flat1097)
             return None
         else:
             _dollar_dollar = msg
-            fields1083 = (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 fields1083 is not None
-            unwrapped_fields1084 = fields1083
+            fields1087 = (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 fields1087 is not None
+            unwrapped_fields1088 = fields1087
             self.write("(datetime")
             self.indent_sexp()
             self.newline()
-            field1085 = unwrapped_fields1084[0]
-            self.write(str(field1085))
+            field1089 = unwrapped_fields1088[0]
+            self.write(str(field1089))
             self.newline()
-            field1086 = unwrapped_fields1084[1]
-            self.write(str(field1086))
+            field1090 = unwrapped_fields1088[1]
+            self.write(str(field1090))
             self.newline()
-            field1087 = unwrapped_fields1084[2]
-            self.write(str(field1087))
+            field1091 = unwrapped_fields1088[2]
+            self.write(str(field1091))
             self.newline()
-            field1088 = unwrapped_fields1084[3]
-            self.write(str(field1088))
+            field1092 = unwrapped_fields1088[3]
+            self.write(str(field1092))
             self.newline()
-            field1089 = unwrapped_fields1084[4]
-            self.write(str(field1089))
+            field1093 = unwrapped_fields1088[4]
+            self.write(str(field1093))
             self.newline()
-            field1090 = unwrapped_fields1084[5]
-            self.write(str(field1090))
-            field1091 = unwrapped_fields1084[6]
-            if field1091 is not None:
+            field1094 = unwrapped_fields1088[5]
+            self.write(str(field1094))
+            field1095 = unwrapped_fields1088[6]
+            if field1095 is not None:
                 self.newline()
-                assert field1091 is not None
-                opt_val1092 = field1091
-                self.write(str(opt_val1092))
+                assert field1095 is not None
+                opt_val1096 = field1095
+                self.write(str(opt_val1096))
             self.dedent()
             self.write(")")
 
     def pretty_conjunction(self, msg: logic_pb2.Conjunction):
-        flat1098 = self._try_flat(msg, self.pretty_conjunction)
-        if flat1098 is not None:
-            assert flat1098 is not None
-            self.write(flat1098)
+        flat1102 = self._try_flat(msg, self.pretty_conjunction)
+        if flat1102 is not None:
+            assert flat1102 is not None
+            self.write(flat1102)
             return None
         else:
             _dollar_dollar = msg
-            fields1094 = _dollar_dollar.args
-            assert fields1094 is not None
-            unwrapped_fields1095 = fields1094
+            fields1098 = _dollar_dollar.args
+            assert fields1098 is not None
+            unwrapped_fields1099 = fields1098
             self.write("(and")
             self.indent_sexp()
-            if not len(unwrapped_fields1095) == 0:
+            if not len(unwrapped_fields1099) == 0:
                 self.newline()
-                for i1097, elem1096 in enumerate(unwrapped_fields1095):
-                    if (i1097 > 0):
+                for i1101, elem1100 in enumerate(unwrapped_fields1099):
+                    if (i1101 > 0):
                         self.newline()
-                    self.pretty_formula(elem1096)
+                    self.pretty_formula(elem1100)
             self.dedent()
             self.write(")")
 
     def pretty_disjunction(self, msg: logic_pb2.Disjunction):
-        flat1103 = self._try_flat(msg, self.pretty_disjunction)
-        if flat1103 is not None:
-            assert flat1103 is not None
-            self.write(flat1103)
+        flat1107 = self._try_flat(msg, self.pretty_disjunction)
+        if flat1107 is not None:
+            assert flat1107 is not None
+            self.write(flat1107)
             return None
         else:
             _dollar_dollar = msg
-            fields1099 = _dollar_dollar.args
-            assert fields1099 is not None
-            unwrapped_fields1100 = fields1099
+            fields1103 = _dollar_dollar.args
+            assert fields1103 is not None
+            unwrapped_fields1104 = fields1103
             self.write("(or")
             self.indent_sexp()
-            if not len(unwrapped_fields1100) == 0:
+            if not len(unwrapped_fields1104) == 0:
                 self.newline()
-                for i1102, elem1101 in enumerate(unwrapped_fields1100):
-                    if (i1102 > 0):
+                for i1106, elem1105 in enumerate(unwrapped_fields1104):
+                    if (i1106 > 0):
                         self.newline()
-                    self.pretty_formula(elem1101)
+                    self.pretty_formula(elem1105)
             self.dedent()
             self.write(")")
 
     def pretty_not(self, msg: logic_pb2.Not):
-        flat1106 = self._try_flat(msg, self.pretty_not)
-        if flat1106 is not None:
-            assert flat1106 is not None
-            self.write(flat1106)
+        flat1110 = self._try_flat(msg, self.pretty_not)
+        if flat1110 is not None:
+            assert flat1110 is not None
+            self.write(flat1110)
             return None
         else:
             _dollar_dollar = msg
-            fields1104 = _dollar_dollar.arg
-            assert fields1104 is not None
-            unwrapped_fields1105 = fields1104
+            fields1108 = _dollar_dollar.arg
+            assert fields1108 is not None
+            unwrapped_fields1109 = fields1108
             self.write("(not")
             self.indent_sexp()
             self.newline()
-            self.pretty_formula(unwrapped_fields1105)
+            self.pretty_formula(unwrapped_fields1109)
             self.dedent()
             self.write(")")
 
     def pretty_ffi(self, msg: logic_pb2.FFI):
-        flat1112 = self._try_flat(msg, self.pretty_ffi)
-        if flat1112 is not None:
-            assert flat1112 is not None
-            self.write(flat1112)
+        flat1116 = self._try_flat(msg, self.pretty_ffi)
+        if flat1116 is not None:
+            assert flat1116 is not None
+            self.write(flat1116)
             return None
         else:
             _dollar_dollar = msg
-            fields1107 = (_dollar_dollar.name, _dollar_dollar.args, _dollar_dollar.terms,)
-            assert fields1107 is not None
-            unwrapped_fields1108 = fields1107
+            fields1111 = (_dollar_dollar.name, _dollar_dollar.args, _dollar_dollar.terms,)
+            assert fields1111 is not None
+            unwrapped_fields1112 = fields1111
             self.write("(ffi")
             self.indent_sexp()
             self.newline()
-            field1109 = unwrapped_fields1108[0]
-            self.pretty_name(field1109)
+            field1113 = unwrapped_fields1112[0]
+            self.pretty_name(field1113)
             self.newline()
-            field1110 = unwrapped_fields1108[1]
-            self.pretty_ffi_args(field1110)
+            field1114 = unwrapped_fields1112[1]
+            self.pretty_ffi_args(field1114)
             self.newline()
-            field1111 = unwrapped_fields1108[2]
-            self.pretty_terms(field1111)
+            field1115 = unwrapped_fields1112[2]
+            self.pretty_terms(field1115)
             self.dedent()
             self.write(")")
 
     def pretty_name(self, msg: str):
-        flat1114 = self._try_flat(msg, self.pretty_name)
-        if flat1114 is not None:
-            assert flat1114 is not None
-            self.write(flat1114)
+        flat1118 = self._try_flat(msg, self.pretty_name)
+        if flat1118 is not None:
+            assert flat1118 is not None
+            self.write(flat1118)
             return None
         else:
-            fields1113 = msg
+            fields1117 = msg
             self.write(":")
-            self.write(fields1113)
+            self.write(fields1117)
 
     def pretty_ffi_args(self, msg: Sequence[logic_pb2.Abstraction]):
-        flat1118 = self._try_flat(msg, self.pretty_ffi_args)
-        if flat1118 is not None:
-            assert flat1118 is not None
-            self.write(flat1118)
+        flat1122 = self._try_flat(msg, self.pretty_ffi_args)
+        if flat1122 is not None:
+            assert flat1122 is not None
+            self.write(flat1122)
             return None
         else:
-            fields1115 = msg
+            fields1119 = msg
             self.write("(args")
             self.indent_sexp()
-            if not len(fields1115) == 0:
+            if not len(fields1119) == 0:
                 self.newline()
-                for i1117, elem1116 in enumerate(fields1115):
-                    if (i1117 > 0):
+                for i1121, elem1120 in enumerate(fields1119):
+                    if (i1121 > 0):
                         self.newline()
-                    self.pretty_abstraction(elem1116)
+                    self.pretty_abstraction(elem1120)
             self.dedent()
             self.write(")")
 
     def pretty_atom(self, msg: logic_pb2.Atom):
-        flat1125 = self._try_flat(msg, self.pretty_atom)
-        if flat1125 is not None:
-            assert flat1125 is not None
-            self.write(flat1125)
+        flat1129 = self._try_flat(msg, self.pretty_atom)
+        if flat1129 is not None:
+            assert flat1129 is not None
+            self.write(flat1129)
             return None
         else:
             _dollar_dollar = msg
-            fields1119 = (_dollar_dollar.name, _dollar_dollar.terms,)
-            assert fields1119 is not None
-            unwrapped_fields1120 = fields1119
+            fields1123 = (_dollar_dollar.name, _dollar_dollar.terms,)
+            assert fields1123 is not None
+            unwrapped_fields1124 = fields1123
             self.write("(atom")
             self.indent_sexp()
             self.newline()
-            field1121 = unwrapped_fields1120[0]
-            self.pretty_relation_id(field1121)
-            field1122 = unwrapped_fields1120[1]
-            if not len(field1122) == 0:
+            field1125 = unwrapped_fields1124[0]
+            self.pretty_relation_id(field1125)
+            field1126 = unwrapped_fields1124[1]
+            if not len(field1126) == 0:
                 self.newline()
-                for i1124, elem1123 in enumerate(field1122):
-                    if (i1124 > 0):
+                for i1128, elem1127 in enumerate(field1126):
+                    if (i1128 > 0):
                         self.newline()
-                    self.pretty_term(elem1123)
+                    self.pretty_term(elem1127)
             self.dedent()
             self.write(")")
 
     def pretty_pragma(self, msg: logic_pb2.Pragma):
-        flat1132 = self._try_flat(msg, self.pretty_pragma)
-        if flat1132 is not None:
-            assert flat1132 is not None
-            self.write(flat1132)
+        flat1136 = self._try_flat(msg, self.pretty_pragma)
+        if flat1136 is not None:
+            assert flat1136 is not None
+            self.write(flat1136)
             return None
         else:
             _dollar_dollar = msg
-            fields1126 = (_dollar_dollar.name, _dollar_dollar.terms,)
-            assert fields1126 is not None
-            unwrapped_fields1127 = fields1126
+            fields1130 = (_dollar_dollar.name, _dollar_dollar.terms,)
+            assert fields1130 is not None
+            unwrapped_fields1131 = fields1130
             self.write("(pragma")
             self.indent_sexp()
             self.newline()
-            field1128 = unwrapped_fields1127[0]
-            self.pretty_name(field1128)
-            field1129 = unwrapped_fields1127[1]
-            if not len(field1129) == 0:
+            field1132 = unwrapped_fields1131[0]
+            self.pretty_name(field1132)
+            field1133 = unwrapped_fields1131[1]
+            if not len(field1133) == 0:
                 self.newline()
-                for i1131, elem1130 in enumerate(field1129):
-                    if (i1131 > 0):
+                for i1135, elem1134 in enumerate(field1133):
+                    if (i1135 > 0):
                         self.newline()
-                    self.pretty_term(elem1130)
+                    self.pretty_term(elem1134)
             self.dedent()
             self.write(")")
 
     def pretty_primitive(self, msg: logic_pb2.Primitive):
-        flat1148 = self._try_flat(msg, self.pretty_primitive)
-        if flat1148 is not None:
-            assert flat1148 is not None
-            self.write(flat1148)
+        flat1152 = self._try_flat(msg, self.pretty_primitive)
+        if flat1152 is not None:
+            assert flat1152 is not None
+            self.write(flat1152)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_eq":
-                _t1675 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1683 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1675 = None
-            guard_result1147 = _t1675
-            if guard_result1147 is not None:
+                _t1683 = None
+            guard_result1151 = _t1683
+            if guard_result1151 is not None:
                 self.pretty_eq(msg)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.name == "rel_primitive_lt_monotype":
-                    _t1676 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                    _t1684 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
                 else:
-                    _t1676 = None
-                guard_result1146 = _t1676
-                if guard_result1146 is not None:
+                    _t1684 = None
+                guard_result1150 = _t1684
+                if guard_result1150 is not None:
                     self.pretty_lt(msg)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.name == "rel_primitive_lt_eq_monotype":
-                        _t1677 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                        _t1685 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
                     else:
-                        _t1677 = None
-                    guard_result1145 = _t1677
-                    if guard_result1145 is not None:
+                        _t1685 = None
+                    guard_result1149 = _t1685
+                    if guard_result1149 is not None:
                         self.pretty_lt_eq(msg)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.name == "rel_primitive_gt_monotype":
-                            _t1678 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                            _t1686 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
                         else:
-                            _t1678 = None
-                        guard_result1144 = _t1678
-                        if guard_result1144 is not None:
+                            _t1686 = None
+                        guard_result1148 = _t1686
+                        if guard_result1148 is not None:
                             self.pretty_gt(msg)
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.name == "rel_primitive_gt_eq_monotype":
-                                _t1679 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                                _t1687 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
                             else:
-                                _t1679 = None
-                            guard_result1143 = _t1679
-                            if guard_result1143 is not None:
+                                _t1687 = None
+                            guard_result1147 = _t1687
+                            if guard_result1147 is not None:
                                 self.pretty_gt_eq(msg)
                             else:
                                 _dollar_dollar = msg
                                 if _dollar_dollar.name == "rel_primitive_add_monotype":
-                                    _t1680 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                                    _t1688 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
                                 else:
-                                    _t1680 = None
-                                guard_result1142 = _t1680
-                                if guard_result1142 is not None:
+                                    _t1688 = None
+                                guard_result1146 = _t1688
+                                if guard_result1146 is not None:
                                     self.pretty_add(msg)
                                 else:
                                     _dollar_dollar = msg
                                     if _dollar_dollar.name == "rel_primitive_subtract_monotype":
-                                        _t1681 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                                        _t1689 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
                                     else:
-                                        _t1681 = None
-                                    guard_result1141 = _t1681
-                                    if guard_result1141 is not None:
+                                        _t1689 = None
+                                    guard_result1145 = _t1689
+                                    if guard_result1145 is not None:
                                         self.pretty_minus(msg)
                                     else:
                                         _dollar_dollar = msg
                                         if _dollar_dollar.name == "rel_primitive_multiply_monotype":
-                                            _t1682 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                                            _t1690 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
                                         else:
-                                            _t1682 = None
-                                        guard_result1140 = _t1682
-                                        if guard_result1140 is not None:
+                                            _t1690 = None
+                                        guard_result1144 = _t1690
+                                        if guard_result1144 is not None:
                                             self.pretty_multiply(msg)
                                         else:
                                             _dollar_dollar = msg
                                             if _dollar_dollar.name == "rel_primitive_divide_monotype":
-                                                _t1683 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                                                _t1691 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
                                             else:
-                                                _t1683 = None
-                                            guard_result1139 = _t1683
-                                            if guard_result1139 is not None:
+                                                _t1691 = None
+                                            guard_result1143 = _t1691
+                                            if guard_result1143 is not None:
                                                 self.pretty_divide(msg)
                                             else:
                                                 _dollar_dollar = msg
-                                                fields1133 = (_dollar_dollar.name, _dollar_dollar.terms,)
-                                                assert fields1133 is not None
-                                                unwrapped_fields1134 = fields1133
+                                                fields1137 = (_dollar_dollar.name, _dollar_dollar.terms,)
+                                                assert fields1137 is not None
+                                                unwrapped_fields1138 = fields1137
                                                 self.write("(primitive")
                                                 self.indent_sexp()
                                                 self.newline()
-                                                field1135 = unwrapped_fields1134[0]
-                                                self.pretty_name(field1135)
-                                                field1136 = unwrapped_fields1134[1]
-                                                if not len(field1136) == 0:
+                                                field1139 = unwrapped_fields1138[0]
+                                                self.pretty_name(field1139)
+                                                field1140 = unwrapped_fields1138[1]
+                                                if not len(field1140) == 0:
                                                     self.newline()
-                                                    for i1138, elem1137 in enumerate(field1136):
-                                                        if (i1138 > 0):
+                                                    for i1142, elem1141 in enumerate(field1140):
+                                                        if (i1142 > 0):
                                                             self.newline()
-                                                        self.pretty_rel_term(elem1137)
+                                                        self.pretty_rel_term(elem1141)
                                                 self.dedent()
                                                 self.write(")")
 
     def pretty_eq(self, msg: logic_pb2.Primitive):
-        flat1153 = self._try_flat(msg, self.pretty_eq)
-        if flat1153 is not None:
-            assert flat1153 is not None
-            self.write(flat1153)
+        flat1157 = self._try_flat(msg, self.pretty_eq)
+        if flat1157 is not None:
+            assert flat1157 is not None
+            self.write(flat1157)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_eq":
-                _t1684 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1692 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1684 = None
-            fields1149 = _t1684
-            assert fields1149 is not None
-            unwrapped_fields1150 = fields1149
+                _t1692 = None
+            fields1153 = _t1692
+            assert fields1153 is not None
+            unwrapped_fields1154 = fields1153
             self.write("(=")
             self.indent_sexp()
             self.newline()
-            field1151 = unwrapped_fields1150[0]
-            self.pretty_term(field1151)
+            field1155 = unwrapped_fields1154[0]
+            self.pretty_term(field1155)
             self.newline()
-            field1152 = unwrapped_fields1150[1]
-            self.pretty_term(field1152)
+            field1156 = unwrapped_fields1154[1]
+            self.pretty_term(field1156)
             self.dedent()
             self.write(")")
 
     def pretty_lt(self, msg: logic_pb2.Primitive):
-        flat1158 = self._try_flat(msg, self.pretty_lt)
-        if flat1158 is not None:
-            assert flat1158 is not None
-            self.write(flat1158)
+        flat1162 = self._try_flat(msg, self.pretty_lt)
+        if flat1162 is not None:
+            assert flat1162 is not None
+            self.write(flat1162)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_lt_monotype":
-                _t1685 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1693 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1685 = None
-            fields1154 = _t1685
-            assert fields1154 is not None
-            unwrapped_fields1155 = fields1154
+                _t1693 = None
+            fields1158 = _t1693
+            assert fields1158 is not None
+            unwrapped_fields1159 = fields1158
             self.write("(<")
             self.indent_sexp()
             self.newline()
-            field1156 = unwrapped_fields1155[0]
-            self.pretty_term(field1156)
+            field1160 = unwrapped_fields1159[0]
+            self.pretty_term(field1160)
             self.newline()
-            field1157 = unwrapped_fields1155[1]
-            self.pretty_term(field1157)
+            field1161 = unwrapped_fields1159[1]
+            self.pretty_term(field1161)
             self.dedent()
             self.write(")")
 
     def pretty_lt_eq(self, msg: logic_pb2.Primitive):
-        flat1163 = self._try_flat(msg, self.pretty_lt_eq)
-        if flat1163 is not None:
-            assert flat1163 is not None
-            self.write(flat1163)
+        flat1167 = self._try_flat(msg, self.pretty_lt_eq)
+        if flat1167 is not None:
+            assert flat1167 is not None
+            self.write(flat1167)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_lt_eq_monotype":
-                _t1686 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1694 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1686 = None
-            fields1159 = _t1686
-            assert fields1159 is not None
-            unwrapped_fields1160 = fields1159
+                _t1694 = None
+            fields1163 = _t1694
+            assert fields1163 is not None
+            unwrapped_fields1164 = fields1163
             self.write("(<=")
             self.indent_sexp()
             self.newline()
-            field1161 = unwrapped_fields1160[0]
-            self.pretty_term(field1161)
+            field1165 = unwrapped_fields1164[0]
+            self.pretty_term(field1165)
             self.newline()
-            field1162 = unwrapped_fields1160[1]
-            self.pretty_term(field1162)
+            field1166 = unwrapped_fields1164[1]
+            self.pretty_term(field1166)
             self.dedent()
             self.write(")")
 
     def pretty_gt(self, msg: logic_pb2.Primitive):
-        flat1168 = self._try_flat(msg, self.pretty_gt)
-        if flat1168 is not None:
-            assert flat1168 is not None
-            self.write(flat1168)
+        flat1172 = self._try_flat(msg, self.pretty_gt)
+        if flat1172 is not None:
+            assert flat1172 is not None
+            self.write(flat1172)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_gt_monotype":
-                _t1687 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1695 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1687 = None
-            fields1164 = _t1687
-            assert fields1164 is not None
-            unwrapped_fields1165 = fields1164
+                _t1695 = None
+            fields1168 = _t1695
+            assert fields1168 is not None
+            unwrapped_fields1169 = fields1168
             self.write("(>")
             self.indent_sexp()
             self.newline()
-            field1166 = unwrapped_fields1165[0]
-            self.pretty_term(field1166)
+            field1170 = unwrapped_fields1169[0]
+            self.pretty_term(field1170)
             self.newline()
-            field1167 = unwrapped_fields1165[1]
-            self.pretty_term(field1167)
+            field1171 = unwrapped_fields1169[1]
+            self.pretty_term(field1171)
             self.dedent()
             self.write(")")
 
     def pretty_gt_eq(self, msg: logic_pb2.Primitive):
-        flat1173 = self._try_flat(msg, self.pretty_gt_eq)
-        if flat1173 is not None:
-            assert flat1173 is not None
-            self.write(flat1173)
+        flat1177 = self._try_flat(msg, self.pretty_gt_eq)
+        if flat1177 is not None:
+            assert flat1177 is not None
+            self.write(flat1177)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_gt_eq_monotype":
-                _t1688 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
+                _t1696 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term,)
             else:
-                _t1688 = None
-            fields1169 = _t1688
-            assert fields1169 is not None
-            unwrapped_fields1170 = fields1169
+                _t1696 = None
+            fields1173 = _t1696
+            assert fields1173 is not None
+            unwrapped_fields1174 = fields1173
             self.write("(>=")
             self.indent_sexp()
             self.newline()
-            field1171 = unwrapped_fields1170[0]
-            self.pretty_term(field1171)
+            field1175 = unwrapped_fields1174[0]
+            self.pretty_term(field1175)
             self.newline()
-            field1172 = unwrapped_fields1170[1]
-            self.pretty_term(field1172)
+            field1176 = unwrapped_fields1174[1]
+            self.pretty_term(field1176)
             self.dedent()
             self.write(")")
 
     def pretty_add(self, msg: logic_pb2.Primitive):
-        flat1179 = self._try_flat(msg, self.pretty_add)
-        if flat1179 is not None:
-            assert flat1179 is not None
-            self.write(flat1179)
+        flat1183 = self._try_flat(msg, self.pretty_add)
+        if flat1183 is not None:
+            assert flat1183 is not None
+            self.write(flat1183)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_add_monotype":
-                _t1689 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                _t1697 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
             else:
-                _t1689 = None
-            fields1174 = _t1689
-            assert fields1174 is not None
-            unwrapped_fields1175 = fields1174
+                _t1697 = None
+            fields1178 = _t1697
+            assert fields1178 is not None
+            unwrapped_fields1179 = fields1178
             self.write("(+")
             self.indent_sexp()
             self.newline()
-            field1176 = unwrapped_fields1175[0]
-            self.pretty_term(field1176)
+            field1180 = unwrapped_fields1179[0]
+            self.pretty_term(field1180)
             self.newline()
-            field1177 = unwrapped_fields1175[1]
-            self.pretty_term(field1177)
+            field1181 = unwrapped_fields1179[1]
+            self.pretty_term(field1181)
             self.newline()
-            field1178 = unwrapped_fields1175[2]
-            self.pretty_term(field1178)
+            field1182 = unwrapped_fields1179[2]
+            self.pretty_term(field1182)
             self.dedent()
             self.write(")")
 
     def pretty_minus(self, msg: logic_pb2.Primitive):
-        flat1185 = self._try_flat(msg, self.pretty_minus)
-        if flat1185 is not None:
-            assert flat1185 is not None
-            self.write(flat1185)
+        flat1189 = self._try_flat(msg, self.pretty_minus)
+        if flat1189 is not None:
+            assert flat1189 is not None
+            self.write(flat1189)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_subtract_monotype":
-                _t1690 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                _t1698 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
             else:
-                _t1690 = None
-            fields1180 = _t1690
-            assert fields1180 is not None
-            unwrapped_fields1181 = fields1180
+                _t1698 = None
+            fields1184 = _t1698
+            assert fields1184 is not None
+            unwrapped_fields1185 = fields1184
             self.write("(-")
             self.indent_sexp()
             self.newline()
-            field1182 = unwrapped_fields1181[0]
-            self.pretty_term(field1182)
+            field1186 = unwrapped_fields1185[0]
+            self.pretty_term(field1186)
             self.newline()
-            field1183 = unwrapped_fields1181[1]
-            self.pretty_term(field1183)
+            field1187 = unwrapped_fields1185[1]
+            self.pretty_term(field1187)
             self.newline()
-            field1184 = unwrapped_fields1181[2]
-            self.pretty_term(field1184)
+            field1188 = unwrapped_fields1185[2]
+            self.pretty_term(field1188)
             self.dedent()
             self.write(")")
 
     def pretty_multiply(self, msg: logic_pb2.Primitive):
-        flat1191 = self._try_flat(msg, self.pretty_multiply)
-        if flat1191 is not None:
-            assert flat1191 is not None
-            self.write(flat1191)
+        flat1195 = self._try_flat(msg, self.pretty_multiply)
+        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_multiply_monotype":
-                _t1691 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                _t1699 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
             else:
-                _t1691 = None
-            fields1186 = _t1691
-            assert fields1186 is not None
-            unwrapped_fields1187 = fields1186
+                _t1699 = None
+            fields1190 = _t1699
+            assert fields1190 is not None
+            unwrapped_fields1191 = fields1190
             self.write("(*")
             self.indent_sexp()
             self.newline()
-            field1188 = unwrapped_fields1187[0]
-            self.pretty_term(field1188)
+            field1192 = unwrapped_fields1191[0]
+            self.pretty_term(field1192)
             self.newline()
-            field1189 = unwrapped_fields1187[1]
-            self.pretty_term(field1189)
+            field1193 = unwrapped_fields1191[1]
+            self.pretty_term(field1193)
             self.newline()
-            field1190 = unwrapped_fields1187[2]
-            self.pretty_term(field1190)
+            field1194 = unwrapped_fields1191[2]
+            self.pretty_term(field1194)
             self.dedent()
             self.write(")")
 
     def pretty_divide(self, msg: logic_pb2.Primitive):
-        flat1197 = self._try_flat(msg, self.pretty_divide)
-        if flat1197 is not None:
-            assert flat1197 is not None
-            self.write(flat1197)
+        flat1201 = self._try_flat(msg, self.pretty_divide)
+        if flat1201 is not None:
+            assert flat1201 is not None
+            self.write(flat1201)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name == "rel_primitive_divide_monotype":
-                _t1692 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
+                _t1700 = (_dollar_dollar.terms[0].term, _dollar_dollar.terms[1].term, _dollar_dollar.terms[2].term,)
             else:
-                _t1692 = None
-            fields1192 = _t1692
-            assert fields1192 is not None
-            unwrapped_fields1193 = fields1192
+                _t1700 = None
+            fields1196 = _t1700
+            assert fields1196 is not None
+            unwrapped_fields1197 = fields1196
             self.write("(/")
             self.indent_sexp()
             self.newline()
-            field1194 = unwrapped_fields1193[0]
-            self.pretty_term(field1194)
+            field1198 = unwrapped_fields1197[0]
+            self.pretty_term(field1198)
             self.newline()
-            field1195 = unwrapped_fields1193[1]
-            self.pretty_term(field1195)
+            field1199 = unwrapped_fields1197[1]
+            self.pretty_term(field1199)
             self.newline()
-            field1196 = unwrapped_fields1193[2]
-            self.pretty_term(field1196)
+            field1200 = unwrapped_fields1197[2]
+            self.pretty_term(field1200)
             self.dedent()
             self.write(")")
 
     def pretty_rel_term(self, msg: logic_pb2.RelTerm):
-        flat1202 = self._try_flat(msg, self.pretty_rel_term)
-        if flat1202 is not None:
-            assert flat1202 is not None
-            self.write(flat1202)
+        flat1206 = self._try_flat(msg, self.pretty_rel_term)
+        if flat1206 is not None:
+            assert flat1206 is not None
+            self.write(flat1206)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("specialized_value"):
-                _t1693 = _dollar_dollar.specialized_value
+                _t1701 = _dollar_dollar.specialized_value
             else:
-                _t1693 = None
-            deconstruct_result1200 = _t1693
-            if deconstruct_result1200 is not None:
-                assert deconstruct_result1200 is not None
-                unwrapped1201 = deconstruct_result1200
-                self.pretty_specialized_value(unwrapped1201)
+                _t1701 = None
+            deconstruct_result1204 = _t1701
+            if deconstruct_result1204 is not None:
+                assert deconstruct_result1204 is not None
+                unwrapped1205 = deconstruct_result1204
+                self.pretty_specialized_value(unwrapped1205)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("term"):
-                    _t1694 = _dollar_dollar.term
+                    _t1702 = _dollar_dollar.term
                 else:
-                    _t1694 = None
-                deconstruct_result1198 = _t1694
-                if deconstruct_result1198 is not None:
-                    assert deconstruct_result1198 is not None
-                    unwrapped1199 = deconstruct_result1198
-                    self.pretty_term(unwrapped1199)
+                    _t1702 = None
+                deconstruct_result1202 = _t1702
+                if deconstruct_result1202 is not None:
+                    assert deconstruct_result1202 is not None
+                    unwrapped1203 = deconstruct_result1202
+                    self.pretty_term(unwrapped1203)
                 else:
                     raise ParseError("No matching rule for rel_term")
 
     def pretty_specialized_value(self, msg: logic_pb2.Value):
-        flat1204 = self._try_flat(msg, self.pretty_specialized_value)
-        if flat1204 is not None:
-            assert flat1204 is not None
-            self.write(flat1204)
+        flat1208 = self._try_flat(msg, self.pretty_specialized_value)
+        if flat1208 is not None:
+            assert flat1208 is not None
+            self.write(flat1208)
             return None
         else:
-            fields1203 = msg
+            fields1207 = msg
             self.write("#")
-            self.pretty_raw_value(fields1203)
+            self.pretty_raw_value(fields1207)
 
     def pretty_rel_atom(self, msg: logic_pb2.RelAtom):
-        flat1211 = self._try_flat(msg, self.pretty_rel_atom)
-        if flat1211 is not None:
-            assert flat1211 is not None
-            self.write(flat1211)
+        flat1215 = self._try_flat(msg, self.pretty_rel_atom)
+        if flat1215 is not None:
+            assert flat1215 is not None
+            self.write(flat1215)
             return None
         else:
             _dollar_dollar = msg
-            fields1205 = (_dollar_dollar.name, _dollar_dollar.terms,)
-            assert fields1205 is not None
-            unwrapped_fields1206 = fields1205
+            fields1209 = (_dollar_dollar.name, _dollar_dollar.terms,)
+            assert fields1209 is not None
+            unwrapped_fields1210 = fields1209
             self.write("(relatom")
             self.indent_sexp()
             self.newline()
-            field1207 = unwrapped_fields1206[0]
-            self.pretty_name(field1207)
-            field1208 = unwrapped_fields1206[1]
-            if not len(field1208) == 0:
+            field1211 = unwrapped_fields1210[0]
+            self.pretty_name(field1211)
+            field1212 = unwrapped_fields1210[1]
+            if not len(field1212) == 0:
                 self.newline()
-                for i1210, elem1209 in enumerate(field1208):
-                    if (i1210 > 0):
+                for i1214, elem1213 in enumerate(field1212):
+                    if (i1214 > 0):
                         self.newline()
-                    self.pretty_rel_term(elem1209)
+                    self.pretty_rel_term(elem1213)
             self.dedent()
             self.write(")")
 
     def pretty_cast(self, msg: logic_pb2.Cast):
-        flat1216 = self._try_flat(msg, self.pretty_cast)
-        if flat1216 is not None:
-            assert flat1216 is not None
-            self.write(flat1216)
+        flat1220 = self._try_flat(msg, self.pretty_cast)
+        if flat1220 is not None:
+            assert flat1220 is not None
+            self.write(flat1220)
             return None
         else:
             _dollar_dollar = msg
-            fields1212 = (_dollar_dollar.input, _dollar_dollar.result,)
-            assert fields1212 is not None
-            unwrapped_fields1213 = fields1212
+            fields1216 = (_dollar_dollar.input, _dollar_dollar.result,)
+            assert fields1216 is not None
+            unwrapped_fields1217 = fields1216
             self.write("(cast")
             self.indent_sexp()
             self.newline()
-            field1214 = unwrapped_fields1213[0]
-            self.pretty_term(field1214)
+            field1218 = unwrapped_fields1217[0]
+            self.pretty_term(field1218)
             self.newline()
-            field1215 = unwrapped_fields1213[1]
-            self.pretty_term(field1215)
+            field1219 = unwrapped_fields1217[1]
+            self.pretty_term(field1219)
             self.dedent()
             self.write(")")
 
     def pretty_attrs(self, msg: Sequence[logic_pb2.Attribute]):
-        flat1220 = self._try_flat(msg, self.pretty_attrs)
-        if flat1220 is not None:
-            assert flat1220 is not None
-            self.write(flat1220)
+        flat1224 = self._try_flat(msg, self.pretty_attrs)
+        if flat1224 is not None:
+            assert flat1224 is not None
+            self.write(flat1224)
             return None
         else:
-            fields1217 = msg
+            fields1221 = msg
             self.write("(attrs")
             self.indent_sexp()
-            if not len(fields1217) == 0:
+            if not len(fields1221) == 0:
                 self.newline()
-                for i1219, elem1218 in enumerate(fields1217):
-                    if (i1219 > 0):
+                for i1223, elem1222 in enumerate(fields1221):
+                    if (i1223 > 0):
                         self.newline()
-                    self.pretty_attribute(elem1218)
+                    self.pretty_attribute(elem1222)
             self.dedent()
             self.write(")")
 
     def pretty_attribute(self, msg: logic_pb2.Attribute):
-        flat1227 = self._try_flat(msg, self.pretty_attribute)
-        if flat1227 is not None:
-            assert flat1227 is not None
-            self.write(flat1227)
+        flat1231 = self._try_flat(msg, self.pretty_attribute)
+        if flat1231 is not None:
+            assert flat1231 is not None
+            self.write(flat1231)
             return None
         else:
             _dollar_dollar = msg
-            fields1221 = (_dollar_dollar.name, _dollar_dollar.args,)
-            assert fields1221 is not None
-            unwrapped_fields1222 = fields1221
+            fields1225 = (_dollar_dollar.name, _dollar_dollar.args,)
+            assert fields1225 is not None
+            unwrapped_fields1226 = fields1225
             self.write("(attribute")
             self.indent_sexp()
             self.newline()
-            field1223 = unwrapped_fields1222[0]
-            self.pretty_name(field1223)
-            field1224 = unwrapped_fields1222[1]
-            if not len(field1224) == 0:
+            field1227 = unwrapped_fields1226[0]
+            self.pretty_name(field1227)
+            field1228 = unwrapped_fields1226[1]
+            if not len(field1228) == 0:
                 self.newline()
-                for i1226, elem1225 in enumerate(field1224):
-                    if (i1226 > 0):
+                for i1230, elem1229 in enumerate(field1228):
+                    if (i1230 > 0):
                         self.newline()
-                    self.pretty_raw_value(elem1225)
+                    self.pretty_raw_value(elem1229)
             self.dedent()
             self.write(")")
 
     def pretty_algorithm(self, msg: logic_pb2.Algorithm):
-        flat1234 = self._try_flat(msg, self.pretty_algorithm)
-        if flat1234 is not None:
-            assert flat1234 is not None
-            self.write(flat1234)
+        flat1240 = self._try_flat(msg, self.pretty_algorithm)
+        if flat1240 is not None:
+            assert flat1240 is not None
+            self.write(flat1240)
             return None
         else:
             _dollar_dollar = msg
-            fields1228 = (getattr(_dollar_dollar, 'global'), _dollar_dollar.body,)
-            assert fields1228 is not None
-            unwrapped_fields1229 = fields1228
+            if not len(_dollar_dollar.attrs) == 0:
+                _t1703 = _dollar_dollar.attrs
+            else:
+                _t1703 = None
+            fields1232 = (getattr(_dollar_dollar, 'global'), _dollar_dollar.body, _t1703,)
+            assert fields1232 is not None
+            unwrapped_fields1233 = fields1232
             self.write("(algorithm")
             self.indent_sexp()
-            field1230 = unwrapped_fields1229[0]
-            if not len(field1230) == 0:
+            field1234 = unwrapped_fields1233[0]
+            if not len(field1234) == 0:
                 self.newline()
-                for i1232, elem1231 in enumerate(field1230):
-                    if (i1232 > 0):
+                for i1236, elem1235 in enumerate(field1234):
+                    if (i1236 > 0):
                         self.newline()
-                    self.pretty_relation_id(elem1231)
+                    self.pretty_relation_id(elem1235)
             self.newline()
-            field1233 = unwrapped_fields1229[1]
-            self.pretty_script(field1233)
+            field1237 = unwrapped_fields1233[1]
+            self.pretty_script(field1237)
+            field1238 = unwrapped_fields1233[2]
+            if field1238 is not None:
+                self.newline()
+                assert field1238 is not None
+                opt_val1239 = field1238
+                self.pretty_attrs(opt_val1239)
             self.dedent()
             self.write(")")
 
     def pretty_script(self, msg: logic_pb2.Script):
-        flat1239 = self._try_flat(msg, self.pretty_script)
-        if flat1239 is not None:
-            assert flat1239 is not None
-            self.write(flat1239)
+        flat1245 = self._try_flat(msg, self.pretty_script)
+        if flat1245 is not None:
+            assert flat1245 is not None
+            self.write(flat1245)
             return None
         else:
             _dollar_dollar = msg
-            fields1235 = _dollar_dollar.constructs
-            assert fields1235 is not None
-            unwrapped_fields1236 = fields1235
+            fields1241 = _dollar_dollar.constructs
+            assert fields1241 is not None
+            unwrapped_fields1242 = fields1241
             self.write("(script")
             self.indent_sexp()
-            if not len(unwrapped_fields1236) == 0:
+            if not len(unwrapped_fields1242) == 0:
                 self.newline()
-                for i1238, elem1237 in enumerate(unwrapped_fields1236):
-                    if (i1238 > 0):
+                for i1244, elem1243 in enumerate(unwrapped_fields1242):
+                    if (i1244 > 0):
                         self.newline()
-                    self.pretty_construct(elem1237)
+                    self.pretty_construct(elem1243)
             self.dedent()
             self.write(")")
 
     def pretty_construct(self, msg: logic_pb2.Construct):
-        flat1244 = self._try_flat(msg, self.pretty_construct)
-        if flat1244 is not None:
-            assert flat1244 is not None
-            self.write(flat1244)
+        flat1250 = self._try_flat(msg, self.pretty_construct)
+        if flat1250 is not None:
+            assert flat1250 is not None
+            self.write(flat1250)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("loop"):
-                _t1695 = _dollar_dollar.loop
+                _t1704 = _dollar_dollar.loop
             else:
-                _t1695 = None
-            deconstruct_result1242 = _t1695
-            if deconstruct_result1242 is not None:
-                assert deconstruct_result1242 is not None
-                unwrapped1243 = deconstruct_result1242
-                self.pretty_loop(unwrapped1243)
+                _t1704 = None
+            deconstruct_result1248 = _t1704
+            if deconstruct_result1248 is not None:
+                assert deconstruct_result1248 is not None
+                unwrapped1249 = deconstruct_result1248
+                self.pretty_loop(unwrapped1249)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("instruction"):
-                    _t1696 = _dollar_dollar.instruction
+                    _t1705 = _dollar_dollar.instruction
                 else:
-                    _t1696 = None
-                deconstruct_result1240 = _t1696
-                if deconstruct_result1240 is not None:
-                    assert deconstruct_result1240 is not None
-                    unwrapped1241 = deconstruct_result1240
-                    self.pretty_instruction(unwrapped1241)
+                    _t1705 = None
+                deconstruct_result1246 = _t1705
+                if deconstruct_result1246 is not None:
+                    assert deconstruct_result1246 is not None
+                    unwrapped1247 = deconstruct_result1246
+                    self.pretty_instruction(unwrapped1247)
                 else:
                     raise ParseError("No matching rule for construct")
 
     def pretty_loop(self, msg: logic_pb2.Loop):
-        flat1249 = self._try_flat(msg, self.pretty_loop)
-        if flat1249 is not None:
-            assert flat1249 is not None
-            self.write(flat1249)
+        flat1257 = self._try_flat(msg, self.pretty_loop)
+        if flat1257 is not None:
+            assert flat1257 is not None
+            self.write(flat1257)
             return None
         else:
             _dollar_dollar = msg
-            fields1245 = (_dollar_dollar.init, _dollar_dollar.body,)
-            assert fields1245 is not None
-            unwrapped_fields1246 = fields1245
+            if not len(_dollar_dollar.attrs) == 0:
+                _t1706 = _dollar_dollar.attrs
+            else:
+                _t1706 = None
+            fields1251 = (_dollar_dollar.init, _dollar_dollar.body, _t1706,)
+            assert fields1251 is not None
+            unwrapped_fields1252 = fields1251
             self.write("(loop")
             self.indent_sexp()
             self.newline()
-            field1247 = unwrapped_fields1246[0]
-            self.pretty_init(field1247)
+            field1253 = unwrapped_fields1252[0]
+            self.pretty_init(field1253)
             self.newline()
-            field1248 = unwrapped_fields1246[1]
-            self.pretty_script(field1248)
+            field1254 = unwrapped_fields1252[1]
+            self.pretty_script(field1254)
+            field1255 = unwrapped_fields1252[2]
+            if field1255 is not None:
+                self.newline()
+                assert field1255 is not None
+                opt_val1256 = field1255
+                self.pretty_attrs(opt_val1256)
             self.dedent()
             self.write(")")
 
     def pretty_init(self, msg: Sequence[logic_pb2.Instruction]):
-        flat1253 = self._try_flat(msg, self.pretty_init)
-        if flat1253 is not None:
-            assert flat1253 is not None
-            self.write(flat1253)
+        flat1261 = self._try_flat(msg, self.pretty_init)
+        if flat1261 is not None:
+            assert flat1261 is not None
+            self.write(flat1261)
             return None
         else:
-            fields1250 = msg
+            fields1258 = msg
             self.write("(init")
             self.indent_sexp()
-            if not len(fields1250) == 0:
+            if not len(fields1258) == 0:
                 self.newline()
-                for i1252, elem1251 in enumerate(fields1250):
-                    if (i1252 > 0):
+                for i1260, elem1259 in enumerate(fields1258):
+                    if (i1260 > 0):
                         self.newline()
-                    self.pretty_instruction(elem1251)
+                    self.pretty_instruction(elem1259)
             self.dedent()
             self.write(")")
 
     def pretty_instruction(self, msg: logic_pb2.Instruction):
-        flat1264 = self._try_flat(msg, self.pretty_instruction)
-        if flat1264 is not None:
-            assert flat1264 is not None
-            self.write(flat1264)
+        flat1272 = self._try_flat(msg, self.pretty_instruction)
+        if flat1272 is not None:
+            assert flat1272 is not None
+            self.write(flat1272)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("assign"):
-                _t1697 = _dollar_dollar.assign
+                _t1707 = _dollar_dollar.assign
             else:
-                _t1697 = None
-            deconstruct_result1262 = _t1697
-            if deconstruct_result1262 is not None:
-                assert deconstruct_result1262 is not None
-                unwrapped1263 = deconstruct_result1262
-                self.pretty_assign(unwrapped1263)
+                _t1707 = None
+            deconstruct_result1270 = _t1707
+            if deconstruct_result1270 is not None:
+                assert deconstruct_result1270 is not None
+                unwrapped1271 = deconstruct_result1270
+                self.pretty_assign(unwrapped1271)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("upsert"):
-                    _t1698 = _dollar_dollar.upsert
+                    _t1708 = _dollar_dollar.upsert
                 else:
-                    _t1698 = None
-                deconstruct_result1260 = _t1698
-                if deconstruct_result1260 is not None:
-                    assert deconstruct_result1260 is not None
-                    unwrapped1261 = deconstruct_result1260
-                    self.pretty_upsert(unwrapped1261)
+                    _t1708 = None
+                deconstruct_result1268 = _t1708
+                if deconstruct_result1268 is not None:
+                    assert deconstruct_result1268 is not None
+                    unwrapped1269 = deconstruct_result1268
+                    self.pretty_upsert(unwrapped1269)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("break"):
-                        _t1699 = getattr(_dollar_dollar, 'break')
+                        _t1709 = getattr(_dollar_dollar, 'break')
                     else:
-                        _t1699 = None
-                    deconstruct_result1258 = _t1699
-                    if deconstruct_result1258 is not None:
-                        assert deconstruct_result1258 is not None
-                        unwrapped1259 = deconstruct_result1258
-                        self.pretty_break(unwrapped1259)
+                        _t1709 = None
+                    deconstruct_result1266 = _t1709
+                    if deconstruct_result1266 is not None:
+                        assert deconstruct_result1266 is not None
+                        unwrapped1267 = deconstruct_result1266
+                        self.pretty_break(unwrapped1267)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("monoid_def"):
-                            _t1700 = _dollar_dollar.monoid_def
+                            _t1710 = _dollar_dollar.monoid_def
                         else:
-                            _t1700 = None
-                        deconstruct_result1256 = _t1700
-                        if deconstruct_result1256 is not None:
-                            assert deconstruct_result1256 is not None
-                            unwrapped1257 = deconstruct_result1256
-                            self.pretty_monoid_def(unwrapped1257)
+                            _t1710 = None
+                        deconstruct_result1264 = _t1710
+                        if deconstruct_result1264 is not None:
+                            assert deconstruct_result1264 is not None
+                            unwrapped1265 = deconstruct_result1264
+                            self.pretty_monoid_def(unwrapped1265)
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("monus_def"):
-                                _t1701 = _dollar_dollar.monus_def
+                                _t1711 = _dollar_dollar.monus_def
                             else:
-                                _t1701 = None
-                            deconstruct_result1254 = _t1701
-                            if deconstruct_result1254 is not None:
-                                assert deconstruct_result1254 is not None
-                                unwrapped1255 = deconstruct_result1254
-                                self.pretty_monus_def(unwrapped1255)
+                                _t1711 = None
+                            deconstruct_result1262 = _t1711
+                            if deconstruct_result1262 is not None:
+                                assert deconstruct_result1262 is not None
+                                unwrapped1263 = deconstruct_result1262
+                                self.pretty_monus_def(unwrapped1263)
                             else:
                                 raise ParseError("No matching rule for instruction")
 
     def pretty_assign(self, msg: logic_pb2.Assign):
-        flat1271 = self._try_flat(msg, self.pretty_assign)
-        if flat1271 is not None:
-            assert flat1271 is not None
-            self.write(flat1271)
+        flat1279 = self._try_flat(msg, self.pretty_assign)
+        if flat1279 is not None:
+            assert flat1279 is not None
+            self.write(flat1279)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1702 = _dollar_dollar.attrs
+                _t1712 = _dollar_dollar.attrs
             else:
-                _t1702 = None
-            fields1265 = (_dollar_dollar.name, _dollar_dollar.body, _t1702,)
-            assert fields1265 is not None
-            unwrapped_fields1266 = fields1265
+                _t1712 = None
+            fields1273 = (_dollar_dollar.name, _dollar_dollar.body, _t1712,)
+            assert fields1273 is not None
+            unwrapped_fields1274 = fields1273
             self.write("(assign")
             self.indent_sexp()
             self.newline()
-            field1267 = unwrapped_fields1266[0]
-            self.pretty_relation_id(field1267)
+            field1275 = unwrapped_fields1274[0]
+            self.pretty_relation_id(field1275)
             self.newline()
-            field1268 = unwrapped_fields1266[1]
-            self.pretty_abstraction(field1268)
-            field1269 = unwrapped_fields1266[2]
-            if field1269 is not None:
+            field1276 = unwrapped_fields1274[1]
+            self.pretty_abstraction(field1276)
+            field1277 = unwrapped_fields1274[2]
+            if field1277 is not None:
                 self.newline()
-                assert field1269 is not None
-                opt_val1270 = field1269
-                self.pretty_attrs(opt_val1270)
+                assert field1277 is not None
+                opt_val1278 = field1277
+                self.pretty_attrs(opt_val1278)
             self.dedent()
             self.write(")")
 
     def pretty_upsert(self, msg: logic_pb2.Upsert):
-        flat1278 = self._try_flat(msg, self.pretty_upsert)
-        if flat1278 is not None:
-            assert flat1278 is not None
-            self.write(flat1278)
+        flat1286 = self._try_flat(msg, self.pretty_upsert)
+        if flat1286 is not None:
+            assert flat1286 is not None
+            self.write(flat1286)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1703 = _dollar_dollar.attrs
+                _t1713 = _dollar_dollar.attrs
             else:
-                _t1703 = None
-            fields1272 = (_dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1703,)
-            assert fields1272 is not None
-            unwrapped_fields1273 = fields1272
+                _t1713 = None
+            fields1280 = (_dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1713,)
+            assert fields1280 is not None
+            unwrapped_fields1281 = fields1280
             self.write("(upsert")
             self.indent_sexp()
             self.newline()
-            field1274 = unwrapped_fields1273[0]
-            self.pretty_relation_id(field1274)
+            field1282 = unwrapped_fields1281[0]
+            self.pretty_relation_id(field1282)
             self.newline()
-            field1275 = unwrapped_fields1273[1]
-            self.pretty_abstraction_with_arity(field1275)
-            field1276 = unwrapped_fields1273[2]
-            if field1276 is not None:
+            field1283 = unwrapped_fields1281[1]
+            self.pretty_abstraction_with_arity(field1283)
+            field1284 = unwrapped_fields1281[2]
+            if field1284 is not None:
                 self.newline()
-                assert field1276 is not None
-                opt_val1277 = field1276
-                self.pretty_attrs(opt_val1277)
+                assert field1284 is not None
+                opt_val1285 = field1284
+                self.pretty_attrs(opt_val1285)
             self.dedent()
             self.write(")")
 
     def pretty_abstraction_with_arity(self, msg: tuple[logic_pb2.Abstraction, int]):
-        flat1283 = self._try_flat(msg, self.pretty_abstraction_with_arity)
-        if flat1283 is not None:
-            assert flat1283 is not None
-            self.write(flat1283)
+        flat1291 = self._try_flat(msg, self.pretty_abstraction_with_arity)
+        if flat1291 is not None:
+            assert flat1291 is not None
+            self.write(flat1291)
             return None
         else:
             _dollar_dollar = msg
-            _t1704 = self.deconstruct_bindings_with_arity(_dollar_dollar[0], _dollar_dollar[1])
-            fields1279 = (_t1704, _dollar_dollar[0].value,)
-            assert fields1279 is not None
-            unwrapped_fields1280 = fields1279
+            _t1714 = self.deconstruct_bindings_with_arity(_dollar_dollar[0], _dollar_dollar[1])
+            fields1287 = (_t1714, _dollar_dollar[0].value,)
+            assert fields1287 is not None
+            unwrapped_fields1288 = fields1287
             self.write("(")
             self.indent()
-            field1281 = unwrapped_fields1280[0]
-            self.pretty_bindings(field1281)
+            field1289 = unwrapped_fields1288[0]
+            self.pretty_bindings(field1289)
             self.newline()
-            field1282 = unwrapped_fields1280[1]
-            self.pretty_formula(field1282)
+            field1290 = unwrapped_fields1288[1]
+            self.pretty_formula(field1290)
             self.dedent()
             self.write(")")
 
     def pretty_break(self, msg: logic_pb2.Break):
-        flat1290 = self._try_flat(msg, self.pretty_break)
-        if flat1290 is not None:
-            assert flat1290 is not None
-            self.write(flat1290)
+        flat1298 = self._try_flat(msg, self.pretty_break)
+        if flat1298 is not None:
+            assert flat1298 is not None
+            self.write(flat1298)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1705 = _dollar_dollar.attrs
+                _t1715 = _dollar_dollar.attrs
             else:
-                _t1705 = None
-            fields1284 = (_dollar_dollar.name, _dollar_dollar.body, _t1705,)
-            assert fields1284 is not None
-            unwrapped_fields1285 = fields1284
+                _t1715 = None
+            fields1292 = (_dollar_dollar.name, _dollar_dollar.body, _t1715,)
+            assert fields1292 is not None
+            unwrapped_fields1293 = fields1292
             self.write("(break")
             self.indent_sexp()
             self.newline()
-            field1286 = unwrapped_fields1285[0]
-            self.pretty_relation_id(field1286)
+            field1294 = unwrapped_fields1293[0]
+            self.pretty_relation_id(field1294)
             self.newline()
-            field1287 = unwrapped_fields1285[1]
-            self.pretty_abstraction(field1287)
-            field1288 = unwrapped_fields1285[2]
-            if field1288 is not None:
+            field1295 = unwrapped_fields1293[1]
+            self.pretty_abstraction(field1295)
+            field1296 = unwrapped_fields1293[2]
+            if field1296 is not None:
                 self.newline()
-                assert field1288 is not None
-                opt_val1289 = field1288
-                self.pretty_attrs(opt_val1289)
+                assert field1296 is not None
+                opt_val1297 = field1296
+                self.pretty_attrs(opt_val1297)
             self.dedent()
             self.write(")")
 
     def pretty_monoid_def(self, msg: logic_pb2.MonoidDef):
-        flat1298 = self._try_flat(msg, self.pretty_monoid_def)
-        if flat1298 is not None:
-            assert flat1298 is not None
-            self.write(flat1298)
+        flat1306 = self._try_flat(msg, self.pretty_monoid_def)
+        if flat1306 is not None:
+            assert flat1306 is not None
+            self.write(flat1306)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1706 = _dollar_dollar.attrs
+                _t1716 = _dollar_dollar.attrs
             else:
-                _t1706 = None
-            fields1291 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1706,)
-            assert fields1291 is not None
-            unwrapped_fields1292 = fields1291
+                _t1716 = None
+            fields1299 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1716,)
+            assert fields1299 is not None
+            unwrapped_fields1300 = fields1299
             self.write("(monoid")
             self.indent_sexp()
             self.newline()
-            field1293 = unwrapped_fields1292[0]
-            self.pretty_monoid(field1293)
+            field1301 = unwrapped_fields1300[0]
+            self.pretty_monoid(field1301)
             self.newline()
-            field1294 = unwrapped_fields1292[1]
-            self.pretty_relation_id(field1294)
+            field1302 = unwrapped_fields1300[1]
+            self.pretty_relation_id(field1302)
             self.newline()
-            field1295 = unwrapped_fields1292[2]
-            self.pretty_abstraction_with_arity(field1295)
-            field1296 = unwrapped_fields1292[3]
-            if field1296 is not None:
+            field1303 = unwrapped_fields1300[2]
+            self.pretty_abstraction_with_arity(field1303)
+            field1304 = unwrapped_fields1300[3]
+            if field1304 is not None:
                 self.newline()
-                assert field1296 is not None
-                opt_val1297 = field1296
-                self.pretty_attrs(opt_val1297)
+                assert field1304 is not None
+                opt_val1305 = field1304
+                self.pretty_attrs(opt_val1305)
             self.dedent()
             self.write(")")
 
     def pretty_monoid(self, msg: logic_pb2.Monoid):
-        flat1307 = self._try_flat(msg, self.pretty_monoid)
-        if flat1307 is not None:
-            assert flat1307 is not None
-            self.write(flat1307)
+        flat1315 = self._try_flat(msg, self.pretty_monoid)
+        if flat1315 is not None:
+            assert flat1315 is not None
+            self.write(flat1315)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("or_monoid"):
-                _t1707 = _dollar_dollar.or_monoid
+                _t1717 = _dollar_dollar.or_monoid
             else:
-                _t1707 = None
-            deconstruct_result1305 = _t1707
-            if deconstruct_result1305 is not None:
-                assert deconstruct_result1305 is not None
-                unwrapped1306 = deconstruct_result1305
-                self.pretty_or_monoid(unwrapped1306)
+                _t1717 = None
+            deconstruct_result1313 = _t1717
+            if deconstruct_result1313 is not None:
+                assert deconstruct_result1313 is not None
+                unwrapped1314 = deconstruct_result1313
+                self.pretty_or_monoid(unwrapped1314)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("min_monoid"):
-                    _t1708 = _dollar_dollar.min_monoid
+                    _t1718 = _dollar_dollar.min_monoid
                 else:
-                    _t1708 = None
-                deconstruct_result1303 = _t1708
-                if deconstruct_result1303 is not None:
-                    assert deconstruct_result1303 is not None
-                    unwrapped1304 = deconstruct_result1303
-                    self.pretty_min_monoid(unwrapped1304)
+                    _t1718 = None
+                deconstruct_result1311 = _t1718
+                if deconstruct_result1311 is not None:
+                    assert deconstruct_result1311 is not None
+                    unwrapped1312 = deconstruct_result1311
+                    self.pretty_min_monoid(unwrapped1312)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("max_monoid"):
-                        _t1709 = _dollar_dollar.max_monoid
+                        _t1719 = _dollar_dollar.max_monoid
                     else:
-                        _t1709 = None
-                    deconstruct_result1301 = _t1709
-                    if deconstruct_result1301 is not None:
-                        assert deconstruct_result1301 is not None
-                        unwrapped1302 = deconstruct_result1301
-                        self.pretty_max_monoid(unwrapped1302)
+                        _t1719 = None
+                    deconstruct_result1309 = _t1719
+                    if deconstruct_result1309 is not None:
+                        assert deconstruct_result1309 is not None
+                        unwrapped1310 = deconstruct_result1309
+                        self.pretty_max_monoid(unwrapped1310)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("sum_monoid"):
-                            _t1710 = _dollar_dollar.sum_monoid
+                            _t1720 = _dollar_dollar.sum_monoid
                         else:
-                            _t1710 = None
-                        deconstruct_result1299 = _t1710
-                        if deconstruct_result1299 is not None:
-                            assert deconstruct_result1299 is not None
-                            unwrapped1300 = deconstruct_result1299
-                            self.pretty_sum_monoid(unwrapped1300)
+                            _t1720 = None
+                        deconstruct_result1307 = _t1720
+                        if deconstruct_result1307 is not None:
+                            assert deconstruct_result1307 is not None
+                            unwrapped1308 = deconstruct_result1307
+                            self.pretty_sum_monoid(unwrapped1308)
                         else:
                             raise ParseError("No matching rule for monoid")
 
     def pretty_or_monoid(self, msg: logic_pb2.OrMonoid):
-        fields1308 = msg
+        fields1316 = msg
         self.write("(or)")
 
     def pretty_min_monoid(self, msg: logic_pb2.MinMonoid):
-        flat1311 = self._try_flat(msg, self.pretty_min_monoid)
-        if flat1311 is not None:
-            assert flat1311 is not None
-            self.write(flat1311)
+        flat1319 = self._try_flat(msg, self.pretty_min_monoid)
+        if flat1319 is not None:
+            assert flat1319 is not None
+            self.write(flat1319)
             return None
         else:
             _dollar_dollar = msg
-            fields1309 = _dollar_dollar.type
-            assert fields1309 is not None
-            unwrapped_fields1310 = fields1309
+            fields1317 = _dollar_dollar.type
+            assert fields1317 is not None
+            unwrapped_fields1318 = fields1317
             self.write("(min")
             self.indent_sexp()
             self.newline()
-            self.pretty_type(unwrapped_fields1310)
+            self.pretty_type(unwrapped_fields1318)
             self.dedent()
             self.write(")")
 
     def pretty_max_monoid(self, msg: logic_pb2.MaxMonoid):
-        flat1314 = self._try_flat(msg, self.pretty_max_monoid)
-        if flat1314 is not None:
-            assert flat1314 is not None
-            self.write(flat1314)
+        flat1322 = self._try_flat(msg, self.pretty_max_monoid)
+        if flat1322 is not None:
+            assert flat1322 is not None
+            self.write(flat1322)
             return None
         else:
             _dollar_dollar = msg
-            fields1312 = _dollar_dollar.type
-            assert fields1312 is not None
-            unwrapped_fields1313 = fields1312
+            fields1320 = _dollar_dollar.type
+            assert fields1320 is not None
+            unwrapped_fields1321 = fields1320
             self.write("(max")
             self.indent_sexp()
             self.newline()
-            self.pretty_type(unwrapped_fields1313)
+            self.pretty_type(unwrapped_fields1321)
             self.dedent()
             self.write(")")
 
     def pretty_sum_monoid(self, msg: logic_pb2.SumMonoid):
-        flat1317 = self._try_flat(msg, self.pretty_sum_monoid)
-        if flat1317 is not None:
-            assert flat1317 is not None
-            self.write(flat1317)
+        flat1325 = self._try_flat(msg, self.pretty_sum_monoid)
+        if flat1325 is not None:
+            assert flat1325 is not None
+            self.write(flat1325)
             return None
         else:
             _dollar_dollar = msg
-            fields1315 = _dollar_dollar.type
-            assert fields1315 is not None
-            unwrapped_fields1316 = fields1315
+            fields1323 = _dollar_dollar.type
+            assert fields1323 is not None
+            unwrapped_fields1324 = fields1323
             self.write("(sum")
             self.indent_sexp()
             self.newline()
-            self.pretty_type(unwrapped_fields1316)
+            self.pretty_type(unwrapped_fields1324)
             self.dedent()
             self.write(")")
 
     def pretty_monus_def(self, msg: logic_pb2.MonusDef):
-        flat1325 = self._try_flat(msg, self.pretty_monus_def)
-        if flat1325 is not None:
-            assert flat1325 is not None
-            self.write(flat1325)
+        flat1333 = self._try_flat(msg, self.pretty_monus_def)
+        if flat1333 is not None:
+            assert flat1333 is not None
+            self.write(flat1333)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.attrs) == 0:
-                _t1711 = _dollar_dollar.attrs
+                _t1721 = _dollar_dollar.attrs
             else:
-                _t1711 = None
-            fields1318 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1711,)
-            assert fields1318 is not None
-            unwrapped_fields1319 = fields1318
+                _t1721 = None
+            fields1326 = (_dollar_dollar.monoid, _dollar_dollar.name, (_dollar_dollar.body, _dollar_dollar.value_arity,), _t1721,)
+            assert fields1326 is not None
+            unwrapped_fields1327 = fields1326
             self.write("(monus")
             self.indent_sexp()
             self.newline()
-            field1320 = unwrapped_fields1319[0]
-            self.pretty_monoid(field1320)
+            field1328 = unwrapped_fields1327[0]
+            self.pretty_monoid(field1328)
             self.newline()
-            field1321 = unwrapped_fields1319[1]
-            self.pretty_relation_id(field1321)
+            field1329 = unwrapped_fields1327[1]
+            self.pretty_relation_id(field1329)
             self.newline()
-            field1322 = unwrapped_fields1319[2]
-            self.pretty_abstraction_with_arity(field1322)
-            field1323 = unwrapped_fields1319[3]
-            if field1323 is not None:
+            field1330 = unwrapped_fields1327[2]
+            self.pretty_abstraction_with_arity(field1330)
+            field1331 = unwrapped_fields1327[3]
+            if field1331 is not None:
                 self.newline()
-                assert field1323 is not None
-                opt_val1324 = field1323
-                self.pretty_attrs(opt_val1324)
+                assert field1331 is not None
+                opt_val1332 = field1331
+                self.pretty_attrs(opt_val1332)
             self.dedent()
             self.write(")")
 
     def pretty_constraint(self, msg: logic_pb2.Constraint):
-        flat1332 = self._try_flat(msg, self.pretty_constraint)
-        if flat1332 is not None:
-            assert flat1332 is not None
-            self.write(flat1332)
+        flat1340 = self._try_flat(msg, self.pretty_constraint)
+        if flat1340 is not None:
+            assert flat1340 is not None
+            self.write(flat1340)
             return None
         else:
             _dollar_dollar = msg
-            fields1326 = (_dollar_dollar.name, _dollar_dollar.functional_dependency.guard, _dollar_dollar.functional_dependency.keys, _dollar_dollar.functional_dependency.values,)
-            assert fields1326 is not None
-            unwrapped_fields1327 = fields1326
+            fields1334 = (_dollar_dollar.name, _dollar_dollar.functional_dependency.guard, _dollar_dollar.functional_dependency.keys, _dollar_dollar.functional_dependency.values,)
+            assert fields1334 is not None
+            unwrapped_fields1335 = fields1334
             self.write("(functional_dependency")
             self.indent_sexp()
             self.newline()
-            field1328 = unwrapped_fields1327[0]
-            self.pretty_relation_id(field1328)
+            field1336 = unwrapped_fields1335[0]
+            self.pretty_relation_id(field1336)
             self.newline()
-            field1329 = unwrapped_fields1327[1]
-            self.pretty_abstraction(field1329)
+            field1337 = unwrapped_fields1335[1]
+            self.pretty_abstraction(field1337)
             self.newline()
-            field1330 = unwrapped_fields1327[2]
-            self.pretty_functional_dependency_keys(field1330)
+            field1338 = unwrapped_fields1335[2]
+            self.pretty_functional_dependency_keys(field1338)
             self.newline()
-            field1331 = unwrapped_fields1327[3]
-            self.pretty_functional_dependency_values(field1331)
+            field1339 = unwrapped_fields1335[3]
+            self.pretty_functional_dependency_values(field1339)
             self.dedent()
             self.write(")")
 
     def pretty_functional_dependency_keys(self, msg: Sequence[logic_pb2.Var]):
-        flat1336 = self._try_flat(msg, self.pretty_functional_dependency_keys)
-        if flat1336 is not None:
-            assert flat1336 is not None
-            self.write(flat1336)
+        flat1344 = self._try_flat(msg, self.pretty_functional_dependency_keys)
+        if flat1344 is not None:
+            assert flat1344 is not None
+            self.write(flat1344)
             return None
         else:
-            fields1333 = msg
+            fields1341 = msg
             self.write("(keys")
             self.indent_sexp()
-            if not len(fields1333) == 0:
+            if not len(fields1341) == 0:
                 self.newline()
-                for i1335, elem1334 in enumerate(fields1333):
-                    if (i1335 > 0):
+                for i1343, elem1342 in enumerate(fields1341):
+                    if (i1343 > 0):
                         self.newline()
-                    self.pretty_var(elem1334)
+                    self.pretty_var(elem1342)
             self.dedent()
             self.write(")")
 
     def pretty_functional_dependency_values(self, msg: Sequence[logic_pb2.Var]):
-        flat1340 = self._try_flat(msg, self.pretty_functional_dependency_values)
-        if flat1340 is not None:
-            assert flat1340 is not None
-            self.write(flat1340)
+        flat1348 = self._try_flat(msg, self.pretty_functional_dependency_values)
+        if flat1348 is not None:
+            assert flat1348 is not None
+            self.write(flat1348)
             return None
         else:
-            fields1337 = msg
+            fields1345 = msg
             self.write("(values")
             self.indent_sexp()
-            if not len(fields1337) == 0:
+            if not len(fields1345) == 0:
                 self.newline()
-                for i1339, elem1338 in enumerate(fields1337):
-                    if (i1339 > 0):
+                for i1347, elem1346 in enumerate(fields1345):
+                    if (i1347 > 0):
                         self.newline()
-                    self.pretty_var(elem1338)
+                    self.pretty_var(elem1346)
             self.dedent()
             self.write(")")
 
     def pretty_data(self, msg: logic_pb2.Data):
-        flat1349 = self._try_flat(msg, self.pretty_data)
-        if flat1349 is not None:
-            assert flat1349 is not None
-            self.write(flat1349)
+        flat1357 = self._try_flat(msg, self.pretty_data)
+        if flat1357 is not None:
+            assert flat1357 is not None
+            self.write(flat1357)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("edb"):
-                _t1712 = _dollar_dollar.edb
+                _t1722 = _dollar_dollar.edb
             else:
-                _t1712 = None
-            deconstruct_result1347 = _t1712
-            if deconstruct_result1347 is not None:
-                assert deconstruct_result1347 is not None
-                unwrapped1348 = deconstruct_result1347
-                self.pretty_edb(unwrapped1348)
+                _t1722 = None
+            deconstruct_result1355 = _t1722
+            if deconstruct_result1355 is not None:
+                assert deconstruct_result1355 is not None
+                unwrapped1356 = deconstruct_result1355
+                self.pretty_edb(unwrapped1356)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("betree_relation"):
-                    _t1713 = _dollar_dollar.betree_relation
+                    _t1723 = _dollar_dollar.betree_relation
                 else:
-                    _t1713 = None
-                deconstruct_result1345 = _t1713
-                if deconstruct_result1345 is not None:
-                    assert deconstruct_result1345 is not None
-                    unwrapped1346 = deconstruct_result1345
-                    self.pretty_betree_relation(unwrapped1346)
+                    _t1723 = None
+                deconstruct_result1353 = _t1723
+                if deconstruct_result1353 is not None:
+                    assert deconstruct_result1353 is not None
+                    unwrapped1354 = deconstruct_result1353
+                    self.pretty_betree_relation(unwrapped1354)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("csv_data"):
-                        _t1714 = _dollar_dollar.csv_data
+                        _t1724 = _dollar_dollar.csv_data
                     else:
-                        _t1714 = None
-                    deconstruct_result1343 = _t1714
-                    if deconstruct_result1343 is not None:
-                        assert deconstruct_result1343 is not None
-                        unwrapped1344 = deconstruct_result1343
-                        self.pretty_csv_data(unwrapped1344)
+                        _t1724 = None
+                    deconstruct_result1351 = _t1724
+                    if deconstruct_result1351 is not None:
+                        assert deconstruct_result1351 is not None
+                        unwrapped1352 = deconstruct_result1351
+                        self.pretty_csv_data(unwrapped1352)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("iceberg_data"):
-                            _t1715 = _dollar_dollar.iceberg_data
+                            _t1725 = _dollar_dollar.iceberg_data
                         else:
-                            _t1715 = None
-                        deconstruct_result1341 = _t1715
-                        if deconstruct_result1341 is not None:
-                            assert deconstruct_result1341 is not None
-                            unwrapped1342 = deconstruct_result1341
-                            self.pretty_iceberg_data(unwrapped1342)
+                            _t1725 = None
+                        deconstruct_result1349 = _t1725
+                        if deconstruct_result1349 is not None:
+                            assert deconstruct_result1349 is not None
+                            unwrapped1350 = deconstruct_result1349
+                            self.pretty_iceberg_data(unwrapped1350)
                         else:
                             raise ParseError("No matching rule for data")
 
     def pretty_edb(self, msg: logic_pb2.EDB):
-        flat1355 = self._try_flat(msg, self.pretty_edb)
-        if flat1355 is not None:
-            assert flat1355 is not None
-            self.write(flat1355)
+        flat1363 = self._try_flat(msg, self.pretty_edb)
+        if flat1363 is not None:
+            assert flat1363 is not None
+            self.write(flat1363)
             return None
         else:
             _dollar_dollar = msg
-            fields1350 = (_dollar_dollar.target_id, _dollar_dollar.path, _dollar_dollar.types,)
-            assert fields1350 is not None
-            unwrapped_fields1351 = fields1350
+            fields1358 = (_dollar_dollar.target_id, _dollar_dollar.path, _dollar_dollar.types,)
+            assert fields1358 is not None
+            unwrapped_fields1359 = fields1358
             self.write("(edb")
             self.indent_sexp()
             self.newline()
-            field1352 = unwrapped_fields1351[0]
-            self.pretty_relation_id(field1352)
+            field1360 = unwrapped_fields1359[0]
+            self.pretty_relation_id(field1360)
             self.newline()
-            field1353 = unwrapped_fields1351[1]
-            self.pretty_edb_path(field1353)
+            field1361 = unwrapped_fields1359[1]
+            self.pretty_edb_path(field1361)
             self.newline()
-            field1354 = unwrapped_fields1351[2]
-            self.pretty_edb_types(field1354)
+            field1362 = unwrapped_fields1359[2]
+            self.pretty_edb_types(field1362)
             self.dedent()
             self.write(")")
 
     def pretty_edb_path(self, msg: Sequence[str]):
-        flat1359 = self._try_flat(msg, self.pretty_edb_path)
-        if flat1359 is not None:
-            assert flat1359 is not None
-            self.write(flat1359)
+        flat1367 = self._try_flat(msg, self.pretty_edb_path)
+        if flat1367 is not None:
+            assert flat1367 is not None
+            self.write(flat1367)
             return None
         else:
-            fields1356 = msg
+            fields1364 = msg
             self.write("[")
             self.indent()
-            for i1358, elem1357 in enumerate(fields1356):
-                if (i1358 > 0):
+            for i1366, elem1365 in enumerate(fields1364):
+                if (i1366 > 0):
                     self.newline()
-                self.write(self.format_string_value(elem1357))
+                self.write(self.format_string_value(elem1365))
             self.dedent()
             self.write("]")
 
     def pretty_edb_types(self, msg: Sequence[logic_pb2.Type]):
-        flat1363 = self._try_flat(msg, self.pretty_edb_types)
-        if flat1363 is not None:
-            assert flat1363 is not None
-            self.write(flat1363)
+        flat1371 = self._try_flat(msg, self.pretty_edb_types)
+        if flat1371 is not None:
+            assert flat1371 is not None
+            self.write(flat1371)
             return None
         else:
-            fields1360 = msg
+            fields1368 = msg
             self.write("[")
             self.indent()
-            for i1362, elem1361 in enumerate(fields1360):
-                if (i1362 > 0):
+            for i1370, elem1369 in enumerate(fields1368):
+                if (i1370 > 0):
                     self.newline()
-                self.pretty_type(elem1361)
+                self.pretty_type(elem1369)
             self.dedent()
             self.write("]")
 
     def pretty_betree_relation(self, msg: logic_pb2.BeTreeRelation):
-        flat1368 = self._try_flat(msg, self.pretty_betree_relation)
-        if flat1368 is not None:
-            assert flat1368 is not None
-            self.write(flat1368)
+        flat1376 = self._try_flat(msg, self.pretty_betree_relation)
+        if flat1376 is not None:
+            assert flat1376 is not None
+            self.write(flat1376)
             return None
         else:
             _dollar_dollar = msg
-            fields1364 = (_dollar_dollar.name, _dollar_dollar.relation_info,)
-            assert fields1364 is not None
-            unwrapped_fields1365 = fields1364
+            fields1372 = (_dollar_dollar.name, _dollar_dollar.relation_info,)
+            assert fields1372 is not None
+            unwrapped_fields1373 = fields1372
             self.write("(betree_relation")
             self.indent_sexp()
             self.newline()
-            field1366 = unwrapped_fields1365[0]
-            self.pretty_relation_id(field1366)
+            field1374 = unwrapped_fields1373[0]
+            self.pretty_relation_id(field1374)
             self.newline()
-            field1367 = unwrapped_fields1365[1]
-            self.pretty_betree_info(field1367)
+            field1375 = unwrapped_fields1373[1]
+            self.pretty_betree_info(field1375)
             self.dedent()
             self.write(")")
 
     def pretty_betree_info(self, msg: logic_pb2.BeTreeInfo):
-        flat1374 = self._try_flat(msg, self.pretty_betree_info)
-        if flat1374 is not None:
-            assert flat1374 is not None
-            self.write(flat1374)
+        flat1382 = self._try_flat(msg, self.pretty_betree_info)
+        if flat1382 is not None:
+            assert flat1382 is not None
+            self.write(flat1382)
             return None
         else:
             _dollar_dollar = msg
-            _t1716 = self.deconstruct_betree_info_config(_dollar_dollar)
-            fields1369 = (_dollar_dollar.key_types, _dollar_dollar.value_types, _t1716,)
-            assert fields1369 is not None
-            unwrapped_fields1370 = fields1369
+            _t1726 = self.deconstruct_betree_info_config(_dollar_dollar)
+            fields1377 = (_dollar_dollar.key_types, _dollar_dollar.value_types, _t1726,)
+            assert fields1377 is not None
+            unwrapped_fields1378 = fields1377
             self.write("(betree_info")
             self.indent_sexp()
             self.newline()
-            field1371 = unwrapped_fields1370[0]
-            self.pretty_betree_info_key_types(field1371)
+            field1379 = unwrapped_fields1378[0]
+            self.pretty_betree_info_key_types(field1379)
             self.newline()
-            field1372 = unwrapped_fields1370[1]
-            self.pretty_betree_info_value_types(field1372)
+            field1380 = unwrapped_fields1378[1]
+            self.pretty_betree_info_value_types(field1380)
             self.newline()
-            field1373 = unwrapped_fields1370[2]
-            self.pretty_config_dict(field1373)
+            field1381 = unwrapped_fields1378[2]
+            self.pretty_config_dict(field1381)
             self.dedent()
             self.write(")")
 
     def pretty_betree_info_key_types(self, msg: Sequence[logic_pb2.Type]):
-        flat1378 = self._try_flat(msg, self.pretty_betree_info_key_types)
-        if flat1378 is not None:
-            assert flat1378 is not None
-            self.write(flat1378)
+        flat1386 = self._try_flat(msg, self.pretty_betree_info_key_types)
+        if flat1386 is not None:
+            assert flat1386 is not None
+            self.write(flat1386)
             return None
         else:
-            fields1375 = msg
+            fields1383 = msg
             self.write("(key_types")
             self.indent_sexp()
-            if not len(fields1375) == 0:
+            if not len(fields1383) == 0:
                 self.newline()
-                for i1377, elem1376 in enumerate(fields1375):
-                    if (i1377 > 0):
+                for i1385, elem1384 in enumerate(fields1383):
+                    if (i1385 > 0):
                         self.newline()
-                    self.pretty_type(elem1376)
+                    self.pretty_type(elem1384)
             self.dedent()
             self.write(")")
 
     def pretty_betree_info_value_types(self, msg: Sequence[logic_pb2.Type]):
-        flat1382 = self._try_flat(msg, self.pretty_betree_info_value_types)
-        if flat1382 is not None:
-            assert flat1382 is not None
-            self.write(flat1382)
+        flat1390 = self._try_flat(msg, self.pretty_betree_info_value_types)
+        if flat1390 is not None:
+            assert flat1390 is not None
+            self.write(flat1390)
             return None
         else:
-            fields1379 = msg
+            fields1387 = msg
             self.write("(value_types")
             self.indent_sexp()
-            if not len(fields1379) == 0:
+            if not len(fields1387) == 0:
                 self.newline()
-                for i1381, elem1380 in enumerate(fields1379):
-                    if (i1381 > 0):
+                for i1389, elem1388 in enumerate(fields1387):
+                    if (i1389 > 0):
                         self.newline()
-                    self.pretty_type(elem1380)
+                    self.pretty_type(elem1388)
             self.dedent()
             self.write(")")
 
     def pretty_csv_data(self, msg: logic_pb2.CSVData):
-        flat1389 = self._try_flat(msg, self.pretty_csv_data)
-        if flat1389 is not None:
-            assert flat1389 is not None
-            self.write(flat1389)
+        flat1397 = self._try_flat(msg, self.pretty_csv_data)
+        if flat1397 is not None:
+            assert flat1397 is not None
+            self.write(flat1397)
             return None
         else:
             _dollar_dollar = msg
-            fields1383 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _dollar_dollar.asof,)
-            assert fields1383 is not None
-            unwrapped_fields1384 = fields1383
+            fields1391 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _dollar_dollar.asof,)
+            assert fields1391 is not None
+            unwrapped_fields1392 = fields1391
             self.write("(csv_data")
             self.indent_sexp()
             self.newline()
-            field1385 = unwrapped_fields1384[0]
-            self.pretty_csvlocator(field1385)
+            field1393 = unwrapped_fields1392[0]
+            self.pretty_csvlocator(field1393)
             self.newline()
-            field1386 = unwrapped_fields1384[1]
-            self.pretty_csv_config(field1386)
+            field1394 = unwrapped_fields1392[1]
+            self.pretty_csv_config(field1394)
             self.newline()
-            field1387 = unwrapped_fields1384[2]
-            self.pretty_gnf_columns(field1387)
+            field1395 = unwrapped_fields1392[2]
+            self.pretty_gnf_columns(field1395)
             self.newline()
-            field1388 = unwrapped_fields1384[3]
-            self.pretty_csv_asof(field1388)
+            field1396 = unwrapped_fields1392[3]
+            self.pretty_csv_asof(field1396)
             self.dedent()
             self.write(")")
 
     def pretty_csvlocator(self, msg: logic_pb2.CSVLocator):
-        flat1396 = self._try_flat(msg, self.pretty_csvlocator)
-        if flat1396 is not None:
-            assert flat1396 is not None
-            self.write(flat1396)
+        flat1404 = self._try_flat(msg, self.pretty_csvlocator)
+        if flat1404 is not None:
+            assert flat1404 is not None
+            self.write(flat1404)
             return None
         else:
             _dollar_dollar = msg
             if not len(_dollar_dollar.paths) == 0:
-                _t1717 = _dollar_dollar.paths
+                _t1727 = _dollar_dollar.paths
             else:
-                _t1717 = None
+                _t1727 = None
             if _dollar_dollar.inline_data.decode('utf-8') != "":
-                _t1718 = _dollar_dollar.inline_data.decode('utf-8')
+                _t1728 = _dollar_dollar.inline_data.decode('utf-8')
             else:
-                _t1718 = None
-            fields1390 = (_t1717, _t1718,)
-            assert fields1390 is not None
-            unwrapped_fields1391 = fields1390
+                _t1728 = None
+            fields1398 = (_t1727, _t1728,)
+            assert fields1398 is not None
+            unwrapped_fields1399 = fields1398
             self.write("(csv_locator")
             self.indent_sexp()
-            field1392 = unwrapped_fields1391[0]
-            if field1392 is not None:
+            field1400 = unwrapped_fields1399[0]
+            if field1400 is not None:
                 self.newline()
-                assert field1392 is not None
-                opt_val1393 = field1392
-                self.pretty_csv_locator_paths(opt_val1393)
-            field1394 = unwrapped_fields1391[1]
-            if field1394 is not None:
+                assert field1400 is not None
+                opt_val1401 = field1400
+                self.pretty_csv_locator_paths(opt_val1401)
+            field1402 = unwrapped_fields1399[1]
+            if field1402 is not None:
                 self.newline()
-                assert field1394 is not None
-                opt_val1395 = field1394
-                self.pretty_csv_locator_inline_data(opt_val1395)
+                assert field1402 is not None
+                opt_val1403 = field1402
+                self.pretty_csv_locator_inline_data(opt_val1403)
             self.dedent()
             self.write(")")
 
     def pretty_csv_locator_paths(self, msg: Sequence[str]):
-        flat1400 = self._try_flat(msg, self.pretty_csv_locator_paths)
-        if flat1400 is not None:
-            assert flat1400 is not None
-            self.write(flat1400)
+        flat1408 = self._try_flat(msg, self.pretty_csv_locator_paths)
+        if flat1408 is not None:
+            assert flat1408 is not None
+            self.write(flat1408)
             return None
         else:
-            fields1397 = msg
+            fields1405 = msg
             self.write("(paths")
             self.indent_sexp()
-            if not len(fields1397) == 0:
+            if not len(fields1405) == 0:
                 self.newline()
-                for i1399, elem1398 in enumerate(fields1397):
-                    if (i1399 > 0):
+                for i1407, elem1406 in enumerate(fields1405):
+                    if (i1407 > 0):
                         self.newline()
-                    self.write(self.format_string_value(elem1398))
+                    self.write(self.format_string_value(elem1406))
             self.dedent()
             self.write(")")
 
     def pretty_csv_locator_inline_data(self, msg: str):
-        flat1402 = self._try_flat(msg, self.pretty_csv_locator_inline_data)
-        if flat1402 is not None:
-            assert flat1402 is not None
-            self.write(flat1402)
+        flat1410 = self._try_flat(msg, self.pretty_csv_locator_inline_data)
+        if flat1410 is not None:
+            assert flat1410 is not None
+            self.write(flat1410)
             return None
         else:
-            fields1401 = msg
+            fields1409 = msg
             self.write("(inline_data")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1401))
+            self.write(self.format_string_value(fields1409))
             self.dedent()
             self.write(")")
 
     def pretty_csv_config(self, msg: logic_pb2.CSVConfig):
-        flat1405 = self._try_flat(msg, self.pretty_csv_config)
-        if flat1405 is not None:
-            assert flat1405 is not None
-            self.write(flat1405)
+        flat1413 = self._try_flat(msg, self.pretty_csv_config)
+        if flat1413 is not None:
+            assert flat1413 is not None
+            self.write(flat1413)
             return None
         else:
             _dollar_dollar = msg
-            _t1719 = self.deconstruct_csv_config(_dollar_dollar)
-            fields1403 = _t1719
-            assert fields1403 is not None
-            unwrapped_fields1404 = fields1403
+            _t1729 = self.deconstruct_csv_config(_dollar_dollar)
+            fields1411 = _t1729
+            assert fields1411 is not None
+            unwrapped_fields1412 = fields1411
             self.write("(csv_config")
             self.indent_sexp()
             self.newline()
-            self.pretty_config_dict(unwrapped_fields1404)
+            self.pretty_config_dict(unwrapped_fields1412)
             self.dedent()
             self.write(")")
 
     def pretty_gnf_columns(self, msg: Sequence[logic_pb2.GNFColumn]):
-        flat1409 = self._try_flat(msg, self.pretty_gnf_columns)
-        if flat1409 is not None:
-            assert flat1409 is not None
-            self.write(flat1409)
+        flat1417 = self._try_flat(msg, self.pretty_gnf_columns)
+        if flat1417 is not None:
+            assert flat1417 is not None
+            self.write(flat1417)
             return None
         else:
-            fields1406 = msg
+            fields1414 = msg
             self.write("(columns")
             self.indent_sexp()
-            if not len(fields1406) == 0:
+            if not len(fields1414) == 0:
                 self.newline()
-                for i1408, elem1407 in enumerate(fields1406):
-                    if (i1408 > 0):
+                for i1416, elem1415 in enumerate(fields1414):
+                    if (i1416 > 0):
                         self.newline()
-                    self.pretty_gnf_column(elem1407)
+                    self.pretty_gnf_column(elem1415)
             self.dedent()
             self.write(")")
 
     def pretty_gnf_column(self, msg: logic_pb2.GNFColumn):
-        flat1418 = self._try_flat(msg, self.pretty_gnf_column)
-        if flat1418 is not None:
-            assert flat1418 is not None
-            self.write(flat1418)
+        flat1426 = self._try_flat(msg, self.pretty_gnf_column)
+        if flat1426 is not None:
+            assert flat1426 is not None
+            self.write(flat1426)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("target_id"):
-                _t1720 = _dollar_dollar.target_id
+                _t1730 = _dollar_dollar.target_id
             else:
-                _t1720 = None
-            fields1410 = (_dollar_dollar.column_path, _t1720, _dollar_dollar.types,)
-            assert fields1410 is not None
-            unwrapped_fields1411 = fields1410
+                _t1730 = None
+            fields1418 = (_dollar_dollar.column_path, _t1730, _dollar_dollar.types,)
+            assert fields1418 is not None
+            unwrapped_fields1419 = fields1418
             self.write("(column")
             self.indent_sexp()
             self.newline()
-            field1412 = unwrapped_fields1411[0]
-            self.pretty_gnf_column_path(field1412)
-            field1413 = unwrapped_fields1411[1]
-            if field1413 is not None:
+            field1420 = unwrapped_fields1419[0]
+            self.pretty_gnf_column_path(field1420)
+            field1421 = unwrapped_fields1419[1]
+            if field1421 is not None:
                 self.newline()
-                assert field1413 is not None
-                opt_val1414 = field1413
-                self.pretty_relation_id(opt_val1414)
+                assert field1421 is not None
+                opt_val1422 = field1421
+                self.pretty_relation_id(opt_val1422)
             self.newline()
             self.write("[")
-            field1415 = unwrapped_fields1411[2]
-            for i1417, elem1416 in enumerate(field1415):
-                if (i1417 > 0):
+            field1423 = unwrapped_fields1419[2]
+            for i1425, elem1424 in enumerate(field1423):
+                if (i1425 > 0):
                     self.newline()
-                self.pretty_type(elem1416)
+                self.pretty_type(elem1424)
             self.write("]")
             self.dedent()
             self.write(")")
 
     def pretty_gnf_column_path(self, msg: Sequence[str]):
-        flat1425 = self._try_flat(msg, self.pretty_gnf_column_path)
-        if flat1425 is not None:
-            assert flat1425 is not None
-            self.write(flat1425)
+        flat1433 = self._try_flat(msg, self.pretty_gnf_column_path)
+        if flat1433 is not None:
+            assert flat1433 is not None
+            self.write(flat1433)
             return None
         else:
             _dollar_dollar = msg
             if len(_dollar_dollar) == 1:
-                _t1721 = _dollar_dollar[0]
+                _t1731 = _dollar_dollar[0]
             else:
-                _t1721 = None
-            deconstruct_result1423 = _t1721
-            if deconstruct_result1423 is not None:
-                assert deconstruct_result1423 is not None
-                unwrapped1424 = deconstruct_result1423
-                self.write(self.format_string_value(unwrapped1424))
+                _t1731 = None
+            deconstruct_result1431 = _t1731
+            if deconstruct_result1431 is not None:
+                assert deconstruct_result1431 is not None
+                unwrapped1432 = deconstruct_result1431
+                self.write(self.format_string_value(unwrapped1432))
             else:
                 _dollar_dollar = msg
                 if len(_dollar_dollar) != 1:
-                    _t1722 = _dollar_dollar
+                    _t1732 = _dollar_dollar
                 else:
-                    _t1722 = None
-                deconstruct_result1419 = _t1722
-                if deconstruct_result1419 is not None:
-                    assert deconstruct_result1419 is not None
-                    unwrapped1420 = deconstruct_result1419
+                    _t1732 = None
+                deconstruct_result1427 = _t1732
+                if deconstruct_result1427 is not None:
+                    assert deconstruct_result1427 is not None
+                    unwrapped1428 = deconstruct_result1427
                     self.write("[")
                     self.indent()
-                    for i1422, elem1421 in enumerate(unwrapped1420):
-                        if (i1422 > 0):
+                    for i1430, elem1429 in enumerate(unwrapped1428):
+                        if (i1430 > 0):
                             self.newline()
-                        self.write(self.format_string_value(elem1421))
+                        self.write(self.format_string_value(elem1429))
                     self.dedent()
                     self.write("]")
                 else:
                     raise ParseError("No matching rule for gnf_column_path")
 
     def pretty_csv_asof(self, msg: str):
-        flat1427 = self._try_flat(msg, self.pretty_csv_asof)
-        if flat1427 is not None:
-            assert flat1427 is not None
-            self.write(flat1427)
+        flat1435 = self._try_flat(msg, self.pretty_csv_asof)
+        if flat1435 is not None:
+            assert flat1435 is not None
+            self.write(flat1435)
             return None
         else:
-            fields1426 = msg
+            fields1434 = msg
             self.write("(asof")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1426))
+            self.write(self.format_string_value(fields1434))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_data(self, msg: logic_pb2.IcebergData):
-        flat1438 = self._try_flat(msg, self.pretty_iceberg_data)
-        if flat1438 is not None:
-            assert flat1438 is not None
-            self.write(flat1438)
+        flat1446 = self._try_flat(msg, self.pretty_iceberg_data)
+        if flat1446 is not None:
+            assert flat1446 is not None
+            self.write(flat1446)
             return None
         else:
             _dollar_dollar = msg
-            _t1723 = self.deconstruct_iceberg_data_from_snapshot_optional(_dollar_dollar)
-            _t1724 = self.deconstruct_iceberg_data_to_snapshot_optional(_dollar_dollar)
-            fields1428 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _t1723, _t1724, _dollar_dollar.returns_delta,)
-            assert fields1428 is not None
-            unwrapped_fields1429 = fields1428
+            _t1733 = self.deconstruct_iceberg_data_from_snapshot_optional(_dollar_dollar)
+            _t1734 = self.deconstruct_iceberg_data_to_snapshot_optional(_dollar_dollar)
+            fields1436 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.columns, _t1733, _t1734, _dollar_dollar.returns_delta,)
+            assert fields1436 is not None
+            unwrapped_fields1437 = fields1436
             self.write("(iceberg_data")
             self.indent_sexp()
             self.newline()
-            field1430 = unwrapped_fields1429[0]
-            self.pretty_iceberg_locator(field1430)
+            field1438 = unwrapped_fields1437[0]
+            self.pretty_iceberg_locator(field1438)
             self.newline()
-            field1431 = unwrapped_fields1429[1]
-            self.pretty_iceberg_catalog_config(field1431)
+            field1439 = unwrapped_fields1437[1]
+            self.pretty_iceberg_catalog_config(field1439)
             self.newline()
-            field1432 = unwrapped_fields1429[2]
-            self.pretty_gnf_columns(field1432)
-            field1433 = unwrapped_fields1429[3]
-            if field1433 is not None:
+            field1440 = unwrapped_fields1437[2]
+            self.pretty_gnf_columns(field1440)
+            field1441 = unwrapped_fields1437[3]
+            if field1441 is not None:
                 self.newline()
-                assert field1433 is not None
-                opt_val1434 = field1433
-                self.pretty_iceberg_from_snapshot(opt_val1434)
-            field1435 = unwrapped_fields1429[4]
-            if field1435 is not None:
+                assert field1441 is not None
+                opt_val1442 = field1441
+                self.pretty_iceberg_from_snapshot(opt_val1442)
+            field1443 = unwrapped_fields1437[4]
+            if field1443 is not None:
                 self.newline()
-                assert field1435 is not None
-                opt_val1436 = field1435
-                self.pretty_iceberg_to_snapshot(opt_val1436)
+                assert field1443 is not None
+                opt_val1444 = field1443
+                self.pretty_iceberg_to_snapshot(opt_val1444)
             self.newline()
-            field1437 = unwrapped_fields1429[5]
-            self.pretty_boolean_value(field1437)
+            field1445 = unwrapped_fields1437[5]
+            self.pretty_boolean_value(field1445)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_locator(self, msg: logic_pb2.IcebergLocator):
-        flat1444 = self._try_flat(msg, self.pretty_iceberg_locator)
-        if flat1444 is not None:
-            assert flat1444 is not None
-            self.write(flat1444)
+        flat1452 = self._try_flat(msg, self.pretty_iceberg_locator)
+        if flat1452 is not None:
+            assert flat1452 is not None
+            self.write(flat1452)
             return None
         else:
             _dollar_dollar = msg
-            fields1439 = (_dollar_dollar.table_name, _dollar_dollar.namespace, _dollar_dollar.warehouse,)
-            assert fields1439 is not None
-            unwrapped_fields1440 = fields1439
+            fields1447 = (_dollar_dollar.table_name, _dollar_dollar.namespace, _dollar_dollar.warehouse,)
+            assert fields1447 is not None
+            unwrapped_fields1448 = fields1447
             self.write("(iceberg_locator")
             self.indent_sexp()
             self.newline()
-            field1441 = unwrapped_fields1440[0]
-            self.pretty_iceberg_locator_table_name(field1441)
+            field1449 = unwrapped_fields1448[0]
+            self.pretty_iceberg_locator_table_name(field1449)
             self.newline()
-            field1442 = unwrapped_fields1440[1]
-            self.pretty_iceberg_locator_namespace(field1442)
+            field1450 = unwrapped_fields1448[1]
+            self.pretty_iceberg_locator_namespace(field1450)
             self.newline()
-            field1443 = unwrapped_fields1440[2]
-            self.pretty_iceberg_locator_warehouse(field1443)
+            field1451 = unwrapped_fields1448[2]
+            self.pretty_iceberg_locator_warehouse(field1451)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_locator_table_name(self, msg: str):
-        flat1446 = self._try_flat(msg, self.pretty_iceberg_locator_table_name)
-        if flat1446 is not None:
-            assert flat1446 is not None
-            self.write(flat1446)
+        flat1454 = self._try_flat(msg, self.pretty_iceberg_locator_table_name)
+        if flat1454 is not None:
+            assert flat1454 is not None
+            self.write(flat1454)
             return None
         else:
-            fields1445 = msg
+            fields1453 = msg
             self.write("(table_name")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1445))
+            self.write(self.format_string_value(fields1453))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_locator_namespace(self, msg: Sequence[str]):
-        flat1450 = self._try_flat(msg, self.pretty_iceberg_locator_namespace)
-        if flat1450 is not None:
-            assert flat1450 is not None
-            self.write(flat1450)
+        flat1458 = self._try_flat(msg, self.pretty_iceberg_locator_namespace)
+        if flat1458 is not None:
+            assert flat1458 is not None
+            self.write(flat1458)
             return None
         else:
-            fields1447 = msg
+            fields1455 = msg
             self.write("(namespace")
             self.indent_sexp()
-            if not len(fields1447) == 0:
+            if not len(fields1455) == 0:
                 self.newline()
-                for i1449, elem1448 in enumerate(fields1447):
-                    if (i1449 > 0):
+                for i1457, elem1456 in enumerate(fields1455):
+                    if (i1457 > 0):
                         self.newline()
-                    self.write(self.format_string_value(elem1448))
+                    self.write(self.format_string_value(elem1456))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_locator_warehouse(self, msg: str):
-        flat1452 = self._try_flat(msg, self.pretty_iceberg_locator_warehouse)
-        if flat1452 is not None:
-            assert flat1452 is not None
-            self.write(flat1452)
+        flat1460 = self._try_flat(msg, self.pretty_iceberg_locator_warehouse)
+        if flat1460 is not None:
+            assert flat1460 is not None
+            self.write(flat1460)
             return None
         else:
-            fields1451 = msg
+            fields1459 = msg
             self.write("(warehouse")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1451))
+            self.write(self.format_string_value(fields1459))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_catalog_config(self, msg: logic_pb2.IcebergCatalogConfig):
-        flat1460 = self._try_flat(msg, self.pretty_iceberg_catalog_config)
-        if flat1460 is not None:
-            assert flat1460 is not None
-            self.write(flat1460)
+        flat1468 = self._try_flat(msg, self.pretty_iceberg_catalog_config)
+        if flat1468 is not None:
+            assert flat1468 is not None
+            self.write(flat1468)
             return None
         else:
             _dollar_dollar = msg
-            _t1725 = self.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
-            fields1453 = (_dollar_dollar.catalog_uri, _t1725, sorted(_dollar_dollar.properties.items()), sorted(_dollar_dollar.auth_properties.items()),)
-            assert fields1453 is not None
-            unwrapped_fields1454 = fields1453
+            _t1735 = self.deconstruct_iceberg_catalog_config_scope_optional(_dollar_dollar)
+            fields1461 = (_dollar_dollar.catalog_uri, _t1735, sorted(_dollar_dollar.properties.items()), sorted(_dollar_dollar.auth_properties.items()),)
+            assert fields1461 is not None
+            unwrapped_fields1462 = fields1461
             self.write("(iceberg_catalog_config")
             self.indent_sexp()
             self.newline()
-            field1455 = unwrapped_fields1454[0]
-            self.pretty_iceberg_catalog_uri(field1455)
-            field1456 = unwrapped_fields1454[1]
-            if field1456 is not None:
+            field1463 = unwrapped_fields1462[0]
+            self.pretty_iceberg_catalog_uri(field1463)
+            field1464 = unwrapped_fields1462[1]
+            if field1464 is not None:
                 self.newline()
-                assert field1456 is not None
-                opt_val1457 = field1456
-                self.pretty_iceberg_catalog_config_scope(opt_val1457)
+                assert field1464 is not None
+                opt_val1465 = field1464
+                self.pretty_iceberg_catalog_config_scope(opt_val1465)
             self.newline()
-            field1458 = unwrapped_fields1454[2]
-            self.pretty_iceberg_properties(field1458)
+            field1466 = unwrapped_fields1462[2]
+            self.pretty_iceberg_properties(field1466)
             self.newline()
-            field1459 = unwrapped_fields1454[3]
-            self.pretty_iceberg_auth_properties(field1459)
+            field1467 = unwrapped_fields1462[3]
+            self.pretty_iceberg_auth_properties(field1467)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_catalog_uri(self, msg: str):
-        flat1462 = self._try_flat(msg, self.pretty_iceberg_catalog_uri)
-        if flat1462 is not None:
-            assert flat1462 is not None
-            self.write(flat1462)
+        flat1470 = self._try_flat(msg, self.pretty_iceberg_catalog_uri)
+        if flat1470 is not None:
+            assert flat1470 is not None
+            self.write(flat1470)
             return None
         else:
-            fields1461 = msg
+            fields1469 = msg
             self.write("(catalog_uri")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1461))
+            self.write(self.format_string_value(fields1469))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_catalog_config_scope(self, msg: str):
-        flat1464 = self._try_flat(msg, self.pretty_iceberg_catalog_config_scope)
-        if flat1464 is not None:
-            assert flat1464 is not None
-            self.write(flat1464)
+        flat1472 = self._try_flat(msg, self.pretty_iceberg_catalog_config_scope)
+        if flat1472 is not None:
+            assert flat1472 is not None
+            self.write(flat1472)
             return None
         else:
-            fields1463 = msg
+            fields1471 = msg
             self.write("(scope")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1463))
+            self.write(self.format_string_value(fields1471))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_properties(self, msg: Sequence[tuple[str, str]]):
-        flat1468 = self._try_flat(msg, self.pretty_iceberg_properties)
-        if flat1468 is not None:
-            assert flat1468 is not None
-            self.write(flat1468)
+        flat1476 = self._try_flat(msg, self.pretty_iceberg_properties)
+        if flat1476 is not None:
+            assert flat1476 is not None
+            self.write(flat1476)
             return None
         else:
-            fields1465 = msg
+            fields1473 = msg
             self.write("(properties")
             self.indent_sexp()
-            if not len(fields1465) == 0:
+            if not len(fields1473) == 0:
                 self.newline()
-                for i1467, elem1466 in enumerate(fields1465):
-                    if (i1467 > 0):
+                for i1475, elem1474 in enumerate(fields1473):
+                    if (i1475 > 0):
                         self.newline()
-                    self.pretty_iceberg_property_entry(elem1466)
+                    self.pretty_iceberg_property_entry(elem1474)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_property_entry(self, msg: tuple[str, str]):
-        flat1473 = self._try_flat(msg, self.pretty_iceberg_property_entry)
-        if flat1473 is not None:
-            assert flat1473 is not None
-            self.write(flat1473)
+        flat1481 = self._try_flat(msg, self.pretty_iceberg_property_entry)
+        if flat1481 is not None:
+            assert flat1481 is not None
+            self.write(flat1481)
             return None
         else:
             _dollar_dollar = msg
-            fields1469 = (_dollar_dollar[0], _dollar_dollar[1],)
-            assert fields1469 is not None
-            unwrapped_fields1470 = fields1469
+            fields1477 = (_dollar_dollar[0], _dollar_dollar[1],)
+            assert fields1477 is not None
+            unwrapped_fields1478 = fields1477
             self.write("(prop")
             self.indent_sexp()
             self.newline()
-            field1471 = unwrapped_fields1470[0]
-            self.write(self.format_string_value(field1471))
+            field1479 = unwrapped_fields1478[0]
+            self.write(self.format_string_value(field1479))
             self.newline()
-            field1472 = unwrapped_fields1470[1]
-            self.write(self.format_string_value(field1472))
+            field1480 = unwrapped_fields1478[1]
+            self.write(self.format_string_value(field1480))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_auth_properties(self, msg: Sequence[tuple[str, str]]):
-        flat1477 = self._try_flat(msg, self.pretty_iceberg_auth_properties)
-        if flat1477 is not None:
-            assert flat1477 is not None
-            self.write(flat1477)
+        flat1485 = self._try_flat(msg, self.pretty_iceberg_auth_properties)
+        if flat1485 is not None:
+            assert flat1485 is not None
+            self.write(flat1485)
             return None
         else:
-            fields1474 = msg
+            fields1482 = msg
             self.write("(auth_properties")
             self.indent_sexp()
-            if not len(fields1474) == 0:
+            if not len(fields1482) == 0:
                 self.newline()
-                for i1476, elem1475 in enumerate(fields1474):
-                    if (i1476 > 0):
+                for i1484, elem1483 in enumerate(fields1482):
+                    if (i1484 > 0):
                         self.newline()
-                    self.pretty_iceberg_masked_property_entry(elem1475)
+                    self.pretty_iceberg_masked_property_entry(elem1483)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_masked_property_entry(self, msg: tuple[str, str]):
-        flat1482 = self._try_flat(msg, self.pretty_iceberg_masked_property_entry)
-        if flat1482 is not None:
-            assert flat1482 is not None
-            self.write(flat1482)
+        flat1490 = self._try_flat(msg, self.pretty_iceberg_masked_property_entry)
+        if flat1490 is not None:
+            assert flat1490 is not None
+            self.write(flat1490)
             return None
         else:
             _dollar_dollar = msg
-            _t1726 = self.mask_secret_value(_dollar_dollar)
-            fields1478 = (_dollar_dollar[0], _t1726,)
-            assert fields1478 is not None
-            unwrapped_fields1479 = fields1478
+            _t1736 = self.mask_secret_value(_dollar_dollar)
+            fields1486 = (_dollar_dollar[0], _t1736,)
+            assert fields1486 is not None
+            unwrapped_fields1487 = fields1486
             self.write("(prop")
             self.indent_sexp()
             self.newline()
-            field1480 = unwrapped_fields1479[0]
-            self.write(self.format_string_value(field1480))
+            field1488 = unwrapped_fields1487[0]
+            self.write(self.format_string_value(field1488))
             self.newline()
-            field1481 = unwrapped_fields1479[1]
-            self.write(self.format_string_value(field1481))
+            field1489 = unwrapped_fields1487[1]
+            self.write(self.format_string_value(field1489))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_from_snapshot(self, msg: str):
-        flat1484 = self._try_flat(msg, self.pretty_iceberg_from_snapshot)
-        if flat1484 is not None:
-            assert flat1484 is not None
-            self.write(flat1484)
+        flat1492 = self._try_flat(msg, self.pretty_iceberg_from_snapshot)
+        if flat1492 is not None:
+            assert flat1492 is not None
+            self.write(flat1492)
             return None
         else:
-            fields1483 = msg
+            fields1491 = msg
             self.write("(from_snapshot")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1483))
+            self.write(self.format_string_value(fields1491))
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_to_snapshot(self, msg: str):
-        flat1486 = self._try_flat(msg, self.pretty_iceberg_to_snapshot)
-        if flat1486 is not None:
-            assert flat1486 is not None
-            self.write(flat1486)
+        flat1494 = self._try_flat(msg, self.pretty_iceberg_to_snapshot)
+        if flat1494 is not None:
+            assert flat1494 is not None
+            self.write(flat1494)
             return None
         else:
-            fields1485 = msg
+            fields1493 = msg
             self.write("(to_snapshot")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1485))
+            self.write(self.format_string_value(fields1493))
             self.dedent()
             self.write(")")
 
     def pretty_undefine(self, msg: transactions_pb2.Undefine):
-        flat1489 = self._try_flat(msg, self.pretty_undefine)
-        if flat1489 is not None:
-            assert flat1489 is not None
-            self.write(flat1489)
+        flat1497 = self._try_flat(msg, self.pretty_undefine)
+        if flat1497 is not None:
+            assert flat1497 is not None
+            self.write(flat1497)
             return None
         else:
             _dollar_dollar = msg
-            fields1487 = _dollar_dollar.fragment_id
-            assert fields1487 is not None
-            unwrapped_fields1488 = fields1487
+            fields1495 = _dollar_dollar.fragment_id
+            assert fields1495 is not None
+            unwrapped_fields1496 = fields1495
             self.write("(undefine")
             self.indent_sexp()
             self.newline()
-            self.pretty_fragment_id(unwrapped_fields1488)
+            self.pretty_fragment_id(unwrapped_fields1496)
             self.dedent()
             self.write(")")
 
     def pretty_context(self, msg: transactions_pb2.Context):
-        flat1494 = self._try_flat(msg, self.pretty_context)
-        if flat1494 is not None:
-            assert flat1494 is not None
-            self.write(flat1494)
+        flat1502 = self._try_flat(msg, self.pretty_context)
+        if flat1502 is not None:
+            assert flat1502 is not None
+            self.write(flat1502)
             return None
         else:
             _dollar_dollar = msg
-            fields1490 = _dollar_dollar.relations
-            assert fields1490 is not None
-            unwrapped_fields1491 = fields1490
+            fields1498 = _dollar_dollar.relations
+            assert fields1498 is not None
+            unwrapped_fields1499 = fields1498
             self.write("(context")
             self.indent_sexp()
-            if not len(unwrapped_fields1491) == 0:
+            if not len(unwrapped_fields1499) == 0:
                 self.newline()
-                for i1493, elem1492 in enumerate(unwrapped_fields1491):
-                    if (i1493 > 0):
+                for i1501, elem1500 in enumerate(unwrapped_fields1499):
+                    if (i1501 > 0):
                         self.newline()
-                    self.pretty_relation_id(elem1492)
+                    self.pretty_relation_id(elem1500)
             self.dedent()
             self.write(")")
 
     def pretty_snapshot(self, msg: transactions_pb2.Snapshot):
-        flat1501 = self._try_flat(msg, self.pretty_snapshot)
-        if flat1501 is not None:
-            assert flat1501 is not None
-            self.write(flat1501)
+        flat1509 = self._try_flat(msg, self.pretty_snapshot)
+        if flat1509 is not None:
+            assert flat1509 is not None
+            self.write(flat1509)
             return None
         else:
             _dollar_dollar = msg
-            fields1495 = (_dollar_dollar.prefix, _dollar_dollar.mappings,)
-            assert fields1495 is not None
-            unwrapped_fields1496 = fields1495
+            fields1503 = (_dollar_dollar.prefix, _dollar_dollar.mappings,)
+            assert fields1503 is not None
+            unwrapped_fields1504 = fields1503
             self.write("(snapshot")
             self.indent_sexp()
             self.newline()
-            field1497 = unwrapped_fields1496[0]
-            self.pretty_edb_path(field1497)
-            field1498 = unwrapped_fields1496[1]
-            if not len(field1498) == 0:
+            field1505 = unwrapped_fields1504[0]
+            self.pretty_edb_path(field1505)
+            field1506 = unwrapped_fields1504[1]
+            if not len(field1506) == 0:
                 self.newline()
-                for i1500, elem1499 in enumerate(field1498):
-                    if (i1500 > 0):
+                for i1508, elem1507 in enumerate(field1506):
+                    if (i1508 > 0):
                         self.newline()
-                    self.pretty_snapshot_mapping(elem1499)
+                    self.pretty_snapshot_mapping(elem1507)
             self.dedent()
             self.write(")")
 
     def pretty_snapshot_mapping(self, msg: transactions_pb2.SnapshotMapping):
-        flat1506 = self._try_flat(msg, self.pretty_snapshot_mapping)
-        if flat1506 is not None:
-            assert flat1506 is not None
-            self.write(flat1506)
+        flat1514 = self._try_flat(msg, self.pretty_snapshot_mapping)
+        if flat1514 is not None:
+            assert flat1514 is not None
+            self.write(flat1514)
             return None
         else:
             _dollar_dollar = msg
-            fields1502 = (_dollar_dollar.destination_path, _dollar_dollar.source_relation,)
-            assert fields1502 is not None
-            unwrapped_fields1503 = fields1502
-            field1504 = unwrapped_fields1503[0]
-            self.pretty_edb_path(field1504)
+            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)
             self.write(" ")
-            field1505 = unwrapped_fields1503[1]
-            self.pretty_relation_id(field1505)
+            field1513 = unwrapped_fields1511[1]
+            self.pretty_relation_id(field1513)
 
     def pretty_epoch_reads(self, msg: Sequence[transactions_pb2.Read]):
-        flat1510 = self._try_flat(msg, self.pretty_epoch_reads)
-        if flat1510 is not None:
-            assert flat1510 is not None
-            self.write(flat1510)
+        flat1518 = self._try_flat(msg, self.pretty_epoch_reads)
+        if flat1518 is not None:
+            assert flat1518 is not None
+            self.write(flat1518)
             return None
         else:
-            fields1507 = msg
+            fields1515 = msg
             self.write("(reads")
             self.indent_sexp()
-            if not len(fields1507) == 0:
+            if not len(fields1515) == 0:
                 self.newline()
-                for i1509, elem1508 in enumerate(fields1507):
-                    if (i1509 > 0):
+                for i1517, elem1516 in enumerate(fields1515):
+                    if (i1517 > 0):
                         self.newline()
-                    self.pretty_read(elem1508)
+                    self.pretty_read(elem1516)
             self.dedent()
             self.write(")")
 
     def pretty_read(self, msg: transactions_pb2.Read):
-        flat1521 = self._try_flat(msg, self.pretty_read)
-        if flat1521 is not None:
-            assert flat1521 is not None
-            self.write(flat1521)
+        flat1529 = self._try_flat(msg, self.pretty_read)
+        if flat1529 is not None:
+            assert flat1529 is not None
+            self.write(flat1529)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("demand"):
-                _t1727 = _dollar_dollar.demand
+                _t1737 = _dollar_dollar.demand
             else:
-                _t1727 = None
-            deconstruct_result1519 = _t1727
-            if deconstruct_result1519 is not None:
-                assert deconstruct_result1519 is not None
-                unwrapped1520 = deconstruct_result1519
-                self.pretty_demand(unwrapped1520)
+                _t1737 = None
+            deconstruct_result1527 = _t1737
+            if deconstruct_result1527 is not None:
+                assert deconstruct_result1527 is not None
+                unwrapped1528 = deconstruct_result1527
+                self.pretty_demand(unwrapped1528)
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("output"):
-                    _t1728 = _dollar_dollar.output
+                    _t1738 = _dollar_dollar.output
                 else:
-                    _t1728 = None
-                deconstruct_result1517 = _t1728
-                if deconstruct_result1517 is not None:
-                    assert deconstruct_result1517 is not None
-                    unwrapped1518 = deconstruct_result1517
-                    self.pretty_output(unwrapped1518)
+                    _t1738 = None
+                deconstruct_result1525 = _t1738
+                if deconstruct_result1525 is not None:
+                    assert deconstruct_result1525 is not None
+                    unwrapped1526 = deconstruct_result1525
+                    self.pretty_output(unwrapped1526)
                 else:
                     _dollar_dollar = msg
                     if _dollar_dollar.HasField("what_if"):
-                        _t1729 = _dollar_dollar.what_if
+                        _t1739 = _dollar_dollar.what_if
                     else:
-                        _t1729 = None
-                    deconstruct_result1515 = _t1729
-                    if deconstruct_result1515 is not None:
-                        assert deconstruct_result1515 is not None
-                        unwrapped1516 = deconstruct_result1515
-                        self.pretty_what_if(unwrapped1516)
+                        _t1739 = None
+                    deconstruct_result1523 = _t1739
+                    if deconstruct_result1523 is not None:
+                        assert deconstruct_result1523 is not None
+                        unwrapped1524 = deconstruct_result1523
+                        self.pretty_what_if(unwrapped1524)
                     else:
                         _dollar_dollar = msg
                         if _dollar_dollar.HasField("abort"):
-                            _t1730 = _dollar_dollar.abort
+                            _t1740 = _dollar_dollar.abort
                         else:
-                            _t1730 = None
-                        deconstruct_result1513 = _t1730
-                        if deconstruct_result1513 is not None:
-                            assert deconstruct_result1513 is not None
-                            unwrapped1514 = deconstruct_result1513
-                            self.pretty_abort(unwrapped1514)
+                            _t1740 = None
+                        deconstruct_result1521 = _t1740
+                        if deconstruct_result1521 is not None:
+                            assert deconstruct_result1521 is not None
+                            unwrapped1522 = deconstruct_result1521
+                            self.pretty_abort(unwrapped1522)
                         else:
                             _dollar_dollar = msg
                             if _dollar_dollar.HasField("export"):
-                                _t1731 = _dollar_dollar.export
+                                _t1741 = _dollar_dollar.export
                             else:
-                                _t1731 = None
-                            deconstruct_result1511 = _t1731
-                            if deconstruct_result1511 is not None:
-                                assert deconstruct_result1511 is not None
-                                unwrapped1512 = deconstruct_result1511
-                                self.pretty_export(unwrapped1512)
+                                _t1741 = None
+                            deconstruct_result1519 = _t1741
+                            if deconstruct_result1519 is not None:
+                                assert deconstruct_result1519 is not None
+                                unwrapped1520 = deconstruct_result1519
+                                self.pretty_export(unwrapped1520)
                             else:
                                 raise ParseError("No matching rule for read")
 
     def pretty_demand(self, msg: transactions_pb2.Demand):
-        flat1524 = self._try_flat(msg, self.pretty_demand)
-        if flat1524 is not None:
-            assert flat1524 is not None
-            self.write(flat1524)
+        flat1532 = self._try_flat(msg, self.pretty_demand)
+        if flat1532 is not None:
+            assert flat1532 is not None
+            self.write(flat1532)
             return None
         else:
             _dollar_dollar = msg
-            fields1522 = _dollar_dollar.relation_id
-            assert fields1522 is not None
-            unwrapped_fields1523 = fields1522
+            fields1530 = _dollar_dollar.relation_id
+            assert fields1530 is not None
+            unwrapped_fields1531 = fields1530
             self.write("(demand")
             self.indent_sexp()
             self.newline()
-            self.pretty_relation_id(unwrapped_fields1523)
+            self.pretty_relation_id(unwrapped_fields1531)
             self.dedent()
             self.write(")")
 
     def pretty_output(self, msg: transactions_pb2.Output):
-        flat1529 = self._try_flat(msg, self.pretty_output)
-        if flat1529 is not None:
-            assert flat1529 is not None
-            self.write(flat1529)
+        flat1537 = self._try_flat(msg, self.pretty_output)
+        if flat1537 is not None:
+            assert flat1537 is not None
+            self.write(flat1537)
             return None
         else:
             _dollar_dollar = msg
-            fields1525 = (_dollar_dollar.name, _dollar_dollar.relation_id,)
-            assert fields1525 is not None
-            unwrapped_fields1526 = fields1525
+            fields1533 = (_dollar_dollar.name, _dollar_dollar.relation_id,)
+            assert fields1533 is not None
+            unwrapped_fields1534 = fields1533
             self.write("(output")
             self.indent_sexp()
             self.newline()
-            field1527 = unwrapped_fields1526[0]
-            self.pretty_name(field1527)
+            field1535 = unwrapped_fields1534[0]
+            self.pretty_name(field1535)
             self.newline()
-            field1528 = unwrapped_fields1526[1]
-            self.pretty_relation_id(field1528)
+            field1536 = unwrapped_fields1534[1]
+            self.pretty_relation_id(field1536)
             self.dedent()
             self.write(")")
 
     def pretty_what_if(self, msg: transactions_pb2.WhatIf):
-        flat1534 = self._try_flat(msg, self.pretty_what_if)
-        if flat1534 is not None:
-            assert flat1534 is not None
-            self.write(flat1534)
+        flat1542 = self._try_flat(msg, self.pretty_what_if)
+        if flat1542 is not None:
+            assert flat1542 is not None
+            self.write(flat1542)
             return None
         else:
             _dollar_dollar = msg
-            fields1530 = (_dollar_dollar.branch, _dollar_dollar.epoch,)
-            assert fields1530 is not None
-            unwrapped_fields1531 = fields1530
+            fields1538 = (_dollar_dollar.branch, _dollar_dollar.epoch,)
+            assert fields1538 is not None
+            unwrapped_fields1539 = fields1538
             self.write("(what_if")
             self.indent_sexp()
             self.newline()
-            field1532 = unwrapped_fields1531[0]
-            self.pretty_name(field1532)
+            field1540 = unwrapped_fields1539[0]
+            self.pretty_name(field1540)
             self.newline()
-            field1533 = unwrapped_fields1531[1]
-            self.pretty_epoch(field1533)
+            field1541 = unwrapped_fields1539[1]
+            self.pretty_epoch(field1541)
             self.dedent()
             self.write(")")
 
     def pretty_abort(self, msg: transactions_pb2.Abort):
-        flat1540 = self._try_flat(msg, self.pretty_abort)
-        if flat1540 is not None:
-            assert flat1540 is not None
-            self.write(flat1540)
+        flat1548 = self._try_flat(msg, self.pretty_abort)
+        if flat1548 is not None:
+            assert flat1548 is not None
+            self.write(flat1548)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.name != "abort":
-                _t1732 = _dollar_dollar.name
+                _t1742 = _dollar_dollar.name
             else:
-                _t1732 = None
-            fields1535 = (_t1732, _dollar_dollar.relation_id,)
-            assert fields1535 is not None
-            unwrapped_fields1536 = fields1535
+                _t1742 = None
+            fields1543 = (_t1742, _dollar_dollar.relation_id,)
+            assert fields1543 is not None
+            unwrapped_fields1544 = fields1543
             self.write("(abort")
             self.indent_sexp()
-            field1537 = unwrapped_fields1536[0]
-            if field1537 is not None:
+            field1545 = unwrapped_fields1544[0]
+            if field1545 is not None:
                 self.newline()
-                assert field1537 is not None
-                opt_val1538 = field1537
-                self.pretty_name(opt_val1538)
+                assert field1545 is not None
+                opt_val1546 = field1545
+                self.pretty_name(opt_val1546)
             self.newline()
-            field1539 = unwrapped_fields1536[1]
-            self.pretty_relation_id(field1539)
+            field1547 = unwrapped_fields1544[1]
+            self.pretty_relation_id(field1547)
             self.dedent()
             self.write(")")
 
     def pretty_export(self, msg: transactions_pb2.Export):
-        flat1545 = self._try_flat(msg, self.pretty_export)
-        if flat1545 is not None:
-            assert flat1545 is not None
-            self.write(flat1545)
+        flat1553 = self._try_flat(msg, self.pretty_export)
+        if flat1553 is not None:
+            assert flat1553 is not None
+            self.write(flat1553)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("csv_config"):
-                _t1733 = _dollar_dollar.csv_config
+                _t1743 = _dollar_dollar.csv_config
             else:
-                _t1733 = None
-            deconstruct_result1543 = _t1733
-            if deconstruct_result1543 is not None:
-                assert deconstruct_result1543 is not None
-                unwrapped1544 = deconstruct_result1543
+                _t1743 = None
+            deconstruct_result1551 = _t1743
+            if deconstruct_result1551 is not None:
+                assert deconstruct_result1551 is not None
+                unwrapped1552 = deconstruct_result1551
                 self.write("(export")
                 self.indent_sexp()
                 self.newline()
-                self.pretty_export_csv_config(unwrapped1544)
+                self.pretty_export_csv_config(unwrapped1552)
                 self.dedent()
                 self.write(")")
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("iceberg_config"):
-                    _t1734 = _dollar_dollar.iceberg_config
+                    _t1744 = _dollar_dollar.iceberg_config
                 else:
-                    _t1734 = None
-                deconstruct_result1541 = _t1734
-                if deconstruct_result1541 is not None:
-                    assert deconstruct_result1541 is not None
-                    unwrapped1542 = deconstruct_result1541
+                    _t1744 = None
+                deconstruct_result1549 = _t1744
+                if deconstruct_result1549 is not None:
+                    assert deconstruct_result1549 is not None
+                    unwrapped1550 = deconstruct_result1549
                     self.write("(export_iceberg")
                     self.indent_sexp()
                     self.newline()
-                    self.pretty_export_iceberg_config(unwrapped1542)
+                    self.pretty_export_iceberg_config(unwrapped1550)
                     self.dedent()
                     self.write(")")
                 else:
                     raise ParseError("No matching rule for export")
 
     def pretty_export_csv_config(self, msg: transactions_pb2.ExportCSVConfig):
-        flat1556 = self._try_flat(msg, self.pretty_export_csv_config)
-        if flat1556 is not None:
-            assert flat1556 is not None
-            self.write(flat1556)
+        flat1564 = self._try_flat(msg, self.pretty_export_csv_config)
+        if flat1564 is not None:
+            assert flat1564 is not None
+            self.write(flat1564)
             return None
         else:
             _dollar_dollar = msg
             if len(_dollar_dollar.data_columns) == 0:
-                _t1735 = (_dollar_dollar.path, _dollar_dollar.csv_source, _dollar_dollar.csv_config,)
+                _t1745 = (_dollar_dollar.path, _dollar_dollar.csv_source, _dollar_dollar.csv_config,)
             else:
-                _t1735 = None
-            deconstruct_result1551 = _t1735
-            if deconstruct_result1551 is not None:
-                assert deconstruct_result1551 is not None
-                unwrapped1552 = deconstruct_result1551
+                _t1745 = None
+            deconstruct_result1559 = _t1745
+            if deconstruct_result1559 is not None:
+                assert deconstruct_result1559 is not None
+                unwrapped1560 = deconstruct_result1559
                 self.write("(export_csv_config_v2")
                 self.indent_sexp()
                 self.newline()
-                field1553 = unwrapped1552[0]
-                self.pretty_export_csv_path(field1553)
+                field1561 = unwrapped1560[0]
+                self.pretty_export_csv_path(field1561)
                 self.newline()
-                field1554 = unwrapped1552[1]
-                self.pretty_export_csv_source(field1554)
+                field1562 = unwrapped1560[1]
+                self.pretty_export_csv_source(field1562)
                 self.newline()
-                field1555 = unwrapped1552[2]
-                self.pretty_csv_config(field1555)
+                field1563 = unwrapped1560[2]
+                self.pretty_csv_config(field1563)
                 self.dedent()
                 self.write(")")
             else:
                 _dollar_dollar = msg
                 if len(_dollar_dollar.data_columns) != 0:
-                    _t1737 = self.deconstruct_export_csv_config(_dollar_dollar)
-                    _t1736 = (_dollar_dollar.path, _dollar_dollar.data_columns, _t1737,)
+                    _t1747 = self.deconstruct_export_csv_config(_dollar_dollar)
+                    _t1746 = (_dollar_dollar.path, _dollar_dollar.data_columns, _t1747,)
                 else:
-                    _t1736 = None
-                deconstruct_result1546 = _t1736
-                if deconstruct_result1546 is not None:
-                    assert deconstruct_result1546 is not None
-                    unwrapped1547 = deconstruct_result1546
+                    _t1746 = None
+                deconstruct_result1554 = _t1746
+                if deconstruct_result1554 is not None:
+                    assert deconstruct_result1554 is not None
+                    unwrapped1555 = deconstruct_result1554
                     self.write("(export_csv_config")
                     self.indent_sexp()
                     self.newline()
-                    field1548 = unwrapped1547[0]
-                    self.pretty_export_csv_path(field1548)
+                    field1556 = unwrapped1555[0]
+                    self.pretty_export_csv_path(field1556)
                     self.newline()
-                    field1549 = unwrapped1547[1]
-                    self.pretty_export_csv_columns_list(field1549)
+                    field1557 = unwrapped1555[1]
+                    self.pretty_export_csv_columns_list(field1557)
                     self.newline()
-                    field1550 = unwrapped1547[2]
-                    self.pretty_config_dict(field1550)
+                    field1558 = unwrapped1555[2]
+                    self.pretty_config_dict(field1558)
                     self.dedent()
                     self.write(")")
                 else:
                     raise ParseError("No matching rule for export_csv_config")
 
     def pretty_export_csv_path(self, msg: str):
-        flat1558 = self._try_flat(msg, self.pretty_export_csv_path)
-        if flat1558 is not None:
-            assert flat1558 is not None
-            self.write(flat1558)
+        flat1566 = self._try_flat(msg, self.pretty_export_csv_path)
+        if flat1566 is not None:
+            assert flat1566 is not None
+            self.write(flat1566)
             return None
         else:
-            fields1557 = msg
+            fields1565 = msg
             self.write("(path")
             self.indent_sexp()
             self.newline()
-            self.write(self.format_string_value(fields1557))
+            self.write(self.format_string_value(fields1565))
             self.dedent()
             self.write(")")
 
     def pretty_export_csv_source(self, msg: transactions_pb2.ExportCSVSource):
-        flat1565 = self._try_flat(msg, self.pretty_export_csv_source)
-        if flat1565 is not None:
-            assert flat1565 is not None
-            self.write(flat1565)
+        flat1573 = self._try_flat(msg, self.pretty_export_csv_source)
+        if flat1573 is not None:
+            assert flat1573 is not None
+            self.write(flat1573)
             return None
         else:
             _dollar_dollar = msg
             if _dollar_dollar.HasField("gnf_columns"):
-                _t1738 = _dollar_dollar.gnf_columns.columns
+                _t1748 = _dollar_dollar.gnf_columns.columns
             else:
-                _t1738 = None
-            deconstruct_result1561 = _t1738
-            if deconstruct_result1561 is not None:
-                assert deconstruct_result1561 is not None
-                unwrapped1562 = deconstruct_result1561
+                _t1748 = None
+            deconstruct_result1569 = _t1748
+            if deconstruct_result1569 is not None:
+                assert deconstruct_result1569 is not None
+                unwrapped1570 = deconstruct_result1569
                 self.write("(gnf_columns")
                 self.indent_sexp()
-                if not len(unwrapped1562) == 0:
+                if not len(unwrapped1570) == 0:
                     self.newline()
-                    for i1564, elem1563 in enumerate(unwrapped1562):
-                        if (i1564 > 0):
+                    for i1572, elem1571 in enumerate(unwrapped1570):
+                        if (i1572 > 0):
                             self.newline()
-                        self.pretty_export_csv_column(elem1563)
+                        self.pretty_export_csv_column(elem1571)
                 self.dedent()
                 self.write(")")
             else:
                 _dollar_dollar = msg
                 if _dollar_dollar.HasField("table_def"):
-                    _t1739 = _dollar_dollar.table_def
+                    _t1749 = _dollar_dollar.table_def
                 else:
-                    _t1739 = None
-                deconstruct_result1559 = _t1739
-                if deconstruct_result1559 is not None:
-                    assert deconstruct_result1559 is not None
-                    unwrapped1560 = deconstruct_result1559
+                    _t1749 = None
+                deconstruct_result1567 = _t1749
+                if deconstruct_result1567 is not None:
+                    assert deconstruct_result1567 is not None
+                    unwrapped1568 = deconstruct_result1567
                     self.write("(table_def")
                     self.indent_sexp()
                     self.newline()
-                    self.pretty_relation_id(unwrapped1560)
+                    self.pretty_relation_id(unwrapped1568)
                     self.dedent()
                     self.write(")")
                 else:
                     raise ParseError("No matching rule for export_csv_source")
 
     def pretty_export_csv_column(self, msg: transactions_pb2.ExportCSVColumn):
-        flat1570 = self._try_flat(msg, self.pretty_export_csv_column)
-        if flat1570 is not None:
-            assert flat1570 is not None
-            self.write(flat1570)
+        flat1578 = self._try_flat(msg, self.pretty_export_csv_column)
+        if flat1578 is not None:
+            assert flat1578 is not None
+            self.write(flat1578)
             return None
         else:
             _dollar_dollar = msg
-            fields1566 = (_dollar_dollar.column_name, _dollar_dollar.column_data,)
-            assert fields1566 is not None
-            unwrapped_fields1567 = fields1566
+            fields1574 = (_dollar_dollar.column_name, _dollar_dollar.column_data,)
+            assert fields1574 is not None
+            unwrapped_fields1575 = fields1574
             self.write("(column")
             self.indent_sexp()
             self.newline()
-            field1568 = unwrapped_fields1567[0]
-            self.write(self.format_string_value(field1568))
+            field1576 = unwrapped_fields1575[0]
+            self.write(self.format_string_value(field1576))
             self.newline()
-            field1569 = unwrapped_fields1567[1]
-            self.pretty_relation_id(field1569)
+            field1577 = unwrapped_fields1575[1]
+            self.pretty_relation_id(field1577)
             self.dedent()
             self.write(")")
 
     def pretty_export_csv_columns_list(self, msg: Sequence[transactions_pb2.ExportCSVColumn]):
-        flat1574 = self._try_flat(msg, self.pretty_export_csv_columns_list)
-        if flat1574 is not None:
-            assert flat1574 is not None
-            self.write(flat1574)
+        flat1582 = self._try_flat(msg, self.pretty_export_csv_columns_list)
+        if flat1582 is not None:
+            assert flat1582 is not None
+            self.write(flat1582)
             return None
         else:
-            fields1571 = msg
+            fields1579 = msg
             self.write("(columns")
             self.indent_sexp()
-            if not len(fields1571) == 0:
+            if not len(fields1579) == 0:
                 self.newline()
-                for i1573, elem1572 in enumerate(fields1571):
-                    if (i1573 > 0):
+                for i1581, elem1580 in enumerate(fields1579):
+                    if (i1581 > 0):
                         self.newline()
-                    self.pretty_export_csv_column(elem1572)
+                    self.pretty_export_csv_column(elem1580)
             self.dedent()
             self.write(")")
 
     def pretty_export_iceberg_config(self, msg: transactions_pb2.ExportIcebergConfig):
-        flat1584 = self._try_flat(msg, self.pretty_export_iceberg_config)
-        if flat1584 is not None:
-            assert flat1584 is not None
-            self.write(flat1584)
+        flat1592 = self._try_flat(msg, self.pretty_export_iceberg_config)
+        if flat1592 is not None:
+            assert flat1592 is not None
+            self.write(flat1592)
             return None
         else:
             _dollar_dollar = msg
-            _t1740 = self.deconstruct_export_iceberg_config_optional(_dollar_dollar)
-            fields1575 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.table_def, _dollar_dollar.columns, sorted(_dollar_dollar.table_properties.items()), _t1740,)
-            assert fields1575 is not None
-            unwrapped_fields1576 = fields1575
+            _t1750 = self.deconstruct_export_iceberg_config_optional(_dollar_dollar)
+            fields1583 = (_dollar_dollar.locator, _dollar_dollar.config, _dollar_dollar.table_def, _dollar_dollar.columns, sorted(_dollar_dollar.table_properties.items()), _t1750,)
+            assert fields1583 is not None
+            unwrapped_fields1584 = fields1583
             self.write("(export_iceberg_config")
             self.indent_sexp()
             self.newline()
-            field1577 = unwrapped_fields1576[0]
-            self.pretty_iceberg_locator(field1577)
+            field1585 = unwrapped_fields1584[0]
+            self.pretty_iceberg_locator(field1585)
             self.newline()
-            field1578 = unwrapped_fields1576[1]
-            self.pretty_iceberg_catalog_config(field1578)
+            field1586 = unwrapped_fields1584[1]
+            self.pretty_iceberg_catalog_config(field1586)
             self.newline()
-            field1579 = unwrapped_fields1576[2]
-            self.pretty_export_iceberg_table_def(field1579)
+            field1587 = unwrapped_fields1584[2]
+            self.pretty_export_iceberg_table_def(field1587)
             self.newline()
-            field1580 = unwrapped_fields1576[3]
-            self.pretty_export_iceberg_columns(field1580)
+            field1588 = unwrapped_fields1584[3]
+            self.pretty_export_iceberg_columns(field1588)
             self.newline()
-            field1581 = unwrapped_fields1576[4]
-            self.pretty_iceberg_table_properties(field1581)
-            field1582 = unwrapped_fields1576[5]
-            if field1582 is not None:
+            field1589 = unwrapped_fields1584[4]
+            self.pretty_iceberg_table_properties(field1589)
+            field1590 = unwrapped_fields1584[5]
+            if field1590 is not None:
                 self.newline()
-                assert field1582 is not None
-                opt_val1583 = field1582
-                self.pretty_config_dict(opt_val1583)
+                assert field1590 is not None
+                opt_val1591 = field1590
+                self.pretty_config_dict(opt_val1591)
             self.dedent()
             self.write(")")
 
     def pretty_export_iceberg_table_def(self, msg: logic_pb2.RelationId):
-        flat1586 = self._try_flat(msg, self.pretty_export_iceberg_table_def)
-        if flat1586 is not None:
-            assert flat1586 is not None
-            self.write(flat1586)
+        flat1594 = self._try_flat(msg, self.pretty_export_iceberg_table_def)
+        if flat1594 is not None:
+            assert flat1594 is not None
+            self.write(flat1594)
             return None
         else:
-            fields1585 = msg
+            fields1593 = msg
             self.write("(table_def")
             self.indent_sexp()
             self.newline()
-            self.pretty_relation_id(fields1585)
+            self.pretty_relation_id(fields1593)
             self.dedent()
             self.write(")")
 
     def pretty_export_iceberg_columns(self, msg: Sequence[transactions_pb2.ExportColumn]):
-        flat1590 = self._try_flat(msg, self.pretty_export_iceberg_columns)
-        if flat1590 is not None:
-            assert flat1590 is not None
-            self.write(flat1590)
+        flat1598 = self._try_flat(msg, self.pretty_export_iceberg_columns)
+        if flat1598 is not None:
+            assert flat1598 is not None
+            self.write(flat1598)
             return None
         else:
-            fields1587 = msg
+            fields1595 = msg
             self.write("(columns")
             self.indent_sexp()
-            if not len(fields1587) == 0:
+            if not len(fields1595) == 0:
                 self.newline()
-                for i1589, elem1588 in enumerate(fields1587):
-                    if (i1589 > 0):
+                for i1597, elem1596 in enumerate(fields1595):
+                    if (i1597 > 0):
                         self.newline()
-                    self.pretty_export_iceberg_column(elem1588)
+                    self.pretty_export_iceberg_column(elem1596)
             self.dedent()
             self.write(")")
 
     def pretty_export_iceberg_column(self, msg: transactions_pb2.ExportColumn):
-        flat1595 = self._try_flat(msg, self.pretty_export_iceberg_column)
-        if flat1595 is not None:
-            assert flat1595 is not None
-            self.write(flat1595)
+        flat1603 = self._try_flat(msg, self.pretty_export_iceberg_column)
+        if flat1603 is not None:
+            assert flat1603 is not None
+            self.write(flat1603)
             return None
         else:
             _dollar_dollar = msg
-            fields1591 = (_dollar_dollar.name, _dollar_dollar.nullable,)
-            assert fields1591 is not None
-            unwrapped_fields1592 = fields1591
+            fields1599 = (_dollar_dollar.name, _dollar_dollar.nullable,)
+            assert fields1599 is not None
+            unwrapped_fields1600 = fields1599
             self.write("(column")
             self.indent_sexp()
             self.newline()
-            field1593 = unwrapped_fields1592[0]
-            self.write(self.format_string_value(field1593))
+            field1601 = unwrapped_fields1600[0]
+            self.write(self.format_string_value(field1601))
             self.newline()
-            field1594 = unwrapped_fields1592[1]
-            self.pretty_boolean_value(field1594)
+            field1602 = unwrapped_fields1600[1]
+            self.pretty_boolean_value(field1602)
             self.dedent()
             self.write(")")
 
     def pretty_iceberg_table_properties(self, msg: Sequence[tuple[str, str]]):
-        flat1599 = self._try_flat(msg, self.pretty_iceberg_table_properties)
-        if flat1599 is not None:
-            assert flat1599 is not None
-            self.write(flat1599)
+        flat1607 = self._try_flat(msg, self.pretty_iceberg_table_properties)
+        if flat1607 is not None:
+            assert flat1607 is not None
+            self.write(flat1607)
             return None
         else:
-            fields1596 = msg
+            fields1604 = msg
             self.write("(table_properties")
             self.indent_sexp()
-            if not len(fields1596) == 0:
+            if not len(fields1604) == 0:
                 self.newline()
-                for i1598, elem1597 in enumerate(fields1596):
-                    if (i1598 > 0):
+                for i1606, elem1605 in enumerate(fields1604):
+                    if (i1606 > 0):
                         self.newline()
-                    self.pretty_iceberg_property_entry(elem1597)
+                    self.pretty_iceberg_property_entry(elem1605)
             self.dedent()
             self.write(")")
 
@@ -4366,8 +4386,8 @@ def pretty_debug_info(self, msg: fragments_pb2.DebugInfo):
         for _idx, _rid in enumerate(msg.ids):
             self.newline()
             self.write("(")
-            _t1786 = logic_pb2.UInt128Value(low=_rid.id_low, high=_rid.id_high)
-            self.pprint_dispatch(_t1786)
+            _t1796 = logic_pb2.UInt128Value(low=_rid.id_low, high=_rid.id_high)
+            self.pprint_dispatch(_t1796)
             self.write(" ")
             self.write(self.format_string_value(msg.orig_names[_idx]))
             self.write(")")
diff --git a/sdks/python/src/lqp/proto/v1/logic_pb2.py b/sdks/python/src/lqp/proto/v1/logic_pb2.py
index adbe2fae..f72fb042 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\"u\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\"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\"m\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\"\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\"\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\"\x8f\x03\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\"\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\"\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\"\x8f\x03\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\"\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)
@@ -44,146 +44,146 @@
   _globals['_CONSTRAINT']._serialized_end=670
   _globals['_FUNCTIONALDEPENDENCY']._serialized_start=673
   _globals['_FUNCTIONALDEPENDENCY']._serialized_end=847
-  _globals['_ALGORITHM']._serialized_start=849
-  _globals['_ALGORITHM']._serialized_end=966
-  _globals['_SCRIPT']._serialized_start=968
-  _globals['_SCRIPT']._serialized_end=1040
-  _globals['_CONSTRUCT']._serialized_start=1043
-  _globals['_CONSTRUCT']._serialized_end=1191
-  _globals['_LOOP']._serialized_start=1193
-  _globals['_LOOP']._serialized_end=1302
-  _globals['_INSTRUCTION']._serialized_start=1305
-  _globals['_INSTRUCTION']._serialized_end=1627
-  _globals['_ASSIGN']._serialized_start=1630
-  _globals['_ASSIGN']._serialized_end=1799
-  _globals['_UPSERT']._serialized_start=1802
-  _globals['_UPSERT']._serialized_end=2004
-  _globals['_BREAK']._serialized_start=2007
-  _globals['_BREAK']._serialized_end=2175
-  _globals['_MONOIDDEF']._serialized_start=2178
-  _globals['_MONOIDDEF']._serialized_end=2436
-  _globals['_MONUSDEF']._serialized_start=2439
-  _globals['_MONUSDEF']._serialized_end=2696
-  _globals['_MONOID']._serialized_start=2699
-  _globals['_MONOID']._serialized_end=2973
-  _globals['_ORMONOID']._serialized_start=2975
-  _globals['_ORMONOID']._serialized_end=2985
-  _globals['_MINMONOID']._serialized_start=2987
-  _globals['_MINMONOID']._serialized_end=3045
-  _globals['_MAXMONOID']._serialized_start=3047
-  _globals['_MAXMONOID']._serialized_end=3105
-  _globals['_SUMMONOID']._serialized_start=3107
-  _globals['_SUMMONOID']._serialized_end=3165
-  _globals['_BINDING']._serialized_start=3167
-  _globals['_BINDING']._serialized_end=3267
-  _globals['_ABSTRACTION']._serialized_start=3269
-  _globals['_ABSTRACTION']._serialized_end=3384
-  _globals['_FORMULA']._serialized_start=3387
-  _globals['_FORMULA']._serialized_end=4030
-  _globals['_EXISTS']._serialized_start=4032
-  _globals['_EXISTS']._serialized_end=4094
-  _globals['_REDUCE']._serialized_start=4097
-  _globals['_REDUCE']._serialized_end=4258
-  _globals['_CONJUNCTION']._serialized_start=4260
-  _globals['_CONJUNCTION']._serialized_end=4323
-  _globals['_DISJUNCTION']._serialized_start=4325
-  _globals['_DISJUNCTION']._serialized_end=4388
-  _globals['_NOT']._serialized_start=4390
-  _globals['_NOT']._serialized_end=4443
-  _globals['_FFI']._serialized_start=4446
-  _globals['_FFI']._serialized_end=4574
-  _globals['_ATOM']._serialized_start=4576
-  _globals['_ATOM']._serialized_end=4684
-  _globals['_PRAGMA']._serialized_start=4686
-  _globals['_PRAGMA']._serialized_end=4763
-  _globals['_PRIMITIVE']._serialized_start=4765
-  _globals['_PRIMITIVE']._serialized_end=4848
-  _globals['_RELATOM']._serialized_start=4850
-  _globals['_RELATOM']._serialized_end=4931
-  _globals['_CAST']._serialized_start=4933
-  _globals['_CAST']._serialized_end=5039
-  _globals['_RELTERM']._serialized_start=5042
-  _globals['_RELTERM']._serialized_end=5192
-  _globals['_TERM']._serialized_start=5194
-  _globals['_TERM']._serialized_end=5317
-  _globals['_VAR']._serialized_start=5319
-  _globals['_VAR']._serialized_end=5344
-  _globals['_ATTRIBUTE']._serialized_start=5346
-  _globals['_ATTRIBUTE']._serialized_end=5425
-  _globals['_DATA']._serialized_start=5428
-  _globals['_DATA']._serialized_end=5703
-  _globals['_EDB']._serialized_start=5706
-  _globals['_EDB']._serialized_end=5842
-  _globals['_BETREERELATION']._serialized_start=5845
-  _globals['_BETREERELATION']._serialized_end=5984
-  _globals['_BETREEINFO']._serialized_start=5987
-  _globals['_BETREEINFO']._serialized_end=6274
-  _globals['_BETREECONFIG']._serialized_start=6277
-  _globals['_BETREECONFIG']._serialized_end=6406
-  _globals['_BETREELOCATOR']._serialized_start=6409
-  _globals['_BETREELOCATOR']._serialized_end=6611
-  _globals['_CSVDATA']._serialized_start=6614
-  _globals['_CSVDATA']._serialized_end=6816
-  _globals['_CSVLOCATOR']._serialized_start=6818
-  _globals['_CSVLOCATOR']._serialized_end=6885
-  _globals['_CSVCONFIG']._serialized_start=6888
-  _globals['_CSVCONFIG']._serialized_end=7287
-  _globals['_ICEBERGDATA']._serialized_start=7290
-  _globals['_ICEBERGDATA']._serialized_end=7642
-  _globals['_ICEBERGLOCATOR']._serialized_start=7644
-  _globals['_ICEBERGLOCATOR']._serialized_end=7751
-  _globals['_ICEBERGCATALOGCONFIG']._serialized_start=7754
-  _globals['_ICEBERGCATALOGCONFIG']._serialized_end=8171
-  _globals['_ICEBERGCATALOGCONFIG_PROPERTIESENTRY']._serialized_start=8033
-  _globals['_ICEBERGCATALOGCONFIG_PROPERTIESENTRY']._serialized_end=8094
-  _globals['_ICEBERGCATALOGCONFIG_AUTHPROPERTIESENTRY']._serialized_start=8096
-  _globals['_ICEBERGCATALOGCONFIG_AUTHPROPERTIESENTRY']._serialized_end=8161
-  _globals['_GNFCOLUMN']._serialized_start=8174
-  _globals['_GNFCOLUMN']._serialized_end=8348
-  _globals['_RELATIONID']._serialized_start=8350
-  _globals['_RELATIONID']._serialized_end=8410
-  _globals['_TYPE']._serialized_start=8413
-  _globals['_TYPE']._serialized_end=9394
-  _globals['_UNSPECIFIEDTYPE']._serialized_start=9396
-  _globals['_UNSPECIFIEDTYPE']._serialized_end=9413
-  _globals['_STRINGTYPE']._serialized_start=9415
-  _globals['_STRINGTYPE']._serialized_end=9427
-  _globals['_INTTYPE']._serialized_start=9429
-  _globals['_INTTYPE']._serialized_end=9438
-  _globals['_FLOATTYPE']._serialized_start=9440
-  _globals['_FLOATTYPE']._serialized_end=9451
-  _globals['_UINT128TYPE']._serialized_start=9453
-  _globals['_UINT128TYPE']._serialized_end=9466
-  _globals['_INT128TYPE']._serialized_start=9468
-  _globals['_INT128TYPE']._serialized_end=9480
-  _globals['_DATETYPE']._serialized_start=9482
-  _globals['_DATETYPE']._serialized_end=9492
-  _globals['_DATETIMETYPE']._serialized_start=9494
-  _globals['_DATETIMETYPE']._serialized_end=9508
-  _globals['_MISSINGTYPE']._serialized_start=9510
-  _globals['_MISSINGTYPE']._serialized_end=9523
-  _globals['_DECIMALTYPE']._serialized_start=9525
-  _globals['_DECIMALTYPE']._serialized_end=9590
-  _globals['_BOOLEANTYPE']._serialized_start=9592
-  _globals['_BOOLEANTYPE']._serialized_end=9605
-  _globals['_INT32TYPE']._serialized_start=9607
-  _globals['_INT32TYPE']._serialized_end=9618
-  _globals['_FLOAT32TYPE']._serialized_start=9620
-  _globals['_FLOAT32TYPE']._serialized_end=9633
-  _globals['_UINT32TYPE']._serialized_start=9635
-  _globals['_UINT32TYPE']._serialized_end=9647
-  _globals['_VALUE']._serialized_start=9650
-  _globals['_VALUE']._serialized_end=10354
-  _globals['_UINT128VALUE']._serialized_start=10356
-  _globals['_UINT128VALUE']._serialized_end=10408
-  _globals['_INT128VALUE']._serialized_start=10410
-  _globals['_INT128VALUE']._serialized_end=10461
-  _globals['_MISSINGVALUE']._serialized_start=10463
-  _globals['_MISSINGVALUE']._serialized_end=10477
-  _globals['_DATEVALUE']._serialized_start=10479
-  _globals['_DATEVALUE']._serialized_end=10550
-  _globals['_DATETIMEVALUE']._serialized_start=10553
-  _globals['_DATETIMEVALUE']._serialized_end=10730
-  _globals['_DECIMALVALUE']._serialized_start=10732
-  _globals['_DECIMALVALUE']._serialized_end=10854
+  _globals['_ALGORITHM']._serialized_start=850
+  _globals['_ALGORITHM']._serialized_end=1021
+  _globals['_SCRIPT']._serialized_start=1023
+  _globals['_SCRIPT']._serialized_end=1095
+  _globals['_CONSTRUCT']._serialized_start=1098
+  _globals['_CONSTRUCT']._serialized_end=1246
+  _globals['_LOOP']._serialized_start=1249
+  _globals['_LOOP']._serialized_end=1412
+  _globals['_INSTRUCTION']._serialized_start=1415
+  _globals['_INSTRUCTION']._serialized_end=1737
+  _globals['_ASSIGN']._serialized_start=1740
+  _globals['_ASSIGN']._serialized_end=1909
+  _globals['_UPSERT']._serialized_start=1912
+  _globals['_UPSERT']._serialized_end=2114
+  _globals['_BREAK']._serialized_start=2117
+  _globals['_BREAK']._serialized_end=2285
+  _globals['_MONOIDDEF']._serialized_start=2288
+  _globals['_MONOIDDEF']._serialized_end=2546
+  _globals['_MONUSDEF']._serialized_start=2549
+  _globals['_MONUSDEF']._serialized_end=2806
+  _globals['_MONOID']._serialized_start=2809
+  _globals['_MONOID']._serialized_end=3083
+  _globals['_ORMONOID']._serialized_start=3085
+  _globals['_ORMONOID']._serialized_end=3095
+  _globals['_MINMONOID']._serialized_start=3097
+  _globals['_MINMONOID']._serialized_end=3155
+  _globals['_MAXMONOID']._serialized_start=3157
+  _globals['_MAXMONOID']._serialized_end=3215
+  _globals['_SUMMONOID']._serialized_start=3217
+  _globals['_SUMMONOID']._serialized_end=3275
+  _globals['_BINDING']._serialized_start=3277
+  _globals['_BINDING']._serialized_end=3377
+  _globals['_ABSTRACTION']._serialized_start=3379
+  _globals['_ABSTRACTION']._serialized_end=3494
+  _globals['_FORMULA']._serialized_start=3497
+  _globals['_FORMULA']._serialized_end=4140
+  _globals['_EXISTS']._serialized_start=4142
+  _globals['_EXISTS']._serialized_end=4204
+  _globals['_REDUCE']._serialized_start=4207
+  _globals['_REDUCE']._serialized_end=4368
+  _globals['_CONJUNCTION']._serialized_start=4370
+  _globals['_CONJUNCTION']._serialized_end=4433
+  _globals['_DISJUNCTION']._serialized_start=4435
+  _globals['_DISJUNCTION']._serialized_end=4498
+  _globals['_NOT']._serialized_start=4500
+  _globals['_NOT']._serialized_end=4553
+  _globals['_FFI']._serialized_start=4556
+  _globals['_FFI']._serialized_end=4684
+  _globals['_ATOM']._serialized_start=4686
+  _globals['_ATOM']._serialized_end=4794
+  _globals['_PRAGMA']._serialized_start=4796
+  _globals['_PRAGMA']._serialized_end=4873
+  _globals['_PRIMITIVE']._serialized_start=4875
+  _globals['_PRIMITIVE']._serialized_end=4958
+  _globals['_RELATOM']._serialized_start=4960
+  _globals['_RELATOM']._serialized_end=5041
+  _globals['_CAST']._serialized_start=5043
+  _globals['_CAST']._serialized_end=5149
+  _globals['_RELTERM']._serialized_start=5152
+  _globals['_RELTERM']._serialized_end=5302
+  _globals['_TERM']._serialized_start=5304
+  _globals['_TERM']._serialized_end=5427
+  _globals['_VAR']._serialized_start=5429
+  _globals['_VAR']._serialized_end=5454
+  _globals['_ATTRIBUTE']._serialized_start=5456
+  _globals['_ATTRIBUTE']._serialized_end=5535
+  _globals['_DATA']._serialized_start=5538
+  _globals['_DATA']._serialized_end=5813
+  _globals['_EDB']._serialized_start=5816
+  _globals['_EDB']._serialized_end=5952
+  _globals['_BETREERELATION']._serialized_start=5955
+  _globals['_BETREERELATION']._serialized_end=6094
+  _globals['_BETREEINFO']._serialized_start=6097
+  _globals['_BETREEINFO']._serialized_end=6384
+  _globals['_BETREECONFIG']._serialized_start=6387
+  _globals['_BETREECONFIG']._serialized_end=6516
+  _globals['_BETREELOCATOR']._serialized_start=6519
+  _globals['_BETREELOCATOR']._serialized_end=6721
+  _globals['_CSVDATA']._serialized_start=6724
+  _globals['_CSVDATA']._serialized_end=6926
+  _globals['_CSVLOCATOR']._serialized_start=6928
+  _globals['_CSVLOCATOR']._serialized_end=6995
+  _globals['_CSVCONFIG']._serialized_start=6998
+  _globals['_CSVCONFIG']._serialized_end=7397
+  _globals['_ICEBERGDATA']._serialized_start=7400
+  _globals['_ICEBERGDATA']._serialized_end=7752
+  _globals['_ICEBERGLOCATOR']._serialized_start=7754
+  _globals['_ICEBERGLOCATOR']._serialized_end=7861
+  _globals['_ICEBERGCATALOGCONFIG']._serialized_start=7864
+  _globals['_ICEBERGCATALOGCONFIG']._serialized_end=8281
+  _globals['_ICEBERGCATALOGCONFIG_PROPERTIESENTRY']._serialized_start=8143
+  _globals['_ICEBERGCATALOGCONFIG_PROPERTIESENTRY']._serialized_end=8204
+  _globals['_ICEBERGCATALOGCONFIG_AUTHPROPERTIESENTRY']._serialized_start=8206
+  _globals['_ICEBERGCATALOGCONFIG_AUTHPROPERTIESENTRY']._serialized_end=8271
+  _globals['_GNFCOLUMN']._serialized_start=8284
+  _globals['_GNFCOLUMN']._serialized_end=8458
+  _globals['_RELATIONID']._serialized_start=8460
+  _globals['_RELATIONID']._serialized_end=8520
+  _globals['_TYPE']._serialized_start=8523
+  _globals['_TYPE']._serialized_end=9504
+  _globals['_UNSPECIFIEDTYPE']._serialized_start=9506
+  _globals['_UNSPECIFIEDTYPE']._serialized_end=9523
+  _globals['_STRINGTYPE']._serialized_start=9525
+  _globals['_STRINGTYPE']._serialized_end=9537
+  _globals['_INTTYPE']._serialized_start=9539
+  _globals['_INTTYPE']._serialized_end=9548
+  _globals['_FLOATTYPE']._serialized_start=9550
+  _globals['_FLOATTYPE']._serialized_end=9561
+  _globals['_UINT128TYPE']._serialized_start=9563
+  _globals['_UINT128TYPE']._serialized_end=9576
+  _globals['_INT128TYPE']._serialized_start=9578
+  _globals['_INT128TYPE']._serialized_end=9590
+  _globals['_DATETYPE']._serialized_start=9592
+  _globals['_DATETYPE']._serialized_end=9602
+  _globals['_DATETIMETYPE']._serialized_start=9604
+  _globals['_DATETIMETYPE']._serialized_end=9618
+  _globals['_MISSINGTYPE']._serialized_start=9620
+  _globals['_MISSINGTYPE']._serialized_end=9633
+  _globals['_DECIMALTYPE']._serialized_start=9635
+  _globals['_DECIMALTYPE']._serialized_end=9700
+  _globals['_BOOLEANTYPE']._serialized_start=9702
+  _globals['_BOOLEANTYPE']._serialized_end=9715
+  _globals['_INT32TYPE']._serialized_start=9717
+  _globals['_INT32TYPE']._serialized_end=9728
+  _globals['_FLOAT32TYPE']._serialized_start=9730
+  _globals['_FLOAT32TYPE']._serialized_end=9743
+  _globals['_UINT32TYPE']._serialized_start=9745
+  _globals['_UINT32TYPE']._serialized_end=9757
+  _globals['_VALUE']._serialized_start=9760
+  _globals['_VALUE']._serialized_end=10464
+  _globals['_UINT128VALUE']._serialized_start=10466
+  _globals['_UINT128VALUE']._serialized_end=10518
+  _globals['_INT128VALUE']._serialized_start=10520
+  _globals['_INT128VALUE']._serialized_end=10571
+  _globals['_MISSINGVALUE']._serialized_start=10573
+  _globals['_MISSINGVALUE']._serialized_end=10587
+  _globals['_DATEVALUE']._serialized_start=10589
+  _globals['_DATEVALUE']._serialized_end=10660
+  _globals['_DATETIMEVALUE']._serialized_start=10663
+  _globals['_DATETIMEVALUE']._serialized_end=10840
+  _globals['_DECIMALVALUE']._serialized_start=10842
+  _globals['_DECIMALVALUE']._serialized_end=10964
 # @@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 c9d08eb4..2dbb2f2d 100644
--- a/sdks/python/src/lqp/proto/v1/logic_pb2.pyi
+++ b/sdks/python/src/lqp/proto/v1/logic_pb2.pyi
@@ -46,11 +46,13 @@ class FunctionalDependency(_message.Message):
     def __init__(self, guard: _Optional[_Union[Abstraction, _Mapping]] = ..., keys: _Optional[_Iterable[_Union[Var, _Mapping]]] = ..., values: _Optional[_Iterable[_Union[Var, _Mapping]]] = ...) -> None: ...
 
 class Algorithm(_message.Message):
-    __slots__ = ("body",)
+    __slots__ = ("body", "attrs")
     GLOBAL_FIELD_NUMBER: _ClassVar[int]
     BODY_FIELD_NUMBER: _ClassVar[int]
+    ATTRS_FIELD_NUMBER: _ClassVar[int]
     body: Script
-    def __init__(self, body: _Optional[_Union[Script, _Mapping]] = ..., **kwargs) -> None: ...
+    attrs: _containers.RepeatedCompositeFieldContainer[Attribute]
+    def __init__(self, body: _Optional[_Union[Script, _Mapping]] = ..., attrs: _Optional[_Iterable[_Union[Attribute, _Mapping]]] = ..., **kwargs) -> None: ...
 
 class Script(_message.Message):
     __slots__ = ("constructs",)
@@ -67,12 +69,14 @@ class Construct(_message.Message):
     def __init__(self, loop: _Optional[_Union[Loop, _Mapping]] = ..., instruction: _Optional[_Union[Instruction, _Mapping]] = ...) -> None: ...
 
 class Loop(_message.Message):
-    __slots__ = ("init", "body")
+    __slots__ = ("init", "body", "attrs")
     INIT_FIELD_NUMBER: _ClassVar[int]
     BODY_FIELD_NUMBER: _ClassVar[int]
+    ATTRS_FIELD_NUMBER: _ClassVar[int]
     init: _containers.RepeatedCompositeFieldContainer[Instruction]
     body: Script
-    def __init__(self, init: _Optional[_Iterable[_Union[Instruction, _Mapping]]] = ..., body: _Optional[_Union[Script, _Mapping]] = ...) -> None: ...
+    attrs: _containers.RepeatedCompositeFieldContainer[Attribute]
+    def __init__(self, init: _Optional[_Iterable[_Union[Instruction, _Mapping]]] = ..., body: _Optional[_Union[Script, _Mapping]] = ..., attrs: _Optional[_Iterable[_Union[Attribute, _Mapping]]] = ...) -> None: ...
 
 class Instruction(_message.Message):
     __slots__ = ("assign", "upsert", "monoid_def", "monus_def")
diff --git a/tests/bin/algorithm_loop_annotations.bin b/tests/bin/algorithm_loop_annotations.bin
new file mode 100644
index 00000000..3fd96a97
Binary files /dev/null and b/tests/bin/algorithm_loop_annotations.bin differ
diff --git a/tests/lqp/algorithm_loop_annotations.lqp b/tests/lqp/algorithm_loop_annotations.lqp
new file mode 100644
index 00000000..7c95b3a4
--- /dev/null
+++ b/tests/lqp/algorithm_loop_annotations.lqp
@@ -0,0 +1,14 @@
+(transaction
+  (epoch
+    (writes
+      (define
+        (fragment :f1
+          (algorithm :R1 :R2
+            (script
+              (loop
+                (init)
+                (script
+                  (break :always ([] (and))))
+                (attrs (attribute :foo))))
+            (attrs (attribute :bar))))))
+    (reads)))
diff --git a/tests/pretty/algorithm_loop_annotations.lqp b/tests/pretty/algorithm_loop_annotations.lqp
new file mode 100644
index 00000000..c0c846da
--- /dev/null
+++ b/tests/pretty/algorithm_loop_annotations.lqp
@@ -0,0 +1,13 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (algorithm
+            :R1
+            :R2
+            (script
+              (loop (init) (script (break :always ([] (true)))) (attrs (attribute :foo))))
+            (attrs (attribute :bar))))))))
diff --git a/tests/pretty_debug/algorithm_loop_annotations.lqp b/tests/pretty_debug/algorithm_loop_annotations.lqp
new file mode 100644
index 00000000..3e60ec0d
--- /dev/null
+++ b/tests/pretty_debug/algorithm_loop_annotations.lqp
@@ -0,0 +1,23 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (algorithm
+            0x2d8a69513b5e1e29a29a4048ffb16e27
+            0xadffeb38ae46cc701e3462343727717b
+            (script
+              (loop
+                (init)
+                (script (break 0xadbe254c82095d39531f5e5c1314bdd ([] (true))))
+                (attrs (attribute :foo))))
+            (attrs (attribute :bar))))))))
+
+;; Debug information
+;; -----------------------
+;; Original names
+;; 	 ID `0x2d8a69513b5e1e29a29a4048ffb16e27` -> `R1`
+;; 	 ID `0xadffeb38ae46cc701e3462343727717b` -> `R2`
+;; 	 ID `0xadbe254c82095d39531f5e5c1314bdd` -> `always`