cmd/protoc-gen-go: unexport implementation-specific XXX fields

We modify protoc-gen-go to stop generating exported XXX fields.
The unsafe implementation is unaffected by this change since unsafe
can access fields regardless of visibility. However, for the purego
implementation, we need to respect Go visibility rules as enforced
by the reflect package.

We work around this by generating a exporter function that given
a reference to the message and the field to export, returns a reference
to the unexported field value. This exporter function is protected by
a constant such that it is not linked into the final binary in non-purego
build environment.

Updates golang/protobuf#276

Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go b/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go
index 77bcc61..f7bd25e 100644
--- a/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go
+++ b/cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go
@@ -18,9 +18,8 @@
 )
 
 type Request struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Request) Reset() {
@@ -47,9 +46,8 @@
 }
 
 type Response struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Response) Reset() {
@@ -147,6 +145,28 @@
 	if File_grpc_grpc_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_grpc_grpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Request); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_grpc_grpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Response); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_grpc_grpc_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/internal_gengo/main.go b/cmd/protoc-gen-go/internal_gengo/main.go
index 3cd0c38..22d87ca 100644
--- a/cmd/protoc-gen-go/internal_gengo/main.go
+++ b/cmd/protoc-gen-go/internal_gengo/main.go
@@ -39,6 +39,22 @@
 	// generateOneofWrapperMethods specifies whether to generate
 	// XXX_OneofWrappers methods on messages with oneofs.
 	generateOneofWrapperMethods = false
+
+	// generateNoUnkeyedLiteralFields specifies whether to generate
+	// the XXX_NoUnkeyedLiteral field.
+	generateNoUnkeyedLiteralFields = false
+
+	// generateExportedSizeCacheFields specifies whether to generate an exported
+	// XXX_sizecache field instead of an unexported sizeCache field.
+	generateExportedSizeCacheFields = false
+
+	// generateExportedUnknownFields specifies whether to generate an exported
+	// XXX_unrecognized field instead of an unexported unknownFields field.
+	generateExportedUnknownFields = false
+
+	// generateExportedExtensionFields specifies whether to generate an exported
+	// XXX_InternalExtensions field instead of an unexported extensionFields field.
+	generateExportedExtensionFields = false
 )
 
 const (
@@ -54,11 +70,28 @@
 type fileInfo struct {
 	*protogen.File
 
-	allEnums         []*protogen.Enum
-	allEnumsByPtr    map[*protogen.Enum]int // value is index into allEnums
-	allMessages      []*protogen.Message
-	allMessagesByPtr map[*protogen.Message]int // value is index into allMessages
-	allExtensions    []*protogen.Extension
+	allEnums      []*protogen.Enum
+	allMessages   []*protogen.Message
+	allExtensions []*protogen.Extension
+
+	allEnumsByPtr         map[*protogen.Enum]int    // value is index into allEnums
+	allMessagesByPtr      map[*protogen.Message]int // value is index into allMessages
+	allMessageFieldsByPtr map[*protogen.Message]*structFields
+}
+
+type structFields struct {
+	count      int
+	unexported map[int]string
+}
+
+func (sf *structFields) append(name string) {
+	if r, _ := utf8.DecodeRuneInString(name); !unicode.IsUpper(r) {
+		if sf.unexported == nil {
+			sf.unexported = make(map[int]string)
+		}
+		sf.unexported[sf.count] = name
+	}
+	sf.count++
 }
 
 // GenerateFile generates the contents of a .pb.go file.
@@ -90,8 +123,10 @@
 	}
 	if len(f.allMessages) > 0 {
 		f.allMessagesByPtr = make(map[*protogen.Message]int)
+		f.allMessageFieldsByPtr = make(map[*protogen.Message]*structFields)
 		for i, m := range f.allMessages {
 			f.allMessagesByPtr[m] = i
+			f.allMessageFieldsByPtr[m] = new(structFields)
 		}
 	}
 
@@ -347,15 +382,28 @@
 	}
 	g.Annotate(message.GoIdent.GoName, message.Location)
 	g.P("type ", message.GoIdent, " struct {")
+	sf := f.allMessageFieldsByPtr[message]
 	for _, field := range message.Fields {
 		if field.Oneof != nil {
 			// It would be a bit simpler to iterate over the oneofs below,
 			// but generating the field here keeps the contents of the Go
 			// struct in the same order as the contents of the source
 			// .proto file.
-			if field == field.Oneof.Fields[0] {
-				genOneofField(gen, g, f, message, field.Oneof)
+			oneof := field.Oneof
+			if field != oneof.Fields[0] {
+				continue // already generated oneof field for first entry
 			}
+			if g.PrintLeadingComments(oneof.Location) {
+				g.P("//")
+			}
+			g.P("// Types that are valid to be assigned to ", oneofFieldName(oneof), ":")
+			for _, field := range oneof.Fields {
+				g.PrintLeadingComments(field.Location)
+				g.P("//\t*", fieldOneofType(field))
+			}
+			g.Annotate(message.GoIdent.GoName+"."+oneofFieldName(oneof), oneof.Location)
+			g.P(oneofFieldName(oneof), " ", oneofInterfaceName(oneof), " `protobuf_oneof:\"", oneof.Desc.Name(), "\"`")
+			sf.append(oneofFieldName(oneof))
 			continue
 		}
 		g.PrintLeadingComments(field.Location)
@@ -378,19 +426,42 @@
 		g.Annotate(message.GoIdent.GoName+"."+field.GoName, field.Location)
 		g.P(field.GoName, " ", goType, " `", strings.Join(tags, " "), "`",
 			deprecationComment(field.Desc.Options().(*descriptorpb.FieldOptions).GetDeprecated()))
+		sf.append(field.GoName)
 	}
-	g.P("XXX_NoUnkeyedLiteral struct{} `json:\"-\"`")
 
+	if generateNoUnkeyedLiteralFields {
+		g.P("XXX_NoUnkeyedLiteral", " struct{} `json:\"-\"`")
+		sf.append("XXX_NoUnkeyedLiteral")
+	}
+	if generateExportedSizeCacheFields {
+		g.P("XXX_sizecache", " ", protoimplPackage.Ident("SizeCache"), " `json:\"-\"`")
+		sf.append("XXX_sizecache")
+	} else {
+		g.P("sizeCache", " ", protoimplPackage.Ident("SizeCache"))
+		sf.append("sizeCache")
+	}
+	if generateExportedUnknownFields {
+		g.P("XXX_unrecognized", " ", protoimplPackage.Ident("UnknownFields"), " `json:\"-\"`")
+		sf.append("XXX_unrecognized")
+	} else {
+		g.P("unknownFields", " ", protoimplPackage.Ident("UnknownFields"))
+		sf.append("unknownFields")
+	}
 	if message.Desc.ExtensionRanges().Len() > 0 {
+		// TODO: Remove this tag when we drop v1 support.
 		var tags []string
 		if message.Desc.Options().(*descriptorpb.MessageOptions).GetMessageSetWireFormat() {
 			tags = append(tags, `protobuf_messageset:"1"`)
 		}
-		tags = append(tags, `json:"-"`)
-		g.P("XXX_InternalExtensions ", protoimplPackage.Ident("ExtensionFields"), " `", strings.Join(tags, " "), "`")
+		if generateExportedExtensionFields {
+			tags = append(tags, `json:"-"`)
+			g.P("XXX_InternalExtensions", " ", protoimplPackage.Ident("ExtensionFields"), " `", strings.Join(tags, " "), "`")
+			sf.append("XXX_InternalExtensions")
+		} else {
+			g.P("extensionFields", " ", protoimplPackage.Ident("ExtensionFields"), " `", strings.Join(tags, " "), "`")
+			sf.append("extensionFields")
+		}
 	}
-	g.P("XXX_unrecognized ", protoimplPackage.Ident("UnknownFields"), " `json:\"-\"`")
-	g.P("XXX_sizecache ", protoimplPackage.Ident("SizeCache"), " `json:\"-\"`")
 	g.P("}")
 	g.P()
 
@@ -744,20 +815,6 @@
 	"google.protobuf.Value":       true,
 }
 
-// genOneofField generates the struct field for a oneof.
-func genOneofField(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, message *protogen.Message, oneof *protogen.Oneof) {
-	if g.PrintLeadingComments(oneof.Location) {
-		g.P("//")
-	}
-	g.P("// Types that are valid to be assigned to ", oneofFieldName(oneof), ":")
-	for _, field := range oneof.Fields {
-		g.PrintLeadingComments(field.Location)
-		g.P("//\t*", fieldOneofType(field))
-	}
-	g.Annotate(message.GoIdent.GoName+"."+oneofFieldName(oneof), oneof.Location)
-	g.P(oneofFieldName(oneof), " ", oneofInterfaceName(oneof), " `protobuf_oneof:\"", oneof.Desc.Name(), "\"`")
-}
-
 // genOneofGetter generate a Get method for a oneof.
 func genOneofGetter(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, message *protogen.Message, oneof *protogen.Oneof) {
 	g.Annotate(message.GoIdent.GoName+".Get"+oneof.GoName, oneof.Location)
diff --git a/cmd/protoc-gen-go/internal_gengo/reflect.go b/cmd/protoc-gen-go/internal_gengo/reflect.go
index d0abebe..b7c5261 100644
--- a/cmd/protoc-gen-go/internal_gengo/reflect.go
+++ b/cmd/protoc-gen-go/internal_gengo/reflect.go
@@ -154,6 +154,27 @@
 	}
 
 	if len(f.allMessages) > 0 {
+		// Populate MessageInfo.Exporters.
+		g.P("if !", protoimplPackage.Ident("UnsafeEnabled"), " {")
+		for _, message := range f.allMessages {
+			if sf := f.allMessageFieldsByPtr[message]; len(sf.unexported) > 0 {
+				idx := f.allMessagesByPtr[message]
+				typesVar := messageTypesVarName(f)
+
+				g.P(typesVar, "[", idx, "].Exporter = func(v interface{}, i int) interface{} {")
+				g.P("switch v := v.(*", message.GoIdent, "); i {")
+				for i := 0; i < sf.count; i++ {
+					if name := sf.unexported[i]; name != "" {
+						g.P("case ", i, ": return &v.", name)
+					}
+				}
+				g.P("default: return nil")
+				g.P("}")
+				g.P("}")
+			}
+		}
+		g.P("}")
+
 		// Populate MessageInfo.OneofWrappers.
 		for _, message := range f.allMessages {
 			if len(message.Oneofs) > 0 {
diff --git a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
index a99dbb1..da6e752 100644
--- a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
+++ b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
@@ -66,10 +66,9 @@
 }
 
 type AnnotationsTestMessage struct {
-	AnnotationsTestField *string                 `protobuf:"bytes,1,opt,name=AnnotationsTestField" json:"AnnotationsTestField,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	AnnotationsTestField *string `protobuf:"bytes,1,opt,name=AnnotationsTestField" json:"AnnotationsTestField,omitempty"`
+	sizeCache            protoimpl.SizeCache
+	unknownFields        protoimpl.UnknownFields
 }
 
 func (x *AnnotationsTestMessage) Reset() {
@@ -155,6 +154,18 @@
 	if File_annotations_annotations_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_annotations_annotations_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AnnotationsTestMessage); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_annotations_annotations_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta
index e127af0..6450f14 100644
--- a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta
+++ b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta
@@ -1 +1 @@
-annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:631 end:650} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:667 end:714} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1821 end:1843} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1854 end:1874} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2895 end:2918}
\ No newline at end of file
+annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:631 end:650} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:667 end:714} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1821 end:1843} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1854 end:1874} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2796 end:2819}
\ No newline at end of file
diff --git a/cmd/protoc-gen-go/testdata/comments/comments.pb.go b/cmd/protoc-gen-go/testdata/comments/comments.pb.go
index 50c87fd..ae1e989 100644
--- a/cmd/protoc-gen-go/testdata/comments/comments.pb.go
+++ b/cmd/protoc-gen-go/testdata/comments/comments.pb.go
@@ -28,10 +28,9 @@
 	// Types that are valid to be assigned to Oneof1A:
 	// COMMENT: Oneof1AField1
 	//	*Message1_Oneof1AField1
-	Oneof1A              isMessage1_Oneof1A      `protobuf_oneof:"Oneof1a"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Oneof1A       isMessage1_Oneof1A `protobuf_oneof:"Oneof1a"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message1) Reset() {
@@ -90,9 +89,8 @@
 
 // COMMENT: Message2
 type Message2 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2) Reset() {
@@ -120,9 +118,8 @@
 
 // COMMENT: Message1A
 type Message1_Message1A struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message1_Message1A) Reset() {
@@ -150,9 +147,8 @@
 
 // COMMENT: Message1B
 type Message1_Message1B struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message1_Message1B) Reset() {
@@ -180,9 +176,8 @@
 
 // COMMENT: Message2A
 type Message2_Message2A struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2_Message2A) Reset() {
@@ -210,9 +205,8 @@
 
 // COMMENT: Message2B
 type Message2_Message2B struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2_Message2B) Reset() {
@@ -294,6 +288,68 @@
 	if File_comments_comments_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_comments_comments_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message1); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_comments_comments_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_comments_comments_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message1_Message1A); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_comments_comments_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message1_Message1B); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_comments_comments_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2_Message2A); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_comments_comments_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2_Message2B); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_comments_comments_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*Message1_Oneof1AField1)(nil),
 	}
diff --git a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
index beeeded..b0d7ce9 100644
--- a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
+++ b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
@@ -56,10 +56,9 @@
 
 // Deprecated: Do not use.
 type DeprecatedMessage struct {
-	DeprecatedField      string                  `protobuf:"bytes,1,opt,name=deprecated_field,json=deprecatedField,proto3" json:"deprecated_field,omitempty"` // Deprecated: Do not use.
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	DeprecatedField string `protobuf:"bytes,1,opt,name=deprecated_field,json=deprecatedField,proto3" json:"deprecated_field,omitempty"` // Deprecated: Do not use.
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
 }
 
 func (x *DeprecatedMessage) Reset() {
@@ -145,6 +144,18 @@
 	if File_comments_deprecated_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_comments_deprecated_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DeprecatedMessage); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_comments_deprecated_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
index 4364047..3681aac 100644
--- a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
@@ -18,11 +18,10 @@
 )
 
 type BaseMessage struct {
-	Field                  *string                   `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field           *string `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *BaseMessage) Reset() {
@@ -66,10 +65,9 @@
 }
 
 type MessageSetWireFormatMessage struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `protobuf_messageset:"1" json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields `protobuf_messageset:"1"`
 }
 
 func (x *MessageSetWireFormatMessage) Reset() {
@@ -154,6 +152,32 @@
 	if File_extensions_base_base_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_extensions_base_base_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BaseMessage); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			case 3:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_extensions_base_base_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MessageSetWireFormatMessage); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_extensions_base_base_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
index 451a0b6..71f3dad 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
@@ -68,10 +68,9 @@
 }
 
 type Message struct {
-	Data                 []byte                  `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Data          []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message) Reset() {
@@ -105,10 +104,9 @@
 }
 
 type ExtensionGroup struct {
-	ExtensionGroup       *string                 `protobuf:"bytes,120,opt,name=extension_group,json=extensionGroup" json:"extension_group,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	ExtensionGroup *string `protobuf:"bytes,120,opt,name=extension_group,json=extensionGroup" json:"extension_group,omitempty"`
+	sizeCache      protoimpl.SizeCache
+	unknownFields  protoimpl.UnknownFields
 }
 
 func (x *ExtensionGroup) Reset() {
@@ -143,9 +141,8 @@
 
 // Extend in the scope of another type.
 type ExtendingMessage struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ExtendingMessage) Reset() {
@@ -172,10 +169,9 @@
 }
 
 type RepeatedGroup struct {
-	RepeatedXGroup       []string                `protobuf:"bytes,319,rep,name=repeated_x_group,json=repeatedXGroup" json:"repeated_x_group,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	RepeatedXGroup []string `protobuf:"bytes,319,rep,name=repeated_x_group,json=repeatedXGroup" json:"repeated_x_group,omitempty"`
+	sizeCache      protoimpl.SizeCache
+	unknownFields  protoimpl.UnknownFields
 }
 
 func (x *RepeatedGroup) Reset() {
@@ -210,10 +206,9 @@
 
 // An extension of an extension.
 type Extendable struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Extendable) Reset() {
@@ -250,9 +245,8 @@
 
 // Message set wire format.
 type MessageSetWireFormatExtension struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *MessageSetWireFormatExtension) Reset() {
@@ -279,9 +273,8 @@
 }
 
 type Message_M struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message_M) Reset() {
@@ -308,9 +301,8 @@
 }
 
 type ExtendingMessage_ExtendingMessageSubmessage struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ExtendingMessage_ExtendingMessageSubmessage) Reset() {
@@ -1238,6 +1230,90 @@
 	if File_extensions_ext_ext_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_extensions_ext_ext_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_extensions_ext_ext_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtensionGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_extensions_ext_ext_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtendingMessage); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_extensions_ext_ext_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RepeatedGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_extensions_ext_ext_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Extendable); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_extensions_ext_ext_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MessageSetWireFormatExtension); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_extensions_ext_ext_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message_M); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_extensions_ext_ext_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtendingMessage_ExtendingMessageSubmessage); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_extensions_ext_ext_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
index 93a95dc..639b0ab 100644
--- a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
@@ -18,10 +18,9 @@
 )
 
 type ExtraMessage struct {
-	Data                 []byte                  `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Data          []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ExtraMessage) Reset() {
@@ -99,6 +98,18 @@
 	if File_extensions_extra_extra_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_extensions_extra_extra_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtraMessage); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_extensions_extra_extra_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
index 74b844e..d8ec9d7 100644
--- a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go
@@ -57,9 +57,8 @@
 }
 
 type Message struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message) Reset() {
@@ -742,6 +741,18 @@
 	if File_extensions_proto3_ext3_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_extensions_proto3_ext3_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_extensions_proto3_ext3_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
index 2c156fe..1aa62b7 100644
--- a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
+++ b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
@@ -56,10 +56,9 @@
 	//
 	// Types that are valid to be assigned to OneofConflictC:
 	//	*Message_OneofMessageConflict_
-	OneofConflictC       isMessage_OneofConflictC `protobuf_oneof:"oneof_conflict_c"`
-	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields  `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache      `json:"-"`
+	OneofConflictC isMessage_OneofConflictC `protobuf_oneof:"oneof_conflict_c"`
+	sizeCache      protoimpl.SizeCache
+	unknownFields  protoimpl.UnknownFields
 }
 
 func (x *Message) Reset() {
@@ -269,9 +268,8 @@
 func (*Message_OneofMessageConflict_) isMessage_OneofConflictC() {}
 
 type Message_OneofMessageConflict struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message_OneofMessageConflict) Reset() {
@@ -384,6 +382,28 @@
 	if File_fieldnames_fieldnames_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_fieldnames_fieldnames_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message); i {
+			case 17:
+				return &v.sizeCache
+			case 18:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_fieldnames_fieldnames_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message_OneofMessageConflict); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_fieldnames_fieldnames_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*Message_OneofConflictA)(nil),
 		(*Message_OneofNoConflict)(nil),
diff --git a/cmd/protoc-gen-go/testdata/import_public/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
index 9ff5681..89e81e4 100644
--- a/cmd/protoc-gen-go/testdata/import_public/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
@@ -57,12 +57,11 @@
 var E_ExtensionField = sub.E_ExtensionField
 
 type Public struct {
-	M                    *sub.M                  `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
-	E                    *sub.E                  `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"`
-	Local                *Local                  `protobuf:"bytes,3,opt,name=local" json:"local,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	M             *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
+	E             *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"`
+	Local         *Local `protobuf:"bytes,3,opt,name=local" json:"local,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Public) Reset() {
@@ -172,6 +171,18 @@
 		return
 	}
 	file_import_public_b_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_import_public_a_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Public); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_import_public_a_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/import_public/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
index da6a3a6..1cc48ea 100644
--- a/cmd/protoc-gen-go/testdata/import_public/b.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
@@ -19,11 +19,10 @@
 )
 
 type Local struct {
-	M                    *sub.M                  `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
-	E                    *sub.E                  `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	M             *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
+	E             *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Local) Reset() {
@@ -118,6 +117,18 @@
 	if File_import_public_b_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_import_public_b_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Local); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_import_public_b_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/import_public/c.pb.go b/cmd/protoc-gen-go/testdata/import_public/c.pb.go
index 955f91b..f863ac5 100644
--- a/cmd/protoc-gen-go/testdata/import_public/c.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/c.pb.go
@@ -23,10 +23,9 @@
 	Local *Local `protobuf:"bytes,1,opt,name=local" json:"local,omitempty"`
 	// Sub2Message is declared in sub2/a.proto, which is a public import of
 	// sub/a.proto, which is a public import of a.proto.
-	Sub2                 *sub2.Sub2Message       `protobuf:"bytes,2,opt,name=sub2" json:"sub2,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Sub2          *sub2.Sub2Message `protobuf:"bytes,2,opt,name=sub2" json:"sub2,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *UsingPublicImport) Reset() {
@@ -124,6 +123,18 @@
 		return
 	}
 	file_import_public_a_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_import_public_c_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UsingPublicImport); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_import_public_c_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
index 6248d99..5cbcfe9 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
@@ -174,11 +174,10 @@
 	// Types that are valid to be assigned to OneofField:
 	//	*M_OneofInt32
 	//	*M_OneofInt64
-	OneofField             isM_OneofField            `protobuf_oneof:"oneof_field"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	OneofField      isM_OneofField `protobuf_oneof:"oneof_field"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *M) Reset() {
@@ -288,9 +287,8 @@
 	//	*M_Submessage_SubmessageOneofInt32
 	//	*M_Submessage_SubmessageOneofInt64
 	SubmessageOneofField isM_Submessage_SubmessageOneofField `protobuf_oneof:"submessage_oneof_field"`
-	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields             `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache                 `json:"-"`
+	sizeCache            protoimpl.SizeCache
+	unknownFields        protoimpl.UnknownFields
 }
 
 func (x *M_Submessage) Reset() {
@@ -456,6 +454,30 @@
 		return
 	}
 	file_import_public_sub_b_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_import_public_sub_a_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			case 7:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_import_public_sub_a_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M_Submessage); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_import_public_sub_a_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*M_OneofInt32)(nil),
 		(*M_OneofInt64)(nil),
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
index dfa99ab..33c51fe 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go
@@ -18,9 +18,8 @@
 )
 
 type M2 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M2) Reset() {
@@ -89,6 +88,18 @@
 	if File_import_public_sub_b_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_import_public_sub_b_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M2); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_import_public_sub_b_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go
index cde2a6f..d5f6c72 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go
@@ -18,9 +18,8 @@
 )
 
 type Sub2Message struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Sub2Message) Reset() {
@@ -90,6 +89,18 @@
 	if File_import_public_sub2_a_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_import_public_sub2_a_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Sub2Message); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_import_public_sub2_a_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go b/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go
index 8cdb704..9acc5d0 100644
--- a/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go
@@ -18,9 +18,8 @@
 )
 
 type M struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M) Reset() {
@@ -87,6 +86,18 @@
 	if File_imports_fmt_m_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_fmt_m_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_fmt_m_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
index 915316f..20dbd48 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go
@@ -56,9 +56,8 @@
 }
 
 type M1 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M1) Reset() {
@@ -85,10 +84,9 @@
 }
 
 type M1_1 struct {
-	M1                   *M1                     `protobuf:"bytes,1,opt,name=m1,proto3" json:"m1,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	M1            *M1 `protobuf:"bytes,1,opt,name=m1,proto3" json:"m1,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M1_1) Reset() {
@@ -171,6 +169,28 @@
 	if File_imports_test_a_1_m1_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_a_1_m1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M1); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_imports_test_a_1_m1_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M1_1); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_a_1_m1_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
index 1884c23..ed81393 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go
@@ -18,9 +18,8 @@
 )
 
 type M2 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M2) Reset() {
@@ -88,6 +87,18 @@
 	if File_imports_test_a_1_m2_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_a_1_m2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M2); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_a_1_m2_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
index 319f61f..2365425 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go
@@ -18,9 +18,8 @@
 )
 
 type M3 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M3) Reset() {
@@ -88,6 +87,18 @@
 	if File_imports_test_a_2_m3_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_a_2_m3_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M3); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_a_2_m3_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go b/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
index 47695eb..356427b 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go
@@ -18,9 +18,8 @@
 )
 
 type M4 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M4) Reset() {
@@ -88,6 +87,18 @@
 	if File_imports_test_a_2_m4_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_a_2_m4_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M4); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_a_2_m4_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
index acda349..f8485df 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go
@@ -18,9 +18,8 @@
 )
 
 type M1 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M1) Reset() {
@@ -89,6 +88,18 @@
 	if File_imports_test_b_1_m1_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_b_1_m1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M1); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_b_1_m1_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
index 16e918f..0c4a73c 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go
@@ -18,9 +18,8 @@
 )
 
 type M2 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *M2) Reset() {
@@ -89,6 +88,18 @@
 	if File_imports_test_b_1_m2_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_b_1_m2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*M2); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_b_1_m2_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
index 9d28776..8d790d3 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go
@@ -19,10 +19,9 @@
 )
 
 type A1M1 struct {
-	F                    *test_a_1.M1            `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	F             *test_a_1.M1 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *A1M1) Reset() {
@@ -102,6 +101,18 @@
 	if File_imports_test_import_a1m1_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_import_a1m1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*A1M1); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_import_a1m1_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
index 55d689a..0483904 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go
@@ -19,10 +19,9 @@
 )
 
 type A1M2 struct {
-	F                    *test_a_1.M2            `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	F             *test_a_1.M2 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *A1M2) Reset() {
@@ -102,6 +101,18 @@
 	if File_imports_test_import_a1m2_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_import_a1m2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*A1M2); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_import_a1m2_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go b/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go
index cd82745..0475375 100644
--- a/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go
+++ b/cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go
@@ -22,14 +22,13 @@
 )
 
 type All struct {
-	Am1                  *test_a_1.M1            `protobuf:"bytes,1,opt,name=am1,proto3" json:"am1,omitempty"`
-	Am2                  *test_a_1.M2            `protobuf:"bytes,2,opt,name=am2,proto3" json:"am2,omitempty"`
-	Bm1                  *test_b_1.M1            `protobuf:"bytes,5,opt,name=bm1,proto3" json:"bm1,omitempty"`
-	Bm2                  *test_b_1.M2            `protobuf:"bytes,6,opt,name=bm2,proto3" json:"bm2,omitempty"`
-	Fmt                  *fmt.M                  `protobuf:"bytes,7,opt,name=fmt,proto3" json:"fmt,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Am1           *test_a_1.M1 `protobuf:"bytes,1,opt,name=am1,proto3" json:"am1,omitempty"`
+	Am2           *test_a_1.M2 `protobuf:"bytes,2,opt,name=am2,proto3" json:"am2,omitempty"`
+	Bm1           *test_b_1.M1 `protobuf:"bytes,5,opt,name=bm1,proto3" json:"bm1,omitempty"`
+	Bm2           *test_b_1.M2 `protobuf:"bytes,6,opt,name=bm2,proto3" json:"bm2,omitempty"`
+	Fmt           *fmt.M       `protobuf:"bytes,7,opt,name=fmt,proto3" json:"fmt,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *All) Reset() {
@@ -163,6 +162,18 @@
 	if File_imports_test_import_all_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_imports_test_import_all_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*All); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_imports_test_import_all_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go b/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go
index 2c7e1da..5d9bd7d 100644
--- a/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go
+++ b/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go
@@ -20,10 +20,9 @@
 type Foo struct {
 	// Types that are valid to be assigned to Bar:
 	//	*Foo_GetBar
-	Bar                  isFoo_Bar               `protobuf_oneof:"bar"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Bar           isFoo_Bar `protobuf_oneof:"bar"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Foo) Reset() {
@@ -113,6 +112,18 @@
 	if File_issue780_oneof_conflict_test_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_issue780_oneof_conflict_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Foo); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_issue780_oneof_conflict_test_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*Foo_GetBar)(nil),
 	}
diff --git a/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go b/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
index 3854d2b..0026f3e 100644
--- a/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
+++ b/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
@@ -66,11 +66,10 @@
 }
 
 type Message struct {
-	StringField          *string                 `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"`
-	EnumField            *Enum                   `protobuf:"varint,2,opt,name=enum_field,json=enumField,enum=Enum,def=0" json:"enum_field,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	StringField   *string `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"`
+	EnumField     *Enum   `protobuf:"varint,2,opt,name=enum_field,json=enumField,enum=Enum,def=0" json:"enum_field,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message) Reset() {
@@ -158,6 +157,18 @@
 	if File_nopackage_nopackage_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_nopackage_nopackage_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_nopackage_nopackage_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
index 0b27fc3..8f92f17 100644
--- a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
@@ -314,11 +314,10 @@
 }
 
 type EnumContainerMessage1 struct {
-	DefaultDuplicate1    *EnumType2              `protobuf:"varint,1,opt,name=default_duplicate1,json=defaultDuplicate1,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate1,omitempty"`
-	DefaultDuplicate2    *EnumType2              `protobuf:"varint,2,opt,name=default_duplicate2,json=defaultDuplicate2,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate2,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	DefaultDuplicate1 *EnumType2 `protobuf:"varint,1,opt,name=default_duplicate1,json=defaultDuplicate1,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate1,omitempty"`
+	DefaultDuplicate2 *EnumType2 `protobuf:"varint,2,opt,name=default_duplicate2,json=defaultDuplicate2,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate2,omitempty"`
+	sizeCache         protoimpl.SizeCache
+	unknownFields     protoimpl.UnknownFields
 }
 
 func (x *EnumContainerMessage1) Reset() {
@@ -362,9 +361,8 @@
 }
 
 type EnumContainerMessage1_EnumContainerMessage2 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *EnumContainerMessage1_EnumContainerMessage2) Reset() {
@@ -473,6 +471,28 @@
 	if File_proto2_enum_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto2_enum_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnumContainerMessage1); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto2_enum_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnumContainerMessage1_EnumContainerMessage2); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_proto2_enum_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
index 5757a17..054e264 100644
--- a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
@@ -175,10 +175,9 @@
 	// Types that are valid to be assigned to OneofTwo:
 	//	*FieldTestMessage_OneofTwo_1
 	//	*FieldTestMessage_OneofTwo_2
-	OneofTwo             isFieldTestMessage_OneofTwo `protobuf_oneof:"oneof_two"`
-	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields     `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache         `json:"-"`
+	OneofTwo      isFieldTestMessage_OneofTwo `protobuf_oneof:"oneof_two"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FieldTestMessage) Reset() {
@@ -1095,10 +1094,9 @@
 func (*FieldTestMessage_OneofTwo_2) isFieldTestMessage_OneofTwo() {}
 
 type FieldTestMessage_OptionalGroup struct {
-	OptionalGroup        *string                 `protobuf:"bytes,19,opt,name=optional_group,json=optionalGroup" json:"optional_group,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptionalGroup *string `protobuf:"bytes,19,opt,name=optional_group,json=optionalGroup" json:"optional_group,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FieldTestMessage_OptionalGroup) Reset() {
@@ -1132,10 +1130,9 @@
 }
 
 type FieldTestMessage_RequiredGroup struct {
-	RequiredGroup        *string                 `protobuf:"bytes,119,req,name=required_group,json=requiredGroup" json:"required_group,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	RequiredGroup *string `protobuf:"bytes,119,req,name=required_group,json=requiredGroup" json:"required_group,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FieldTestMessage_RequiredGroup) Reset() {
@@ -1169,10 +1166,9 @@
 }
 
 type FieldTestMessage_RepeatedGroup struct {
-	RepeatedGroup        []string                `protobuf:"bytes,219,rep,name=repeated_group,json=repeatedGroup" json:"repeated_group,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	RepeatedGroup []string `protobuf:"bytes,219,rep,name=repeated_group,json=repeatedGroup" json:"repeated_group,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FieldTestMessage_RepeatedGroup) Reset() {
@@ -1206,10 +1202,9 @@
 }
 
 type FieldTestMessage_OneofGroup struct {
-	OneofGroupField      *string                 `protobuf:"bytes,619,opt,name=oneof_group_field,json=oneofGroupField" json:"oneof_group_field,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OneofGroupField *string `protobuf:"bytes,619,opt,name=oneof_group_field,json=oneofGroupField" json:"oneof_group_field,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
 }
 
 func (x *FieldTestMessage_OneofGroup) Reset() {
@@ -1243,9 +1238,8 @@
 }
 
 type FieldTestMessage_Message struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FieldTestMessage_Message) Reset() {
@@ -1703,6 +1697,68 @@
 	if File_proto2_fields_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto2_fields_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldTestMessage); i {
+			case 83:
+				return &v.sizeCache
+			case 84:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto2_fields_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldTestMessage_OptionalGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto2_fields_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldTestMessage_RequiredGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto2_fields_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldTestMessage_RepeatedGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto2_fields_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldTestMessage_OneofGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto2_fields_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldTestMessage_Message); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_proto2_fields_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*FieldTestMessage_OneofBool)(nil),
 		(*FieldTestMessage_OneofEnum)(nil),
diff --git a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
index 16da78e..8d2b452 100644
--- a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
@@ -18,11 +18,10 @@
 )
 
 type Layer1 struct {
-	L2                   *Layer1_Layer2          `protobuf:"bytes,1,opt,name=l2" json:"l2,omitempty"`
-	L3                   *Layer1_Layer2_Layer3   `protobuf:"bytes,2,opt,name=l3" json:"l3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	L2            *Layer1_Layer2        `protobuf:"bytes,1,opt,name=l2" json:"l2,omitempty"`
+	L3            *Layer1_Layer2_Layer3 `protobuf:"bytes,2,opt,name=l3" json:"l3,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Layer1) Reset() {
@@ -63,10 +62,9 @@
 }
 
 type Layer1_Layer2 struct {
-	L3                   *Layer1_Layer2_Layer3   `protobuf:"bytes,1,opt,name=l3" json:"l3,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	L3            *Layer1_Layer2_Layer3 `protobuf:"bytes,1,opt,name=l3" json:"l3,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Layer1_Layer2) Reset() {
@@ -100,9 +98,8 @@
 }
 
 type Layer1_Layer2_Layer3 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Layer1_Layer2_Layer3) Reset() {
@@ -188,6 +185,38 @@
 	if File_proto2_nested_messages_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto2_nested_messages_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Layer1); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto2_nested_messages_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Layer1_Layer2); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto2_nested_messages_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Layer1_Layer2_Layer3); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_proto2_nested_messages_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
index dfa61e5..0fe3fcb 100644
--- a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
@@ -18,11 +18,10 @@
 )
 
 type Message struct {
-	I32                  *int32                  `protobuf:"varint,1,opt,name=i32" json:"i32,omitempty"`
-	M                    *Message                `protobuf:"bytes,2,opt,name=m" json:"m,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	I32           *int32   `protobuf:"varint,1,opt,name=i32" json:"i32,omitempty"`
+	M             *Message `protobuf:"bytes,2,opt,name=m" json:"m,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message) Reset() {
@@ -109,6 +108,18 @@
 	if File_proto2_proto2_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto2_proto2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_proto2_proto2_proto_rawDesc,
diff --git a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
index e2cdc77..7333421 100644
--- a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
@@ -56,46 +56,45 @@
 }
 
 type FieldTestMessage struct {
-	OptionalBool         string                               `protobuf:"bytes,1,opt,name=optional_bool,json=optionalBool,proto3" json:"optional_bool,omitempty"`
-	OptionalEnum         FieldTestMessage_Enum                `protobuf:"varint,2,opt,name=optional_enum,json=optionalEnum,proto3,enum=goproto.protoc.proto3.FieldTestMessage_Enum" json:"optional_enum,omitempty"`
-	OptionalInt32        int32                                `protobuf:"varint,3,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`
-	OptionalSint32       int32                                `protobuf:"zigzag32,4,opt,name=optional_sint32,json=optionalSint32,proto3" json:"optional_sint32,omitempty"`
-	OptionalUint32       uint32                               `protobuf:"varint,5,opt,name=optional_uint32,json=optionalUint32,proto3" json:"optional_uint32,omitempty"`
-	OptionalInt64        int64                                `protobuf:"varint,6,opt,name=optional_int64,json=optionalInt64,proto3" json:"optional_int64,omitempty"`
-	OptionalSint64       int64                                `protobuf:"zigzag64,7,opt,name=optional_sint64,json=optionalSint64,proto3" json:"optional_sint64,omitempty"`
-	OptionalUint64       uint64                               `protobuf:"varint,8,opt,name=optional_uint64,json=optionalUint64,proto3" json:"optional_uint64,omitempty"`
-	OptionalSfixed32     int32                                `protobuf:"fixed32,9,opt,name=optional_sfixed32,json=optionalSfixed32,proto3" json:"optional_sfixed32,omitempty"`
-	OptionalFixed32      uint32                               `protobuf:"fixed32,10,opt,name=optional_fixed32,json=optionalFixed32,proto3" json:"optional_fixed32,omitempty"`
-	OptionalFloat        float32                              `protobuf:"fixed32,11,opt,name=optional_float,json=optionalFloat,proto3" json:"optional_float,omitempty"`
-	OptionalSfixed64     int64                                `protobuf:"fixed64,12,opt,name=optional_sfixed64,json=optionalSfixed64,proto3" json:"optional_sfixed64,omitempty"`
-	OptionalFixed64      uint64                               `protobuf:"fixed64,13,opt,name=optional_fixed64,json=optionalFixed64,proto3" json:"optional_fixed64,omitempty"`
-	OptionalDouble       float64                              `protobuf:"fixed64,14,opt,name=optional_double,json=optionalDouble,proto3" json:"optional_double,omitempty"`
-	OptionalString       string                               `protobuf:"bytes,15,opt,name=optional_string,json=optionalString,proto3" json:"optional_string,omitempty"`
-	OptionalBytes        []byte                               `protobuf:"bytes,16,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
-	Optional_Message     *FieldTestMessage_Message            `protobuf:"bytes,17,opt,name=optional_Message,json=optionalMessage,proto3" json:"optional_Message,omitempty"`
-	RepeatedBool         []bool                               `protobuf:"varint,201,rep,packed,name=repeated_bool,json=repeatedBool,proto3" json:"repeated_bool,omitempty"`
-	RepeatedEnum         []FieldTestMessage_Enum              `protobuf:"varint,202,rep,packed,name=repeated_enum,json=repeatedEnum,proto3,enum=goproto.protoc.proto3.FieldTestMessage_Enum" json:"repeated_enum,omitempty"`
-	RepeatedInt32        []int32                              `protobuf:"varint,203,rep,packed,name=repeated_int32,json=repeatedInt32,proto3" json:"repeated_int32,omitempty"`
-	RepeatedSint32       []int32                              `protobuf:"zigzag32,204,rep,packed,name=repeated_sint32,json=repeatedSint32,proto3" json:"repeated_sint32,omitempty"`
-	RepeatedUint32       []uint32                             `protobuf:"varint,205,rep,packed,name=repeated_uint32,json=repeatedUint32,proto3" json:"repeated_uint32,omitempty"`
-	RepeatedInt64        []int64                              `protobuf:"varint,206,rep,packed,name=repeated_int64,json=repeatedInt64,proto3" json:"repeated_int64,omitempty"`
-	RepeatedSint64       []int64                              `protobuf:"zigzag64,207,rep,packed,name=repeated_sint64,json=repeatedSint64,proto3" json:"repeated_sint64,omitempty"`
-	RepeatedUint64       []uint64                             `protobuf:"varint,208,rep,packed,name=repeated_uint64,json=repeatedUint64,proto3" json:"repeated_uint64,omitempty"`
-	RepeatedSfixed32     []int32                              `protobuf:"fixed32,209,rep,packed,name=repeated_sfixed32,json=repeatedSfixed32,proto3" json:"repeated_sfixed32,omitempty"`
-	RepeatedFixed32      []uint32                             `protobuf:"fixed32,210,rep,packed,name=repeated_fixed32,json=repeatedFixed32,proto3" json:"repeated_fixed32,omitempty"`
-	RepeatedFloat        []float32                            `protobuf:"fixed32,211,rep,packed,name=repeated_float,json=repeatedFloat,proto3" json:"repeated_float,omitempty"`
-	RepeatedSfixed64     []int64                              `protobuf:"fixed64,212,rep,packed,name=repeated_sfixed64,json=repeatedSfixed64,proto3" json:"repeated_sfixed64,omitempty"`
-	RepeatedFixed64      []uint64                             `protobuf:"fixed64,213,rep,packed,name=repeated_fixed64,json=repeatedFixed64,proto3" json:"repeated_fixed64,omitempty"`
-	RepeatedDouble       []float64                            `protobuf:"fixed64,214,rep,packed,name=repeated_double,json=repeatedDouble,proto3" json:"repeated_double,omitempty"`
-	RepeatedString       []string                             `protobuf:"bytes,215,rep,name=repeated_string,json=repeatedString,proto3" json:"repeated_string,omitempty"`
-	RepeatedBytes        [][]byte                             `protobuf:"bytes,216,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	Repeated_Message     []*FieldTestMessage_Message          `protobuf:"bytes,217,rep,name=repeated_Message,json=repeatedMessage,proto3" json:"repeated_Message,omitempty"`
-	MapInt32Int64        map[int32]int64                      `protobuf:"bytes,500,rep,name=map_int32_int64,json=mapInt32Int64,proto3" json:"map_int32_int64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	MapStringMessage     map[string]*FieldTestMessage_Message `protobuf:"bytes,501,rep,name=map_string_message,json=mapStringMessage,proto3" json:"map_string_message,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapFixed64Enum       map[uint64]FieldTestMessage_Enum     `protobuf:"bytes,502,rep,name=map_fixed64_enum,json=mapFixed64Enum,proto3" json:"map_fixed64_enum,omitempty" protobuf_key:"fixed64,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=goproto.protoc.proto3.FieldTestMessage_Enum"`
-	XXX_NoUnkeyedLiteral struct{}                             `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields              `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache                  `json:"-"`
+	OptionalBool     string                               `protobuf:"bytes,1,opt,name=optional_bool,json=optionalBool,proto3" json:"optional_bool,omitempty"`
+	OptionalEnum     FieldTestMessage_Enum                `protobuf:"varint,2,opt,name=optional_enum,json=optionalEnum,proto3,enum=goproto.protoc.proto3.FieldTestMessage_Enum" json:"optional_enum,omitempty"`
+	OptionalInt32    int32                                `protobuf:"varint,3,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`
+	OptionalSint32   int32                                `protobuf:"zigzag32,4,opt,name=optional_sint32,json=optionalSint32,proto3" json:"optional_sint32,omitempty"`
+	OptionalUint32   uint32                               `protobuf:"varint,5,opt,name=optional_uint32,json=optionalUint32,proto3" json:"optional_uint32,omitempty"`
+	OptionalInt64    int64                                `protobuf:"varint,6,opt,name=optional_int64,json=optionalInt64,proto3" json:"optional_int64,omitempty"`
+	OptionalSint64   int64                                `protobuf:"zigzag64,7,opt,name=optional_sint64,json=optionalSint64,proto3" json:"optional_sint64,omitempty"`
+	OptionalUint64   uint64                               `protobuf:"varint,8,opt,name=optional_uint64,json=optionalUint64,proto3" json:"optional_uint64,omitempty"`
+	OptionalSfixed32 int32                                `protobuf:"fixed32,9,opt,name=optional_sfixed32,json=optionalSfixed32,proto3" json:"optional_sfixed32,omitempty"`
+	OptionalFixed32  uint32                               `protobuf:"fixed32,10,opt,name=optional_fixed32,json=optionalFixed32,proto3" json:"optional_fixed32,omitempty"`
+	OptionalFloat    float32                              `protobuf:"fixed32,11,opt,name=optional_float,json=optionalFloat,proto3" json:"optional_float,omitempty"`
+	OptionalSfixed64 int64                                `protobuf:"fixed64,12,opt,name=optional_sfixed64,json=optionalSfixed64,proto3" json:"optional_sfixed64,omitempty"`
+	OptionalFixed64  uint64                               `protobuf:"fixed64,13,opt,name=optional_fixed64,json=optionalFixed64,proto3" json:"optional_fixed64,omitempty"`
+	OptionalDouble   float64                              `protobuf:"fixed64,14,opt,name=optional_double,json=optionalDouble,proto3" json:"optional_double,omitempty"`
+	OptionalString   string                               `protobuf:"bytes,15,opt,name=optional_string,json=optionalString,proto3" json:"optional_string,omitempty"`
+	OptionalBytes    []byte                               `protobuf:"bytes,16,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
+	Optional_Message *FieldTestMessage_Message            `protobuf:"bytes,17,opt,name=optional_Message,json=optionalMessage,proto3" json:"optional_Message,omitempty"`
+	RepeatedBool     []bool                               `protobuf:"varint,201,rep,packed,name=repeated_bool,json=repeatedBool,proto3" json:"repeated_bool,omitempty"`
+	RepeatedEnum     []FieldTestMessage_Enum              `protobuf:"varint,202,rep,packed,name=repeated_enum,json=repeatedEnum,proto3,enum=goproto.protoc.proto3.FieldTestMessage_Enum" json:"repeated_enum,omitempty"`
+	RepeatedInt32    []int32                              `protobuf:"varint,203,rep,packed,name=repeated_int32,json=repeatedInt32,proto3" json:"repeated_int32,omitempty"`
+	RepeatedSint32   []int32                              `protobuf:"zigzag32,204,rep,packed,name=repeated_sint32,json=repeatedSint32,proto3" json:"repeated_sint32,omitempty"`
+	RepeatedUint32   []uint32                             `protobuf:"varint,205,rep,packed,name=repeated_uint32,json=repeatedUint32,proto3" json:"repeated_uint32,omitempty"`
+	RepeatedInt64    []int64                              `protobuf:"varint,206,rep,packed,name=repeated_int64,json=repeatedInt64,proto3" json:"repeated_int64,omitempty"`
+	RepeatedSint64   []int64                              `protobuf:"zigzag64,207,rep,packed,name=repeated_sint64,json=repeatedSint64,proto3" json:"repeated_sint64,omitempty"`
+	RepeatedUint64   []uint64                             `protobuf:"varint,208,rep,packed,name=repeated_uint64,json=repeatedUint64,proto3" json:"repeated_uint64,omitempty"`
+	RepeatedSfixed32 []int32                              `protobuf:"fixed32,209,rep,packed,name=repeated_sfixed32,json=repeatedSfixed32,proto3" json:"repeated_sfixed32,omitempty"`
+	RepeatedFixed32  []uint32                             `protobuf:"fixed32,210,rep,packed,name=repeated_fixed32,json=repeatedFixed32,proto3" json:"repeated_fixed32,omitempty"`
+	RepeatedFloat    []float32                            `protobuf:"fixed32,211,rep,packed,name=repeated_float,json=repeatedFloat,proto3" json:"repeated_float,omitempty"`
+	RepeatedSfixed64 []int64                              `protobuf:"fixed64,212,rep,packed,name=repeated_sfixed64,json=repeatedSfixed64,proto3" json:"repeated_sfixed64,omitempty"`
+	RepeatedFixed64  []uint64                             `protobuf:"fixed64,213,rep,packed,name=repeated_fixed64,json=repeatedFixed64,proto3" json:"repeated_fixed64,omitempty"`
+	RepeatedDouble   []float64                            `protobuf:"fixed64,214,rep,packed,name=repeated_double,json=repeatedDouble,proto3" json:"repeated_double,omitempty"`
+	RepeatedString   []string                             `protobuf:"bytes,215,rep,name=repeated_string,json=repeatedString,proto3" json:"repeated_string,omitempty"`
+	RepeatedBytes    [][]byte                             `protobuf:"bytes,216,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
+	Repeated_Message []*FieldTestMessage_Message          `protobuf:"bytes,217,rep,name=repeated_Message,json=repeatedMessage,proto3" json:"repeated_Message,omitempty"`
+	MapInt32Int64    map[int32]int64                      `protobuf:"bytes,500,rep,name=map_int32_int64,json=mapInt32Int64,proto3" json:"map_int32_int64,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	MapStringMessage map[string]*FieldTestMessage_Message `protobuf:"bytes,501,rep,name=map_string_message,json=mapStringMessage,proto3" json:"map_string_message,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	MapFixed64Enum   map[uint64]FieldTestMessage_Enum     `protobuf:"bytes,502,rep,name=map_fixed64_enum,json=mapFixed64Enum,proto3" json:"map_fixed64_enum,omitempty" protobuf_key:"fixed64,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=goproto.protoc.proto3.FieldTestMessage_Enum"`
+	sizeCache        protoimpl.SizeCache
+	unknownFields    protoimpl.UnknownFields
 }
 
 func (x *FieldTestMessage) Reset() {
@@ -381,9 +380,8 @@
 }
 
 type FieldTestMessage_Message struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FieldTestMessage_Message) Reset() {
@@ -607,6 +605,28 @@
 	if File_proto3_fields_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto3_fields_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldTestMessage); i {
+			case 37:
+				return &v.sizeCache
+			case 38:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto3_fields_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldTestMessage_Message); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_proto3_fields_proto_rawDesc,
diff --git a/encoding/testprotos/pb2/test.pb.go b/encoding/testprotos/pb2/test.pb.go
index a286391..38670db 100644
--- a/encoding/testprotos/pb2/test.pb.go
+++ b/encoding/testprotos/pb2/test.pb.go
@@ -133,24 +133,23 @@
 
 // Scalars contains optional scalar fields.
 type Scalars struct {
-	OptBool              *bool                   `protobuf:"varint,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32             *int32                  `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
-	OptInt64             *int64                  `protobuf:"varint,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
-	OptUint32            *uint32                 `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
-	OptUint64            *uint64                 `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
-	OptSint32            *int32                  `protobuf:"zigzag32,6,opt,name=opt_sint32,json=optSint32" json:"opt_sint32,omitempty"`
-	OptSint64            *int64                  `protobuf:"zigzag64,7,opt,name=opt_sint64,json=optSint64" json:"opt_sint64,omitempty"`
-	OptFixed32           *uint32                 `protobuf:"fixed32,8,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
-	OptFixed64           *uint64                 `protobuf:"fixed64,9,opt,name=opt_fixed64,json=optFixed64" json:"opt_fixed64,omitempty"`
-	OptSfixed32          *int32                  `protobuf:"fixed32,10,opt,name=opt_sfixed32,json=optSfixed32" json:"opt_sfixed32,omitempty"`
-	OptSfixed64          *int64                  `protobuf:"fixed64,11,opt,name=opt_sfixed64,json=optSfixed64" json:"opt_sfixed64,omitempty"`
-	OptFloat             *float32                `protobuf:"fixed32,20,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
-	OptDouble            *float64                `protobuf:"fixed64,21,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
-	OptBytes             []byte                  `protobuf:"bytes,14,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
-	OptString            *string                 `protobuf:"bytes,13,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptBool       *bool    `protobuf:"varint,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
+	OptInt32      *int32   `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
+	OptInt64      *int64   `protobuf:"varint,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
+	OptUint32     *uint32  `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
+	OptUint64     *uint64  `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
+	OptSint32     *int32   `protobuf:"zigzag32,6,opt,name=opt_sint32,json=optSint32" json:"opt_sint32,omitempty"`
+	OptSint64     *int64   `protobuf:"zigzag64,7,opt,name=opt_sint64,json=optSint64" json:"opt_sint64,omitempty"`
+	OptFixed32    *uint32  `protobuf:"fixed32,8,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
+	OptFixed64    *uint64  `protobuf:"fixed64,9,opt,name=opt_fixed64,json=optFixed64" json:"opt_fixed64,omitempty"`
+	OptSfixed32   *int32   `protobuf:"fixed32,10,opt,name=opt_sfixed32,json=optSfixed32" json:"opt_sfixed32,omitempty"`
+	OptSfixed64   *int64   `protobuf:"fixed64,11,opt,name=opt_sfixed64,json=optSfixed64" json:"opt_sfixed64,omitempty"`
+	OptFloat      *float32 `protobuf:"fixed32,20,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
+	OptDouble     *float64 `protobuf:"fixed64,21,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
+	OptBytes      []byte   `protobuf:"bytes,14,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
+	OptString     *string  `protobuf:"bytes,13,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Scalars) Reset() {
@@ -283,13 +282,12 @@
 
 // Message contains enum fields.
 type Enums struct {
-	OptEnum              *Enum                   `protobuf:"varint,1,opt,name=opt_enum,json=optEnum,enum=pb2.Enum" json:"opt_enum,omitempty"`
-	RptEnum              []Enum                  `protobuf:"varint,2,rep,name=rpt_enum,json=rptEnum,enum=pb2.Enum" json:"rpt_enum,omitempty"`
-	OptNestedEnum        *Enums_NestedEnum       `protobuf:"varint,3,opt,name=opt_nested_enum,json=optNestedEnum,enum=pb2.Enums_NestedEnum" json:"opt_nested_enum,omitempty"`
-	RptNestedEnum        []Enums_NestedEnum      `protobuf:"varint,4,rep,name=rpt_nested_enum,json=rptNestedEnum,enum=pb2.Enums_NestedEnum" json:"rpt_nested_enum,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptEnum       *Enum              `protobuf:"varint,1,opt,name=opt_enum,json=optEnum,enum=pb2.Enum" json:"opt_enum,omitempty"`
+	RptEnum       []Enum             `protobuf:"varint,2,rep,name=rpt_enum,json=rptEnum,enum=pb2.Enum" json:"rpt_enum,omitempty"`
+	OptNestedEnum *Enums_NestedEnum  `protobuf:"varint,3,opt,name=opt_nested_enum,json=optNestedEnum,enum=pb2.Enums_NestedEnum" json:"opt_nested_enum,omitempty"`
+	RptNestedEnum []Enums_NestedEnum `protobuf:"varint,4,rep,name=rpt_nested_enum,json=rptNestedEnum,enum=pb2.Enums_NestedEnum" json:"rpt_nested_enum,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Enums) Reset() {
@@ -345,18 +343,17 @@
 
 // Message contains repeated fields.
 type Repeats struct {
-	RptBool              []bool                  `protobuf:"varint,1,rep,name=rpt_bool,json=rptBool" json:"rpt_bool,omitempty"`
-	RptInt32             []int32                 `protobuf:"varint,2,rep,name=rpt_int32,json=rptInt32" json:"rpt_int32,omitempty"`
-	RptInt64             []int64                 `protobuf:"varint,3,rep,name=rpt_int64,json=rptInt64" json:"rpt_int64,omitempty"`
-	RptUint32            []uint32                `protobuf:"varint,4,rep,name=rpt_uint32,json=rptUint32" json:"rpt_uint32,omitempty"`
-	RptUint64            []uint64                `protobuf:"varint,5,rep,name=rpt_uint64,json=rptUint64" json:"rpt_uint64,omitempty"`
-	RptFloat             []float32               `protobuf:"fixed32,6,rep,name=rpt_float,json=rptFloat" json:"rpt_float,omitempty"`
-	RptDouble            []float64               `protobuf:"fixed64,7,rep,name=rpt_double,json=rptDouble" json:"rpt_double,omitempty"`
-	RptString            []string                `protobuf:"bytes,8,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
-	RptBytes             [][]byte                `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes" json:"rpt_bytes,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	RptBool       []bool    `protobuf:"varint,1,rep,name=rpt_bool,json=rptBool" json:"rpt_bool,omitempty"`
+	RptInt32      []int32   `protobuf:"varint,2,rep,name=rpt_int32,json=rptInt32" json:"rpt_int32,omitempty"`
+	RptInt64      []int64   `protobuf:"varint,3,rep,name=rpt_int64,json=rptInt64" json:"rpt_int64,omitempty"`
+	RptUint32     []uint32  `protobuf:"varint,4,rep,name=rpt_uint32,json=rptUint32" json:"rpt_uint32,omitempty"`
+	RptUint64     []uint64  `protobuf:"varint,5,rep,name=rpt_uint64,json=rptUint64" json:"rpt_uint64,omitempty"`
+	RptFloat      []float32 `protobuf:"fixed32,6,rep,name=rpt_float,json=rptFloat" json:"rpt_float,omitempty"`
+	RptDouble     []float64 `protobuf:"fixed64,7,rep,name=rpt_double,json=rptDouble" json:"rpt_double,omitempty"`
+	RptString     []string  `protobuf:"bytes,8,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
+	RptBytes      [][]byte  `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes" json:"rpt_bytes,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Repeats) Reset() {
@@ -447,11 +444,10 @@
 
 // Message type used as submessage.
 type Nested struct {
-	OptString            *string                 `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptNested            *Nested                 `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	OptNested     *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Nested) Reset() {
@@ -493,13 +489,12 @@
 
 // Message contains message and group fields.
 type Nests struct {
-	OptNested            *Nested                 `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	Optgroup             *Nests_OptGroup         `protobuf:"group,2,opt,name=OptGroup,json=optgroup" json:"optgroup,omitempty"`
-	RptNested            []*Nested               `protobuf:"bytes,4,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
-	Rptgroup             []*Nests_RptGroup       `protobuf:"group,5,rep,name=RptGroup,json=rptgroup" json:"rptgroup,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptNested     *Nested           `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
+	Optgroup      *Nests_OptGroup   `protobuf:"group,2,opt,name=OptGroup,json=optgroup" json:"optgroup,omitempty"`
+	RptNested     []*Nested         `protobuf:"bytes,4,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
+	Rptgroup      []*Nests_RptGroup `protobuf:"group,5,rep,name=RptGroup,json=rptgroup" json:"rptgroup,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Nests) Reset() {
@@ -555,15 +550,14 @@
 
 // Message contains required fields.
 type Requireds struct {
-	ReqBool              *bool                   `protobuf:"varint,1,req,name=req_bool,json=reqBool" json:"req_bool,omitempty"`
-	ReqSfixed64          *int64                  `protobuf:"fixed64,2,req,name=req_sfixed64,json=reqSfixed64" json:"req_sfixed64,omitempty"`
-	ReqDouble            *float64                `protobuf:"fixed64,3,req,name=req_double,json=reqDouble" json:"req_double,omitempty"`
-	ReqString            *string                 `protobuf:"bytes,4,req,name=req_string,json=reqString" json:"req_string,omitempty"`
-	ReqEnum              *Enum                   `protobuf:"varint,5,req,name=req_enum,json=reqEnum,enum=pb2.Enum" json:"req_enum,omitempty"`
-	ReqNested            *Nested                 `protobuf:"bytes,6,req,name=req_nested,json=reqNested" json:"req_nested,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	ReqBool       *bool    `protobuf:"varint,1,req,name=req_bool,json=reqBool" json:"req_bool,omitempty"`
+	ReqSfixed64   *int64   `protobuf:"fixed64,2,req,name=req_sfixed64,json=reqSfixed64" json:"req_sfixed64,omitempty"`
+	ReqDouble     *float64 `protobuf:"fixed64,3,req,name=req_double,json=reqDouble" json:"req_double,omitempty"`
+	ReqString     *string  `protobuf:"bytes,4,req,name=req_string,json=reqString" json:"req_string,omitempty"`
+	ReqEnum       *Enum    `protobuf:"varint,5,req,name=req_enum,json=reqEnum,enum=pb2.Enum" json:"req_enum,omitempty"`
+	ReqNested     *Nested  `protobuf:"bytes,6,req,name=req_nested,json=reqNested" json:"req_nested,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Requireds) Reset() {
@@ -633,11 +627,10 @@
 
 // Message contains both required and optional fields.
 type PartialRequired struct {
-	ReqString            *string                 `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
-	OptString            *string                 `protobuf:"bytes,2,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	ReqString     *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
+	OptString     *string `protobuf:"bytes,2,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *PartialRequired) Reset() {
@@ -678,10 +671,9 @@
 }
 
 type NestedWithRequired struct {
-	ReqString            *string                 `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	ReqString     *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *NestedWithRequired) Reset() {
@@ -720,10 +712,9 @@
 	StrToNested map[string]*NestedWithRequired `protobuf:"bytes,3,rep,name=str_to_nested,json=strToNested" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Types that are valid to be assigned to Union:
 	//	*IndirectRequired_OneofNested
-	Union                isIndirectRequired_Union `protobuf_oneof:"union"`
-	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields  `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache      `json:"-"`
+	Union         isIndirectRequired_Union `protobuf_oneof:"union"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *IndirectRequired) Reset() {
@@ -795,13 +786,12 @@
 func (*IndirectRequired_OneofNested) isIndirectRequired_Union() {}
 
 type Extensions struct {
-	OptString              *string                   `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptBool                *bool                     `protobuf:"varint,101,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32               *int32                    `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	OptString       *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	OptBool         *bool   `protobuf:"varint,101,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
+	OptInt32        *int32  `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Extensions) Reset() {
@@ -858,9 +848,8 @@
 }
 
 type ExtensionsContainer struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ExtensionsContainer) Reset() {
@@ -887,10 +876,9 @@
 }
 
 type MessageSet struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `protobuf_messageset:"1" json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields `protobuf_messageset:"1"`
 }
 
 func (x *MessageSet) Reset() {
@@ -926,10 +914,9 @@
 }
 
 type MessageSetExtension struct {
-	OptString            *string                 `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *MessageSetExtension) Reset() {
@@ -963,10 +950,9 @@
 }
 
 type FakeMessageSet struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *FakeMessageSet) Reset() {
@@ -1002,10 +988,9 @@
 }
 
 type FakeMessageSetExtension struct {
-	OptString            *string                 `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FakeMessageSetExtension) Reset() {
@@ -1040,27 +1025,26 @@
 
 // Message contains well-known type fields.
 type KnownTypes struct {
-	OptBool              *wrapperspb.BoolValue   `protobuf:"bytes,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32             *wrapperspb.Int32Value  `protobuf:"bytes,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
-	OptInt64             *wrapperspb.Int64Value  `protobuf:"bytes,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
-	OptUint32            *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
-	OptUint64            *wrapperspb.UInt64Value `protobuf:"bytes,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
-	OptFloat             *wrapperspb.FloatValue  `protobuf:"bytes,6,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
-	OptDouble            *wrapperspb.DoubleValue `protobuf:"bytes,7,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
-	OptString            *wrapperspb.StringValue `protobuf:"bytes,8,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptBytes             *wrapperspb.BytesValue  `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
-	OptDuration          *durationpb.Duration    `protobuf:"bytes,20,opt,name=opt_duration,json=optDuration" json:"opt_duration,omitempty"`
-	OptTimestamp         *timestamppb.Timestamp  `protobuf:"bytes,21,opt,name=opt_timestamp,json=optTimestamp" json:"opt_timestamp,omitempty"`
-	OptStruct            *structpb.Struct        `protobuf:"bytes,25,opt,name=opt_struct,json=optStruct" json:"opt_struct,omitempty"`
-	OptList              *structpb.ListValue     `protobuf:"bytes,26,opt,name=opt_list,json=optList" json:"opt_list,omitempty"`
-	OptValue             *structpb.Value         `protobuf:"bytes,27,opt,name=opt_value,json=optValue" json:"opt_value,omitempty"`
-	OptNull              *structpb.NullValue     `protobuf:"varint,28,opt,name=opt_null,json=optNull,enum=google.protobuf.NullValue" json:"opt_null,omitempty"`
-	OptEmpty             *emptypb.Empty          `protobuf:"bytes,30,opt,name=opt_empty,json=optEmpty" json:"opt_empty,omitempty"`
-	OptAny               *anypb.Any              `protobuf:"bytes,32,opt,name=opt_any,json=optAny" json:"opt_any,omitempty"`
-	OptFieldmask         *fieldmaskpb.FieldMask  `protobuf:"bytes,40,opt,name=opt_fieldmask,json=optFieldmask" json:"opt_fieldmask,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptBool       *wrapperspb.BoolValue   `protobuf:"bytes,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
+	OptInt32      *wrapperspb.Int32Value  `protobuf:"bytes,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
+	OptInt64      *wrapperspb.Int64Value  `protobuf:"bytes,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
+	OptUint32     *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
+	OptUint64     *wrapperspb.UInt64Value `protobuf:"bytes,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
+	OptFloat      *wrapperspb.FloatValue  `protobuf:"bytes,6,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
+	OptDouble     *wrapperspb.DoubleValue `protobuf:"bytes,7,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
+	OptString     *wrapperspb.StringValue `protobuf:"bytes,8,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	OptBytes      *wrapperspb.BytesValue  `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
+	OptDuration   *durationpb.Duration    `protobuf:"bytes,20,opt,name=opt_duration,json=optDuration" json:"opt_duration,omitempty"`
+	OptTimestamp  *timestamppb.Timestamp  `protobuf:"bytes,21,opt,name=opt_timestamp,json=optTimestamp" json:"opt_timestamp,omitempty"`
+	OptStruct     *structpb.Struct        `protobuf:"bytes,25,opt,name=opt_struct,json=optStruct" json:"opt_struct,omitempty"`
+	OptList       *structpb.ListValue     `protobuf:"bytes,26,opt,name=opt_list,json=optList" json:"opt_list,omitempty"`
+	OptValue      *structpb.Value         `protobuf:"bytes,27,opt,name=opt_value,json=optValue" json:"opt_value,omitempty"`
+	OptNull       *structpb.NullValue     `protobuf:"varint,28,opt,name=opt_null,json=optNull,enum=google.protobuf.NullValue" json:"opt_null,omitempty"`
+	OptEmpty      *emptypb.Empty          `protobuf:"bytes,30,opt,name=opt_empty,json=optEmpty" json:"opt_empty,omitempty"`
+	OptAny        *anypb.Any              `protobuf:"bytes,32,opt,name=opt_any,json=optAny" json:"opt_any,omitempty"`
+	OptFieldmask  *fieldmaskpb.FieldMask  `protobuf:"bytes,40,opt,name=opt_fieldmask,json=optFieldmask" json:"opt_fieldmask,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *KnownTypes) Reset() {
@@ -1213,12 +1197,11 @@
 }
 
 type Nests_OptGroup struct {
-	OptString            *string                        `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptNested            *Nested                        `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	Optnestedgroup       *Nests_OptGroup_OptNestedGroup `protobuf:"group,3,opt,name=OptNestedGroup,json=optnestedgroup" json:"optnestedgroup,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields        `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache            `json:"-"`
+	OptString      *string                        `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	OptNested      *Nested                        `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
+	Optnestedgroup *Nests_OptGroup_OptNestedGroup `protobuf:"group,3,opt,name=OptNestedGroup,json=optnestedgroup" json:"optnestedgroup,omitempty"`
+	sizeCache      protoimpl.SizeCache
+	unknownFields  protoimpl.UnknownFields
 }
 
 func (x *Nests_OptGroup) Reset() {
@@ -1266,10 +1249,9 @@
 }
 
 type Nests_RptGroup struct {
-	RptString            []string                `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	RptString     []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Nests_RptGroup) Reset() {
@@ -1303,10 +1285,9 @@
 }
 
 type Nests_OptGroup_OptNestedGroup struct {
-	OptFixed32           *uint32                 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	OptFixed32    *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Nests_OptGroup_OptNestedGroup) Reset() {
@@ -2059,6 +2040,204 @@
 	if File_pb2_test_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_pb2_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Scalars); i {
+			case 15:
+				return &v.sizeCache
+			case 16:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Enums); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Repeats); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nested); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nests); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Requireds); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PartialRequired); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NestedWithRequired); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IndirectRequired); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Extensions); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			case 5:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtensionsContainer); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MessageSet); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MessageSetExtension); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FakeMessageSet); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FakeMessageSetExtension); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*KnownTypes); i {
+			case 18:
+				return &v.sizeCache
+			case 19:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nests_OptGroup); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nests_RptGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb2_test_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nests_OptGroup_OptNestedGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_pb2_test_proto_msgTypes[8].OneofWrappers = []interface{}{
 		(*IndirectRequired_OneofNested)(nil),
 	}
diff --git a/encoding/testprotos/pb3/test.pb.go b/encoding/testprotos/pb3/test.pb.go
index 26fbe79..50ecdcc 100644
--- a/encoding/testprotos/pb3/test.pb.go
+++ b/encoding/testprotos/pb3/test.pb.go
@@ -112,24 +112,23 @@
 
 // Scalars contains scalar field types.
 type Scalars struct {
-	SBool                bool                    `protobuf:"varint,1,opt,name=s_bool,json=sBool,proto3" json:"s_bool,omitempty"`
-	SInt32               int32                   `protobuf:"varint,2,opt,name=s_int32,json=sInt32,proto3" json:"s_int32,omitempty"`
-	SInt64               int64                   `protobuf:"varint,3,opt,name=s_int64,json=sInt64,proto3" json:"s_int64,omitempty"`
-	SUint32              uint32                  `protobuf:"varint,4,opt,name=s_uint32,json=sUint32,proto3" json:"s_uint32,omitempty"`
-	SUint64              uint64                  `protobuf:"varint,5,opt,name=s_uint64,json=sUint64,proto3" json:"s_uint64,omitempty"`
-	SSint32              int32                   `protobuf:"zigzag32,6,opt,name=s_sint32,json=sSint32,proto3" json:"s_sint32,omitempty"`
-	SSint64              int64                   `protobuf:"zigzag64,7,opt,name=s_sint64,json=sSint64,proto3" json:"s_sint64,omitempty"`
-	SFixed32             uint32                  `protobuf:"fixed32,8,opt,name=s_fixed32,json=sFixed32,proto3" json:"s_fixed32,omitempty"`
-	SFixed64             uint64                  `protobuf:"fixed64,9,opt,name=s_fixed64,json=sFixed64,proto3" json:"s_fixed64,omitempty"`
-	SSfixed32            int32                   `protobuf:"fixed32,10,opt,name=s_sfixed32,json=sSfixed32,proto3" json:"s_sfixed32,omitempty"`
-	SSfixed64            int64                   `protobuf:"fixed64,11,opt,name=s_sfixed64,json=sSfixed64,proto3" json:"s_sfixed64,omitempty"`
-	SFloat               float32                 `protobuf:"fixed32,20,opt,name=s_float,json=sFloat,proto3" json:"s_float,omitempty"`
-	SDouble              float64                 `protobuf:"fixed64,21,opt,name=s_double,json=sDouble,proto3" json:"s_double,omitempty"`
-	SBytes               []byte                  `protobuf:"bytes,14,opt,name=s_bytes,json=sBytes,proto3" json:"s_bytes,omitempty"`
-	SString              string                  `protobuf:"bytes,13,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	SBool         bool    `protobuf:"varint,1,opt,name=s_bool,json=sBool,proto3" json:"s_bool,omitempty"`
+	SInt32        int32   `protobuf:"varint,2,opt,name=s_int32,json=sInt32,proto3" json:"s_int32,omitempty"`
+	SInt64        int64   `protobuf:"varint,3,opt,name=s_int64,json=sInt64,proto3" json:"s_int64,omitempty"`
+	SUint32       uint32  `protobuf:"varint,4,opt,name=s_uint32,json=sUint32,proto3" json:"s_uint32,omitempty"`
+	SUint64       uint64  `protobuf:"varint,5,opt,name=s_uint64,json=sUint64,proto3" json:"s_uint64,omitempty"`
+	SSint32       int32   `protobuf:"zigzag32,6,opt,name=s_sint32,json=sSint32,proto3" json:"s_sint32,omitempty"`
+	SSint64       int64   `protobuf:"zigzag64,7,opt,name=s_sint64,json=sSint64,proto3" json:"s_sint64,omitempty"`
+	SFixed32      uint32  `protobuf:"fixed32,8,opt,name=s_fixed32,json=sFixed32,proto3" json:"s_fixed32,omitempty"`
+	SFixed64      uint64  `protobuf:"fixed64,9,opt,name=s_fixed64,json=sFixed64,proto3" json:"s_fixed64,omitempty"`
+	SSfixed32     int32   `protobuf:"fixed32,10,opt,name=s_sfixed32,json=sSfixed32,proto3" json:"s_sfixed32,omitempty"`
+	SSfixed64     int64   `protobuf:"fixed64,11,opt,name=s_sfixed64,json=sSfixed64,proto3" json:"s_sfixed64,omitempty"`
+	SFloat        float32 `protobuf:"fixed32,20,opt,name=s_float,json=sFloat,proto3" json:"s_float,omitempty"`
+	SDouble       float64 `protobuf:"fixed64,21,opt,name=s_double,json=sDouble,proto3" json:"s_double,omitempty"`
+	SBytes        []byte  `protobuf:"bytes,14,opt,name=s_bytes,json=sBytes,proto3" json:"s_bytes,omitempty"`
+	SString       string  `protobuf:"bytes,13,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Scalars) Reset() {
@@ -262,11 +261,10 @@
 
 // Message contains enum fields.
 type Enums struct {
-	SEnum                Enum                    `protobuf:"varint,1,opt,name=s_enum,json=sEnum,proto3,enum=pb3.Enum" json:"s_enum,omitempty"`
-	SNestedEnum          Enums_NestedEnum        `protobuf:"varint,3,opt,name=s_nested_enum,json=sNestedEnum,proto3,enum=pb3.Enums_NestedEnum" json:"s_nested_enum,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	SEnum         Enum             `protobuf:"varint,1,opt,name=s_enum,json=sEnum,proto3,enum=pb3.Enum" json:"s_enum,omitempty"`
+	SNestedEnum   Enums_NestedEnum `protobuf:"varint,3,opt,name=s_nested_enum,json=sNestedEnum,proto3,enum=pb3.Enums_NestedEnum" json:"s_nested_enum,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Enums) Reset() {
@@ -308,10 +306,9 @@
 
 // Message contains nested message field.
 type Nests struct {
-	SNested              *Nested                 `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	SNested       *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Nests) Reset() {
@@ -346,11 +343,10 @@
 
 // Message type used as submessage.
 type Nested struct {
-	SString              string                  `protobuf:"bytes,1,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
-	SNested              *Nested                 `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	SString       string  `protobuf:"bytes,1,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
+	SNested       *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Nested) Reset() {
@@ -396,10 +392,9 @@
 	//	*Oneofs_OneofEnum
 	//	*Oneofs_OneofString
 	//	*Oneofs_OneofNested
-	Union                isOneofs_Union          `protobuf_oneof:"union"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Union         isOneofs_Union `protobuf_oneof:"union"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Oneofs) Reset() {
@@ -477,14 +472,13 @@
 
 // Message contains map fields.
 type Maps struct {
-	Int32ToStr           map[int32]string        `protobuf:"bytes,1,rep,name=int32_to_str,json=int32ToStr,proto3" json:"int32_to_str,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	BoolToUint32         map[bool]uint32         `protobuf:"bytes,2,rep,name=bool_to_uint32,json=boolToUint32,proto3" json:"bool_to_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	Uint64ToEnum         map[uint64]Enum         `protobuf:"bytes,3,rep,name=uint64_to_enum,json=uint64ToEnum,proto3" json:"uint64_to_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=pb3.Enum"`
-	StrToNested          map[string]*Nested      `protobuf:"bytes,4,rep,name=str_to_nested,json=strToNested,proto3" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	StrToOneofs          map[string]*Oneofs      `protobuf:"bytes,5,rep,name=str_to_oneofs,json=strToOneofs,proto3" json:"str_to_oneofs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Int32ToStr    map[int32]string   `protobuf:"bytes,1,rep,name=int32_to_str,json=int32ToStr,proto3" json:"int32_to_str,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	BoolToUint32  map[bool]uint32    `protobuf:"bytes,2,rep,name=bool_to_uint32,json=boolToUint32,proto3" json:"bool_to_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Uint64ToEnum  map[uint64]Enum    `protobuf:"bytes,3,rep,name=uint64_to_enum,json=uint64ToEnum,proto3" json:"uint64_to_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=pb3.Enum"`
+	StrToNested   map[string]*Nested `protobuf:"bytes,4,rep,name=str_to_nested,json=strToNested,proto3" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	StrToOneofs   map[string]*Oneofs `protobuf:"bytes,5,rep,name=str_to_oneofs,json=strToOneofs,proto3" json:"str_to_oneofs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Maps) Reset() {
@@ -547,10 +541,9 @@
 
 // Message for testing json_name option.
 type JSONNames struct {
-	SString              string                  `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	SString       string `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *JSONNames) Reset() {
@@ -752,6 +745,78 @@
 	if File_pb3_test_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_pb3_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Scalars); i {
+			case 15:
+				return &v.sizeCache
+			case 16:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb3_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Enums); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb3_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nests); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb3_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nested); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb3_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Oneofs); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb3_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Maps); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pb3_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*JSONNames); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_pb3_test_proto_msgTypes[4].OneofWrappers = []interface{}{
 		(*Oneofs_OneofEnum)(nil),
 		(*Oneofs_OneofString)(nil),
diff --git a/internal/impl/codec_message.go b/internal/impl/codec_message.go
index 2d5b376..e4e3706 100644
--- a/internal/impl/codec_message.go
+++ b/internal/impl/codec_message.go
@@ -19,8 +19,8 @@
 type coderMessageInfo struct {
 	orderedCoderFields []*coderFieldInfo
 	sizecacheOffset    offset
-	extensionOffset    offset
 	unknownOffset      offset
+	extensionOffset    offset
 	needsInitCheck     bool
 }
 
@@ -55,7 +55,7 @@
 		}
 		mi.orderedCoderFields = append(mi.orderedCoderFields, &coderFieldInfo{
 			num:     fd.Number(),
-			offset:  offsetOf(fs),
+			offset:  offsetOf(fs, mi.Exporter),
 			wiretag: wiretag,
 			tagsize: wire.SizeVarint(wiretag),
 			funcs:   fieldCoder(fd, ft),
@@ -71,7 +71,7 @@
 		fs := si.oneofsByName[od.Name()]
 		mi.orderedCoderFields = append(mi.orderedCoderFields, &coderFieldInfo{
 			num:       od.Fields().Get(0).Number(),
-			offset:    offsetOf(fs),
+			offset:    offsetOf(fs, mi.Exporter),
 			funcs:     makeOneofFieldCoder(fs, od, si.fieldsByNumber, si.oneofWrappersByNumber),
 			isPointer: true,
 		})
diff --git a/internal/impl/message.go b/internal/impl/message.go
index 82107df..ec9be4e 100644
--- a/internal/impl/message.go
+++ b/internal/impl/message.go
@@ -29,6 +29,10 @@
 	// Once set, this field must never be mutated.
 	PBType pref.MessageType
 
+	// Exporter must be provided in a purego environment in order to provide
+	// access to unexported fields.
+	Exporter exporter
+
 	// OneofWrappers is list of pointers to oneof wrapper struct types.
 	OneofWrappers []interface{}
 
@@ -51,6 +55,11 @@
 	extensionFieldInfos   map[pref.ExtensionType]*extensionFieldInfo
 }
 
+// exporter is a function that returns a reference to the ith field of v,
+// where v is a pointer to a struct. It returns nil if it does not support
+// exporting the requested field (e.g., already exported).
+type exporter func(v interface{}, i int) interface{}
+
 var prefMessageType = reflect.TypeOf((*pref.Message)(nil)).Elem()
 
 // getMessageInfo returns the MessageInfo (if any) for a type.
@@ -120,8 +129,8 @@
 
 type structInfo struct {
 	sizecacheOffset offset
-	extensionOffset offset
 	unknownOffset   offset
+	extensionOffset offset
 
 	fieldsByNumber        map[pref.FieldNumber]reflect.StructField
 	oneofsByName          map[pref.Name]reflect.StructField
@@ -132,8 +141,8 @@
 func (mi *MessageInfo) makeStructInfo(t reflect.Type) structInfo {
 	si := structInfo{
 		sizecacheOffset: invalidOffset,
-		extensionOffset: invalidOffset,
 		unknownOffset:   invalidOffset,
+		extensionOffset: invalidOffset,
 
 		fieldsByNumber:        map[pref.FieldNumber]reflect.StructField{},
 		oneofsByName:          map[pref.Name]reflect.StructField{},
@@ -141,17 +150,26 @@
 		oneofWrappersByNumber: map[pref.FieldNumber]reflect.Type{},
 	}
 
+	if f, _ := t.FieldByName("sizeCache"); f.Type == sizecacheType {
+		si.sizecacheOffset = offsetOf(f, mi.Exporter)
+	}
 	if f, _ := t.FieldByName("XXX_sizecache"); f.Type == sizecacheType {
-		si.sizecacheOffset = offsetOf(f)
+		si.sizecacheOffset = offsetOf(f, mi.Exporter)
 	}
-	if f, _ := t.FieldByName("XXX_InternalExtensions"); f.Type == extensionFieldsType {
-		si.extensionOffset = offsetOf(f)
-	}
-	if f, _ := t.FieldByName("XXX_extensions"); f.Type == extensionFieldsType {
-		si.extensionOffset = offsetOf(f)
+	if f, _ := t.FieldByName("unknownFields"); f.Type == unknownFieldsType {
+		si.unknownOffset = offsetOf(f, mi.Exporter)
 	}
 	if f, _ := t.FieldByName("XXX_unrecognized"); f.Type == unknownFieldsType {
-		si.unknownOffset = offsetOf(f)
+		si.unknownOffset = offsetOf(f, mi.Exporter)
+	}
+	if f, _ := t.FieldByName("extensionFields"); f.Type == extensionFieldsType {
+		si.extensionOffset = offsetOf(f, mi.Exporter)
+	}
+	if f, _ := t.FieldByName("XXX_InternalExtensions"); f.Type == extensionFieldsType {
+		si.extensionOffset = offsetOf(f, mi.Exporter)
+	}
+	if f, _ := t.FieldByName("XXX_extensions"); f.Type == extensionFieldsType {
+		si.extensionOffset = offsetOf(f, mi.Exporter)
 	}
 
 	// Generate a mapping of field numbers and names to Go struct field or type.
@@ -209,15 +227,15 @@
 		var fi fieldInfo
 		switch {
 		case fd.ContainingOneof() != nil:
-			fi = fieldInfoForOneof(fd, si.oneofsByName[fd.ContainingOneof().Name()], si.oneofWrappersByNumber[fd.Number()])
+			fi = fieldInfoForOneof(fd, si.oneofsByName[fd.ContainingOneof().Name()], mi.Exporter, si.oneofWrappersByNumber[fd.Number()])
 		case fd.IsMap():
-			fi = fieldInfoForMap(fd, fs)
+			fi = fieldInfoForMap(fd, fs, mi.Exporter)
 		case fd.IsList():
-			fi = fieldInfoForList(fd, fs)
+			fi = fieldInfoForList(fd, fs, mi.Exporter)
 		case fd.Kind() == pref.MessageKind || fd.Kind() == pref.GroupKind:
-			fi = fieldInfoForMessage(fd, fs)
+			fi = fieldInfoForMessage(fd, fs, mi.Exporter)
 		default:
-			fi = fieldInfoForScalar(fd, fs)
+			fi = fieldInfoForScalar(fd, fs, mi.Exporter)
 		}
 		mi.fields[fd.Number()] = &fi
 	}
@@ -225,7 +243,7 @@
 	mi.oneofs = map[pref.Name]*oneofInfo{}
 	for i := 0; i < mi.PBType.Descriptor().Oneofs().Len(); i++ {
 		od := mi.PBType.Descriptor().Oneofs().Get(i)
-		mi.oneofs[od.Name()] = makeOneofInfo(od, si.oneofsByName[od.Name()], si.oneofWrappersByType)
+		mi.oneofs[od.Name()] = makeOneofInfo(od, si.oneofsByName[od.Name()], mi.Exporter, si.oneofWrappersByType)
 	}
 }
 
diff --git a/internal/impl/message_field.go b/internal/impl/message_field.go
index dede8a3..f3b4f8a 100644
--- a/internal/impl/message_field.go
+++ b/internal/impl/message_field.go
@@ -26,7 +26,7 @@
 	newMessage func() pref.Message
 }
 
-func fieldInfoForOneof(fd pref.FieldDescriptor, fs reflect.StructField, ot reflect.Type) fieldInfo {
+func fieldInfoForOneof(fd pref.FieldDescriptor, fs reflect.StructField, x exporter, ot reflect.Type) fieldInfo {
 	ft := fs.Type
 	if ft.Kind() != reflect.Interface {
 		panic(fmt.Sprintf("invalid type: got %v, want interface kind", ft))
@@ -44,7 +44,7 @@
 	}
 
 	// TODO: Implement unsafe fast path?
-	fieldOffset := offsetOf(fs)
+	fieldOffset := offsetOf(fs, x)
 	return fieldInfo{
 		// NOTE: The logic below intentionally assumes that oneof fields are
 		// well-formatted. That is, the oneof interface never contains a
@@ -111,7 +111,7 @@
 	}
 }
 
-func fieldInfoForMap(fd pref.FieldDescriptor, fs reflect.StructField) fieldInfo {
+func fieldInfoForMap(fd pref.FieldDescriptor, fs reflect.StructField, x exporter) fieldInfo {
 	ft := fs.Type
 	if ft.Kind() != reflect.Map {
 		panic(fmt.Sprintf("invalid type: got %v, want map kind", ft))
@@ -123,7 +123,7 @@
 	})
 
 	// TODO: Implement unsafe fast path?
-	fieldOffset := offsetOf(fs)
+	fieldOffset := offsetOf(fs, x)
 	return fieldInfo{
 		fieldDesc: fd,
 		has: func(p pointer) bool {
@@ -158,7 +158,7 @@
 	}
 }
 
-func fieldInfoForList(fd pref.FieldDescriptor, fs reflect.StructField) fieldInfo {
+func fieldInfoForList(fd pref.FieldDescriptor, fs reflect.StructField, x exporter) fieldInfo {
 	ft := fs.Type
 	if ft.Kind() != reflect.Slice {
 		panic(fmt.Sprintf("invalid type: got %v, want slice kind", ft))
@@ -169,7 +169,7 @@
 	})
 
 	// TODO: Implement unsafe fast path?
-	fieldOffset := offsetOf(fs)
+	fieldOffset := offsetOf(fs, x)
 	return fieldInfo{
 		fieldDesc: fd,
 		has: func(p pointer) bool {
@@ -206,7 +206,7 @@
 
 var emptyBytes = reflect.ValueOf([]byte{})
 
-func fieldInfoForScalar(fd pref.FieldDescriptor, fs reflect.StructField) fieldInfo {
+func fieldInfoForScalar(fd pref.FieldDescriptor, fs reflect.StructField, x exporter) fieldInfo {
 	ft := fs.Type
 	nullable := fd.Syntax() == pref.Proto2
 	if nullable {
@@ -220,7 +220,7 @@
 	conv, _ := newConverter(ft, fd.Kind())
 
 	// TODO: Implement unsafe fast path?
-	fieldOffset := offsetOf(fs)
+	fieldOffset := offsetOf(fs, x)
 	return fieldInfo{
 		fieldDesc: fd,
 		has: func(p pointer) bool {
@@ -281,13 +281,13 @@
 	}
 }
 
-func fieldInfoForMessage(fd pref.FieldDescriptor, fs reflect.StructField) fieldInfo {
+func fieldInfoForMessage(fd pref.FieldDescriptor, fs reflect.StructField, x exporter) fieldInfo {
 	ft := fs.Type
 	conv, _ := newConverter(ft, fd.Kind())
 	frozenEmpty := pref.ValueOf(frozenMessage{conv.NewMessage()})
 
 	// TODO: Implement unsafe fast path?
-	fieldOffset := offsetOf(fs)
+	fieldOffset := offsetOf(fs, x)
 	return fieldInfo{
 		fieldDesc: fd,
 		has: func(p pointer) bool {
@@ -334,8 +334,8 @@
 	which     func(pointer) pref.FieldNumber
 }
 
-func makeOneofInfo(od pref.OneofDescriptor, fs reflect.StructField, wrappersByType map[reflect.Type]pref.FieldNumber) *oneofInfo {
-	fieldOffset := offsetOf(fs)
+func makeOneofInfo(od pref.OneofDescriptor, fs reflect.StructField, x exporter, wrappersByType map[reflect.Type]pref.FieldNumber) *oneofInfo {
+	fieldOffset := offsetOf(fs, x)
 	return &oneofInfo{
 		oneofDesc: od,
 		which: func(p pointer) pref.FieldNumber {
diff --git a/internal/impl/pointer_reflect.go b/internal/impl/pointer_reflect.go
index 207c20b..6060154 100644
--- a/internal/impl/pointer_reflect.go
+++ b/internal/impl/pointer_reflect.go
@@ -11,26 +11,37 @@
 	"reflect"
 )
 
+const UnsafeEnabled = false
+
 // offset represents the offset to a struct field, accessible from a pointer.
 // The offset is the field index into a struct.
-type offset []int
+type offset struct {
+	index  int
+	export exporter
+}
 
 // offsetOf returns a field offset for the struct field.
-func offsetOf(f reflect.StructField) offset {
+func offsetOf(f reflect.StructField, x exporter) offset {
 	if len(f.Index) != 1 {
 		panic("embedded structs are not supported")
 	}
-	return f.Index
+	if f.PkgPath == "" {
+		return offset{index: f.Index[0]} // field is already exported
+	}
+	if x == nil {
+		panic("exporter must be provided for unexported field")
+	}
+	return offset{index: f.Index[0], export: x}
 }
 
 // IsValid reports whether the offset is valid.
-func (f offset) IsValid() bool { return f != nil }
+func (f offset) IsValid() bool { return f.index >= 0 }
 
 // invalidOffset is an invalid field offset.
-var invalidOffset = offset(nil)
+var invalidOffset = offset{index: -1}
 
 // zeroOffset is a noop when calling pointer.Apply.
-var zeroOffset = offset([]int{0})
+var zeroOffset = offset{index: 0}
 
 // pointer is an abstract representation of a pointer to a struct or field.
 type pointer struct{ v reflect.Value }
@@ -53,8 +64,12 @@
 // Apply adds an offset to the pointer to derive a new pointer
 // to a specified field. The current pointer must be pointing at a struct.
 func (p pointer) Apply(f offset) pointer {
-	// TODO: Handle unexported fields in an API that hides XXX fields?
-	return pointer{v: p.v.Elem().FieldByIndex(f).Addr()}
+	if f.export != nil {
+		if v := reflect.ValueOf(f.export(p.v.Interface(), f.index)); v.IsValid() {
+			return pointer{v: v}
+		}
+	}
+	return pointer{v: p.v.Elem().Field(f.index).Addr()}
 }
 
 // AsValueOf treats p as a pointer to an object of type t and returns the value.
diff --git a/internal/impl/pointer_unsafe.go b/internal/impl/pointer_unsafe.go
index 39f1995..bd5ab4b 100644
--- a/internal/impl/pointer_unsafe.go
+++ b/internal/impl/pointer_unsafe.go
@@ -11,12 +11,14 @@
 	"unsafe"
 )
 
+const UnsafeEnabled = true
+
 // offset represents the offset to a struct field, accessible from a pointer.
 // The offset is the byte offset to the field from the start of the struct.
 type offset uintptr
 
 // offsetOf returns a field offset for the struct field.
-func offsetOf(f reflect.StructField) offset {
+func offsetOf(f reflect.StructField, x exporter) offset {
 	return offset(f.Offset)
 }
 
diff --git a/internal/testprotos/benchmarks/benchmarks.pb.go b/internal/testprotos/benchmarks/benchmarks.pb.go
index 62b706e..2545f7d 100644
--- a/internal/testprotos/benchmarks/benchmarks.pb.go
+++ b/internal/testprotos/benchmarks/benchmarks.pb.go
@@ -42,10 +42,9 @@
 	// potentially more realistic results than just parsing the same message
 	// over and over.  A single message parsed repeatedly could yield unusually
 	// good branch prediction performance.
-	Payload              [][]byte                `protobuf:"bytes,3,rep,name=payload,proto3" json:"payload,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Payload       [][]byte `protobuf:"bytes,3,rep,name=payload,proto3" json:"payload,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *BenchmarkDataset) Reset() {
@@ -141,6 +140,18 @@
 	if File_benchmarks_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_benchmarks_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BenchmarkDataset); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_benchmarks_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go b/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
index d63b74e..ff3c7da 100644
--- a/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
@@ -18,50 +18,49 @@
 )
 
 type GoogleMessage1 struct {
-	Field1               *string                   `protobuf:"bytes,1,req,name=field1" json:"field1,omitempty"`
-	Field9               *string                   `protobuf:"bytes,9,opt,name=field9" json:"field9,omitempty"`
-	Field18              *string                   `protobuf:"bytes,18,opt,name=field18" json:"field18,omitempty"`
-	Field80              *bool                     `protobuf:"varint,80,opt,name=field80,def=0" json:"field80,omitempty"`
-	Field81              *bool                     `protobuf:"varint,81,opt,name=field81,def=1" json:"field81,omitempty"`
-	Field2               *int32                    `protobuf:"varint,2,req,name=field2" json:"field2,omitempty"`
-	Field3               *int32                    `protobuf:"varint,3,req,name=field3" json:"field3,omitempty"`
-	Field280             *int32                    `protobuf:"varint,280,opt,name=field280" json:"field280,omitempty"`
-	Field6               *int32                    `protobuf:"varint,6,opt,name=field6,def=0" json:"field6,omitempty"`
-	Field22              *int64                    `protobuf:"varint,22,opt,name=field22" json:"field22,omitempty"`
-	Field4               *string                   `protobuf:"bytes,4,opt,name=field4" json:"field4,omitempty"`
-	Field5               []uint64                  `protobuf:"fixed64,5,rep,name=field5" json:"field5,omitempty"`
-	Field59              *bool                     `protobuf:"varint,59,opt,name=field59,def=0" json:"field59,omitempty"`
-	Field7               *string                   `protobuf:"bytes,7,opt,name=field7" json:"field7,omitempty"`
-	Field16              *int32                    `protobuf:"varint,16,opt,name=field16" json:"field16,omitempty"`
-	Field130             *int32                    `protobuf:"varint,130,opt,name=field130,def=0" json:"field130,omitempty"`
-	Field12              *bool                     `protobuf:"varint,12,opt,name=field12,def=1" json:"field12,omitempty"`
-	Field17              *bool                     `protobuf:"varint,17,opt,name=field17,def=1" json:"field17,omitempty"`
-	Field13              *bool                     `protobuf:"varint,13,opt,name=field13,def=1" json:"field13,omitempty"`
-	Field14              *bool                     `protobuf:"varint,14,opt,name=field14,def=1" json:"field14,omitempty"`
-	Field104             *int32                    `protobuf:"varint,104,opt,name=field104,def=0" json:"field104,omitempty"`
-	Field100             *int32                    `protobuf:"varint,100,opt,name=field100,def=0" json:"field100,omitempty"`
-	Field101             *int32                    `protobuf:"varint,101,opt,name=field101,def=0" json:"field101,omitempty"`
-	Field102             *string                   `protobuf:"bytes,102,opt,name=field102" json:"field102,omitempty"`
-	Field103             *string                   `protobuf:"bytes,103,opt,name=field103" json:"field103,omitempty"`
-	Field29              *int32                    `protobuf:"varint,29,opt,name=field29,def=0" json:"field29,omitempty"`
-	Field30              *bool                     `protobuf:"varint,30,opt,name=field30,def=0" json:"field30,omitempty"`
-	Field60              *int32                    `protobuf:"varint,60,opt,name=field60,def=-1" json:"field60,omitempty"`
-	Field271             *int32                    `protobuf:"varint,271,opt,name=field271,def=-1" json:"field271,omitempty"`
-	Field272             *int32                    `protobuf:"varint,272,opt,name=field272,def=-1" json:"field272,omitempty"`
-	Field150             *int32                    `protobuf:"varint,150,opt,name=field150" json:"field150,omitempty"`
-	Field23              *int32                    `protobuf:"varint,23,opt,name=field23,def=0" json:"field23,omitempty"`
-	Field24              *bool                     `protobuf:"varint,24,opt,name=field24,def=0" json:"field24,omitempty"`
-	Field25              *int32                    `protobuf:"varint,25,opt,name=field25,def=0" json:"field25,omitempty"`
-	Field15              *GoogleMessage1SubMessage `protobuf:"bytes,15,opt,name=field15" json:"field15,omitempty"`
-	Field78              *bool                     `protobuf:"varint,78,opt,name=field78" json:"field78,omitempty"`
-	Field67              *int32                    `protobuf:"varint,67,opt,name=field67,def=0" json:"field67,omitempty"`
-	Field68              *int32                    `protobuf:"varint,68,opt,name=field68" json:"field68,omitempty"`
-	Field128             *int32                    `protobuf:"varint,128,opt,name=field128,def=0" json:"field128,omitempty"`
-	Field129             *string                   `protobuf:"bytes,129,opt,name=field129,def=xxxxxxxxxxxxxxxxxxxxx" json:"field129,omitempty"`
-	Field131             *int32                    `protobuf:"varint,131,opt,name=field131,def=0" json:"field131,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache       `json:"-"`
+	Field1        *string                   `protobuf:"bytes,1,req,name=field1" json:"field1,omitempty"`
+	Field9        *string                   `protobuf:"bytes,9,opt,name=field9" json:"field9,omitempty"`
+	Field18       *string                   `protobuf:"bytes,18,opt,name=field18" json:"field18,omitempty"`
+	Field80       *bool                     `protobuf:"varint,80,opt,name=field80,def=0" json:"field80,omitempty"`
+	Field81       *bool                     `protobuf:"varint,81,opt,name=field81,def=1" json:"field81,omitempty"`
+	Field2        *int32                    `protobuf:"varint,2,req,name=field2" json:"field2,omitempty"`
+	Field3        *int32                    `protobuf:"varint,3,req,name=field3" json:"field3,omitempty"`
+	Field280      *int32                    `protobuf:"varint,280,opt,name=field280" json:"field280,omitempty"`
+	Field6        *int32                    `protobuf:"varint,6,opt,name=field6,def=0" json:"field6,omitempty"`
+	Field22       *int64                    `protobuf:"varint,22,opt,name=field22" json:"field22,omitempty"`
+	Field4        *string                   `protobuf:"bytes,4,opt,name=field4" json:"field4,omitempty"`
+	Field5        []uint64                  `protobuf:"fixed64,5,rep,name=field5" json:"field5,omitempty"`
+	Field59       *bool                     `protobuf:"varint,59,opt,name=field59,def=0" json:"field59,omitempty"`
+	Field7        *string                   `protobuf:"bytes,7,opt,name=field7" json:"field7,omitempty"`
+	Field16       *int32                    `protobuf:"varint,16,opt,name=field16" json:"field16,omitempty"`
+	Field130      *int32                    `protobuf:"varint,130,opt,name=field130,def=0" json:"field130,omitempty"`
+	Field12       *bool                     `protobuf:"varint,12,opt,name=field12,def=1" json:"field12,omitempty"`
+	Field17       *bool                     `protobuf:"varint,17,opt,name=field17,def=1" json:"field17,omitempty"`
+	Field13       *bool                     `protobuf:"varint,13,opt,name=field13,def=1" json:"field13,omitempty"`
+	Field14       *bool                     `protobuf:"varint,14,opt,name=field14,def=1" json:"field14,omitempty"`
+	Field104      *int32                    `protobuf:"varint,104,opt,name=field104,def=0" json:"field104,omitempty"`
+	Field100      *int32                    `protobuf:"varint,100,opt,name=field100,def=0" json:"field100,omitempty"`
+	Field101      *int32                    `protobuf:"varint,101,opt,name=field101,def=0" json:"field101,omitempty"`
+	Field102      *string                   `protobuf:"bytes,102,opt,name=field102" json:"field102,omitempty"`
+	Field103      *string                   `protobuf:"bytes,103,opt,name=field103" json:"field103,omitempty"`
+	Field29       *int32                    `protobuf:"varint,29,opt,name=field29,def=0" json:"field29,omitempty"`
+	Field30       *bool                     `protobuf:"varint,30,opt,name=field30,def=0" json:"field30,omitempty"`
+	Field60       *int32                    `protobuf:"varint,60,opt,name=field60,def=-1" json:"field60,omitempty"`
+	Field271      *int32                    `protobuf:"varint,271,opt,name=field271,def=-1" json:"field271,omitempty"`
+	Field272      *int32                    `protobuf:"varint,272,opt,name=field272,def=-1" json:"field272,omitempty"`
+	Field150      *int32                    `protobuf:"varint,150,opt,name=field150" json:"field150,omitempty"`
+	Field23       *int32                    `protobuf:"varint,23,opt,name=field23,def=0" json:"field23,omitempty"`
+	Field24       *bool                     `protobuf:"varint,24,opt,name=field24,def=0" json:"field24,omitempty"`
+	Field25       *int32                    `protobuf:"varint,25,opt,name=field25,def=0" json:"field25,omitempty"`
+	Field15       *GoogleMessage1SubMessage `protobuf:"bytes,15,opt,name=field15" json:"field15,omitempty"`
+	Field78       *bool                     `protobuf:"varint,78,opt,name=field78" json:"field78,omitempty"`
+	Field67       *int32                    `protobuf:"varint,67,opt,name=field67,def=0" json:"field67,omitempty"`
+	Field68       *int32                    `protobuf:"varint,68,opt,name=field68" json:"field68,omitempty"`
+	Field128      *int32                    `protobuf:"varint,128,opt,name=field128,def=0" json:"field128,omitempty"`
+	Field129      *string                   `protobuf:"bytes,129,opt,name=field129,def=xxxxxxxxxxxxxxxxxxxxx" json:"field129,omitempty"`
+	Field131      *int32                    `protobuf:"varint,131,opt,name=field131,def=0" json:"field131,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage1) Reset() {
@@ -400,29 +399,28 @@
 }
 
 type GoogleMessage1SubMessage struct {
-	Field1               *int32                  `protobuf:"varint,1,opt,name=field1,def=0" json:"field1,omitempty"`
-	Field2               *int32                  `protobuf:"varint,2,opt,name=field2,def=0" json:"field2,omitempty"`
-	Field3               *int32                  `protobuf:"varint,3,opt,name=field3,def=0" json:"field3,omitempty"`
-	Field15              *string                 `protobuf:"bytes,15,opt,name=field15" json:"field15,omitempty"`
-	Field12              *bool                   `protobuf:"varint,12,opt,name=field12,def=1" json:"field12,omitempty"`
-	Field13              *int64                  `protobuf:"varint,13,opt,name=field13" json:"field13,omitempty"`
-	Field14              *int64                  `protobuf:"varint,14,opt,name=field14" json:"field14,omitempty"`
-	Field16              *int32                  `protobuf:"varint,16,opt,name=field16" json:"field16,omitempty"`
-	Field19              *int32                  `protobuf:"varint,19,opt,name=field19,def=2" json:"field19,omitempty"`
-	Field20              *bool                   `protobuf:"varint,20,opt,name=field20,def=1" json:"field20,omitempty"`
-	Field28              *bool                   `protobuf:"varint,28,opt,name=field28,def=1" json:"field28,omitempty"`
-	Field21              *uint64                 `protobuf:"fixed64,21,opt,name=field21" json:"field21,omitempty"`
-	Field22              *int32                  `protobuf:"varint,22,opt,name=field22" json:"field22,omitempty"`
-	Field23              *bool                   `protobuf:"varint,23,opt,name=field23,def=0" json:"field23,omitempty"`
-	Field206             *bool                   `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
-	Field203             *uint32                 `protobuf:"fixed32,203,opt,name=field203" json:"field203,omitempty"`
-	Field204             *int32                  `protobuf:"varint,204,opt,name=field204" json:"field204,omitempty"`
-	Field205             *string                 `protobuf:"bytes,205,opt,name=field205" json:"field205,omitempty"`
-	Field207             *uint64                 `protobuf:"varint,207,opt,name=field207" json:"field207,omitempty"`
-	Field300             *uint64                 `protobuf:"varint,300,opt,name=field300" json:"field300,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field1        *int32  `protobuf:"varint,1,opt,name=field1,def=0" json:"field1,omitempty"`
+	Field2        *int32  `protobuf:"varint,2,opt,name=field2,def=0" json:"field2,omitempty"`
+	Field3        *int32  `protobuf:"varint,3,opt,name=field3,def=0" json:"field3,omitempty"`
+	Field15       *string `protobuf:"bytes,15,opt,name=field15" json:"field15,omitempty"`
+	Field12       *bool   `protobuf:"varint,12,opt,name=field12,def=1" json:"field12,omitempty"`
+	Field13       *int64  `protobuf:"varint,13,opt,name=field13" json:"field13,omitempty"`
+	Field14       *int64  `protobuf:"varint,14,opt,name=field14" json:"field14,omitempty"`
+	Field16       *int32  `protobuf:"varint,16,opt,name=field16" json:"field16,omitempty"`
+	Field19       *int32  `protobuf:"varint,19,opt,name=field19,def=2" json:"field19,omitempty"`
+	Field20       *bool   `protobuf:"varint,20,opt,name=field20,def=1" json:"field20,omitempty"`
+	Field28       *bool   `protobuf:"varint,28,opt,name=field28,def=1" json:"field28,omitempty"`
+	Field21       *uint64 `protobuf:"fixed64,21,opt,name=field21" json:"field21,omitempty"`
+	Field22       *int32  `protobuf:"varint,22,opt,name=field22" json:"field22,omitempty"`
+	Field23       *bool   `protobuf:"varint,23,opt,name=field23,def=0" json:"field23,omitempty"`
+	Field206      *bool   `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
+	Field203      *uint32 `protobuf:"fixed32,203,opt,name=field203" json:"field203,omitempty"`
+	Field204      *int32  `protobuf:"varint,204,opt,name=field204" json:"field204,omitempty"`
+	Field205      *string `protobuf:"bytes,205,opt,name=field205" json:"field205,omitempty"`
+	Field207      *uint64 `protobuf:"varint,207,opt,name=field207" json:"field207,omitempty"`
+	Field300      *uint64 `protobuf:"varint,300,opt,name=field300" json:"field300,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage1SubMessage) Reset() {
@@ -765,6 +763,28 @@
 	if File_datasets_google_message1_proto2_benchmark_message1_proto2_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message1_proto2_benchmark_message1_proto2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage1); i {
+			case 41:
+				return &v.sizeCache
+			case 42:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message1_proto2_benchmark_message1_proto2_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage1SubMessage); i {
+			case 20:
+				return &v.sizeCache
+			case 21:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message1_proto2_benchmark_message1_proto2_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go b/internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go
index 94e0490..8103da7 100644
--- a/internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go
@@ -18,50 +18,49 @@
 )
 
 type GoogleMessage1 struct {
-	Field1               string                    `protobuf:"bytes,1,opt,name=field1,proto3" json:"field1,omitempty"`
-	Field9               string                    `protobuf:"bytes,9,opt,name=field9,proto3" json:"field9,omitempty"`
-	Field18              string                    `protobuf:"bytes,18,opt,name=field18,proto3" json:"field18,omitempty"`
-	Field80              bool                      `protobuf:"varint,80,opt,name=field80,proto3" json:"field80,omitempty"`
-	Field81              bool                      `protobuf:"varint,81,opt,name=field81,proto3" json:"field81,omitempty"`
-	Field2               int32                     `protobuf:"varint,2,opt,name=field2,proto3" json:"field2,omitempty"`
-	Field3               int32                     `protobuf:"varint,3,opt,name=field3,proto3" json:"field3,omitempty"`
-	Field280             int32                     `protobuf:"varint,280,opt,name=field280,proto3" json:"field280,omitempty"`
-	Field6               int32                     `protobuf:"varint,6,opt,name=field6,proto3" json:"field6,omitempty"`
-	Field22              int64                     `protobuf:"varint,22,opt,name=field22,proto3" json:"field22,omitempty"`
-	Field4               string                    `protobuf:"bytes,4,opt,name=field4,proto3" json:"field4,omitempty"`
-	Field5               []uint64                  `protobuf:"fixed64,5,rep,packed,name=field5,proto3" json:"field5,omitempty"`
-	Field59              bool                      `protobuf:"varint,59,opt,name=field59,proto3" json:"field59,omitempty"`
-	Field7               string                    `protobuf:"bytes,7,opt,name=field7,proto3" json:"field7,omitempty"`
-	Field16              int32                     `protobuf:"varint,16,opt,name=field16,proto3" json:"field16,omitempty"`
-	Field130             int32                     `protobuf:"varint,130,opt,name=field130,proto3" json:"field130,omitempty"`
-	Field12              bool                      `protobuf:"varint,12,opt,name=field12,proto3" json:"field12,omitempty"`
-	Field17              bool                      `protobuf:"varint,17,opt,name=field17,proto3" json:"field17,omitempty"`
-	Field13              bool                      `protobuf:"varint,13,opt,name=field13,proto3" json:"field13,omitempty"`
-	Field14              bool                      `protobuf:"varint,14,opt,name=field14,proto3" json:"field14,omitempty"`
-	Field104             int32                     `protobuf:"varint,104,opt,name=field104,proto3" json:"field104,omitempty"`
-	Field100             int32                     `protobuf:"varint,100,opt,name=field100,proto3" json:"field100,omitempty"`
-	Field101             int32                     `protobuf:"varint,101,opt,name=field101,proto3" json:"field101,omitempty"`
-	Field102             string                    `protobuf:"bytes,102,opt,name=field102,proto3" json:"field102,omitempty"`
-	Field103             string                    `protobuf:"bytes,103,opt,name=field103,proto3" json:"field103,omitempty"`
-	Field29              int32                     `protobuf:"varint,29,opt,name=field29,proto3" json:"field29,omitempty"`
-	Field30              bool                      `protobuf:"varint,30,opt,name=field30,proto3" json:"field30,omitempty"`
-	Field60              int32                     `protobuf:"varint,60,opt,name=field60,proto3" json:"field60,omitempty"`
-	Field271             int32                     `protobuf:"varint,271,opt,name=field271,proto3" json:"field271,omitempty"`
-	Field272             int32                     `protobuf:"varint,272,opt,name=field272,proto3" json:"field272,omitempty"`
-	Field150             int32                     `protobuf:"varint,150,opt,name=field150,proto3" json:"field150,omitempty"`
-	Field23              int32                     `protobuf:"varint,23,opt,name=field23,proto3" json:"field23,omitempty"`
-	Field24              bool                      `protobuf:"varint,24,opt,name=field24,proto3" json:"field24,omitempty"`
-	Field25              int32                     `protobuf:"varint,25,opt,name=field25,proto3" json:"field25,omitempty"`
-	Field15              *GoogleMessage1SubMessage `protobuf:"bytes,15,opt,name=field15,proto3" json:"field15,omitempty"`
-	Field78              bool                      `protobuf:"varint,78,opt,name=field78,proto3" json:"field78,omitempty"`
-	Field67              int32                     `protobuf:"varint,67,opt,name=field67,proto3" json:"field67,omitempty"`
-	Field68              int32                     `protobuf:"varint,68,opt,name=field68,proto3" json:"field68,omitempty"`
-	Field128             int32                     `protobuf:"varint,128,opt,name=field128,proto3" json:"field128,omitempty"`
-	Field129             string                    `protobuf:"bytes,129,opt,name=field129,proto3" json:"field129,omitempty"`
-	Field131             int32                     `protobuf:"varint,131,opt,name=field131,proto3" json:"field131,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache       `json:"-"`
+	Field1        string                    `protobuf:"bytes,1,opt,name=field1,proto3" json:"field1,omitempty"`
+	Field9        string                    `protobuf:"bytes,9,opt,name=field9,proto3" json:"field9,omitempty"`
+	Field18       string                    `protobuf:"bytes,18,opt,name=field18,proto3" json:"field18,omitempty"`
+	Field80       bool                      `protobuf:"varint,80,opt,name=field80,proto3" json:"field80,omitempty"`
+	Field81       bool                      `protobuf:"varint,81,opt,name=field81,proto3" json:"field81,omitempty"`
+	Field2        int32                     `protobuf:"varint,2,opt,name=field2,proto3" json:"field2,omitempty"`
+	Field3        int32                     `protobuf:"varint,3,opt,name=field3,proto3" json:"field3,omitempty"`
+	Field280      int32                     `protobuf:"varint,280,opt,name=field280,proto3" json:"field280,omitempty"`
+	Field6        int32                     `protobuf:"varint,6,opt,name=field6,proto3" json:"field6,omitempty"`
+	Field22       int64                     `protobuf:"varint,22,opt,name=field22,proto3" json:"field22,omitempty"`
+	Field4        string                    `protobuf:"bytes,4,opt,name=field4,proto3" json:"field4,omitempty"`
+	Field5        []uint64                  `protobuf:"fixed64,5,rep,packed,name=field5,proto3" json:"field5,omitempty"`
+	Field59       bool                      `protobuf:"varint,59,opt,name=field59,proto3" json:"field59,omitempty"`
+	Field7        string                    `protobuf:"bytes,7,opt,name=field7,proto3" json:"field7,omitempty"`
+	Field16       int32                     `protobuf:"varint,16,opt,name=field16,proto3" json:"field16,omitempty"`
+	Field130      int32                     `protobuf:"varint,130,opt,name=field130,proto3" json:"field130,omitempty"`
+	Field12       bool                      `protobuf:"varint,12,opt,name=field12,proto3" json:"field12,omitempty"`
+	Field17       bool                      `protobuf:"varint,17,opt,name=field17,proto3" json:"field17,omitempty"`
+	Field13       bool                      `protobuf:"varint,13,opt,name=field13,proto3" json:"field13,omitempty"`
+	Field14       bool                      `protobuf:"varint,14,opt,name=field14,proto3" json:"field14,omitempty"`
+	Field104      int32                     `protobuf:"varint,104,opt,name=field104,proto3" json:"field104,omitempty"`
+	Field100      int32                     `protobuf:"varint,100,opt,name=field100,proto3" json:"field100,omitempty"`
+	Field101      int32                     `protobuf:"varint,101,opt,name=field101,proto3" json:"field101,omitempty"`
+	Field102      string                    `protobuf:"bytes,102,opt,name=field102,proto3" json:"field102,omitempty"`
+	Field103      string                    `protobuf:"bytes,103,opt,name=field103,proto3" json:"field103,omitempty"`
+	Field29       int32                     `protobuf:"varint,29,opt,name=field29,proto3" json:"field29,omitempty"`
+	Field30       bool                      `protobuf:"varint,30,opt,name=field30,proto3" json:"field30,omitempty"`
+	Field60       int32                     `protobuf:"varint,60,opt,name=field60,proto3" json:"field60,omitempty"`
+	Field271      int32                     `protobuf:"varint,271,opt,name=field271,proto3" json:"field271,omitempty"`
+	Field272      int32                     `protobuf:"varint,272,opt,name=field272,proto3" json:"field272,omitempty"`
+	Field150      int32                     `protobuf:"varint,150,opt,name=field150,proto3" json:"field150,omitempty"`
+	Field23       int32                     `protobuf:"varint,23,opt,name=field23,proto3" json:"field23,omitempty"`
+	Field24       bool                      `protobuf:"varint,24,opt,name=field24,proto3" json:"field24,omitempty"`
+	Field25       int32                     `protobuf:"varint,25,opt,name=field25,proto3" json:"field25,omitempty"`
+	Field15       *GoogleMessage1SubMessage `protobuf:"bytes,15,opt,name=field15,proto3" json:"field15,omitempty"`
+	Field78       bool                      `protobuf:"varint,78,opt,name=field78,proto3" json:"field78,omitempty"`
+	Field67       int32                     `protobuf:"varint,67,opt,name=field67,proto3" json:"field67,omitempty"`
+	Field68       int32                     `protobuf:"varint,68,opt,name=field68,proto3" json:"field68,omitempty"`
+	Field128      int32                     `protobuf:"varint,128,opt,name=field128,proto3" json:"field128,omitempty"`
+	Field129      string                    `protobuf:"bytes,129,opt,name=field129,proto3" json:"field129,omitempty"`
+	Field131      int32                     `protobuf:"varint,131,opt,name=field131,proto3" json:"field131,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage1) Reset() {
@@ -375,29 +374,28 @@
 }
 
 type GoogleMessage1SubMessage struct {
-	Field1               int32                   `protobuf:"varint,1,opt,name=field1,proto3" json:"field1,omitempty"`
-	Field2               int32                   `protobuf:"varint,2,opt,name=field2,proto3" json:"field2,omitempty"`
-	Field3               int32                   `protobuf:"varint,3,opt,name=field3,proto3" json:"field3,omitempty"`
-	Field15              string                  `protobuf:"bytes,15,opt,name=field15,proto3" json:"field15,omitempty"`
-	Field12              bool                    `protobuf:"varint,12,opt,name=field12,proto3" json:"field12,omitempty"`
-	Field13              int64                   `protobuf:"varint,13,opt,name=field13,proto3" json:"field13,omitempty"`
-	Field14              int64                   `protobuf:"varint,14,opt,name=field14,proto3" json:"field14,omitempty"`
-	Field16              int32                   `protobuf:"varint,16,opt,name=field16,proto3" json:"field16,omitempty"`
-	Field19              int32                   `protobuf:"varint,19,opt,name=field19,proto3" json:"field19,omitempty"`
-	Field20              bool                    `protobuf:"varint,20,opt,name=field20,proto3" json:"field20,omitempty"`
-	Field28              bool                    `protobuf:"varint,28,opt,name=field28,proto3" json:"field28,omitempty"`
-	Field21              uint64                  `protobuf:"fixed64,21,opt,name=field21,proto3" json:"field21,omitempty"`
-	Field22              int32                   `protobuf:"varint,22,opt,name=field22,proto3" json:"field22,omitempty"`
-	Field23              bool                    `protobuf:"varint,23,opt,name=field23,proto3" json:"field23,omitempty"`
-	Field206             bool                    `protobuf:"varint,206,opt,name=field206,proto3" json:"field206,omitempty"`
-	Field203             uint32                  `protobuf:"fixed32,203,opt,name=field203,proto3" json:"field203,omitempty"`
-	Field204             int32                   `protobuf:"varint,204,opt,name=field204,proto3" json:"field204,omitempty"`
-	Field205             string                  `protobuf:"bytes,205,opt,name=field205,proto3" json:"field205,omitempty"`
-	Field207             uint64                  `protobuf:"varint,207,opt,name=field207,proto3" json:"field207,omitempty"`
-	Field300             uint64                  `protobuf:"varint,300,opt,name=field300,proto3" json:"field300,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field1        int32  `protobuf:"varint,1,opt,name=field1,proto3" json:"field1,omitempty"`
+	Field2        int32  `protobuf:"varint,2,opt,name=field2,proto3" json:"field2,omitempty"`
+	Field3        int32  `protobuf:"varint,3,opt,name=field3,proto3" json:"field3,omitempty"`
+	Field15       string `protobuf:"bytes,15,opt,name=field15,proto3" json:"field15,omitempty"`
+	Field12       bool   `protobuf:"varint,12,opt,name=field12,proto3" json:"field12,omitempty"`
+	Field13       int64  `protobuf:"varint,13,opt,name=field13,proto3" json:"field13,omitempty"`
+	Field14       int64  `protobuf:"varint,14,opt,name=field14,proto3" json:"field14,omitempty"`
+	Field16       int32  `protobuf:"varint,16,opt,name=field16,proto3" json:"field16,omitempty"`
+	Field19       int32  `protobuf:"varint,19,opt,name=field19,proto3" json:"field19,omitempty"`
+	Field20       bool   `protobuf:"varint,20,opt,name=field20,proto3" json:"field20,omitempty"`
+	Field28       bool   `protobuf:"varint,28,opt,name=field28,proto3" json:"field28,omitempty"`
+	Field21       uint64 `protobuf:"fixed64,21,opt,name=field21,proto3" json:"field21,omitempty"`
+	Field22       int32  `protobuf:"varint,22,opt,name=field22,proto3" json:"field22,omitempty"`
+	Field23       bool   `protobuf:"varint,23,opt,name=field23,proto3" json:"field23,omitempty"`
+	Field206      bool   `protobuf:"varint,206,opt,name=field206,proto3" json:"field206,omitempty"`
+	Field203      uint32 `protobuf:"fixed32,203,opt,name=field203,proto3" json:"field203,omitempty"`
+	Field204      int32  `protobuf:"varint,204,opt,name=field204,proto3" json:"field204,omitempty"`
+	Field205      string `protobuf:"bytes,205,opt,name=field205,proto3" json:"field205,omitempty"`
+	Field207      uint64 `protobuf:"varint,207,opt,name=field207,proto3" json:"field207,omitempty"`
+	Field300      uint64 `protobuf:"varint,300,opt,name=field300,proto3" json:"field300,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage1SubMessage) Reset() {
@@ -720,6 +718,28 @@
 	if File_datasets_google_message1_proto3_benchmark_message1_proto3_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message1_proto3_benchmark_message1_proto3_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage1); i {
+			case 41:
+				return &v.sizeCache
+			case 42:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message1_proto3_benchmark_message1_proto3_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage1SubMessage); i {
+			case 20:
+				return &v.sizeCache
+			case 21:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message1_proto3_benchmark_message1_proto3_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go b/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
index 53ee5ec..dd875d6 100644
--- a/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
@@ -18,39 +18,38 @@
 )
 
 type GoogleMessage2 struct {
-	Field1               *string                  `protobuf:"bytes,1,opt,name=field1" json:"field1,omitempty"`
-	Field3               *int64                   `protobuf:"varint,3,opt,name=field3" json:"field3,omitempty"`
-	Field4               *int64                   `protobuf:"varint,4,opt,name=field4" json:"field4,omitempty"`
-	Field30              *int64                   `protobuf:"varint,30,opt,name=field30" json:"field30,omitempty"`
-	Field75              *bool                    `protobuf:"varint,75,opt,name=field75,def=0" json:"field75,omitempty"`
-	Field6               *string                  `protobuf:"bytes,6,opt,name=field6" json:"field6,omitempty"`
-	Field2               []byte                   `protobuf:"bytes,2,opt,name=field2" json:"field2,omitempty"`
-	Field21              *int32                   `protobuf:"varint,21,opt,name=field21,def=0" json:"field21,omitempty"`
-	Field71              *int32                   `protobuf:"varint,71,opt,name=field71" json:"field71,omitempty"`
-	Field25              *float32                 `protobuf:"fixed32,25,opt,name=field25" json:"field25,omitempty"`
-	Field109             *int32                   `protobuf:"varint,109,opt,name=field109,def=0" json:"field109,omitempty"`
-	Field210             *int32                   `protobuf:"varint,210,opt,name=field210,def=0" json:"field210,omitempty"`
-	Field211             *int32                   `protobuf:"varint,211,opt,name=field211,def=0" json:"field211,omitempty"`
-	Field212             *int32                   `protobuf:"varint,212,opt,name=field212,def=0" json:"field212,omitempty"`
-	Field213             *int32                   `protobuf:"varint,213,opt,name=field213,def=0" json:"field213,omitempty"`
-	Field216             *int32                   `protobuf:"varint,216,opt,name=field216,def=0" json:"field216,omitempty"`
-	Field217             *int32                   `protobuf:"varint,217,opt,name=field217,def=0" json:"field217,omitempty"`
-	Field218             *int32                   `protobuf:"varint,218,opt,name=field218,def=0" json:"field218,omitempty"`
-	Field220             *int32                   `protobuf:"varint,220,opt,name=field220,def=0" json:"field220,omitempty"`
-	Field221             *int32                   `protobuf:"varint,221,opt,name=field221,def=0" json:"field221,omitempty"`
-	Field222             *float32                 `protobuf:"fixed32,222,opt,name=field222,def=0" json:"field222,omitempty"`
-	Field63              *int32                   `protobuf:"varint,63,opt,name=field63" json:"field63,omitempty"`
-	Group1               []*GoogleMessage2_Group1 `protobuf:"group,10,rep,name=Group1,json=group1" json:"group1,omitempty"`
-	Field128             []string                 `protobuf:"bytes,128,rep,name=field128" json:"field128,omitempty"`
-	Field131             *int64                   `protobuf:"varint,131,opt,name=field131" json:"field131,omitempty"`
-	Field127             []string                 `protobuf:"bytes,127,rep,name=field127" json:"field127,omitempty"`
-	Field129             *int32                   `protobuf:"varint,129,opt,name=field129" json:"field129,omitempty"`
-	Field130             []int64                  `protobuf:"varint,130,rep,name=field130" json:"field130,omitempty"`
-	Field205             *bool                    `protobuf:"varint,205,opt,name=field205,def=0" json:"field205,omitempty"`
-	Field206             *bool                    `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields  `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache      `json:"-"`
+	Field1        *string                  `protobuf:"bytes,1,opt,name=field1" json:"field1,omitempty"`
+	Field3        *int64                   `protobuf:"varint,3,opt,name=field3" json:"field3,omitempty"`
+	Field4        *int64                   `protobuf:"varint,4,opt,name=field4" json:"field4,omitempty"`
+	Field30       *int64                   `protobuf:"varint,30,opt,name=field30" json:"field30,omitempty"`
+	Field75       *bool                    `protobuf:"varint,75,opt,name=field75,def=0" json:"field75,omitempty"`
+	Field6        *string                  `protobuf:"bytes,6,opt,name=field6" json:"field6,omitempty"`
+	Field2        []byte                   `protobuf:"bytes,2,opt,name=field2" json:"field2,omitempty"`
+	Field21       *int32                   `protobuf:"varint,21,opt,name=field21,def=0" json:"field21,omitempty"`
+	Field71       *int32                   `protobuf:"varint,71,opt,name=field71" json:"field71,omitempty"`
+	Field25       *float32                 `protobuf:"fixed32,25,opt,name=field25" json:"field25,omitempty"`
+	Field109      *int32                   `protobuf:"varint,109,opt,name=field109,def=0" json:"field109,omitempty"`
+	Field210      *int32                   `protobuf:"varint,210,opt,name=field210,def=0" json:"field210,omitempty"`
+	Field211      *int32                   `protobuf:"varint,211,opt,name=field211,def=0" json:"field211,omitempty"`
+	Field212      *int32                   `protobuf:"varint,212,opt,name=field212,def=0" json:"field212,omitempty"`
+	Field213      *int32                   `protobuf:"varint,213,opt,name=field213,def=0" json:"field213,omitempty"`
+	Field216      *int32                   `protobuf:"varint,216,opt,name=field216,def=0" json:"field216,omitempty"`
+	Field217      *int32                   `protobuf:"varint,217,opt,name=field217,def=0" json:"field217,omitempty"`
+	Field218      *int32                   `protobuf:"varint,218,opt,name=field218,def=0" json:"field218,omitempty"`
+	Field220      *int32                   `protobuf:"varint,220,opt,name=field220,def=0" json:"field220,omitempty"`
+	Field221      *int32                   `protobuf:"varint,221,opt,name=field221,def=0" json:"field221,omitempty"`
+	Field222      *float32                 `protobuf:"fixed32,222,opt,name=field222,def=0" json:"field222,omitempty"`
+	Field63       *int32                   `protobuf:"varint,63,opt,name=field63" json:"field63,omitempty"`
+	Group1        []*GoogleMessage2_Group1 `protobuf:"group,10,rep,name=Group1,json=group1" json:"group1,omitempty"`
+	Field128      []string                 `protobuf:"bytes,128,rep,name=field128" json:"field128,omitempty"`
+	Field131      *int64                   `protobuf:"varint,131,opt,name=field131" json:"field131,omitempty"`
+	Field127      []string                 `protobuf:"bytes,127,rep,name=field127" json:"field127,omitempty"`
+	Field129      *int32                   `protobuf:"varint,129,opt,name=field129" json:"field129,omitempty"`
+	Field130      []int64                  `protobuf:"varint,130,rep,name=field130" json:"field130,omitempty"`
+	Field205      *bool                    `protobuf:"varint,205,opt,name=field205,def=0" json:"field205,omitempty"`
+	Field206      *bool                    `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage2) Reset() {
@@ -303,20 +302,19 @@
 }
 
 type GoogleMessage2GroupedMessage struct {
-	Field1               *float32                `protobuf:"fixed32,1,opt,name=field1" json:"field1,omitempty"`
-	Field2               *float32                `protobuf:"fixed32,2,opt,name=field2" json:"field2,omitempty"`
-	Field3               *float32                `protobuf:"fixed32,3,opt,name=field3,def=0" json:"field3,omitempty"`
-	Field4               *bool                   `protobuf:"varint,4,opt,name=field4" json:"field4,omitempty"`
-	Field5               *bool                   `protobuf:"varint,5,opt,name=field5" json:"field5,omitempty"`
-	Field6               *bool                   `protobuf:"varint,6,opt,name=field6,def=1" json:"field6,omitempty"`
-	Field7               *bool                   `protobuf:"varint,7,opt,name=field7,def=0" json:"field7,omitempty"`
-	Field8               *float32                `protobuf:"fixed32,8,opt,name=field8" json:"field8,omitempty"`
-	Field9               *bool                   `protobuf:"varint,9,opt,name=field9" json:"field9,omitempty"`
-	Field10              *float32                `protobuf:"fixed32,10,opt,name=field10" json:"field10,omitempty"`
-	Field11              *int64                  `protobuf:"varint,11,opt,name=field11" json:"field11,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field1        *float32 `protobuf:"fixed32,1,opt,name=field1" json:"field1,omitempty"`
+	Field2        *float32 `protobuf:"fixed32,2,opt,name=field2" json:"field2,omitempty"`
+	Field3        *float32 `protobuf:"fixed32,3,opt,name=field3,def=0" json:"field3,omitempty"`
+	Field4        *bool    `protobuf:"varint,4,opt,name=field4" json:"field4,omitempty"`
+	Field5        *bool    `protobuf:"varint,5,opt,name=field5" json:"field5,omitempty"`
+	Field6        *bool    `protobuf:"varint,6,opt,name=field6,def=1" json:"field6,omitempty"`
+	Field7        *bool    `protobuf:"varint,7,opt,name=field7,def=0" json:"field7,omitempty"`
+	Field8        *float32 `protobuf:"fixed32,8,opt,name=field8" json:"field8,omitempty"`
+	Field9        *bool    `protobuf:"varint,9,opt,name=field9" json:"field9,omitempty"`
+	Field10       *float32 `protobuf:"fixed32,10,opt,name=field10" json:"field10,omitempty"`
+	Field11       *int64   `protobuf:"varint,11,opt,name=field11" json:"field11,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage2GroupedMessage) Reset() {
@@ -424,25 +422,24 @@
 }
 
 type GoogleMessage2_Group1 struct {
-	Field11              *float32                      `protobuf:"fixed32,11,req,name=field11" json:"field11,omitempty"`
-	Field26              *float32                      `protobuf:"fixed32,26,opt,name=field26" json:"field26,omitempty"`
-	Field12              *string                       `protobuf:"bytes,12,opt,name=field12" json:"field12,omitempty"`
-	Field13              *string                       `protobuf:"bytes,13,opt,name=field13" json:"field13,omitempty"`
-	Field14              []string                      `protobuf:"bytes,14,rep,name=field14" json:"field14,omitempty"`
-	Field15              *uint64                       `protobuf:"varint,15,req,name=field15" json:"field15,omitempty"`
-	Field5               *int32                        `protobuf:"varint,5,opt,name=field5" json:"field5,omitempty"`
-	Field27              *string                       `protobuf:"bytes,27,opt,name=field27" json:"field27,omitempty"`
-	Field28              *int32                        `protobuf:"varint,28,opt,name=field28" json:"field28,omitempty"`
-	Field29              *string                       `protobuf:"bytes,29,opt,name=field29" json:"field29,omitempty"`
-	Field16              *string                       `protobuf:"bytes,16,opt,name=field16" json:"field16,omitempty"`
-	Field22              []string                      `protobuf:"bytes,22,rep,name=field22" json:"field22,omitempty"`
-	Field73              []int32                       `protobuf:"varint,73,rep,name=field73" json:"field73,omitempty"`
-	Field20              *int32                        `protobuf:"varint,20,opt,name=field20,def=0" json:"field20,omitempty"`
-	Field24              *string                       `protobuf:"bytes,24,opt,name=field24" json:"field24,omitempty"`
-	Field31              *GoogleMessage2GroupedMessage `protobuf:"bytes,31,opt,name=field31" json:"field31,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields       `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache           `json:"-"`
+	Field11       *float32                      `protobuf:"fixed32,11,req,name=field11" json:"field11,omitempty"`
+	Field26       *float32                      `protobuf:"fixed32,26,opt,name=field26" json:"field26,omitempty"`
+	Field12       *string                       `protobuf:"bytes,12,opt,name=field12" json:"field12,omitempty"`
+	Field13       *string                       `protobuf:"bytes,13,opt,name=field13" json:"field13,omitempty"`
+	Field14       []string                      `protobuf:"bytes,14,rep,name=field14" json:"field14,omitempty"`
+	Field15       *uint64                       `protobuf:"varint,15,req,name=field15" json:"field15,omitempty"`
+	Field5        *int32                        `protobuf:"varint,5,opt,name=field5" json:"field5,omitempty"`
+	Field27       *string                       `protobuf:"bytes,27,opt,name=field27" json:"field27,omitempty"`
+	Field28       *int32                        `protobuf:"varint,28,opt,name=field28" json:"field28,omitempty"`
+	Field29       *string                       `protobuf:"bytes,29,opt,name=field29" json:"field29,omitempty"`
+	Field16       *string                       `protobuf:"bytes,16,opt,name=field16" json:"field16,omitempty"`
+	Field22       []string                      `protobuf:"bytes,22,rep,name=field22" json:"field22,omitempty"`
+	Field73       []int32                       `protobuf:"varint,73,rep,name=field73" json:"field73,omitempty"`
+	Field20       *int32                        `protobuf:"varint,20,opt,name=field20,def=0" json:"field20,omitempty"`
+	Field24       *string                       `protobuf:"bytes,24,opt,name=field24" json:"field24,omitempty"`
+	Field31       *GoogleMessage2GroupedMessage `protobuf:"bytes,31,opt,name=field31" json:"field31,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage2_Group1) Reset() {
@@ -741,6 +738,38 @@
 	if File_datasets_google_message2_benchmark_message2_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message2_benchmark_message2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage2); i {
+			case 30:
+				return &v.sizeCache
+			case 31:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message2_benchmark_message2_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage2GroupedMessage); i {
+			case 11:
+				return &v.sizeCache
+			case 12:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message2_benchmark_message2_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage2_Group1); i {
+			case 16:
+				return &v.sizeCache
+			case 17:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message2_benchmark_message2_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
index c0bc0eb..087607c 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
@@ -18,24 +18,23 @@
 )
 
 type GoogleMessage3 struct {
-	Field37519           *Message37487           `protobuf:"bytes,2,opt,name=field37519" json:"field37519,omitempty"`
-	Field37520           *Message36876           `protobuf:"bytes,3,opt,name=field37520" json:"field37520,omitempty"`
-	Field37521           *Message13062           `protobuf:"bytes,4,opt,name=field37521" json:"field37521,omitempty"`
-	Field37522           *Message952             `protobuf:"bytes,5,opt,name=field37522" json:"field37522,omitempty"`
-	Field37523           *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field37523" json:"field37523,omitempty"`
-	Field37524           *UnusedEmptyMessage     `protobuf:"bytes,7,opt,name=field37524" json:"field37524,omitempty"`
-	Field37525           *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field37525" json:"field37525,omitempty"`
-	Field37526           *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field37526" json:"field37526,omitempty"`
-	Field37527           *UnusedEmptyMessage     `protobuf:"bytes,10,opt,name=field37527" json:"field37527,omitempty"`
-	Field37528           *UnusedEmptyMessage     `protobuf:"bytes,11,opt,name=field37528" json:"field37528,omitempty"`
-	Field37529           *UnusedEmptyMessage     `protobuf:"bytes,12,opt,name=field37529" json:"field37529,omitempty"`
-	Field37530           *UnusedEmptyMessage     `protobuf:"bytes,13,opt,name=field37530" json:"field37530,omitempty"`
-	Field37531           *UnusedEmptyMessage     `protobuf:"bytes,14,opt,name=field37531" json:"field37531,omitempty"`
-	Field37532           *UnusedEmptyMessage     `protobuf:"bytes,15,opt,name=field37532" json:"field37532,omitempty"`
-	Field37533           *UnusedEmptyMessage     `protobuf:"bytes,16,opt,name=field37533" json:"field37533,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37519    *Message37487       `protobuf:"bytes,2,opt,name=field37519" json:"field37519,omitempty"`
+	Field37520    *Message36876       `protobuf:"bytes,3,opt,name=field37520" json:"field37520,omitempty"`
+	Field37521    *Message13062       `protobuf:"bytes,4,opt,name=field37521" json:"field37521,omitempty"`
+	Field37522    *Message952         `protobuf:"bytes,5,opt,name=field37522" json:"field37522,omitempty"`
+	Field37523    *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field37523" json:"field37523,omitempty"`
+	Field37524    *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37524" json:"field37524,omitempty"`
+	Field37525    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field37525" json:"field37525,omitempty"`
+	Field37526    *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field37526" json:"field37526,omitempty"`
+	Field37527    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field37527" json:"field37527,omitempty"`
+	Field37528    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37528" json:"field37528,omitempty"`
+	Field37529    *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field37529" json:"field37529,omitempty"`
+	Field37530    *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field37530" json:"field37530,omitempty"`
+	Field37531    *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field37531" json:"field37531,omitempty"`
+	Field37532    *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field37532" json:"field37532,omitempty"`
+	Field37533    *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field37533" json:"field37533,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage3) Reset() {
@@ -167,13 +166,12 @@
 }
 
 type Message1327 struct {
-	Field1369            []*UnusedEmptyMessage   `protobuf:"bytes,1,rep,name=field1369" json:"field1369,omitempty"`
-	Field1370            []*Message1328          `protobuf:"bytes,3,rep,name=field1370" json:"field1370,omitempty"`
-	Field1371            []*UnusedEmptyMessage   `protobuf:"bytes,5,rep,name=field1371" json:"field1371,omitempty"`
-	Field1372            []*UnusedEmptyMessage   `protobuf:"bytes,6,rep,name=field1372" json:"field1372,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field1369     []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field1369" json:"field1369,omitempty"`
+	Field1370     []*Message1328        `protobuf:"bytes,3,rep,name=field1370" json:"field1370,omitempty"`
+	Field1371     []*UnusedEmptyMessage `protobuf:"bytes,5,rep,name=field1371" json:"field1371,omitempty"`
+	Field1372     []*UnusedEmptyMessage `protobuf:"bytes,6,rep,name=field1372" json:"field1372,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message1327) Reset() {
@@ -228,19 +226,18 @@
 }
 
 type Message3672 struct {
-	Field3727            *Enum3476                  `protobuf:"varint,1,opt,name=field3727,enum=benchmarks.google_message3.Enum3476" json:"field3727,omitempty"`
-	Field3728            *int32                     `protobuf:"varint,11,opt,name=field3728" json:"field3728,omitempty"`
-	Field3729            *int32                     `protobuf:"varint,2,opt,name=field3729" json:"field3729,omitempty"`
-	Message3673          []*Message3672_Message3673 `protobuf:"group,3,rep,name=Message3673,json=message3673" json:"message3673,omitempty"`
-	Message3674          []*Message3672_Message3674 `protobuf:"group,6,rep,name=Message3674,json=message3674" json:"message3674,omitempty"`
-	Field3732            *bool                      `protobuf:"varint,9,opt,name=field3732" json:"field3732,omitempty"`
-	Field3733            *int32                     `protobuf:"varint,10,opt,name=field3733" json:"field3733,omitempty"`
-	Field3734            *Enum3476                  `protobuf:"varint,20,opt,name=field3734,enum=benchmarks.google_message3.Enum3476" json:"field3734,omitempty"`
-	Field3735            *int32                     `protobuf:"varint,21,opt,name=field3735" json:"field3735,omitempty"`
-	Field3736            *UnusedEmptyMessage        `protobuf:"bytes,50,opt,name=field3736" json:"field3736,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Field3727     *Enum3476                  `protobuf:"varint,1,opt,name=field3727,enum=benchmarks.google_message3.Enum3476" json:"field3727,omitempty"`
+	Field3728     *int32                     `protobuf:"varint,11,opt,name=field3728" json:"field3728,omitempty"`
+	Field3729     *int32                     `protobuf:"varint,2,opt,name=field3729" json:"field3729,omitempty"`
+	Message3673   []*Message3672_Message3673 `protobuf:"group,3,rep,name=Message3673,json=message3673" json:"message3673,omitempty"`
+	Message3674   []*Message3672_Message3674 `protobuf:"group,6,rep,name=Message3674,json=message3674" json:"message3674,omitempty"`
+	Field3732     *bool                      `protobuf:"varint,9,opt,name=field3732" json:"field3732,omitempty"`
+	Field3733     *int32                     `protobuf:"varint,10,opt,name=field3733" json:"field3733,omitempty"`
+	Field3734     *Enum3476                  `protobuf:"varint,20,opt,name=field3734,enum=benchmarks.google_message3.Enum3476" json:"field3734,omitempty"`
+	Field3735     *int32                     `protobuf:"varint,21,opt,name=field3735" json:"field3735,omitempty"`
+	Field3736     *UnusedEmptyMessage        `protobuf:"bytes,50,opt,name=field3736" json:"field3736,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3672) Reset() {
@@ -337,16 +334,15 @@
 }
 
 type Message3804 struct {
-	Field3818            *int64                  `protobuf:"varint,1,req,name=field3818" json:"field3818,omitempty"`
-	Field3819            *bool                   `protobuf:"varint,2,req,name=field3819" json:"field3819,omitempty"`
-	Field3820            []Enum3805              `protobuf:"varint,4,rep,name=field3820,enum=benchmarks.google_message3.Enum3805" json:"field3820,omitempty"`
-	Field3821            *int32                  `protobuf:"varint,5,opt,name=field3821" json:"field3821,omitempty"`
-	Field3822            *bool                   `protobuf:"varint,6,opt,name=field3822" json:"field3822,omitempty"`
-	Field3823            *int64                  `protobuf:"varint,7,opt,name=field3823" json:"field3823,omitempty"`
-	Field3824            *Enum3783               `protobuf:"varint,8,opt,name=field3824,enum=benchmarks.google_message3.Enum3783" json:"field3824,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3818     *int64     `protobuf:"varint,1,req,name=field3818" json:"field3818,omitempty"`
+	Field3819     *bool      `protobuf:"varint,2,req,name=field3819" json:"field3819,omitempty"`
+	Field3820     []Enum3805 `protobuf:"varint,4,rep,name=field3820,enum=benchmarks.google_message3.Enum3805" json:"field3820,omitempty"`
+	Field3821     *int32     `protobuf:"varint,5,opt,name=field3821" json:"field3821,omitempty"`
+	Field3822     *bool      `protobuf:"varint,6,opt,name=field3822" json:"field3822,omitempty"`
+	Field3823     *int64     `protobuf:"varint,7,opt,name=field3823" json:"field3823,omitempty"`
+	Field3824     *Enum3783  `protobuf:"varint,8,opt,name=field3824,enum=benchmarks.google_message3.Enum3783" json:"field3824,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3804) Reset() {
@@ -422,10 +418,9 @@
 }
 
 type Message6849 struct {
-	Field6910            []*Message6850          `protobuf:"bytes,1,rep,name=field6910" json:"field6910,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6910     []*Message6850 `protobuf:"bytes,1,rep,name=field6910" json:"field6910,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6849) Reset() {
@@ -459,10 +454,9 @@
 }
 
 type Message6866 struct {
-	Field6973            []*Message6863          `protobuf:"bytes,1,rep,name=field6973" json:"field6973,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6973     []*Message6863 `protobuf:"bytes,1,rep,name=field6973" json:"field6973,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6866) Reset() {
@@ -496,10 +490,9 @@
 }
 
 type Message6870 struct {
-	Field6991            []*Message6871          `protobuf:"bytes,1,rep,name=field6991" json:"field6991,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6991     []*Message6871 `protobuf:"bytes,1,rep,name=field6991" json:"field6991,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6870) Reset() {
@@ -533,54 +526,53 @@
 }
 
 type Message7651 struct {
-	Field7685            *string                 `protobuf:"bytes,1,opt,name=field7685" json:"field7685,omitempty"`
-	Field7686            *int64                  `protobuf:"varint,2,opt,name=field7686" json:"field7686,omitempty"`
-	Field7687            *int64                  `protobuf:"varint,3,opt,name=field7687" json:"field7687,omitempty"`
-	Field7688            *int64                  `protobuf:"varint,4,opt,name=field7688" json:"field7688,omitempty"`
-	Field7689            *int32                  `protobuf:"varint,5,opt,name=field7689" json:"field7689,omitempty"`
-	Field7690            *int32                  `protobuf:"varint,6,opt,name=field7690" json:"field7690,omitempty"`
-	Field7691            *int32                  `protobuf:"varint,7,opt,name=field7691" json:"field7691,omitempty"`
-	Field7692            *int32                  `protobuf:"varint,8,opt,name=field7692" json:"field7692,omitempty"`
-	Field7693            *int32                  `protobuf:"varint,9,opt,name=field7693" json:"field7693,omitempty"`
-	Field7694            *int32                  `protobuf:"varint,10,opt,name=field7694" json:"field7694,omitempty"`
-	Field7695            *int32                  `protobuf:"varint,11,opt,name=field7695" json:"field7695,omitempty"`
-	Field7696            *int32                  `protobuf:"varint,12,opt,name=field7696" json:"field7696,omitempty"`
-	Field7697            *int32                  `protobuf:"varint,13,opt,name=field7697" json:"field7697,omitempty"`
-	Field7698            *int32                  `protobuf:"varint,14,opt,name=field7698" json:"field7698,omitempty"`
-	Field7699            *int32                  `protobuf:"varint,15,opt,name=field7699" json:"field7699,omitempty"`
-	Field7700            *int32                  `protobuf:"varint,16,opt,name=field7700" json:"field7700,omitempty"`
-	Field7701            *int32                  `protobuf:"varint,17,opt,name=field7701" json:"field7701,omitempty"`
-	Field7702            *int32                  `protobuf:"varint,18,opt,name=field7702" json:"field7702,omitempty"`
-	Field7703            *bool                   `protobuf:"varint,19,opt,name=field7703" json:"field7703,omitempty"`
-	Field7704            []int32                 `protobuf:"varint,20,rep,name=field7704" json:"field7704,omitempty"`
-	Field7705            []int32                 `protobuf:"varint,21,rep,name=field7705" json:"field7705,omitempty"`
-	Field7706            []string                `protobuf:"bytes,22,rep,name=field7706" json:"field7706,omitempty"`
-	Field7707            []string                `protobuf:"bytes,23,rep,name=field7707" json:"field7707,omitempty"`
-	Field7708            *UnusedEmptyMessage     `protobuf:"bytes,24,opt,name=field7708" json:"field7708,omitempty"`
-	Field7709            *int32                  `protobuf:"varint,25,opt,name=field7709" json:"field7709,omitempty"`
-	Field7710            *int32                  `protobuf:"varint,26,opt,name=field7710" json:"field7710,omitempty"`
-	Field7711            *int32                  `protobuf:"varint,27,opt,name=field7711" json:"field7711,omitempty"`
-	Field7712            *int32                  `protobuf:"varint,43,opt,name=field7712" json:"field7712,omitempty"`
-	Field7713            *int32                  `protobuf:"varint,28,opt,name=field7713" json:"field7713,omitempty"`
-	Field7714            *int32                  `protobuf:"varint,29,opt,name=field7714" json:"field7714,omitempty"`
-	Field7715            []*Message7547          `protobuf:"bytes,30,rep,name=field7715" json:"field7715,omitempty"`
-	Field7716            []*Message7547          `protobuf:"bytes,31,rep,name=field7716" json:"field7716,omitempty"`
-	Field7717            []*UnusedEmptyMessage   `protobuf:"bytes,32,rep,name=field7717" json:"field7717,omitempty"`
-	Field7718            []string                `protobuf:"bytes,33,rep,name=field7718" json:"field7718,omitempty"`
-	Field7719            []string                `protobuf:"bytes,34,rep,name=field7719" json:"field7719,omitempty"`
-	Field7720            []*Message7648          `protobuf:"bytes,35,rep,name=field7720" json:"field7720,omitempty"`
-	Field7721            *bool                   `protobuf:"varint,36,opt,name=field7721" json:"field7721,omitempty"`
-	Field7722            *bool                   `protobuf:"varint,37,opt,name=field7722" json:"field7722,omitempty"`
-	Field7723            *bool                   `protobuf:"varint,38,opt,name=field7723" json:"field7723,omitempty"`
-	Field7724            *bool                   `protobuf:"varint,39,opt,name=field7724" json:"field7724,omitempty"`
-	Field7725            *UnusedEmptyMessage     `protobuf:"bytes,40,opt,name=field7725" json:"field7725,omitempty"`
-	Field7726            *UnusedEnum             `protobuf:"varint,41,opt,name=field7726,enum=benchmarks.google_message3.UnusedEnum" json:"field7726,omitempty"`
-	Field7727            *Enum7654               `protobuf:"varint,42,opt,name=field7727,enum=benchmarks.google_message3.Enum7654" json:"field7727,omitempty"`
-	Field7728            *string                 `protobuf:"bytes,44,opt,name=field7728" json:"field7728,omitempty"`
-	Field7729            *UnusedEmptyMessage     `protobuf:"bytes,45,opt,name=field7729" json:"field7729,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7685     *string               `protobuf:"bytes,1,opt,name=field7685" json:"field7685,omitempty"`
+	Field7686     *int64                `protobuf:"varint,2,opt,name=field7686" json:"field7686,omitempty"`
+	Field7687     *int64                `protobuf:"varint,3,opt,name=field7687" json:"field7687,omitempty"`
+	Field7688     *int64                `protobuf:"varint,4,opt,name=field7688" json:"field7688,omitempty"`
+	Field7689     *int32                `protobuf:"varint,5,opt,name=field7689" json:"field7689,omitempty"`
+	Field7690     *int32                `protobuf:"varint,6,opt,name=field7690" json:"field7690,omitempty"`
+	Field7691     *int32                `protobuf:"varint,7,opt,name=field7691" json:"field7691,omitempty"`
+	Field7692     *int32                `protobuf:"varint,8,opt,name=field7692" json:"field7692,omitempty"`
+	Field7693     *int32                `protobuf:"varint,9,opt,name=field7693" json:"field7693,omitempty"`
+	Field7694     *int32                `protobuf:"varint,10,opt,name=field7694" json:"field7694,omitempty"`
+	Field7695     *int32                `protobuf:"varint,11,opt,name=field7695" json:"field7695,omitempty"`
+	Field7696     *int32                `protobuf:"varint,12,opt,name=field7696" json:"field7696,omitempty"`
+	Field7697     *int32                `protobuf:"varint,13,opt,name=field7697" json:"field7697,omitempty"`
+	Field7698     *int32                `protobuf:"varint,14,opt,name=field7698" json:"field7698,omitempty"`
+	Field7699     *int32                `protobuf:"varint,15,opt,name=field7699" json:"field7699,omitempty"`
+	Field7700     *int32                `protobuf:"varint,16,opt,name=field7700" json:"field7700,omitempty"`
+	Field7701     *int32                `protobuf:"varint,17,opt,name=field7701" json:"field7701,omitempty"`
+	Field7702     *int32                `protobuf:"varint,18,opt,name=field7702" json:"field7702,omitempty"`
+	Field7703     *bool                 `protobuf:"varint,19,opt,name=field7703" json:"field7703,omitempty"`
+	Field7704     []int32               `protobuf:"varint,20,rep,name=field7704" json:"field7704,omitempty"`
+	Field7705     []int32               `protobuf:"varint,21,rep,name=field7705" json:"field7705,omitempty"`
+	Field7706     []string              `protobuf:"bytes,22,rep,name=field7706" json:"field7706,omitempty"`
+	Field7707     []string              `protobuf:"bytes,23,rep,name=field7707" json:"field7707,omitempty"`
+	Field7708     *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field7708" json:"field7708,omitempty"`
+	Field7709     *int32                `protobuf:"varint,25,opt,name=field7709" json:"field7709,omitempty"`
+	Field7710     *int32                `protobuf:"varint,26,opt,name=field7710" json:"field7710,omitempty"`
+	Field7711     *int32                `protobuf:"varint,27,opt,name=field7711" json:"field7711,omitempty"`
+	Field7712     *int32                `protobuf:"varint,43,opt,name=field7712" json:"field7712,omitempty"`
+	Field7713     *int32                `protobuf:"varint,28,opt,name=field7713" json:"field7713,omitempty"`
+	Field7714     *int32                `protobuf:"varint,29,opt,name=field7714" json:"field7714,omitempty"`
+	Field7715     []*Message7547        `protobuf:"bytes,30,rep,name=field7715" json:"field7715,omitempty"`
+	Field7716     []*Message7547        `protobuf:"bytes,31,rep,name=field7716" json:"field7716,omitempty"`
+	Field7717     []*UnusedEmptyMessage `protobuf:"bytes,32,rep,name=field7717" json:"field7717,omitempty"`
+	Field7718     []string              `protobuf:"bytes,33,rep,name=field7718" json:"field7718,omitempty"`
+	Field7719     []string              `protobuf:"bytes,34,rep,name=field7719" json:"field7719,omitempty"`
+	Field7720     []*Message7648        `protobuf:"bytes,35,rep,name=field7720" json:"field7720,omitempty"`
+	Field7721     *bool                 `protobuf:"varint,36,opt,name=field7721" json:"field7721,omitempty"`
+	Field7722     *bool                 `protobuf:"varint,37,opt,name=field7722" json:"field7722,omitempty"`
+	Field7723     *bool                 `protobuf:"varint,38,opt,name=field7723" json:"field7723,omitempty"`
+	Field7724     *bool                 `protobuf:"varint,39,opt,name=field7724" json:"field7724,omitempty"`
+	Field7725     *UnusedEmptyMessage   `protobuf:"bytes,40,opt,name=field7725" json:"field7725,omitempty"`
+	Field7726     *UnusedEnum           `protobuf:"varint,41,opt,name=field7726,enum=benchmarks.google_message3.UnusedEnum" json:"field7726,omitempty"`
+	Field7727     *Enum7654             `protobuf:"varint,42,opt,name=field7727,enum=benchmarks.google_message3.Enum7654" json:"field7727,omitempty"`
+	Field7728     *string               `protobuf:"bytes,44,opt,name=field7728" json:"field7728,omitempty"`
+	Field7729     *UnusedEmptyMessage   `protobuf:"bytes,45,opt,name=field7729" json:"field7729,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7651) Reset() {
@@ -922,15 +914,14 @@
 }
 
 type Message7864 struct {
-	Field7866            *string                 `protobuf:"bytes,1,opt,name=field7866" json:"field7866,omitempty"`
-	Field7867            *string                 `protobuf:"bytes,2,opt,name=field7867" json:"field7867,omitempty"`
-	Field7868            []*Message7865          `protobuf:"bytes,5,rep,name=field7868" json:"field7868,omitempty"`
-	Field7869            []*Message7865          `protobuf:"bytes,6,rep,name=field7869" json:"field7869,omitempty"`
-	Field7870            []*Message7865          `protobuf:"bytes,7,rep,name=field7870" json:"field7870,omitempty"`
-	Field7871            []*UnusedEmptyMessage   `protobuf:"bytes,8,rep,name=field7871" json:"field7871,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7866     *string               `protobuf:"bytes,1,opt,name=field7866" json:"field7866,omitempty"`
+	Field7867     *string               `protobuf:"bytes,2,opt,name=field7867" json:"field7867,omitempty"`
+	Field7868     []*Message7865        `protobuf:"bytes,5,rep,name=field7868" json:"field7868,omitempty"`
+	Field7869     []*Message7865        `protobuf:"bytes,6,rep,name=field7869" json:"field7869,omitempty"`
+	Field7870     []*Message7865        `protobuf:"bytes,7,rep,name=field7870" json:"field7870,omitempty"`
+	Field7871     []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field7871" json:"field7871,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7864) Reset() {
@@ -999,29 +990,28 @@
 }
 
 type Message7929 struct {
-	Field7942            *int64                  `protobuf:"varint,1,opt,name=field7942" json:"field7942,omitempty"`
-	Field7943            *int64                  `protobuf:"varint,4,opt,name=field7943" json:"field7943,omitempty"`
-	Field7944            *int64                  `protobuf:"varint,5,opt,name=field7944" json:"field7944,omitempty"`
-	Field7945            *int64                  `protobuf:"varint,12,opt,name=field7945" json:"field7945,omitempty"`
-	Field7946            *int64                  `protobuf:"varint,13,opt,name=field7946" json:"field7946,omitempty"`
-	Field7947            *int64                  `protobuf:"varint,18,opt,name=field7947" json:"field7947,omitempty"`
-	Field7948            *int64                  `protobuf:"varint,6,opt,name=field7948" json:"field7948,omitempty"`
-	Field7949            *int64                  `protobuf:"varint,7,opt,name=field7949" json:"field7949,omitempty"`
-	Field7950            []*Message7919          `protobuf:"bytes,8,rep,name=field7950" json:"field7950,omitempty"`
-	Field7951            []*UnusedEmptyMessage   `protobuf:"bytes,20,rep,name=field7951" json:"field7951,omitempty"`
-	Field7952            []*Message7920          `protobuf:"bytes,14,rep,name=field7952" json:"field7952,omitempty"`
-	Field7953            []*Message7921          `protobuf:"bytes,15,rep,name=field7953" json:"field7953,omitempty"`
-	Field7954            []*Message7928          `protobuf:"bytes,17,rep,name=field7954" json:"field7954,omitempty"`
-	Field7955            *int64                  `protobuf:"varint,19,opt,name=field7955" json:"field7955,omitempty"`
-	Field7956            *bool                   `protobuf:"varint,2,opt,name=field7956" json:"field7956,omitempty"`
-	Field7957            *int64                  `protobuf:"varint,3,opt,name=field7957" json:"field7957,omitempty"`
-	Field7958            *int64                  `protobuf:"varint,9,opt,name=field7958" json:"field7958,omitempty"`
-	Field7959            []*UnusedEmptyMessage   `protobuf:"bytes,10,rep,name=field7959" json:"field7959,omitempty"`
-	Field7960            [][]byte                `protobuf:"bytes,11,rep,name=field7960" json:"field7960,omitempty"`
-	Field7961            *int64                  `protobuf:"varint,16,opt,name=field7961" json:"field7961,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7942     *int64                `protobuf:"varint,1,opt,name=field7942" json:"field7942,omitempty"`
+	Field7943     *int64                `protobuf:"varint,4,opt,name=field7943" json:"field7943,omitempty"`
+	Field7944     *int64                `protobuf:"varint,5,opt,name=field7944" json:"field7944,omitempty"`
+	Field7945     *int64                `protobuf:"varint,12,opt,name=field7945" json:"field7945,omitempty"`
+	Field7946     *int64                `protobuf:"varint,13,opt,name=field7946" json:"field7946,omitempty"`
+	Field7947     *int64                `protobuf:"varint,18,opt,name=field7947" json:"field7947,omitempty"`
+	Field7948     *int64                `protobuf:"varint,6,opt,name=field7948" json:"field7948,omitempty"`
+	Field7949     *int64                `protobuf:"varint,7,opt,name=field7949" json:"field7949,omitempty"`
+	Field7950     []*Message7919        `protobuf:"bytes,8,rep,name=field7950" json:"field7950,omitempty"`
+	Field7951     []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field7951" json:"field7951,omitempty"`
+	Field7952     []*Message7920        `protobuf:"bytes,14,rep,name=field7952" json:"field7952,omitempty"`
+	Field7953     []*Message7921        `protobuf:"bytes,15,rep,name=field7953" json:"field7953,omitempty"`
+	Field7954     []*Message7928        `protobuf:"bytes,17,rep,name=field7954" json:"field7954,omitempty"`
+	Field7955     *int64                `protobuf:"varint,19,opt,name=field7955" json:"field7955,omitempty"`
+	Field7956     *bool                 `protobuf:"varint,2,opt,name=field7956" json:"field7956,omitempty"`
+	Field7957     *int64                `protobuf:"varint,3,opt,name=field7957" json:"field7957,omitempty"`
+	Field7958     *int64                `protobuf:"varint,9,opt,name=field7958" json:"field7958,omitempty"`
+	Field7959     []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field7959" json:"field7959,omitempty"`
+	Field7960     [][]byte              `protobuf:"bytes,11,rep,name=field7960" json:"field7960,omitempty"`
+	Field7961     *int64                `protobuf:"varint,16,opt,name=field7961" json:"field7961,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7929) Reset() {
@@ -1188,26 +1178,25 @@
 }
 
 type Message8508 struct {
-	Field8517            []*Message8511          `protobuf:"bytes,8,rep,name=field8517" json:"field8517,omitempty"`
-	Field8518            []*Message8512          `protobuf:"bytes,9,rep,name=field8518" json:"field8518,omitempty"`
-	Field8519            []*Message8513          `protobuf:"bytes,11,rep,name=field8519" json:"field8519,omitempty"`
-	Field8520            *bool                   `protobuf:"varint,13,opt,name=field8520" json:"field8520,omitempty"`
-	Field8521            *Message8514            `protobuf:"bytes,14,opt,name=field8521" json:"field8521,omitempty"`
-	Field8522            []*UnusedEmptyMessage   `protobuf:"bytes,15,rep,name=field8522" json:"field8522,omitempty"`
-	Field8523            []*Message8515          `protobuf:"bytes,16,rep,name=field8523" json:"field8523,omitempty"`
-	Field8524            []*UnusedEmptyMessage   `protobuf:"bytes,17,rep,name=field8524" json:"field8524,omitempty"`
-	Field8525            *int64                  `protobuf:"varint,1,opt,name=field8525" json:"field8525,omitempty"`
-	Field8526            *float32                `protobuf:"fixed32,2,opt,name=field8526" json:"field8526,omitempty"`
-	Field8527            *int64                  `protobuf:"varint,3,opt,name=field8527" json:"field8527,omitempty"`
-	Field8528            *int64                  `protobuf:"varint,4,opt,name=field8528" json:"field8528,omitempty"`
-	Field8529            *int32                  `protobuf:"varint,5,opt,name=field8529" json:"field8529,omitempty"`
-	Field8530            []byte                  `protobuf:"bytes,6,opt,name=field8530" json:"field8530,omitempty"`
-	Field8531            [][]byte                `protobuf:"bytes,7,rep,name=field8531" json:"field8531,omitempty"`
-	Field8532            *bool                   `protobuf:"varint,10,opt,name=field8532" json:"field8532,omitempty"`
-	Field8533            []byte                  `protobuf:"bytes,12,opt,name=field8533" json:"field8533,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8517     []*Message8511        `protobuf:"bytes,8,rep,name=field8517" json:"field8517,omitempty"`
+	Field8518     []*Message8512        `protobuf:"bytes,9,rep,name=field8518" json:"field8518,omitempty"`
+	Field8519     []*Message8513        `protobuf:"bytes,11,rep,name=field8519" json:"field8519,omitempty"`
+	Field8520     *bool                 `protobuf:"varint,13,opt,name=field8520" json:"field8520,omitempty"`
+	Field8521     *Message8514          `protobuf:"bytes,14,opt,name=field8521" json:"field8521,omitempty"`
+	Field8522     []*UnusedEmptyMessage `protobuf:"bytes,15,rep,name=field8522" json:"field8522,omitempty"`
+	Field8523     []*Message8515        `protobuf:"bytes,16,rep,name=field8523" json:"field8523,omitempty"`
+	Field8524     []*UnusedEmptyMessage `protobuf:"bytes,17,rep,name=field8524" json:"field8524,omitempty"`
+	Field8525     *int64                `protobuf:"varint,1,opt,name=field8525" json:"field8525,omitempty"`
+	Field8526     *float32              `protobuf:"fixed32,2,opt,name=field8526" json:"field8526,omitempty"`
+	Field8527     *int64                `protobuf:"varint,3,opt,name=field8527" json:"field8527,omitempty"`
+	Field8528     *int64                `protobuf:"varint,4,opt,name=field8528" json:"field8528,omitempty"`
+	Field8529     *int32                `protobuf:"varint,5,opt,name=field8529" json:"field8529,omitempty"`
+	Field8530     []byte                `protobuf:"bytes,6,opt,name=field8530" json:"field8530,omitempty"`
+	Field8531     [][]byte              `protobuf:"bytes,7,rep,name=field8531" json:"field8531,omitempty"`
+	Field8532     *bool                 `protobuf:"varint,10,opt,name=field8532" json:"field8532,omitempty"`
+	Field8533     []byte                `protobuf:"bytes,12,opt,name=field8533" json:"field8533,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8508) Reset() {
@@ -1353,11 +1342,10 @@
 }
 
 type Message9122 struct {
-	Field9132            *float32                `protobuf:"fixed32,1,opt,name=field9132" json:"field9132,omitempty"`
-	Field9133            *float32                `protobuf:"fixed32,2,opt,name=field9133" json:"field9133,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9132     *float32 `protobuf:"fixed32,1,opt,name=field9132" json:"field9132,omitempty"`
+	Field9133     *float32 `protobuf:"fixed32,2,opt,name=field9133" json:"field9133,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9122) Reset() {
@@ -1398,10 +1386,9 @@
 }
 
 type Message10177 struct {
-	Field10270           []*Message10155         `protobuf:"bytes,1,rep,name=field10270" json:"field10270,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10270    []*Message10155 `protobuf:"bytes,1,rep,name=field10270" json:"field10270,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10177) Reset() {
@@ -1435,12 +1422,11 @@
 }
 
 type Message10278 struct {
-	Field10286           []int32                 `protobuf:"varint,1,rep,packed,name=field10286" json:"field10286,omitempty"`
-	Field10287           []int32                 `protobuf:"varint,2,rep,packed,name=field10287" json:"field10287,omitempty"`
-	Field10288           *int32                  `protobuf:"varint,3,opt,name=field10288" json:"field10288,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10286    []int32 `protobuf:"varint,1,rep,packed,name=field10286" json:"field10286,omitempty"`
+	Field10287    []int32 `protobuf:"varint,2,rep,packed,name=field10287" json:"field10287,omitempty"`
+	Field10288    *int32  `protobuf:"varint,3,opt,name=field10288" json:"field10288,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10278) Reset() {
@@ -1488,10 +1474,9 @@
 }
 
 type Message10323 struct {
-	Field10360           []*Message10320         `protobuf:"bytes,1,rep,name=field10360" json:"field10360,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10360    []*Message10320 `protobuf:"bytes,1,rep,name=field10360" json:"field10360,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10323) Reset() {
@@ -1525,11 +1510,10 @@
 }
 
 type Message10324 struct {
-	Field10362           []*Message10322         `protobuf:"bytes,1,rep,name=field10362" json:"field10362,omitempty"`
-	Field10363           *Message10321           `protobuf:"bytes,2,opt,name=field10363" json:"field10363,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10362    []*Message10322 `protobuf:"bytes,1,rep,name=field10362" json:"field10362,omitempty"`
+	Field10363    *Message10321   `protobuf:"bytes,2,opt,name=field10363" json:"field10363,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10324) Reset() {
@@ -1570,10 +1554,9 @@
 }
 
 type Message11990 struct {
-	Field12030           []*Message11988         `protobuf:"bytes,1,rep,name=field12030" json:"field12030,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12030    []*Message11988 `protobuf:"bytes,1,rep,name=field12030" json:"field12030,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11990) Reset() {
@@ -1607,12 +1590,11 @@
 }
 
 type Message12691 struct {
-	Field12713           *string                 `protobuf:"bytes,1,opt,name=field12713" json:"field12713,omitempty"`
-	Field12714           *int32                  `protobuf:"varint,2,opt,name=field12714" json:"field12714,omitempty"`
-	Field12715           *Message12668           `protobuf:"bytes,3,opt,name=field12715" json:"field12715,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12713    *string       `protobuf:"bytes,1,opt,name=field12713" json:"field12713,omitempty"`
+	Field12714    *int32        `protobuf:"varint,2,opt,name=field12714" json:"field12714,omitempty"`
+	Field12715    *Message12668 `protobuf:"bytes,3,opt,name=field12715" json:"field12715,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12691) Reset() {
@@ -1660,29 +1642,28 @@
 }
 
 type Message12870 struct {
-	Field12879           *int32                  `protobuf:"varint,1,req,name=field12879" json:"field12879,omitempty"`
-	Field12880           *int32                  `protobuf:"varint,7,opt,name=field12880" json:"field12880,omitempty"`
-	Field12881           *int32                  `protobuf:"varint,2,req,name=field12881" json:"field12881,omitempty"`
-	Field12882           *uint64                 `protobuf:"varint,3,opt,name=field12882" json:"field12882,omitempty"`
-	Field12883           *string                 `protobuf:"bytes,2001,opt,name=field12883" json:"field12883,omitempty"`
-	Field12884           *uint64                 `protobuf:"fixed64,4,opt,name=field12884" json:"field12884,omitempty"`
-	Field12885           []uint64                `protobuf:"fixed64,14,rep,name=field12885" json:"field12885,omitempty"`
-	Field12886           *int32                  `protobuf:"varint,9,opt,name=field12886" json:"field12886,omitempty"`
-	Field12887           *int64                  `protobuf:"varint,18,opt,name=field12887" json:"field12887,omitempty"`
-	Field12888           []*Message12870         `protobuf:"bytes,8,rep,name=field12888" json:"field12888,omitempty"`
-	Field12889           *int32                  `protobuf:"varint,5,opt,name=field12889" json:"field12889,omitempty"`
-	Field12890           *uint64                 `protobuf:"varint,6,opt,name=field12890" json:"field12890,omitempty"`
-	Field12891           *int32                  `protobuf:"varint,10,opt,name=field12891" json:"field12891,omitempty"`
-	Field12892           *int32                  `protobuf:"varint,11,opt,name=field12892" json:"field12892,omitempty"`
-	Field12893           *float64                `protobuf:"fixed64,12,opt,name=field12893" json:"field12893,omitempty"`
-	Field12894           *Message12825           `protobuf:"bytes,13,opt,name=field12894" json:"field12894,omitempty"`
-	Field12895           *float64                `protobuf:"fixed64,15,opt,name=field12895" json:"field12895,omitempty"`
-	Field12896           *string                 `protobuf:"bytes,16,opt,name=field12896" json:"field12896,omitempty"`
-	Field12897           *Enum12871              `protobuf:"varint,17,opt,name=field12897,enum=benchmarks.google_message3.Enum12871" json:"field12897,omitempty"`
-	Field12898           *int32                  `protobuf:"varint,19,opt,name=field12898" json:"field12898,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12879    *int32          `protobuf:"varint,1,req,name=field12879" json:"field12879,omitempty"`
+	Field12880    *int32          `protobuf:"varint,7,opt,name=field12880" json:"field12880,omitempty"`
+	Field12881    *int32          `protobuf:"varint,2,req,name=field12881" json:"field12881,omitempty"`
+	Field12882    *uint64         `protobuf:"varint,3,opt,name=field12882" json:"field12882,omitempty"`
+	Field12883    *string         `protobuf:"bytes,2001,opt,name=field12883" json:"field12883,omitempty"`
+	Field12884    *uint64         `protobuf:"fixed64,4,opt,name=field12884" json:"field12884,omitempty"`
+	Field12885    []uint64        `protobuf:"fixed64,14,rep,name=field12885" json:"field12885,omitempty"`
+	Field12886    *int32          `protobuf:"varint,9,opt,name=field12886" json:"field12886,omitempty"`
+	Field12887    *int64          `protobuf:"varint,18,opt,name=field12887" json:"field12887,omitempty"`
+	Field12888    []*Message12870 `protobuf:"bytes,8,rep,name=field12888" json:"field12888,omitempty"`
+	Field12889    *int32          `protobuf:"varint,5,opt,name=field12889" json:"field12889,omitempty"`
+	Field12890    *uint64         `protobuf:"varint,6,opt,name=field12890" json:"field12890,omitempty"`
+	Field12891    *int32          `protobuf:"varint,10,opt,name=field12891" json:"field12891,omitempty"`
+	Field12892    *int32          `protobuf:"varint,11,opt,name=field12892" json:"field12892,omitempty"`
+	Field12893    *float64        `protobuf:"fixed64,12,opt,name=field12893" json:"field12893,omitempty"`
+	Field12894    *Message12825   `protobuf:"bytes,13,opt,name=field12894" json:"field12894,omitempty"`
+	Field12895    *float64        `protobuf:"fixed64,15,opt,name=field12895" json:"field12895,omitempty"`
+	Field12896    *string         `protobuf:"bytes,16,opt,name=field12896" json:"field12896,omitempty"`
+	Field12897    *Enum12871      `protobuf:"varint,17,opt,name=field12897,enum=benchmarks.google_message3.Enum12871" json:"field12897,omitempty"`
+	Field12898    *int32          `protobuf:"varint,19,opt,name=field12898" json:"field12898,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12870) Reset() {
@@ -1849,11 +1830,10 @@
 }
 
 type Message13154 struct {
-	Field13164           *float32                `protobuf:"fixed32,1,req,name=field13164" json:"field13164,omitempty"`
-	Field13165           *float32                `protobuf:"fixed32,2,req,name=field13165" json:"field13165,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13164    *float32 `protobuf:"fixed32,1,req,name=field13164" json:"field13164,omitempty"`
+	Field13165    *float32 `protobuf:"fixed32,2,req,name=field13165" json:"field13165,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13154) Reset() {
@@ -1894,42 +1874,41 @@
 }
 
 type Message16507 struct {
-	Field16510             *bool                     `protobuf:"varint,3,opt,name=field16510" json:"field16510,omitempty"`
-	Field16511             *bool                     `protobuf:"varint,4,opt,name=field16511" json:"field16511,omitempty"`
-	Field16512             *bool                     `protobuf:"varint,14,opt,name=field16512" json:"field16512,omitempty"`
-	Field16513             []string                  `protobuf:"bytes,5,rep,name=field16513" json:"field16513,omitempty"`
-	Field16514             []string                  `protobuf:"bytes,6,rep,name=field16514" json:"field16514,omitempty"`
-	Field16515             *string                   `protobuf:"bytes,8,opt,name=field16515" json:"field16515,omitempty"`
-	Field16516             []int32                   `protobuf:"varint,9,rep,name=field16516" json:"field16516,omitempty"`
-	Field16517             []int32                   `protobuf:"varint,10,rep,name=field16517" json:"field16517,omitempty"`
-	Field16518             *int32                    `protobuf:"varint,7,opt,name=field16518" json:"field16518,omitempty"`
-	Field16519             *string                   `protobuf:"bytes,15,opt,name=field16519" json:"field16519,omitempty"`
-	Field16520             []string                  `protobuf:"bytes,11,rep,name=field16520" json:"field16520,omitempty"`
-	Field16521             []*UnusedEmptyMessage     `protobuf:"bytes,27,rep,name=field16521" json:"field16521,omitempty"`
-	Field16522             []*UnusedEmptyMessage     `protobuf:"bytes,22,rep,name=field16522" json:"field16522,omitempty"`
-	Field16523             []*UnusedEmptyMessage     `protobuf:"bytes,28,rep,name=field16523" json:"field16523,omitempty"`
-	Field16524             *string                   `protobuf:"bytes,18,opt,name=field16524" json:"field16524,omitempty"`
-	Field16525             *int32                    `protobuf:"varint,19,opt,name=field16525" json:"field16525,omitempty"`
-	Field16526             *int32                    `protobuf:"varint,20,opt,name=field16526" json:"field16526,omitempty"`
-	Field16527             *UnusedEmptyMessage       `protobuf:"bytes,23,opt,name=field16527" json:"field16527,omitempty"`
-	Field16528             *bool                     `protobuf:"varint,24,opt,name=field16528" json:"field16528,omitempty"`
-	Field16529             []string                  `protobuf:"bytes,25,rep,name=field16529" json:"field16529,omitempty"`
-	Field16530             *float64                  `protobuf:"fixed64,26,opt,name=field16530" json:"field16530,omitempty"`
-	Field16531             *Message16478             `protobuf:"bytes,30,opt,name=field16531" json:"field16531,omitempty"`
-	Field16532             *bool                     `protobuf:"varint,31,opt,name=field16532" json:"field16532,omitempty"`
-	Field16533             *string                   `protobuf:"bytes,32,opt,name=field16533" json:"field16533,omitempty"`
-	Field16534             *bool                     `protobuf:"varint,33,opt,name=field16534" json:"field16534,omitempty"`
-	Field16535             *bool                     `protobuf:"varint,35,opt,name=field16535" json:"field16535,omitempty"`
-	Field16536             *bool                     `protobuf:"varint,36,opt,name=field16536" json:"field16536,omitempty"`
-	Field16537             *bool                     `protobuf:"varint,37,opt,name=field16537" json:"field16537,omitempty"`
-	Field16538             *bool                     `protobuf:"varint,38,opt,name=field16538" json:"field16538,omitempty"`
-	Field16539             *bool                     `protobuf:"varint,39,opt,name=field16539" json:"field16539,omitempty"`
-	Field16540             *bool                     `protobuf:"varint,40,opt,name=field16540" json:"field16540,omitempty"`
-	Field16541             []string                  `protobuf:"bytes,41,rep,name=field16541" json:"field16541,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field16510      *bool                 `protobuf:"varint,3,opt,name=field16510" json:"field16510,omitempty"`
+	Field16511      *bool                 `protobuf:"varint,4,opt,name=field16511" json:"field16511,omitempty"`
+	Field16512      *bool                 `protobuf:"varint,14,opt,name=field16512" json:"field16512,omitempty"`
+	Field16513      []string              `protobuf:"bytes,5,rep,name=field16513" json:"field16513,omitempty"`
+	Field16514      []string              `protobuf:"bytes,6,rep,name=field16514" json:"field16514,omitempty"`
+	Field16515      *string               `protobuf:"bytes,8,opt,name=field16515" json:"field16515,omitempty"`
+	Field16516      []int32               `protobuf:"varint,9,rep,name=field16516" json:"field16516,omitempty"`
+	Field16517      []int32               `protobuf:"varint,10,rep,name=field16517" json:"field16517,omitempty"`
+	Field16518      *int32                `protobuf:"varint,7,opt,name=field16518" json:"field16518,omitempty"`
+	Field16519      *string               `protobuf:"bytes,15,opt,name=field16519" json:"field16519,omitempty"`
+	Field16520      []string              `protobuf:"bytes,11,rep,name=field16520" json:"field16520,omitempty"`
+	Field16521      []*UnusedEmptyMessage `protobuf:"bytes,27,rep,name=field16521" json:"field16521,omitempty"`
+	Field16522      []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field16522" json:"field16522,omitempty"`
+	Field16523      []*UnusedEmptyMessage `protobuf:"bytes,28,rep,name=field16523" json:"field16523,omitempty"`
+	Field16524      *string               `protobuf:"bytes,18,opt,name=field16524" json:"field16524,omitempty"`
+	Field16525      *int32                `protobuf:"varint,19,opt,name=field16525" json:"field16525,omitempty"`
+	Field16526      *int32                `protobuf:"varint,20,opt,name=field16526" json:"field16526,omitempty"`
+	Field16527      *UnusedEmptyMessage   `protobuf:"bytes,23,opt,name=field16527" json:"field16527,omitempty"`
+	Field16528      *bool                 `protobuf:"varint,24,opt,name=field16528" json:"field16528,omitempty"`
+	Field16529      []string              `protobuf:"bytes,25,rep,name=field16529" json:"field16529,omitempty"`
+	Field16530      *float64              `protobuf:"fixed64,26,opt,name=field16530" json:"field16530,omitempty"`
+	Field16531      *Message16478         `protobuf:"bytes,30,opt,name=field16531" json:"field16531,omitempty"`
+	Field16532      *bool                 `protobuf:"varint,31,opt,name=field16532" json:"field16532,omitempty"`
+	Field16533      *string               `protobuf:"bytes,32,opt,name=field16533" json:"field16533,omitempty"`
+	Field16534      *bool                 `protobuf:"varint,33,opt,name=field16534" json:"field16534,omitempty"`
+	Field16535      *bool                 `protobuf:"varint,35,opt,name=field16535" json:"field16535,omitempty"`
+	Field16536      *bool                 `protobuf:"varint,36,opt,name=field16536" json:"field16536,omitempty"`
+	Field16537      *bool                 `protobuf:"varint,37,opt,name=field16537" json:"field16537,omitempty"`
+	Field16538      *bool                 `protobuf:"varint,38,opt,name=field16538" json:"field16538,omitempty"`
+	Field16539      *bool                 `protobuf:"varint,39,opt,name=field16539" json:"field16539,omitempty"`
+	Field16540      *bool                 `protobuf:"varint,40,opt,name=field16540" json:"field16540,omitempty"`
+	Field16541      []string              `protobuf:"bytes,41,rep,name=field16541" json:"field16541,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message16507) Reset() {
@@ -2189,10 +2168,9 @@
 }
 
 type Message16564 struct {
-	Field16568           []*Message16552         `protobuf:"bytes,1,rep,name=field16568" json:"field16568,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16568    []*Message16552 `protobuf:"bytes,1,rep,name=field16568" json:"field16568,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16564) Reset() {
@@ -2226,11 +2204,10 @@
 }
 
 type Message16661 struct {
-	Field16671           []*Message16660         `protobuf:"bytes,1,rep,name=field16671" json:"field16671,omitempty"`
-	Field16672           []uint64                `protobuf:"varint,2,rep,name=field16672" json:"field16672,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16671    []*Message16660 `protobuf:"bytes,1,rep,name=field16671" json:"field16671,omitempty"`
+	Field16672    []uint64        `protobuf:"varint,2,rep,name=field16672" json:"field16672,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16661) Reset() {
@@ -2271,13 +2248,12 @@
 }
 
 type Message16746 struct {
-	Field16806           []*Message16727         `protobuf:"bytes,1,rep,name=field16806" json:"field16806,omitempty"`
-	Field16807           *bool                   `protobuf:"varint,2,opt,name=field16807" json:"field16807,omitempty"`
-	Field16808           *bool                   `protobuf:"varint,3,opt,name=field16808" json:"field16808,omitempty"`
-	Field16809           []*Message16725         `protobuf:"bytes,4,rep,name=field16809" json:"field16809,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16806    []*Message16727 `protobuf:"bytes,1,rep,name=field16806" json:"field16806,omitempty"`
+	Field16807    *bool           `protobuf:"varint,2,opt,name=field16807" json:"field16807,omitempty"`
+	Field16808    *bool           `protobuf:"varint,3,opt,name=field16808" json:"field16808,omitempty"`
+	Field16809    []*Message16725 `protobuf:"bytes,4,rep,name=field16809" json:"field16809,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16746) Reset() {
@@ -2332,11 +2308,10 @@
 }
 
 type Message17786 struct {
-	Message17787         []*Message17786_Message17787 `protobuf:"group,1,rep,name=Message17787,json=message17787" json:"message17787,omitempty"`
-	Field18175           []*Message17782              `protobuf:"bytes,20,rep,name=field18175" json:"field18175,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Message17787  []*Message17786_Message17787 `protobuf:"group,1,rep,name=Message17787,json=message17787" json:"message17787,omitempty"`
+	Field18175    []*Message17782              `protobuf:"bytes,20,rep,name=field18175" json:"field18175,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message17786) Reset() {
@@ -2377,10 +2352,9 @@
 }
 
 type Message22857 struct {
-	Field22874           []*Message22853         `protobuf:"bytes,1,rep,name=field22874" json:"field22874,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field22874    []*Message22853 `protobuf:"bytes,1,rep,name=field22874" json:"field22874,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message22857) Reset() {
@@ -2414,11 +2388,10 @@
 }
 
 type Message24404 struct {
-	Message24405         []*Message24404_Message24405 `protobuf:"group,1,rep,name=Message24405,json=message24405" json:"message24405,omitempty"`
-	Field24684           *Message24403                `protobuf:"bytes,30,opt,name=field24684" json:"field24684,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Message24405  []*Message24404_Message24405 `protobuf:"group,1,rep,name=Message24405,json=message24405" json:"message24405,omitempty"`
+	Field24684    *Message24403                `protobuf:"bytes,30,opt,name=field24684" json:"field24684,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24404) Reset() {
@@ -2459,11 +2432,10 @@
 }
 
 type Message27300 struct {
-	Field27302           []*UnusedEmptyMessage   `protobuf:"bytes,1,rep,name=field27302" json:"field27302,omitempty"`
-	Field27303           *string                 `protobuf:"bytes,2,opt,name=field27303" json:"field27303,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field27302    []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field27302" json:"field27302,omitempty"`
+	Field27303    *string               `protobuf:"bytes,2,opt,name=field27303" json:"field27303,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message27300) Reset() {
@@ -2504,32 +2476,31 @@
 }
 
 type Message27453 struct {
-	Field27459           *string                 `protobuf:"bytes,15,opt,name=field27459" json:"field27459,omitempty"`
-	Field27460           []string                `protobuf:"bytes,1,rep,name=field27460" json:"field27460,omitempty"`
-	Field27461           []float32               `protobuf:"fixed32,6,rep,name=field27461" json:"field27461,omitempty"`
-	Field27462           []int32                 `protobuf:"varint,27,rep,name=field27462" json:"field27462,omitempty"`
-	Field27463           []int32                 `protobuf:"varint,28,rep,name=field27463" json:"field27463,omitempty"`
-	Field27464           []*Message27454         `protobuf:"bytes,24,rep,name=field27464" json:"field27464,omitempty"`
-	Field27465           []string                `protobuf:"bytes,2,rep,name=field27465" json:"field27465,omitempty"`
-	Field27466           []float32               `protobuf:"fixed32,7,rep,name=field27466" json:"field27466,omitempty"`
-	Field27467           []string                `protobuf:"bytes,22,rep,name=field27467" json:"field27467,omitempty"`
-	Field27468           []string                `protobuf:"bytes,23,rep,name=field27468" json:"field27468,omitempty"`
-	Field27469           *string                 `protobuf:"bytes,26,opt,name=field27469" json:"field27469,omitempty"`
-	Field27470           []*Message27357         `protobuf:"bytes,8,rep,name=field27470" json:"field27470,omitempty"`
-	Field27471           *Message27360           `protobuf:"bytes,16,opt,name=field27471" json:"field27471,omitempty"`
-	Field27472           *string                 `protobuf:"bytes,25,opt,name=field27472" json:"field27472,omitempty"`
-	Field27473           *string                 `protobuf:"bytes,11,opt,name=field27473" json:"field27473,omitempty"`
-	Field27474           *bool                   `protobuf:"varint,13,opt,name=field27474" json:"field27474,omitempty"`
-	Field27475           *bool                   `protobuf:"varint,14,opt,name=field27475" json:"field27475,omitempty"`
-	Field27476           *bool                   `protobuf:"varint,17,opt,name=field27476" json:"field27476,omitempty"`
-	Field27477           *UnusedEmptyMessage     `protobuf:"bytes,12,opt,name=field27477" json:"field27477,omitempty"`
-	Field27478           *bool                   `protobuf:"varint,34268945,opt,name=field27478" json:"field27478,omitempty"`
-	Field27479           *bool                   `protobuf:"varint,20,opt,name=field27479" json:"field27479,omitempty"`
-	Field27480           *string                 `protobuf:"bytes,21,opt,name=field27480" json:"field27480,omitempty"`
-	Field27481           *UnusedEmptyMessage     `protobuf:"bytes,10,opt,name=field27481" json:"field27481,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field27459    *string             `protobuf:"bytes,15,opt,name=field27459" json:"field27459,omitempty"`
+	Field27460    []string            `protobuf:"bytes,1,rep,name=field27460" json:"field27460,omitempty"`
+	Field27461    []float32           `protobuf:"fixed32,6,rep,name=field27461" json:"field27461,omitempty"`
+	Field27462    []int32             `protobuf:"varint,27,rep,name=field27462" json:"field27462,omitempty"`
+	Field27463    []int32             `protobuf:"varint,28,rep,name=field27463" json:"field27463,omitempty"`
+	Field27464    []*Message27454     `protobuf:"bytes,24,rep,name=field27464" json:"field27464,omitempty"`
+	Field27465    []string            `protobuf:"bytes,2,rep,name=field27465" json:"field27465,omitempty"`
+	Field27466    []float32           `protobuf:"fixed32,7,rep,name=field27466" json:"field27466,omitempty"`
+	Field27467    []string            `protobuf:"bytes,22,rep,name=field27467" json:"field27467,omitempty"`
+	Field27468    []string            `protobuf:"bytes,23,rep,name=field27468" json:"field27468,omitempty"`
+	Field27469    *string             `protobuf:"bytes,26,opt,name=field27469" json:"field27469,omitempty"`
+	Field27470    []*Message27357     `protobuf:"bytes,8,rep,name=field27470" json:"field27470,omitempty"`
+	Field27471    *Message27360       `protobuf:"bytes,16,opt,name=field27471" json:"field27471,omitempty"`
+	Field27472    *string             `protobuf:"bytes,25,opt,name=field27472" json:"field27472,omitempty"`
+	Field27473    *string             `protobuf:"bytes,11,opt,name=field27473" json:"field27473,omitempty"`
+	Field27474    *bool               `protobuf:"varint,13,opt,name=field27474" json:"field27474,omitempty"`
+	Field27475    *bool               `protobuf:"varint,14,opt,name=field27475" json:"field27475,omitempty"`
+	Field27476    *bool               `protobuf:"varint,17,opt,name=field27476" json:"field27476,omitempty"`
+	Field27477    *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field27477" json:"field27477,omitempty"`
+	Field27478    *bool               `protobuf:"varint,34268945,opt,name=field27478" json:"field27478,omitempty"`
+	Field27479    *bool               `protobuf:"varint,20,opt,name=field27479" json:"field27479,omitempty"`
+	Field27480    *string             `protobuf:"bytes,21,opt,name=field27480" json:"field27480,omitempty"`
+	Field27481    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field27481" json:"field27481,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message27453) Reset() {
@@ -2717,11 +2688,10 @@
 }
 
 type Message3672_Message3673 struct {
-	Field3738            *Enum3476               `protobuf:"varint,4,req,name=field3738,enum=benchmarks.google_message3.Enum3476" json:"field3738,omitempty"`
-	Field3739            *int32                  `protobuf:"varint,5,req,name=field3739" json:"field3739,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3738     *Enum3476 `protobuf:"varint,4,req,name=field3738,enum=benchmarks.google_message3.Enum3476" json:"field3738,omitempty"`
+	Field3739     *int32    `protobuf:"varint,5,req,name=field3739" json:"field3739,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3672_Message3673) Reset() {
@@ -2762,11 +2732,10 @@
 }
 
 type Message3672_Message3674 struct {
-	Field3740            *Enum3476               `protobuf:"varint,7,req,name=field3740,enum=benchmarks.google_message3.Enum3476" json:"field3740,omitempty"`
-	Field3741            *int32                  `protobuf:"varint,8,req,name=field3741" json:"field3741,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3740     *Enum3476 `protobuf:"varint,7,req,name=field3740,enum=benchmarks.google_message3.Enum3476" json:"field3740,omitempty"`
+	Field3741     *int32    `protobuf:"varint,8,req,name=field3741" json:"field3741,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3672_Message3674) Reset() {
@@ -2807,35 +2776,34 @@
 }
 
 type Message17786_Message17787 struct {
-	Field18177           *int32                  `protobuf:"varint,2,req,name=field18177" json:"field18177,omitempty"`
-	Field18178           *int32                  `protobuf:"varint,3,req,name=field18178" json:"field18178,omitempty"`
-	Field18179           *Message17783           `protobuf:"bytes,4,opt,name=field18179" json:"field18179,omitempty"`
-	Field18180           *UnusedEmptyMessage     `protobuf:"bytes,5,opt,name=field18180" json:"field18180,omitempty"`
-	Field18181           *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field18181" json:"field18181,omitempty"`
-	Field18182           []*UnusedEmptyMessage   `protobuf:"bytes,8,rep,name=field18182" json:"field18182,omitempty"`
-	Field18183           *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field18183" json:"field18183,omitempty"`
-	Field18184           *Message17726           `protobuf:"bytes,10,opt,name=field18184" json:"field18184,omitempty"`
-	Field18185           *UnusedEmptyMessage     `protobuf:"bytes,11,opt,name=field18185" json:"field18185,omitempty"`
-	Field18186           *Message16945           `protobuf:"bytes,102,opt,name=field18186" json:"field18186,omitempty"`
-	Field18187           *UnusedEmptyMessage     `protobuf:"bytes,12,opt,name=field18187" json:"field18187,omitempty"`
-	Field18188           *UnusedEmptyMessage     `protobuf:"bytes,13,opt,name=field18188" json:"field18188,omitempty"`
-	Field18189           *UnusedEmptyMessage     `protobuf:"bytes,7,opt,name=field18189" json:"field18189,omitempty"`
-	Field18190           *UnusedEmptyMessage     `protobuf:"bytes,100,opt,name=field18190" json:"field18190,omitempty"`
-	Field18191           *UnusedEmptyMessage     `protobuf:"bytes,101,opt,name=field18191" json:"field18191,omitempty"`
-	Field18192           *UnusedEmptyMessage     `protobuf:"bytes,14,opt,name=field18192" json:"field18192,omitempty"`
-	Field18193           *UnusedEmptyMessage     `protobuf:"bytes,19,opt,name=field18193" json:"field18193,omitempty"`
-	Field18194           *UnusedEmptyMessage     `protobuf:"bytes,22,opt,name=field18194" json:"field18194,omitempty"`
-	Field18195           *UnusedEmptyMessage     `protobuf:"bytes,24,opt,name=field18195" json:"field18195,omitempty"`
-	Field18196           *Enum16925              `protobuf:"varint,21,opt,name=field18196,enum=benchmarks.google_message3.Enum16925" json:"field18196,omitempty"`
-	Field18197           *bool                   `protobuf:"varint,18,opt,name=field18197" json:"field18197,omitempty"`
-	Field18198           []UnusedEnum            `protobuf:"varint,23,rep,name=field18198,enum=benchmarks.google_message3.UnusedEnum" json:"field18198,omitempty"`
-	Field18199           *UnusedEmptyMessage     `protobuf:"bytes,15,opt,name=field18199" json:"field18199,omitempty"`
-	Field18200           *string                 `protobuf:"bytes,16,opt,name=field18200" json:"field18200,omitempty"`
-	Field18201           *string                 `protobuf:"bytes,17,opt,name=field18201" json:"field18201,omitempty"`
-	Field18202           *bool                   `protobuf:"varint,99,opt,name=field18202" json:"field18202,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field18177    *int32                `protobuf:"varint,2,req,name=field18177" json:"field18177,omitempty"`
+	Field18178    *int32                `protobuf:"varint,3,req,name=field18178" json:"field18178,omitempty"`
+	Field18179    *Message17783         `protobuf:"bytes,4,opt,name=field18179" json:"field18179,omitempty"`
+	Field18180    *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field18180" json:"field18180,omitempty"`
+	Field18181    *UnusedEmptyMessage   `protobuf:"bytes,6,opt,name=field18181" json:"field18181,omitempty"`
+	Field18182    []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field18182" json:"field18182,omitempty"`
+	Field18183    *UnusedEmptyMessage   `protobuf:"bytes,9,opt,name=field18183" json:"field18183,omitempty"`
+	Field18184    *Message17726         `protobuf:"bytes,10,opt,name=field18184" json:"field18184,omitempty"`
+	Field18185    *UnusedEmptyMessage   `protobuf:"bytes,11,opt,name=field18185" json:"field18185,omitempty"`
+	Field18186    *Message16945         `protobuf:"bytes,102,opt,name=field18186" json:"field18186,omitempty"`
+	Field18187    *UnusedEmptyMessage   `protobuf:"bytes,12,opt,name=field18187" json:"field18187,omitempty"`
+	Field18188    *UnusedEmptyMessage   `protobuf:"bytes,13,opt,name=field18188" json:"field18188,omitempty"`
+	Field18189    *UnusedEmptyMessage   `protobuf:"bytes,7,opt,name=field18189" json:"field18189,omitempty"`
+	Field18190    *UnusedEmptyMessage   `protobuf:"bytes,100,opt,name=field18190" json:"field18190,omitempty"`
+	Field18191    *UnusedEmptyMessage   `protobuf:"bytes,101,opt,name=field18191" json:"field18191,omitempty"`
+	Field18192    *UnusedEmptyMessage   `protobuf:"bytes,14,opt,name=field18192" json:"field18192,omitempty"`
+	Field18193    *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field18193" json:"field18193,omitempty"`
+	Field18194    *UnusedEmptyMessage   `protobuf:"bytes,22,opt,name=field18194" json:"field18194,omitempty"`
+	Field18195    *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field18195" json:"field18195,omitempty"`
+	Field18196    *Enum16925            `protobuf:"varint,21,opt,name=field18196,enum=benchmarks.google_message3.Enum16925" json:"field18196,omitempty"`
+	Field18197    *bool                 `protobuf:"varint,18,opt,name=field18197" json:"field18197,omitempty"`
+	Field18198    []UnusedEnum          `protobuf:"varint,23,rep,name=field18198,enum=benchmarks.google_message3.UnusedEnum" json:"field18198,omitempty"`
+	Field18199    *UnusedEmptyMessage   `protobuf:"bytes,15,opt,name=field18199" json:"field18199,omitempty"`
+	Field18200    *string               `protobuf:"bytes,16,opt,name=field18200" json:"field18200,omitempty"`
+	Field18201    *string               `protobuf:"bytes,17,opt,name=field18201" json:"field18201,omitempty"`
+	Field18202    *bool                 `protobuf:"varint,99,opt,name=field18202" json:"field18202,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message17786_Message17787) Reset() {
@@ -3044,40 +3012,39 @@
 }
 
 type Message24404_Message24405 struct {
-	Field24686           *int32                  `protobuf:"varint,2,req,name=field24686" json:"field24686,omitempty"`
-	Field24687           *int32                  `protobuf:"varint,3,req,name=field24687" json:"field24687,omitempty"`
-	Field24688           *Message24317           `protobuf:"bytes,4,opt,name=field24688" json:"field24688,omitempty"`
-	Field24689           *UnusedEmptyMessage     `protobuf:"bytes,5,opt,name=field24689" json:"field24689,omitempty"`
-	Field24690           *Message24376           `protobuf:"bytes,6,opt,name=field24690" json:"field24690,omitempty"`
-	Field24691           *Message24345           `protobuf:"bytes,7,opt,name=field24691" json:"field24691,omitempty"`
-	Field24692           *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field24692" json:"field24692,omitempty"`
-	Field24693           *Message24379           `protobuf:"bytes,9,opt,name=field24693" json:"field24693,omitempty"`
-	Field24694           *UnusedEmptyMessage     `protobuf:"bytes,10,opt,name=field24694" json:"field24694,omitempty"`
-	Field24695           *UnusedEmptyMessage     `protobuf:"bytes,11,opt,name=field24695" json:"field24695,omitempty"`
-	Field24696           *Message24391           `protobuf:"bytes,12,opt,name=field24696" json:"field24696,omitempty"`
-	Field24697           *UnusedEmptyMessage     `protobuf:"bytes,13,opt,name=field24697" json:"field24697,omitempty"`
-	Field24698           *UnusedEmptyMessage     `protobuf:"bytes,14,opt,name=field24698" json:"field24698,omitempty"`
-	Field24699           *UnusedEmptyMessage     `protobuf:"bytes,22,opt,name=field24699" json:"field24699,omitempty"`
-	Field24700           *UnusedEmptyMessage     `protobuf:"bytes,23,opt,name=field24700" json:"field24700,omitempty"`
-	Field24701           *UnusedEmptyMessage     `protobuf:"bytes,25,opt,name=field24701" json:"field24701,omitempty"`
-	Field24702           *Enum16925              `protobuf:"varint,18,opt,name=field24702,enum=benchmarks.google_message3.Enum16925" json:"field24702,omitempty"`
-	Field24703           *float32                `protobuf:"fixed32,20,opt,name=field24703" json:"field24703,omitempty"`
-	Field24704           *bool                   `protobuf:"varint,19,opt,name=field24704" json:"field24704,omitempty"`
-	Field24705           []Enum16891             `protobuf:"varint,24,rep,name=field24705,enum=benchmarks.google_message3.Enum16891" json:"field24705,omitempty"`
-	Field24706           *UnusedEmptyMessage     `protobuf:"bytes,15,opt,name=field24706" json:"field24706,omitempty"`
-	Field24707           *string                 `protobuf:"bytes,16,opt,name=field24707" json:"field24707,omitempty"`
-	Field24708           *string                 `protobuf:"bytes,17,opt,name=field24708" json:"field24708,omitempty"`
-	Field24709           *float32                `protobuf:"fixed32,21,opt,name=field24709" json:"field24709,omitempty"`
-	Field24710           *bool                   `protobuf:"varint,26,opt,name=field24710" json:"field24710,omitempty"`
-	Field24711           *UnusedEnum             `protobuf:"varint,27,opt,name=field24711,enum=benchmarks.google_message3.UnusedEnum" json:"field24711,omitempty"`
-	Field24712           *bool                   `protobuf:"varint,28,opt,name=field24712" json:"field24712,omitempty"`
-	Field24713           *UnusedEnum             `protobuf:"varint,29,opt,name=field24713,enum=benchmarks.google_message3.UnusedEnum" json:"field24713,omitempty"`
-	Field24714           *bool                   `protobuf:"varint,31,opt,name=field24714" json:"field24714,omitempty"`
-	Field24715           *bool                   `protobuf:"varint,99,opt,name=field24715" json:"field24715,omitempty"`
-	Field24716           *int64                  `protobuf:"varint,32,opt,name=field24716" json:"field24716,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24686    *int32              `protobuf:"varint,2,req,name=field24686" json:"field24686,omitempty"`
+	Field24687    *int32              `protobuf:"varint,3,req,name=field24687" json:"field24687,omitempty"`
+	Field24688    *Message24317       `protobuf:"bytes,4,opt,name=field24688" json:"field24688,omitempty"`
+	Field24689    *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field24689" json:"field24689,omitempty"`
+	Field24690    *Message24376       `protobuf:"bytes,6,opt,name=field24690" json:"field24690,omitempty"`
+	Field24691    *Message24345       `protobuf:"bytes,7,opt,name=field24691" json:"field24691,omitempty"`
+	Field24692    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field24692" json:"field24692,omitempty"`
+	Field24693    *Message24379       `protobuf:"bytes,9,opt,name=field24693" json:"field24693,omitempty"`
+	Field24694    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field24694" json:"field24694,omitempty"`
+	Field24695    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field24695" json:"field24695,omitempty"`
+	Field24696    *Message24391       `protobuf:"bytes,12,opt,name=field24696" json:"field24696,omitempty"`
+	Field24697    *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field24697" json:"field24697,omitempty"`
+	Field24698    *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field24698" json:"field24698,omitempty"`
+	Field24699    *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field24699" json:"field24699,omitempty"`
+	Field24700    *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field24700" json:"field24700,omitempty"`
+	Field24701    *UnusedEmptyMessage `protobuf:"bytes,25,opt,name=field24701" json:"field24701,omitempty"`
+	Field24702    *Enum16925          `protobuf:"varint,18,opt,name=field24702,enum=benchmarks.google_message3.Enum16925" json:"field24702,omitempty"`
+	Field24703    *float32            `protobuf:"fixed32,20,opt,name=field24703" json:"field24703,omitempty"`
+	Field24704    *bool               `protobuf:"varint,19,opt,name=field24704" json:"field24704,omitempty"`
+	Field24705    []Enum16891         `protobuf:"varint,24,rep,name=field24705,enum=benchmarks.google_message3.Enum16891" json:"field24705,omitempty"`
+	Field24706    *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field24706" json:"field24706,omitempty"`
+	Field24707    *string             `protobuf:"bytes,16,opt,name=field24707" json:"field24707,omitempty"`
+	Field24708    *string             `protobuf:"bytes,17,opt,name=field24708" json:"field24708,omitempty"`
+	Field24709    *float32            `protobuf:"fixed32,21,opt,name=field24709" json:"field24709,omitempty"`
+	Field24710    *bool               `protobuf:"varint,26,opt,name=field24710" json:"field24710,omitempty"`
+	Field24711    *UnusedEnum         `protobuf:"varint,27,opt,name=field24711,enum=benchmarks.google_message3.UnusedEnum" json:"field24711,omitempty"`
+	Field24712    *bool               `protobuf:"varint,28,opt,name=field24712" json:"field24712,omitempty"`
+	Field24713    *UnusedEnum         `protobuf:"varint,29,opt,name=field24713,enum=benchmarks.google_message3.UnusedEnum" json:"field24713,omitempty"`
+	Field24714    *bool               `protobuf:"varint,31,opt,name=field24714" json:"field24714,omitempty"`
+	Field24715    *bool               `protobuf:"varint,99,opt,name=field24715" json:"field24715,omitempty"`
+	Field24716    *int64              `protobuf:"varint,32,opt,name=field24716" json:"field24716,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24404_Message24405) Reset() {
@@ -6037,6 +6004,340 @@
 	file_datasets_google_message3_benchmark_message3_5_proto_init()
 	file_datasets_google_message3_benchmark_message3_7_proto_init()
 	file_datasets_google_message3_benchmark_message3_8_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage3); i {
+			case 15:
+				return &v.sizeCache
+			case 16:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message1327); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3672); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3804); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6849); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6866); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6870); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7651); i {
+			case 45:
+				return &v.sizeCache
+			case 46:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7864); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7929); i {
+			case 20:
+				return &v.sizeCache
+			case 21:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8508); i {
+			case 17:
+				return &v.sizeCache
+			case 18:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9122); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10177); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10278); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10323); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10324); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11990); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12691); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12870); i {
+			case 20:
+				return &v.sizeCache
+			case 21:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13154); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16507); i {
+			case 32:
+				return &v.sizeCache
+			case 33:
+				return &v.unknownFields
+			case 34:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16564); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16661); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16746); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message17786); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message22857); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24404); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message27300); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message27453); i {
+			case 23:
+				return &v.sizeCache
+			case 24:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3672_Message3673); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3672_Message3674); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message17786_Message17787); i {
+			case 26:
+				return &v.sizeCache
+			case 27:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24404_Message24405); i {
+			case 31:
+				return &v.sizeCache
+			case 32:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message3_benchmark_message3_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
index 2921282..104c791 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
@@ -18,10 +18,9 @@
 )
 
 type Message34390 struct {
-	Field34452           []*Message34387         `protobuf:"bytes,1,rep,name=field34452" json:"field34452,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field34452    []*Message34387 `protobuf:"bytes,1,rep,name=field34452" json:"field34452,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message34390) Reset() {
@@ -55,11 +54,10 @@
 }
 
 type Message34624 struct {
-	Field34683           *Message34621           `protobuf:"bytes,1,opt,name=field34683" json:"field34683,omitempty"`
-	Field34684           *Message34621           `protobuf:"bytes,2,opt,name=field34684" json:"field34684,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field34683    *Message34621 `protobuf:"bytes,1,opt,name=field34683" json:"field34683,omitempty"`
+	Field34684    *Message34621 `protobuf:"bytes,2,opt,name=field34684" json:"field34684,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message34624) Reset() {
@@ -100,23 +98,22 @@
 }
 
 type Message34791 struct {
-	Field34793           *uint64                      `protobuf:"fixed64,1,opt,name=field34793" json:"field34793,omitempty"`
-	Message34792         []*Message34791_Message34792 `protobuf:"group,2,rep,name=Message34792,json=message34792" json:"message34792,omitempty"`
-	Field34795           *int32                       `protobuf:"varint,5,opt,name=field34795" json:"field34795,omitempty"`
-	Field34796           *int32                       `protobuf:"varint,6,opt,name=field34796" json:"field34796,omitempty"`
-	Field34797           *int32                       `protobuf:"varint,7,opt,name=field34797" json:"field34797,omitempty"`
-	Field34798           *int32                       `protobuf:"varint,8,opt,name=field34798" json:"field34798,omitempty"`
-	Field34799           *int32                       `protobuf:"varint,9,opt,name=field34799" json:"field34799,omitempty"`
-	Field34800           *int32                       `protobuf:"varint,10,opt,name=field34800" json:"field34800,omitempty"`
-	Field34801           *bool                        `protobuf:"varint,11,opt,name=field34801" json:"field34801,omitempty"`
-	Field34802           *float32                     `protobuf:"fixed32,12,opt,name=field34802" json:"field34802,omitempty"`
-	Field34803           *int32                       `protobuf:"varint,13,opt,name=field34803" json:"field34803,omitempty"`
-	Field34804           *string                      `protobuf:"bytes,14,opt,name=field34804" json:"field34804,omitempty"`
-	Field34805           *int64                       `protobuf:"varint,15,opt,name=field34805" json:"field34805,omitempty"`
-	Field34806           []uint64                     `protobuf:"fixed64,17,rep,packed,name=field34806" json:"field34806,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field34793    *uint64                      `protobuf:"fixed64,1,opt,name=field34793" json:"field34793,omitempty"`
+	Message34792  []*Message34791_Message34792 `protobuf:"group,2,rep,name=Message34792,json=message34792" json:"message34792,omitempty"`
+	Field34795    *int32                       `protobuf:"varint,5,opt,name=field34795" json:"field34795,omitempty"`
+	Field34796    *int32                       `protobuf:"varint,6,opt,name=field34796" json:"field34796,omitempty"`
+	Field34797    *int32                       `protobuf:"varint,7,opt,name=field34797" json:"field34797,omitempty"`
+	Field34798    *int32                       `protobuf:"varint,8,opt,name=field34798" json:"field34798,omitempty"`
+	Field34799    *int32                       `protobuf:"varint,9,opt,name=field34799" json:"field34799,omitempty"`
+	Field34800    *int32                       `protobuf:"varint,10,opt,name=field34800" json:"field34800,omitempty"`
+	Field34801    *bool                        `protobuf:"varint,11,opt,name=field34801" json:"field34801,omitempty"`
+	Field34802    *float32                     `protobuf:"fixed32,12,opt,name=field34802" json:"field34802,omitempty"`
+	Field34803    *int32                       `protobuf:"varint,13,opt,name=field34803" json:"field34803,omitempty"`
+	Field34804    *string                      `protobuf:"bytes,14,opt,name=field34804" json:"field34804,omitempty"`
+	Field34805    *int64                       `protobuf:"varint,15,opt,name=field34805" json:"field34805,omitempty"`
+	Field34806    []uint64                     `protobuf:"fixed64,17,rep,packed,name=field34806" json:"field34806,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message34791) Reset() {
@@ -241,15 +238,14 @@
 }
 
 type Message35483 struct {
-	Field35499           *int32                  `protobuf:"varint,1,opt,name=field35499" json:"field35499,omitempty"`
-	Field35500           *string                 `protobuf:"bytes,2,opt,name=field35500" json:"field35500,omitempty"`
-	Field35501           *string                 `protobuf:"bytes,3,opt,name=field35501" json:"field35501,omitempty"`
-	Field35502           *string                 `protobuf:"bytes,4,opt,name=field35502" json:"field35502,omitempty"`
-	Field35503           []*Message35476         `protobuf:"bytes,5,rep,name=field35503" json:"field35503,omitempty"`
-	Field35504           *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field35504" json:"field35504,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35499    *int32              `protobuf:"varint,1,opt,name=field35499" json:"field35499,omitempty"`
+	Field35500    *string             `protobuf:"bytes,2,opt,name=field35500" json:"field35500,omitempty"`
+	Field35501    *string             `protobuf:"bytes,3,opt,name=field35501" json:"field35501,omitempty"`
+	Field35502    *string             `protobuf:"bytes,4,opt,name=field35502" json:"field35502,omitempty"`
+	Field35503    []*Message35476     `protobuf:"bytes,5,rep,name=field35503" json:"field35503,omitempty"`
+	Field35504    *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field35504" json:"field35504,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35483) Reset() {
@@ -318,17 +314,16 @@
 }
 
 type Message35807 struct {
-	Field35810           *int32                  `protobuf:"varint,1,opt,name=field35810" json:"field35810,omitempty"`
-	Field35811           *int32                  `protobuf:"varint,2,opt,name=field35811" json:"field35811,omitempty"`
-	Field35812           *int32                  `protobuf:"varint,3,opt,name=field35812" json:"field35812,omitempty"`
-	Field35813           *int32                  `protobuf:"varint,4,opt,name=field35813" json:"field35813,omitempty"`
-	Field35814           *int32                  `protobuf:"varint,5,opt,name=field35814" json:"field35814,omitempty"`
-	Field35815           *int32                  `protobuf:"varint,6,opt,name=field35815" json:"field35815,omitempty"`
-	Field35816           *int32                  `protobuf:"varint,7,opt,name=field35816" json:"field35816,omitempty"`
-	Field35817           *int32                  `protobuf:"varint,8,opt,name=field35817" json:"field35817,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35810    *int32 `protobuf:"varint,1,opt,name=field35810" json:"field35810,omitempty"`
+	Field35811    *int32 `protobuf:"varint,2,opt,name=field35811" json:"field35811,omitempty"`
+	Field35812    *int32 `protobuf:"varint,3,opt,name=field35812" json:"field35812,omitempty"`
+	Field35813    *int32 `protobuf:"varint,4,opt,name=field35813" json:"field35813,omitempty"`
+	Field35814    *int32 `protobuf:"varint,5,opt,name=field35814" json:"field35814,omitempty"`
+	Field35815    *int32 `protobuf:"varint,6,opt,name=field35815" json:"field35815,omitempty"`
+	Field35816    *int32 `protobuf:"varint,7,opt,name=field35816" json:"field35816,omitempty"`
+	Field35817    *int32 `protobuf:"varint,8,opt,name=field35817" json:"field35817,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35807) Reset() {
@@ -411,11 +406,10 @@
 }
 
 type Message37487 struct {
-	Field37501           []byte                  `protobuf:"bytes,2,opt,name=field37501" json:"field37501,omitempty"`
-	Field37502           *bool                   `protobuf:"varint,3,opt,name=field37502" json:"field37502,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37501    []byte `protobuf:"bytes,2,opt,name=field37501" json:"field37501,omitempty"`
+	Field37502    *bool  `protobuf:"varint,3,opt,name=field37502" json:"field37502,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37487) Reset() {
@@ -456,14 +450,13 @@
 }
 
 type Message13062 struct {
-	Field13075           *int64                  `protobuf:"varint,1,opt,name=field13075" json:"field13075,omitempty"`
-	Field13076           *string                 `protobuf:"bytes,2,opt,name=field13076" json:"field13076,omitempty"`
-	Field13077           *int32                  `protobuf:"varint,3,opt,name=field13077" json:"field13077,omitempty"`
-	Field13078           *string                 `protobuf:"bytes,4,opt,name=field13078" json:"field13078,omitempty"`
-	Field13079           *int32                  `protobuf:"varint,5,opt,name=field13079" json:"field13079,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13075    *int64  `protobuf:"varint,1,opt,name=field13075" json:"field13075,omitempty"`
+	Field13076    *string `protobuf:"bytes,2,opt,name=field13076" json:"field13076,omitempty"`
+	Field13077    *int32  `protobuf:"varint,3,opt,name=field13077" json:"field13077,omitempty"`
+	Field13078    *string `protobuf:"bytes,4,opt,name=field13078" json:"field13078,omitempty"`
+	Field13079    *int32  `protobuf:"varint,5,opt,name=field13079" json:"field13079,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13062) Reset() {
@@ -525,10 +518,9 @@
 }
 
 type Message952 struct {
-	Field963             []*Message949           `protobuf:"bytes,1,rep,name=field963" json:"field963,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field963      []*Message949 `protobuf:"bytes,1,rep,name=field963" json:"field963,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message952) Reset() {
@@ -562,72 +554,71 @@
 }
 
 type Message36876 struct {
-	Field36980           *Message2356                 `protobuf:"bytes,1,opt,name=field36980" json:"field36980,omitempty"`
-	Message36877         []*Message36876_Message36877 `protobuf:"group,111,rep,name=Message36877,json=message36877" json:"message36877,omitempty"`
-	Message36878         []*Message36876_Message36878 `protobuf:"group,168,rep,name=Message36878,json=message36878" json:"message36878,omitempty"`
-	Message36879         []*Message36876_Message36879 `protobuf:"group,55,rep,name=Message36879,json=message36879" json:"message36879,omitempty"`
-	Field36984           []*UnusedEmptyMessage        `protobuf:"bytes,78,rep,name=field36984" json:"field36984,omitempty"`
-	Message36880         *Message36876_Message36880   `protobuf:"group,137,opt,name=Message36880,json=message36880" json:"message36880,omitempty"`
-	Field36986           *uint64                      `protobuf:"varint,59,opt,name=field36986" json:"field36986,omitempty"`
-	Field36987           []byte                       `protobuf:"bytes,121,opt,name=field36987" json:"field36987,omitempty"`
-	Field36988           *UnusedEmptyMessage          `protobuf:"bytes,2,opt,name=field36988" json:"field36988,omitempty"`
-	Field36989           *Message7029                 `protobuf:"bytes,118,opt,name=field36989" json:"field36989,omitempty"`
-	Field36990           *Message35573                `protobuf:"bytes,11,opt,name=field36990" json:"field36990,omitempty"`
-	Field36991           *UnusedEmptyMessage          `protobuf:"bytes,21,opt,name=field36991" json:"field36991,omitempty"`
-	Field36992           *UnusedEmptyMessage          `protobuf:"bytes,22,opt,name=field36992" json:"field36992,omitempty"`
-	Field36993           *float32                     `protobuf:"fixed32,13,opt,name=field36993" json:"field36993,omitempty"`
-	Field36994           *int32                       `protobuf:"varint,20,opt,name=field36994" json:"field36994,omitempty"`
-	Field36995           *bool                        `protobuf:"varint,51,opt,name=field36995" json:"field36995,omitempty"`
-	Field36996           *bool                        `protobuf:"varint,57,opt,name=field36996" json:"field36996,omitempty"`
-	Field36997           []*UnusedEmptyMessage        `protobuf:"bytes,100,rep,name=field36997" json:"field36997,omitempty"`
-	Field36998           *int32                       `protobuf:"varint,47,opt,name=field36998" json:"field36998,omitempty"`
-	Field36999           *int32                       `protobuf:"varint,48,opt,name=field36999" json:"field36999,omitempty"`
-	Field37000           *UnusedEmptyMessage          `protobuf:"bytes,68,opt,name=field37000" json:"field37000,omitempty"`
-	Message36881         []*Message36876_Message36881 `protobuf:"group,23,rep,name=Message36881,json=message36881" json:"message36881,omitempty"`
-	Field37002           *Message4144                 `protobuf:"bytes,125,opt,name=field37002" json:"field37002,omitempty"`
-	Message36882         []*Message36876_Message36882 `protobuf:"group,35,rep,name=Message36882,json=message36882" json:"message36882,omitempty"`
-	Field37004           *UnusedEmptyMessage          `protobuf:"bytes,49,opt,name=field37004" json:"field37004,omitempty"`
-	Field37005           *Message18921                `protobuf:"bytes,52,opt,name=field37005" json:"field37005,omitempty"`
-	Field37006           *Message36858                `protobuf:"bytes,46,opt,name=field37006" json:"field37006,omitempty"`
-	Field37007           *Message18831                `protobuf:"bytes,54,opt,name=field37007" json:"field37007,omitempty"`
-	Field37008           *UnusedEmptyMessage          `protobuf:"bytes,58,opt,name=field37008" json:"field37008,omitempty"`
-	Field37009           *Message18283                `protobuf:"bytes,10,opt,name=field37009" json:"field37009,omitempty"`
-	Field37010           *string                      `protobuf:"bytes,44,opt,name=field37010" json:"field37010,omitempty"`
-	Field37011           *string                      `protobuf:"bytes,103,opt,name=field37011" json:"field37011,omitempty"`
-	Field37012           *Message0                    `protobuf:"bytes,43,opt,name=field37012" json:"field37012,omitempty"`
-	Field37013           *Message0                    `protobuf:"bytes,143,opt,name=field37013" json:"field37013,omitempty"`
-	Field37014           *UnusedEmptyMessage          `protobuf:"bytes,53,opt,name=field37014" json:"field37014,omitempty"`
-	Field37015           *Message36869                `protobuf:"bytes,15,opt,name=field37015" json:"field37015,omitempty"`
-	Message36883         *Message36876_Message36883   `protobuf:"group,3,opt,name=Message36883,json=message36883" json:"message36883,omitempty"`
-	Message36884         []*Message36876_Message36884 `protobuf:"group,16,rep,name=Message36884,json=message36884" json:"message36884,omitempty"`
-	Message36885         []*Message36876_Message36885 `protobuf:"group,27,rep,name=Message36885,json=message36885" json:"message36885,omitempty"`
-	Message36886         *Message36876_Message36886   `protobuf:"group,32,opt,name=Message36886,json=message36886" json:"message36886,omitempty"`
-	Field37020           []UnusedEnum                 `protobuf:"varint,71,rep,name=field37020,enum=benchmarks.google_message3.UnusedEnum" json:"field37020,omitempty"`
-	Field37021           []int32                      `protobuf:"varint,70,rep,name=field37021" json:"field37021,omitempty"`
-	Field37022           *UnusedEmptyMessage          `protobuf:"bytes,66,opt,name=field37022" json:"field37022,omitempty"`
-	Field37023           *Message13090                `protobuf:"bytes,67,opt,name=field37023" json:"field37023,omitempty"`
-	Message36887         *Message36876_Message36887   `protobuf:"group,62,opt,name=Message36887,json=message36887" json:"message36887,omitempty"`
-	Field37025           []*Message10155              `protobuf:"bytes,50,rep,name=field37025" json:"field37025,omitempty"`
-	Field37026           []*Message11874              `protobuf:"bytes,151,rep,name=field37026" json:"field37026,omitempty"`
-	Field37027           *string                      `protobuf:"bytes,12,opt,name=field37027" json:"field37027,omitempty"`
-	Field37028           *int64                       `protobuf:"varint,72,opt,name=field37028" json:"field37028,omitempty"`
-	Field37029           *UnusedEmptyMessage          `protobuf:"bytes,73,opt,name=field37029" json:"field37029,omitempty"`
-	Field37030           *Message35546                `protobuf:"bytes,108,opt,name=field37030" json:"field37030,omitempty"`
-	Message36888         *Message36876_Message36888   `protobuf:"group,74,opt,name=Message36888,json=message36888" json:"message36888,omitempty"`
-	Field37032           []*Message19255              `protobuf:"bytes,104,rep,name=field37032" json:"field37032,omitempty"`
-	Field37033           *Message33968                `protobuf:"bytes,105,opt,name=field37033" json:"field37033,omitempty"`
-	Field37034           *bool                        `protobuf:"varint,106,opt,name=field37034" json:"field37034,omitempty"`
-	Field37035           []*UnusedEmptyMessage        `protobuf:"bytes,107,rep,name=field37035" json:"field37035,omitempty"`
-	Field37036           *Message6644                 `protobuf:"bytes,110,opt,name=field37036" json:"field37036,omitempty"`
-	Field37037           []byte                       `protobuf:"bytes,133,opt,name=field37037" json:"field37037,omitempty"`
-	Message36889         *Message36876_Message36889   `protobuf:"group,116,opt,name=Message36889,json=message36889" json:"message36889,omitempty"`
-	Message36910         []*Message36876_Message36910 `protobuf:"group,119,rep,name=Message36910,json=message36910" json:"message36910,omitempty"`
-	Message36911         *Message36876_Message36911   `protobuf:"group,126,opt,name=Message36911,json=message36911" json:"message36911,omitempty"`
-	Message36912         *Message36876_Message36912   `protobuf:"group,152,opt,name=Message36912,json=message36912" json:"message36912,omitempty"`
-	Field37042           *UnusedEmptyMessage          `protobuf:"bytes,155,opt,name=field37042" json:"field37042,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field36980    *Message2356                 `protobuf:"bytes,1,opt,name=field36980" json:"field36980,omitempty"`
+	Message36877  []*Message36876_Message36877 `protobuf:"group,111,rep,name=Message36877,json=message36877" json:"message36877,omitempty"`
+	Message36878  []*Message36876_Message36878 `protobuf:"group,168,rep,name=Message36878,json=message36878" json:"message36878,omitempty"`
+	Message36879  []*Message36876_Message36879 `protobuf:"group,55,rep,name=Message36879,json=message36879" json:"message36879,omitempty"`
+	Field36984    []*UnusedEmptyMessage        `protobuf:"bytes,78,rep,name=field36984" json:"field36984,omitempty"`
+	Message36880  *Message36876_Message36880   `protobuf:"group,137,opt,name=Message36880,json=message36880" json:"message36880,omitempty"`
+	Field36986    *uint64                      `protobuf:"varint,59,opt,name=field36986" json:"field36986,omitempty"`
+	Field36987    []byte                       `protobuf:"bytes,121,opt,name=field36987" json:"field36987,omitempty"`
+	Field36988    *UnusedEmptyMessage          `protobuf:"bytes,2,opt,name=field36988" json:"field36988,omitempty"`
+	Field36989    *Message7029                 `protobuf:"bytes,118,opt,name=field36989" json:"field36989,omitempty"`
+	Field36990    *Message35573                `protobuf:"bytes,11,opt,name=field36990" json:"field36990,omitempty"`
+	Field36991    *UnusedEmptyMessage          `protobuf:"bytes,21,opt,name=field36991" json:"field36991,omitempty"`
+	Field36992    *UnusedEmptyMessage          `protobuf:"bytes,22,opt,name=field36992" json:"field36992,omitempty"`
+	Field36993    *float32                     `protobuf:"fixed32,13,opt,name=field36993" json:"field36993,omitempty"`
+	Field36994    *int32                       `protobuf:"varint,20,opt,name=field36994" json:"field36994,omitempty"`
+	Field36995    *bool                        `protobuf:"varint,51,opt,name=field36995" json:"field36995,omitempty"`
+	Field36996    *bool                        `protobuf:"varint,57,opt,name=field36996" json:"field36996,omitempty"`
+	Field36997    []*UnusedEmptyMessage        `protobuf:"bytes,100,rep,name=field36997" json:"field36997,omitempty"`
+	Field36998    *int32                       `protobuf:"varint,47,opt,name=field36998" json:"field36998,omitempty"`
+	Field36999    *int32                       `protobuf:"varint,48,opt,name=field36999" json:"field36999,omitempty"`
+	Field37000    *UnusedEmptyMessage          `protobuf:"bytes,68,opt,name=field37000" json:"field37000,omitempty"`
+	Message36881  []*Message36876_Message36881 `protobuf:"group,23,rep,name=Message36881,json=message36881" json:"message36881,omitempty"`
+	Field37002    *Message4144                 `protobuf:"bytes,125,opt,name=field37002" json:"field37002,omitempty"`
+	Message36882  []*Message36876_Message36882 `protobuf:"group,35,rep,name=Message36882,json=message36882" json:"message36882,omitempty"`
+	Field37004    *UnusedEmptyMessage          `protobuf:"bytes,49,opt,name=field37004" json:"field37004,omitempty"`
+	Field37005    *Message18921                `protobuf:"bytes,52,opt,name=field37005" json:"field37005,omitempty"`
+	Field37006    *Message36858                `protobuf:"bytes,46,opt,name=field37006" json:"field37006,omitempty"`
+	Field37007    *Message18831                `protobuf:"bytes,54,opt,name=field37007" json:"field37007,omitempty"`
+	Field37008    *UnusedEmptyMessage          `protobuf:"bytes,58,opt,name=field37008" json:"field37008,omitempty"`
+	Field37009    *Message18283                `protobuf:"bytes,10,opt,name=field37009" json:"field37009,omitempty"`
+	Field37010    *string                      `protobuf:"bytes,44,opt,name=field37010" json:"field37010,omitempty"`
+	Field37011    *string                      `protobuf:"bytes,103,opt,name=field37011" json:"field37011,omitempty"`
+	Field37012    *Message0                    `protobuf:"bytes,43,opt,name=field37012" json:"field37012,omitempty"`
+	Field37013    *Message0                    `protobuf:"bytes,143,opt,name=field37013" json:"field37013,omitempty"`
+	Field37014    *UnusedEmptyMessage          `protobuf:"bytes,53,opt,name=field37014" json:"field37014,omitempty"`
+	Field37015    *Message36869                `protobuf:"bytes,15,opt,name=field37015" json:"field37015,omitempty"`
+	Message36883  *Message36876_Message36883   `protobuf:"group,3,opt,name=Message36883,json=message36883" json:"message36883,omitempty"`
+	Message36884  []*Message36876_Message36884 `protobuf:"group,16,rep,name=Message36884,json=message36884" json:"message36884,omitempty"`
+	Message36885  []*Message36876_Message36885 `protobuf:"group,27,rep,name=Message36885,json=message36885" json:"message36885,omitempty"`
+	Message36886  *Message36876_Message36886   `protobuf:"group,32,opt,name=Message36886,json=message36886" json:"message36886,omitempty"`
+	Field37020    []UnusedEnum                 `protobuf:"varint,71,rep,name=field37020,enum=benchmarks.google_message3.UnusedEnum" json:"field37020,omitempty"`
+	Field37021    []int32                      `protobuf:"varint,70,rep,name=field37021" json:"field37021,omitempty"`
+	Field37022    *UnusedEmptyMessage          `protobuf:"bytes,66,opt,name=field37022" json:"field37022,omitempty"`
+	Field37023    *Message13090                `protobuf:"bytes,67,opt,name=field37023" json:"field37023,omitempty"`
+	Message36887  *Message36876_Message36887   `protobuf:"group,62,opt,name=Message36887,json=message36887" json:"message36887,omitempty"`
+	Field37025    []*Message10155              `protobuf:"bytes,50,rep,name=field37025" json:"field37025,omitempty"`
+	Field37026    []*Message11874              `protobuf:"bytes,151,rep,name=field37026" json:"field37026,omitempty"`
+	Field37027    *string                      `protobuf:"bytes,12,opt,name=field37027" json:"field37027,omitempty"`
+	Field37028    *int64                       `protobuf:"varint,72,opt,name=field37028" json:"field37028,omitempty"`
+	Field37029    *UnusedEmptyMessage          `protobuf:"bytes,73,opt,name=field37029" json:"field37029,omitempty"`
+	Field37030    *Message35546                `protobuf:"bytes,108,opt,name=field37030" json:"field37030,omitempty"`
+	Message36888  *Message36876_Message36888   `protobuf:"group,74,opt,name=Message36888,json=message36888" json:"message36888,omitempty"`
+	Field37032    []*Message19255              `protobuf:"bytes,104,rep,name=field37032" json:"field37032,omitempty"`
+	Field37033    *Message33968                `protobuf:"bytes,105,opt,name=field37033" json:"field37033,omitempty"`
+	Field37034    *bool                        `protobuf:"varint,106,opt,name=field37034" json:"field37034,omitempty"`
+	Field37035    []*UnusedEmptyMessage        `protobuf:"bytes,107,rep,name=field37035" json:"field37035,omitempty"`
+	Field37036    *Message6644                 `protobuf:"bytes,110,opt,name=field37036" json:"field37036,omitempty"`
+	Field37037    []byte                       `protobuf:"bytes,133,opt,name=field37037" json:"field37037,omitempty"`
+	Message36889  *Message36876_Message36889   `protobuf:"group,116,opt,name=Message36889,json=message36889" json:"message36889,omitempty"`
+	Message36910  []*Message36876_Message36910 `protobuf:"group,119,rep,name=Message36910,json=message36910" json:"message36910,omitempty"`
+	Message36911  *Message36876_Message36911   `protobuf:"group,126,opt,name=Message36911,json=message36911" json:"message36911,omitempty"`
+	Message36912  *Message36876_Message36912   `protobuf:"group,152,opt,name=Message36912,json=message36912" json:"message36912,omitempty"`
+	Field37042    *UnusedEmptyMessage          `protobuf:"bytes,155,opt,name=field37042" json:"field37042,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876) Reset() {
@@ -1095,9 +1086,8 @@
 }
 
 type Message1328 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message1328) Reset() {
@@ -1124,9 +1114,8 @@
 }
 
 type Message6850 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6850) Reset() {
@@ -1153,42 +1142,41 @@
 }
 
 type Message6863 struct {
-	Field6931            *Enum6858               `protobuf:"varint,1,opt,name=field6931,enum=benchmarks.google_message3.Enum6858" json:"field6931,omitempty"`
-	Field6932            *Enum6858               `protobuf:"varint,2,opt,name=field6932,enum=benchmarks.google_message3.Enum6858" json:"field6932,omitempty"`
-	Field6933            *UnusedEnum             `protobuf:"varint,36,opt,name=field6933,enum=benchmarks.google_message3.UnusedEnum" json:"field6933,omitempty"`
-	Field6934            *bool                   `protobuf:"varint,27,opt,name=field6934" json:"field6934,omitempty"`
-	Field6935            *Message6773            `protobuf:"bytes,26,opt,name=field6935" json:"field6935,omitempty"`
-	Field6936            *int32                  `protobuf:"varint,30,opt,name=field6936" json:"field6936,omitempty"`
-	Field6937            *int32                  `protobuf:"varint,37,opt,name=field6937" json:"field6937,omitempty"`
-	Field6938            *Enum6815               `protobuf:"varint,31,opt,name=field6938,enum=benchmarks.google_message3.Enum6815" json:"field6938,omitempty"`
-	Field6939            *string                 `protobuf:"bytes,3,opt,name=field6939" json:"field6939,omitempty"`
-	Field6940            *int32                  `protobuf:"varint,4,opt,name=field6940" json:"field6940,omitempty"`
-	Field6941            *Enum6822               `protobuf:"varint,15,opt,name=field6941,enum=benchmarks.google_message3.Enum6822" json:"field6941,omitempty"`
-	Field6942            *bool                   `protobuf:"varint,10,opt,name=field6942" json:"field6942,omitempty"`
-	Field6943            *bool                   `protobuf:"varint,17,opt,name=field6943" json:"field6943,omitempty"`
-	Field6944            *float32                `protobuf:"fixed32,18,opt,name=field6944" json:"field6944,omitempty"`
-	Field6945            *float32                `protobuf:"fixed32,19,opt,name=field6945" json:"field6945,omitempty"`
-	Field6946            *int32                  `protobuf:"varint,5,opt,name=field6946" json:"field6946,omitempty"`
-	Field6947            *int32                  `protobuf:"varint,6,opt,name=field6947" json:"field6947,omitempty"`
-	Field6948            *bool                   `protobuf:"varint,7,opt,name=field6948" json:"field6948,omitempty"`
-	Field6949            *int32                  `protobuf:"varint,12,opt,name=field6949" json:"field6949,omitempty"`
-	Field6950            *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field6950" json:"field6950,omitempty"`
-	Field6951            *uint64                 `protobuf:"varint,9,opt,name=field6951" json:"field6951,omitempty"`
-	Field6952            *string                 `protobuf:"bytes,11,opt,name=field6952" json:"field6952,omitempty"`
-	Field6953            []byte                  `protobuf:"bytes,13,opt,name=field6953" json:"field6953,omitempty"`
-	Field6954            *int32                  `protobuf:"varint,14,opt,name=field6954" json:"field6954,omitempty"`
-	Field6955            *UnusedEmptyMessage     `protobuf:"bytes,16,opt,name=field6955" json:"field6955,omitempty"`
-	Field6956            *UnusedEmptyMessage     `protobuf:"bytes,22,opt,name=field6956" json:"field6956,omitempty"`
-	Field6957            *Message3886            `protobuf:"bytes,38,opt,name=field6957" json:"field6957,omitempty"`
-	Field6958            *string                 `protobuf:"bytes,20,opt,name=field6958" json:"field6958,omitempty"`
-	Field6959            *uint32                 `protobuf:"varint,21,opt,name=field6959" json:"field6959,omitempty"`
-	Field6960            *Message6743            `protobuf:"bytes,23,opt,name=field6960" json:"field6960,omitempty"`
-	Field6961            *UnusedEmptyMessage     `protobuf:"bytes,29,opt,name=field6961" json:"field6961,omitempty"`
-	Field6962            *UnusedEmptyMessage     `protobuf:"bytes,33,opt,name=field6962" json:"field6962,omitempty"`
-	Field6963            *bool                   `protobuf:"varint,34,opt,name=field6963" json:"field6963,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6931     *Enum6858           `protobuf:"varint,1,opt,name=field6931,enum=benchmarks.google_message3.Enum6858" json:"field6931,omitempty"`
+	Field6932     *Enum6858           `protobuf:"varint,2,opt,name=field6932,enum=benchmarks.google_message3.Enum6858" json:"field6932,omitempty"`
+	Field6933     *UnusedEnum         `protobuf:"varint,36,opt,name=field6933,enum=benchmarks.google_message3.UnusedEnum" json:"field6933,omitempty"`
+	Field6934     *bool               `protobuf:"varint,27,opt,name=field6934" json:"field6934,omitempty"`
+	Field6935     *Message6773        `protobuf:"bytes,26,opt,name=field6935" json:"field6935,omitempty"`
+	Field6936     *int32              `protobuf:"varint,30,opt,name=field6936" json:"field6936,omitempty"`
+	Field6937     *int32              `protobuf:"varint,37,opt,name=field6937" json:"field6937,omitempty"`
+	Field6938     *Enum6815           `protobuf:"varint,31,opt,name=field6938,enum=benchmarks.google_message3.Enum6815" json:"field6938,omitempty"`
+	Field6939     *string             `protobuf:"bytes,3,opt,name=field6939" json:"field6939,omitempty"`
+	Field6940     *int32              `protobuf:"varint,4,opt,name=field6940" json:"field6940,omitempty"`
+	Field6941     *Enum6822           `protobuf:"varint,15,opt,name=field6941,enum=benchmarks.google_message3.Enum6822" json:"field6941,omitempty"`
+	Field6942     *bool               `protobuf:"varint,10,opt,name=field6942" json:"field6942,omitempty"`
+	Field6943     *bool               `protobuf:"varint,17,opt,name=field6943" json:"field6943,omitempty"`
+	Field6944     *float32            `protobuf:"fixed32,18,opt,name=field6944" json:"field6944,omitempty"`
+	Field6945     *float32            `protobuf:"fixed32,19,opt,name=field6945" json:"field6945,omitempty"`
+	Field6946     *int32              `protobuf:"varint,5,opt,name=field6946" json:"field6946,omitempty"`
+	Field6947     *int32              `protobuf:"varint,6,opt,name=field6947" json:"field6947,omitempty"`
+	Field6948     *bool               `protobuf:"varint,7,opt,name=field6948" json:"field6948,omitempty"`
+	Field6949     *int32              `protobuf:"varint,12,opt,name=field6949" json:"field6949,omitempty"`
+	Field6950     *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field6950" json:"field6950,omitempty"`
+	Field6951     *uint64             `protobuf:"varint,9,opt,name=field6951" json:"field6951,omitempty"`
+	Field6952     *string             `protobuf:"bytes,11,opt,name=field6952" json:"field6952,omitempty"`
+	Field6953     []byte              `protobuf:"bytes,13,opt,name=field6953" json:"field6953,omitempty"`
+	Field6954     *int32              `protobuf:"varint,14,opt,name=field6954" json:"field6954,omitempty"`
+	Field6955     *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field6955" json:"field6955,omitempty"`
+	Field6956     *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field6956" json:"field6956,omitempty"`
+	Field6957     *Message3886        `protobuf:"bytes,38,opt,name=field6957" json:"field6957,omitempty"`
+	Field6958     *string             `protobuf:"bytes,20,opt,name=field6958" json:"field6958,omitempty"`
+	Field6959     *uint32             `protobuf:"varint,21,opt,name=field6959" json:"field6959,omitempty"`
+	Field6960     *Message6743        `protobuf:"bytes,23,opt,name=field6960" json:"field6960,omitempty"`
+	Field6961     *UnusedEmptyMessage `protobuf:"bytes,29,opt,name=field6961" json:"field6961,omitempty"`
+	Field6962     *UnusedEmptyMessage `protobuf:"bytes,33,opt,name=field6962" json:"field6962,omitempty"`
+	Field6963     *bool               `protobuf:"varint,34,opt,name=field6963" json:"field6963,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6863) Reset() {
@@ -1446,9 +1434,8 @@
 }
 
 type Message6871 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6871) Reset() {
@@ -1475,11 +1462,10 @@
 }
 
 type Message7547 struct {
-	Field7549            []byte                  `protobuf:"bytes,1,req,name=field7549" json:"field7549,omitempty"`
-	Field7550            *int32                  `protobuf:"varint,2,req,name=field7550" json:"field7550,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7549     []byte `protobuf:"bytes,1,req,name=field7549" json:"field7549,omitempty"`
+	Field7550     *int32 `protobuf:"varint,2,req,name=field7550" json:"field7550,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7547) Reset() {
@@ -1520,21 +1506,20 @@
 }
 
 type Message7648 struct {
-	Field7669            *string                 `protobuf:"bytes,1,opt,name=field7669" json:"field7669,omitempty"`
-	Field7670            *int32                  `protobuf:"varint,2,opt,name=field7670" json:"field7670,omitempty"`
-	Field7671            *int32                  `protobuf:"varint,3,opt,name=field7671" json:"field7671,omitempty"`
-	Field7672            *int32                  `protobuf:"varint,4,opt,name=field7672" json:"field7672,omitempty"`
-	Field7673            *int32                  `protobuf:"varint,5,opt,name=field7673" json:"field7673,omitempty"`
-	Field7674            *int32                  `protobuf:"varint,6,opt,name=field7674" json:"field7674,omitempty"`
-	Field7675            *float32                `protobuf:"fixed32,7,opt,name=field7675" json:"field7675,omitempty"`
-	Field7676            *bool                   `protobuf:"varint,8,opt,name=field7676" json:"field7676,omitempty"`
-	Field7677            *bool                   `protobuf:"varint,9,opt,name=field7677" json:"field7677,omitempty"`
-	Field7678            *bool                   `protobuf:"varint,10,opt,name=field7678" json:"field7678,omitempty"`
-	Field7679            *bool                   `protobuf:"varint,11,opt,name=field7679" json:"field7679,omitempty"`
-	Field7680            *bool                   `protobuf:"varint,12,opt,name=field7680" json:"field7680,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7669     *string  `protobuf:"bytes,1,opt,name=field7669" json:"field7669,omitempty"`
+	Field7670     *int32   `protobuf:"varint,2,opt,name=field7670" json:"field7670,omitempty"`
+	Field7671     *int32   `protobuf:"varint,3,opt,name=field7671" json:"field7671,omitempty"`
+	Field7672     *int32   `protobuf:"varint,4,opt,name=field7672" json:"field7672,omitempty"`
+	Field7673     *int32   `protobuf:"varint,5,opt,name=field7673" json:"field7673,omitempty"`
+	Field7674     *int32   `protobuf:"varint,6,opt,name=field7674" json:"field7674,omitempty"`
+	Field7675     *float32 `protobuf:"fixed32,7,opt,name=field7675" json:"field7675,omitempty"`
+	Field7676     *bool    `protobuf:"varint,8,opt,name=field7676" json:"field7676,omitempty"`
+	Field7677     *bool    `protobuf:"varint,9,opt,name=field7677" json:"field7677,omitempty"`
+	Field7678     *bool    `protobuf:"varint,10,opt,name=field7678" json:"field7678,omitempty"`
+	Field7679     *bool    `protobuf:"varint,11,opt,name=field7679" json:"field7679,omitempty"`
+	Field7680     *bool    `protobuf:"varint,12,opt,name=field7680" json:"field7680,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7648) Reset() {
@@ -1645,9 +1630,8 @@
 }
 
 type Message7865 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7865) Reset() {
@@ -1674,11 +1658,10 @@
 }
 
 type Message7928 struct {
-	Field7940            *string                 `protobuf:"bytes,1,opt,name=field7940" json:"field7940,omitempty"`
-	Field7941            *int64                  `protobuf:"varint,2,opt,name=field7941" json:"field7941,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7940     *string `protobuf:"bytes,1,opt,name=field7940" json:"field7940,omitempty"`
+	Field7941     *int64  `protobuf:"varint,2,opt,name=field7941" json:"field7941,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7928) Reset() {
@@ -1719,12 +1702,11 @@
 }
 
 type Message7919 struct {
-	Field7931            *uint64                 `protobuf:"fixed64,1,opt,name=field7931" json:"field7931,omitempty"`
-	Field7932            *int64                  `protobuf:"varint,2,opt,name=field7932" json:"field7932,omitempty"`
-	Field7933            []byte                  `protobuf:"bytes,3,opt,name=field7933" json:"field7933,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7931     *uint64 `protobuf:"fixed64,1,opt,name=field7931" json:"field7931,omitempty"`
+	Field7932     *int64  `protobuf:"varint,2,opt,name=field7932" json:"field7932,omitempty"`
+	Field7933     []byte  `protobuf:"bytes,3,opt,name=field7933" json:"field7933,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7919) Reset() {
@@ -1772,11 +1754,10 @@
 }
 
 type Message7920 struct {
-	Field7934            *int64                  `protobuf:"varint,1,opt,name=field7934" json:"field7934,omitempty"`
-	Field7935            *int64                  `protobuf:"varint,2,opt,name=field7935" json:"field7935,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7934     *int64 `protobuf:"varint,1,opt,name=field7934" json:"field7934,omitempty"`
+	Field7935     *int64 `protobuf:"varint,2,opt,name=field7935" json:"field7935,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7920) Reset() {
@@ -1817,13 +1798,12 @@
 }
 
 type Message7921 struct {
-	Field7936            *int32                  `protobuf:"varint,1,opt,name=field7936" json:"field7936,omitempty"`
-	Field7937            *int64                  `protobuf:"varint,2,opt,name=field7937" json:"field7937,omitempty"`
-	Field7938            *float32                `protobuf:"fixed32,3,opt,name=field7938" json:"field7938,omitempty"`
-	Field7939            *UnusedEnum             `protobuf:"varint,4,opt,name=field7939,enum=benchmarks.google_message3.UnusedEnum" json:"field7939,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7936     *int32      `protobuf:"varint,1,opt,name=field7936" json:"field7936,omitempty"`
+	Field7937     *int64      `protobuf:"varint,2,opt,name=field7937" json:"field7937,omitempty"`
+	Field7938     *float32    `protobuf:"fixed32,3,opt,name=field7938" json:"field7938,omitempty"`
+	Field7939     *UnusedEnum `protobuf:"varint,4,opt,name=field7939,enum=benchmarks.google_message3.UnusedEnum" json:"field7939,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7921) Reset() {
@@ -1878,14 +1858,13 @@
 }
 
 type Message8511 struct {
-	Field8539            *Message8224            `protobuf:"bytes,1,opt,name=field8539" json:"field8539,omitempty"`
-	Field8540            *string                 `protobuf:"bytes,2,opt,name=field8540" json:"field8540,omitempty"`
-	Field8541            *bool                   `protobuf:"varint,3,opt,name=field8541" json:"field8541,omitempty"`
-	Field8542            *int64                  `protobuf:"varint,4,opt,name=field8542" json:"field8542,omitempty"`
-	Field8543            *string                 `protobuf:"bytes,5,opt,name=field8543" json:"field8543,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8539     *Message8224 `protobuf:"bytes,1,opt,name=field8539" json:"field8539,omitempty"`
+	Field8540     *string      `protobuf:"bytes,2,opt,name=field8540" json:"field8540,omitempty"`
+	Field8541     *bool        `protobuf:"varint,3,opt,name=field8541" json:"field8541,omitempty"`
+	Field8542     *int64       `protobuf:"varint,4,opt,name=field8542" json:"field8542,omitempty"`
+	Field8543     *string      `protobuf:"bytes,5,opt,name=field8543" json:"field8543,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8511) Reset() {
@@ -1947,15 +1926,14 @@
 }
 
 type Message8512 struct {
-	Field8544            *Message8301            `protobuf:"bytes,1,opt,name=field8544" json:"field8544,omitempty"`
-	Field8545            *Message8302            `protobuf:"bytes,2,opt,name=field8545" json:"field8545,omitempty"`
-	Field8546            *string                 `protobuf:"bytes,3,opt,name=field8546" json:"field8546,omitempty"`
-	Field8547            *bool                   `protobuf:"varint,4,opt,name=field8547" json:"field8547,omitempty"`
-	Field8548            *int64                  `protobuf:"varint,5,opt,name=field8548" json:"field8548,omitempty"`
-	Field8549            *string                 `protobuf:"bytes,6,opt,name=field8549" json:"field8549,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8544     *Message8301 `protobuf:"bytes,1,opt,name=field8544" json:"field8544,omitempty"`
+	Field8545     *Message8302 `protobuf:"bytes,2,opt,name=field8545" json:"field8545,omitempty"`
+	Field8546     *string      `protobuf:"bytes,3,opt,name=field8546" json:"field8546,omitempty"`
+	Field8547     *bool        `protobuf:"varint,4,opt,name=field8547" json:"field8547,omitempty"`
+	Field8548     *int64       `protobuf:"varint,5,opt,name=field8548" json:"field8548,omitempty"`
+	Field8549     *string      `protobuf:"bytes,6,opt,name=field8549" json:"field8549,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8512) Reset() {
@@ -2024,13 +2002,12 @@
 }
 
 type Message8513 struct {
-	Field8550            []*Message8392          `protobuf:"bytes,1,rep,name=field8550" json:"field8550,omitempty"`
-	Field8551            *string                 `protobuf:"bytes,2,opt,name=field8551" json:"field8551,omitempty"`
-	Field8552            *bool                   `protobuf:"varint,3,opt,name=field8552" json:"field8552,omitempty"`
-	Field8553            *string                 `protobuf:"bytes,4,opt,name=field8553" json:"field8553,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8550     []*Message8392 `protobuf:"bytes,1,rep,name=field8550" json:"field8550,omitempty"`
+	Field8551     *string        `protobuf:"bytes,2,opt,name=field8551" json:"field8551,omitempty"`
+	Field8552     *bool          `protobuf:"varint,3,opt,name=field8552" json:"field8552,omitempty"`
+	Field8553     *string        `protobuf:"bytes,4,opt,name=field8553" json:"field8553,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8513) Reset() {
@@ -2085,14 +2062,13 @@
 }
 
 type Message8514 struct {
-	Field8554            *string                 `protobuf:"bytes,1,opt,name=field8554" json:"field8554,omitempty"`
-	Field8555            *int64                  `protobuf:"varint,2,opt,name=field8555" json:"field8555,omitempty"`
-	Field8556            *bool                   `protobuf:"varint,3,opt,name=field8556" json:"field8556,omitempty"`
-	Field8557            []*Message8130          `protobuf:"bytes,4,rep,name=field8557" json:"field8557,omitempty"`
-	Field8558            *string                 `protobuf:"bytes,5,opt,name=field8558" json:"field8558,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8554     *string        `protobuf:"bytes,1,opt,name=field8554" json:"field8554,omitempty"`
+	Field8555     *int64         `protobuf:"varint,2,opt,name=field8555" json:"field8555,omitempty"`
+	Field8556     *bool          `protobuf:"varint,3,opt,name=field8556" json:"field8556,omitempty"`
+	Field8557     []*Message8130 `protobuf:"bytes,4,rep,name=field8557" json:"field8557,omitempty"`
+	Field8558     *string        `protobuf:"bytes,5,opt,name=field8558" json:"field8558,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8514) Reset() {
@@ -2154,12 +2130,11 @@
 }
 
 type Message8515 struct {
-	Field8559            *Message8479            `protobuf:"bytes,1,opt,name=field8559" json:"field8559,omitempty"`
-	Field8560            *Message8478            `protobuf:"bytes,2,opt,name=field8560" json:"field8560,omitempty"`
-	Field8561            *string                 `protobuf:"bytes,3,opt,name=field8561" json:"field8561,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8559     *Message8479 `protobuf:"bytes,1,opt,name=field8559" json:"field8559,omitempty"`
+	Field8560     *Message8478 `protobuf:"bytes,2,opt,name=field8560" json:"field8560,omitempty"`
+	Field8561     *string      `protobuf:"bytes,3,opt,name=field8561" json:"field8561,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8515) Reset() {
@@ -2207,16 +2182,15 @@
 }
 
 type Message10320 struct {
-	Field10347           *Enum10335              `protobuf:"varint,1,opt,name=field10347,enum=benchmarks.google_message3.Enum10335" json:"field10347,omitempty"`
-	Field10348           []*Message10319         `protobuf:"bytes,2,rep,name=field10348" json:"field10348,omitempty"`
-	Field10349           *int32                  `protobuf:"varint,3,opt,name=field10349" json:"field10349,omitempty"`
-	Field10350           *int32                  `protobuf:"varint,4,opt,name=field10350" json:"field10350,omitempty"`
-	Field10351           *int32                  `protobuf:"varint,5,opt,name=field10351" json:"field10351,omitempty"`
-	Field10352           *int32                  `protobuf:"varint,6,opt,name=field10352" json:"field10352,omitempty"`
-	Field10353           *Enum10337              `protobuf:"varint,7,opt,name=field10353,enum=benchmarks.google_message3.Enum10337" json:"field10353,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10347    *Enum10335      `protobuf:"varint,1,opt,name=field10347,enum=benchmarks.google_message3.Enum10335" json:"field10347,omitempty"`
+	Field10348    []*Message10319 `protobuf:"bytes,2,rep,name=field10348" json:"field10348,omitempty"`
+	Field10349    *int32          `protobuf:"varint,3,opt,name=field10349" json:"field10349,omitempty"`
+	Field10350    *int32          `protobuf:"varint,4,opt,name=field10350" json:"field10350,omitempty"`
+	Field10351    *int32          `protobuf:"varint,5,opt,name=field10351" json:"field10351,omitempty"`
+	Field10352    *int32          `protobuf:"varint,6,opt,name=field10352" json:"field10352,omitempty"`
+	Field10353    *Enum10337      `protobuf:"varint,7,opt,name=field10353,enum=benchmarks.google_message3.Enum10337" json:"field10353,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10320) Reset() {
@@ -2292,12 +2266,11 @@
 }
 
 type Message10321 struct {
-	Field10354           *int32                  `protobuf:"varint,1,opt,name=field10354" json:"field10354,omitempty"`
-	Field10355           *int32                  `protobuf:"varint,2,opt,name=field10355" json:"field10355,omitempty"`
-	Field10356           *uint64                 `protobuf:"varint,3,opt,name=field10356" json:"field10356,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10354    *int32  `protobuf:"varint,1,opt,name=field10354" json:"field10354,omitempty"`
+	Field10355    *int32  `protobuf:"varint,2,opt,name=field10355" json:"field10355,omitempty"`
+	Field10356    *uint64 `protobuf:"varint,3,opt,name=field10356" json:"field10356,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10321) Reset() {
@@ -2345,12 +2318,11 @@
 }
 
 type Message10322 struct {
-	Field10357           *Message4016            `protobuf:"bytes,1,opt,name=field10357" json:"field10357,omitempty"`
-	Field10358           *bool                   `protobuf:"varint,2,opt,name=field10358" json:"field10358,omitempty"`
-	Field10359           *bool                   `protobuf:"varint,3,opt,name=field10359" json:"field10359,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10357    *Message4016 `protobuf:"bytes,1,opt,name=field10357" json:"field10357,omitempty"`
+	Field10358    *bool        `protobuf:"varint,2,opt,name=field10358" json:"field10358,omitempty"`
+	Field10359    *bool        `protobuf:"varint,3,opt,name=field10359" json:"field10359,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10322) Reset() {
@@ -2398,13 +2370,12 @@
 }
 
 type Message11988 struct {
-	Field12021           *string                 `protobuf:"bytes,1,opt,name=field12021" json:"field12021,omitempty"`
-	Field12022           *string                 `protobuf:"bytes,2,opt,name=field12022" json:"field12022,omitempty"`
-	Field12023           *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field12023" json:"field12023,omitempty"`
-	Field12024           *Message10155           `protobuf:"bytes,4,opt,name=field12024" json:"field12024,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12021    *string             `protobuf:"bytes,1,opt,name=field12021" json:"field12021,omitempty"`
+	Field12022    *string             `protobuf:"bytes,2,opt,name=field12022" json:"field12022,omitempty"`
+	Field12023    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field12023" json:"field12023,omitempty"`
+	Field12024    *Message10155       `protobuf:"bytes,4,opt,name=field12024" json:"field12024,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11988) Reset() {
@@ -2459,13 +2430,12 @@
 }
 
 type Message12668 struct {
-	Field12677           []*Message12669         `protobuf:"bytes,1,rep,name=field12677" json:"field12677,omitempty"`
-	Field12678           *int32                  `protobuf:"varint,2,opt,name=field12678" json:"field12678,omitempty"`
-	Field12679           *int32                  `protobuf:"varint,3,opt,name=field12679" json:"field12679,omitempty"`
-	Field12680           *int32                  `protobuf:"varint,4,opt,name=field12680" json:"field12680,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12677    []*Message12669 `protobuf:"bytes,1,rep,name=field12677" json:"field12677,omitempty"`
+	Field12678    *int32          `protobuf:"varint,2,opt,name=field12678" json:"field12678,omitempty"`
+	Field12679    *int32          `protobuf:"varint,3,opt,name=field12679" json:"field12679,omitempty"`
+	Field12680    *int32          `protobuf:"varint,4,opt,name=field12680" json:"field12680,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12668) Reset() {
@@ -2520,16 +2490,15 @@
 }
 
 type Message12825 struct {
-	Field12862           []*Message12818         `protobuf:"bytes,1,rep,name=field12862" json:"field12862,omitempty"`
-	Field12863           *int32                  `protobuf:"varint,2,opt,name=field12863" json:"field12863,omitempty"`
-	Field12864           *Message12819           `protobuf:"bytes,3,opt,name=field12864" json:"field12864,omitempty"`
-	Field12865           *Message12820           `protobuf:"bytes,4,opt,name=field12865" json:"field12865,omitempty"`
-	Field12866           *int32                  `protobuf:"varint,5,opt,name=field12866" json:"field12866,omitempty"`
-	Field12867           []*Message12821         `protobuf:"bytes,6,rep,name=field12867" json:"field12867,omitempty"`
-	Field12868           []*UnusedEmptyMessage   `protobuf:"bytes,7,rep,name=field12868" json:"field12868,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12862    []*Message12818       `protobuf:"bytes,1,rep,name=field12862" json:"field12862,omitempty"`
+	Field12863    *int32                `protobuf:"varint,2,opt,name=field12863" json:"field12863,omitempty"`
+	Field12864    *Message12819         `protobuf:"bytes,3,opt,name=field12864" json:"field12864,omitempty"`
+	Field12865    *Message12820         `protobuf:"bytes,4,opt,name=field12865" json:"field12865,omitempty"`
+	Field12866    *int32                `protobuf:"varint,5,opt,name=field12866" json:"field12866,omitempty"`
+	Field12867    []*Message12821       `protobuf:"bytes,6,rep,name=field12867" json:"field12867,omitempty"`
+	Field12868    []*UnusedEmptyMessage `protobuf:"bytes,7,rep,name=field12868" json:"field12868,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12825) Reset() {
@@ -2605,12 +2574,11 @@
 }
 
 type Message16478 struct {
-	Field16481           []*Message16479         `protobuf:"bytes,1,rep,name=field16481" json:"field16481,omitempty"`
-	Field16482           *bool                   `protobuf:"varint,3,opt,name=field16482" json:"field16482,omitempty"`
-	Field16483           *int32                  `protobuf:"varint,2,opt,name=field16483" json:"field16483,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16481    []*Message16479 `protobuf:"bytes,1,rep,name=field16481" json:"field16481,omitempty"`
+	Field16482    *bool           `protobuf:"varint,3,opt,name=field16482" json:"field16482,omitempty"`
+	Field16483    *int32          `protobuf:"varint,2,opt,name=field16483" json:"field16483,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16478) Reset() {
@@ -2658,12 +2626,11 @@
 }
 
 type Message16552 struct {
-	Field16565           *uint64                 `protobuf:"fixed64,1,opt,name=field16565" json:"field16565,omitempty"`
-	Field16566           *int32                  `protobuf:"varint,2,opt,name=field16566" json:"field16566,omitempty"`
-	Field16567           *Enum16553              `protobuf:"varint,3,opt,name=field16567,enum=benchmarks.google_message3.Enum16553" json:"field16567,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16565    *uint64    `protobuf:"fixed64,1,opt,name=field16565" json:"field16565,omitempty"`
+	Field16566    *int32     `protobuf:"varint,2,opt,name=field16566" json:"field16566,omitempty"`
+	Field16567    *Enum16553 `protobuf:"varint,3,opt,name=field16567,enum=benchmarks.google_message3.Enum16553" json:"field16567,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16552) Reset() {
@@ -2711,12 +2678,11 @@
 }
 
 type Message16660 struct {
-	Field16668           *string                 `protobuf:"bytes,1,opt,name=field16668" json:"field16668,omitempty"`
-	Field16669           *string                 `protobuf:"bytes,2,opt,name=field16669" json:"field16669,omitempty"`
-	Field16670           *int32                  `protobuf:"varint,3,opt,name=field16670" json:"field16670,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16668    *string `protobuf:"bytes,1,opt,name=field16668" json:"field16668,omitempty"`
+	Field16669    *string `protobuf:"bytes,2,opt,name=field16669" json:"field16669,omitempty"`
+	Field16670    *int32  `protobuf:"varint,3,opt,name=field16670" json:"field16670,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16660) Reset() {
@@ -2764,34 +2730,33 @@
 }
 
 type Message16727 struct {
-	Field16782             *Enum16728                `protobuf:"varint,1,req,name=field16782,enum=benchmarks.google_message3.Enum16728" json:"field16782,omitempty"`
-	Field16783             *string                   `protobuf:"bytes,2,req,name=field16783" json:"field16783,omitempty"`
-	Field16784             *string                   `protobuf:"bytes,3,opt,name=field16784" json:"field16784,omitempty"`
-	Field16785             *int32                    `protobuf:"varint,23,opt,name=field16785" json:"field16785,omitempty"`
-	Field16786             *string                   `protobuf:"bytes,4,req,name=field16786" json:"field16786,omitempty"`
-	Field16787             *string                   `protobuf:"bytes,5,opt,name=field16787" json:"field16787,omitempty"`
-	Field16788             *string                   `protobuf:"bytes,6,opt,name=field16788" json:"field16788,omitempty"`
-	Field16789             *Enum16732                `protobuf:"varint,7,req,name=field16789,enum=benchmarks.google_message3.Enum16732" json:"field16789,omitempty"`
-	Field16790             *string                   `protobuf:"bytes,8,opt,name=field16790" json:"field16790,omitempty"`
-	Field16791             *string                   `protobuf:"bytes,9,opt,name=field16791" json:"field16791,omitempty"`
-	Field16792             *string                   `protobuf:"bytes,10,opt,name=field16792" json:"field16792,omitempty"`
-	Field16793             *Enum16738                `protobuf:"varint,11,opt,name=field16793,enum=benchmarks.google_message3.Enum16738" json:"field16793,omitempty"`
-	Field16794             *int32                    `protobuf:"varint,12,opt,name=field16794" json:"field16794,omitempty"`
-	Field16795             []*Message16722           `protobuf:"bytes,13,rep,name=field16795" json:"field16795,omitempty"`
-	Field16796             *bool                     `protobuf:"varint,19,opt,name=field16796" json:"field16796,omitempty"`
-	Field16797             *bool                     `protobuf:"varint,24,opt,name=field16797" json:"field16797,omitempty"`
-	Field16798             *string                   `protobuf:"bytes,14,opt,name=field16798" json:"field16798,omitempty"`
-	Field16799             *int64                    `protobuf:"varint,15,opt,name=field16799" json:"field16799,omitempty"`
-	Field16800             *bool                     `protobuf:"varint,16,opt,name=field16800" json:"field16800,omitempty"`
-	Field16801             *string                   `protobuf:"bytes,17,opt,name=field16801" json:"field16801,omitempty"`
-	Field16802             *Enum16698                `protobuf:"varint,18,opt,name=field16802,enum=benchmarks.google_message3.Enum16698" json:"field16802,omitempty"`
-	Field16803             *Message16724             `protobuf:"bytes,20,opt,name=field16803" json:"field16803,omitempty"`
-	Field16804             *bool                     `protobuf:"varint,22,opt,name=field16804" json:"field16804,omitempty"`
-	Field16805             *UnusedEmptyMessage       `protobuf:"bytes,25,opt,name=field16805" json:"field16805,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field16782      *Enum16728          `protobuf:"varint,1,req,name=field16782,enum=benchmarks.google_message3.Enum16728" json:"field16782,omitempty"`
+	Field16783      *string             `protobuf:"bytes,2,req,name=field16783" json:"field16783,omitempty"`
+	Field16784      *string             `protobuf:"bytes,3,opt,name=field16784" json:"field16784,omitempty"`
+	Field16785      *int32              `protobuf:"varint,23,opt,name=field16785" json:"field16785,omitempty"`
+	Field16786      *string             `protobuf:"bytes,4,req,name=field16786" json:"field16786,omitempty"`
+	Field16787      *string             `protobuf:"bytes,5,opt,name=field16787" json:"field16787,omitempty"`
+	Field16788      *string             `protobuf:"bytes,6,opt,name=field16788" json:"field16788,omitempty"`
+	Field16789      *Enum16732          `protobuf:"varint,7,req,name=field16789,enum=benchmarks.google_message3.Enum16732" json:"field16789,omitempty"`
+	Field16790      *string             `protobuf:"bytes,8,opt,name=field16790" json:"field16790,omitempty"`
+	Field16791      *string             `protobuf:"bytes,9,opt,name=field16791" json:"field16791,omitempty"`
+	Field16792      *string             `protobuf:"bytes,10,opt,name=field16792" json:"field16792,omitempty"`
+	Field16793      *Enum16738          `protobuf:"varint,11,opt,name=field16793,enum=benchmarks.google_message3.Enum16738" json:"field16793,omitempty"`
+	Field16794      *int32              `protobuf:"varint,12,opt,name=field16794" json:"field16794,omitempty"`
+	Field16795      []*Message16722     `protobuf:"bytes,13,rep,name=field16795" json:"field16795,omitempty"`
+	Field16796      *bool               `protobuf:"varint,19,opt,name=field16796" json:"field16796,omitempty"`
+	Field16797      *bool               `protobuf:"varint,24,opt,name=field16797" json:"field16797,omitempty"`
+	Field16798      *string             `protobuf:"bytes,14,opt,name=field16798" json:"field16798,omitempty"`
+	Field16799      *int64              `protobuf:"varint,15,opt,name=field16799" json:"field16799,omitempty"`
+	Field16800      *bool               `protobuf:"varint,16,opt,name=field16800" json:"field16800,omitempty"`
+	Field16801      *string             `protobuf:"bytes,17,opt,name=field16801" json:"field16801,omitempty"`
+	Field16802      *Enum16698          `protobuf:"varint,18,opt,name=field16802,enum=benchmarks.google_message3.Enum16698" json:"field16802,omitempty"`
+	Field16803      *Message16724       `protobuf:"bytes,20,opt,name=field16803" json:"field16803,omitempty"`
+	Field16804      *bool               `protobuf:"varint,22,opt,name=field16804" json:"field16804,omitempty"`
+	Field16805      *UnusedEmptyMessage `protobuf:"bytes,25,opt,name=field16805" json:"field16805,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message16727) Reset() {
@@ -2995,11 +2960,10 @@
 }
 
 type Message16725 struct {
-	Field16774           *Enum16728              `protobuf:"varint,1,opt,name=field16774,enum=benchmarks.google_message3.Enum16728" json:"field16774,omitempty"`
-	Field16775           []string                `protobuf:"bytes,2,rep,name=field16775" json:"field16775,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16774    *Enum16728 `protobuf:"varint,1,opt,name=field16774,enum=benchmarks.google_message3.Enum16728" json:"field16774,omitempty"`
+	Field16775    []string   `protobuf:"bytes,2,rep,name=field16775" json:"field16775,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16725) Reset() {
@@ -3040,31 +3004,30 @@
 }
 
 type Message17726 struct {
-	Field17801           *string                 `protobuf:"bytes,1,opt,name=field17801" json:"field17801,omitempty"`
-	Field17802           []string                `protobuf:"bytes,2,rep,name=field17802" json:"field17802,omitempty"`
-	Field17803           *string                 `protobuf:"bytes,3,opt,name=field17803" json:"field17803,omitempty"`
-	Field17804           []string                `protobuf:"bytes,4,rep,name=field17804" json:"field17804,omitempty"`
-	Field17805           *string                 `protobuf:"bytes,5,opt,name=field17805" json:"field17805,omitempty"`
-	Field17806           []string                `protobuf:"bytes,6,rep,name=field17806" json:"field17806,omitempty"`
-	Field17807           *string                 `protobuf:"bytes,7,opt,name=field17807" json:"field17807,omitempty"`
-	Field17808           *string                 `protobuf:"bytes,8,opt,name=field17808" json:"field17808,omitempty"`
-	Field17809           []string                `protobuf:"bytes,15,rep,name=field17809" json:"field17809,omitempty"`
-	Field17810           []string                `protobuf:"bytes,16,rep,name=field17810" json:"field17810,omitempty"`
-	Field17811           []string                `protobuf:"bytes,17,rep,name=field17811" json:"field17811,omitempty"`
-	Field17812           []*UnusedEmptyMessage   `protobuf:"bytes,18,rep,name=field17812" json:"field17812,omitempty"`
-	Field17813           *string                 `protobuf:"bytes,9,opt,name=field17813" json:"field17813,omitempty"`
-	Field17814           *string                 `protobuf:"bytes,10,opt,name=field17814" json:"field17814,omitempty"`
-	Field17815           *string                 `protobuf:"bytes,11,opt,name=field17815" json:"field17815,omitempty"`
-	Field17816           *string                 `protobuf:"bytes,12,opt,name=field17816" json:"field17816,omitempty"`
-	Field17817           *string                 `protobuf:"bytes,13,opt,name=field17817" json:"field17817,omitempty"`
-	Field17818           *string                 `protobuf:"bytes,14,opt,name=field17818" json:"field17818,omitempty"`
-	Field17819           *string                 `protobuf:"bytes,19,opt,name=field17819" json:"field17819,omitempty"`
-	Field17820           []*Message17728         `protobuf:"bytes,20,rep,name=field17820" json:"field17820,omitempty"`
-	Field17821           []*Message17728         `protobuf:"bytes,21,rep,name=field17821" json:"field17821,omitempty"`
-	Field17822           []*UnusedEmptyMessage   `protobuf:"bytes,30,rep,name=field17822" json:"field17822,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field17801    *string               `protobuf:"bytes,1,opt,name=field17801" json:"field17801,omitempty"`
+	Field17802    []string              `protobuf:"bytes,2,rep,name=field17802" json:"field17802,omitempty"`
+	Field17803    *string               `protobuf:"bytes,3,opt,name=field17803" json:"field17803,omitempty"`
+	Field17804    []string              `protobuf:"bytes,4,rep,name=field17804" json:"field17804,omitempty"`
+	Field17805    *string               `protobuf:"bytes,5,opt,name=field17805" json:"field17805,omitempty"`
+	Field17806    []string              `protobuf:"bytes,6,rep,name=field17806" json:"field17806,omitempty"`
+	Field17807    *string               `protobuf:"bytes,7,opt,name=field17807" json:"field17807,omitempty"`
+	Field17808    *string               `protobuf:"bytes,8,opt,name=field17808" json:"field17808,omitempty"`
+	Field17809    []string              `protobuf:"bytes,15,rep,name=field17809" json:"field17809,omitempty"`
+	Field17810    []string              `protobuf:"bytes,16,rep,name=field17810" json:"field17810,omitempty"`
+	Field17811    []string              `protobuf:"bytes,17,rep,name=field17811" json:"field17811,omitempty"`
+	Field17812    []*UnusedEmptyMessage `protobuf:"bytes,18,rep,name=field17812" json:"field17812,omitempty"`
+	Field17813    *string               `protobuf:"bytes,9,opt,name=field17813" json:"field17813,omitempty"`
+	Field17814    *string               `protobuf:"bytes,10,opt,name=field17814" json:"field17814,omitempty"`
+	Field17815    *string               `protobuf:"bytes,11,opt,name=field17815" json:"field17815,omitempty"`
+	Field17816    *string               `protobuf:"bytes,12,opt,name=field17816" json:"field17816,omitempty"`
+	Field17817    *string               `protobuf:"bytes,13,opt,name=field17817" json:"field17817,omitempty"`
+	Field17818    *string               `protobuf:"bytes,14,opt,name=field17818" json:"field17818,omitempty"`
+	Field17819    *string               `protobuf:"bytes,19,opt,name=field17819" json:"field17819,omitempty"`
+	Field17820    []*Message17728       `protobuf:"bytes,20,rep,name=field17820" json:"field17820,omitempty"`
+	Field17821    []*Message17728       `protobuf:"bytes,21,rep,name=field17821" json:"field17821,omitempty"`
+	Field17822    []*UnusedEmptyMessage `protobuf:"bytes,30,rep,name=field17822" json:"field17822,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message17726) Reset() {
@@ -3245,11 +3208,10 @@
 }
 
 type Message17782 struct {
-	Field18153           *string                 `protobuf:"bytes,1,opt,name=field18153" json:"field18153,omitempty"`
-	Field18154           *string                 `protobuf:"bytes,2,opt,name=field18154" json:"field18154,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field18153    *string `protobuf:"bytes,1,opt,name=field18153" json:"field18153,omitempty"`
+	Field18154    *string `protobuf:"bytes,2,opt,name=field18154" json:"field18154,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message17782) Reset() {
@@ -3290,15 +3252,14 @@
 }
 
 type Message17783 struct {
-	Field18155           *string                      `protobuf:"bytes,1,opt,name=field18155" json:"field18155,omitempty"`
-	Field18156           *string                      `protobuf:"bytes,2,opt,name=field18156" json:"field18156,omitempty"`
-	Field18157           *string                      `protobuf:"bytes,3,opt,name=field18157" json:"field18157,omitempty"`
-	Message17784         []*Message17783_Message17784 `protobuf:"group,4,rep,name=Message17784,json=message17784" json:"message17784,omitempty"`
-	Message17785         []*Message17783_Message17785 `protobuf:"group,9,rep,name=Message17785,json=message17785" json:"message17785,omitempty"`
-	Field18160           []string                     `protobuf:"bytes,16,rep,name=field18160" json:"field18160,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field18155    *string                      `protobuf:"bytes,1,opt,name=field18155" json:"field18155,omitempty"`
+	Field18156    *string                      `protobuf:"bytes,2,opt,name=field18156" json:"field18156,omitempty"`
+	Field18157    *string                      `protobuf:"bytes,3,opt,name=field18157" json:"field18157,omitempty"`
+	Message17784  []*Message17783_Message17784 `protobuf:"group,4,rep,name=Message17784,json=message17784" json:"message17784,omitempty"`
+	Message17785  []*Message17783_Message17785 `protobuf:"group,9,rep,name=Message17785,json=message17785" json:"message17785,omitempty"`
+	Field18160    []string                     `protobuf:"bytes,16,rep,name=field18160" json:"field18160,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message17783) Reset() {
@@ -3367,89 +3328,88 @@
 }
 
 type Message16945 struct {
-	Field16946             *string                   `protobuf:"bytes,1,opt,name=field16946" json:"field16946,omitempty"`
-	Field16947             *string                   `protobuf:"bytes,2,opt,name=field16947" json:"field16947,omitempty"`
-	Field16948             *string                   `protobuf:"bytes,3,opt,name=field16948" json:"field16948,omitempty"`
-	Field16949             *string                   `protobuf:"bytes,4,opt,name=field16949" json:"field16949,omitempty"`
-	Field16950             *string                   `protobuf:"bytes,5,opt,name=field16950" json:"field16950,omitempty"`
-	Field16951             *UnusedEmptyMessage       `protobuf:"bytes,872,opt,name=field16951" json:"field16951,omitempty"`
-	Field16952             []*Message0               `protobuf:"bytes,16,rep,name=field16952" json:"field16952,omitempty"`
-	Field16953             []*UnusedEmptyMessage     `protobuf:"bytes,54,rep,name=field16953" json:"field16953,omitempty"`
-	Field16954             []*Message0               `protobuf:"bytes,55,rep,name=field16954" json:"field16954,omitempty"`
-	Field16955             []string                  `protobuf:"bytes,58,rep,name=field16955" json:"field16955,omitempty"`
-	Field16956             []string                  `protobuf:"bytes,59,rep,name=field16956" json:"field16956,omitempty"`
-	Field16957             []string                  `protobuf:"bytes,62,rep,name=field16957" json:"field16957,omitempty"`
-	Field16958             []string                  `protobuf:"bytes,37,rep,name=field16958" json:"field16958,omitempty"`
-	Field16959             []string                  `protobuf:"bytes,18,rep,name=field16959" json:"field16959,omitempty"`
-	Field16960             []*UnusedEmptyMessage     `protobuf:"bytes,38,rep,name=field16960" json:"field16960,omitempty"`
-	Field16961             []*Message0               `protobuf:"bytes,67,rep,name=field16961" json:"field16961,omitempty"`
-	Field16962             []*Message0               `protobuf:"bytes,130,rep,name=field16962" json:"field16962,omitempty"`
-	Field16963             []*UnusedEmptyMessage     `protobuf:"bytes,136,rep,name=field16963" json:"field16963,omitempty"`
-	Field16964             []string                  `protobuf:"bytes,138,rep,name=field16964" json:"field16964,omitempty"`
-	Field16965             []*UnusedEmptyMessage     `protobuf:"bytes,156,rep,name=field16965" json:"field16965,omitempty"`
-	Field16966             []string                  `protobuf:"bytes,139,rep,name=field16966" json:"field16966,omitempty"`
-	Field16967             []*UnusedEmptyMessage     `protobuf:"bytes,126,rep,name=field16967" json:"field16967,omitempty"`
-	Field16968             []string                  `protobuf:"bytes,152,rep,name=field16968" json:"field16968,omitempty"`
-	Field16969             []*Message0               `protobuf:"bytes,183,rep,name=field16969" json:"field16969,omitempty"`
-	Field16970             []string                  `protobuf:"bytes,168,rep,name=field16970" json:"field16970,omitempty"`
-	Field16971             []string                  `protobuf:"bytes,212,rep,name=field16971" json:"field16971,omitempty"`
-	Field16972             []string                  `protobuf:"bytes,213,rep,name=field16972" json:"field16972,omitempty"`
-	Field16973             []*UnusedEmptyMessage     `protobuf:"bytes,189,rep,name=field16973" json:"field16973,omitempty"`
-	Field16974             []*UnusedEmptyMessage     `protobuf:"bytes,190,rep,name=field16974" json:"field16974,omitempty"`
-	Field16975             []string                  `protobuf:"bytes,191,rep,name=field16975" json:"field16975,omitempty"`
-	Field16976             []string                  `protobuf:"bytes,192,rep,name=field16976" json:"field16976,omitempty"`
-	Field16977             []*Message0               `protobuf:"bytes,193,rep,name=field16977" json:"field16977,omitempty"`
-	Field16978             []*UnusedEmptyMessage     `protobuf:"bytes,194,rep,name=field16978" json:"field16978,omitempty"`
-	Field16979             []*UnusedEmptyMessage     `protobuf:"bytes,195,rep,name=field16979" json:"field16979,omitempty"`
-	Field16980             []int32                   `protobuf:"varint,196,rep,name=field16980" json:"field16980,omitempty"`
-	Field16981             []*UnusedEmptyMessage     `protobuf:"bytes,95,rep,name=field16981" json:"field16981,omitempty"`
-	Field16982             []string                  `protobuf:"bytes,96,rep,name=field16982" json:"field16982,omitempty"`
-	Field16983             []*UnusedEmptyMessage     `protobuf:"bytes,97,rep,name=field16983" json:"field16983,omitempty"`
-	Field16984             []string                  `protobuf:"bytes,1086,rep,name=field16984" json:"field16984,omitempty"`
-	Field16985             []*UnusedEmptyMessage     `protobuf:"bytes,98,rep,name=field16985" json:"field16985,omitempty"`
-	Field16986             []string                  `protobuf:"bytes,99,rep,name=field16986" json:"field16986,omitempty"`
-	Field16987             []string                  `protobuf:"bytes,100,rep,name=field16987" json:"field16987,omitempty"`
-	Field16988             []string                  `protobuf:"bytes,48,rep,name=field16988" json:"field16988,omitempty"`
-	Field16989             *string                   `protobuf:"bytes,22,opt,name=field16989" json:"field16989,omitempty"`
-	Field16990             []*UnusedEmptyMessage     `protobuf:"bytes,51,rep,name=field16990" json:"field16990,omitempty"`
-	Field16991             []string                  `protobuf:"bytes,81,rep,name=field16991" json:"field16991,omitempty"`
-	Field16992             []string                  `protobuf:"bytes,85,rep,name=field16992" json:"field16992,omitempty"`
-	Field16993             []string                  `protobuf:"bytes,169,rep,name=field16993" json:"field16993,omitempty"`
-	Field16994             *UnusedEmptyMessage       `protobuf:"bytes,260,opt,name=field16994" json:"field16994,omitempty"`
-	Field16995             *int32                    `protobuf:"varint,198,opt,name=field16995" json:"field16995,omitempty"`
-	Field16996             *int32                    `protobuf:"varint,204,opt,name=field16996" json:"field16996,omitempty"`
-	Field16997             *string                   `protobuf:"bytes,1087,opt,name=field16997" json:"field16997,omitempty"`
-	Field16998             []string                  `protobuf:"bytes,197,rep,name=field16998" json:"field16998,omitempty"`
-	Field16999             []string                  `protobuf:"bytes,206,rep,name=field16999" json:"field16999,omitempty"`
-	Field17000             *string                   `protobuf:"bytes,211,opt,name=field17000" json:"field17000,omitempty"`
-	Field17001             []string                  `protobuf:"bytes,205,rep,name=field17001" json:"field17001,omitempty"`
-	Field17002             []*UnusedEmptyMessage     `protobuf:"bytes,68,rep,name=field17002" json:"field17002,omitempty"`
-	Field17003             []*UnusedEmptyMessage     `protobuf:"bytes,69,rep,name=field17003" json:"field17003,omitempty"`
-	Field17004             []*UnusedEmptyMessage     `protobuf:"bytes,70,rep,name=field17004" json:"field17004,omitempty"`
-	Field17005             []*UnusedEmptyMessage     `protobuf:"bytes,71,rep,name=field17005" json:"field17005,omitempty"`
-	Field17006             []*UnusedEmptyMessage     `protobuf:"bytes,72,rep,name=field17006" json:"field17006,omitempty"`
-	Field17007             []*UnusedEmptyMessage     `protobuf:"bytes,19,rep,name=field17007" json:"field17007,omitempty"`
-	Field17008             []*UnusedEmptyMessage     `protobuf:"bytes,24,rep,name=field17008" json:"field17008,omitempty"`
-	Field17009             *UnusedEmptyMessage       `protobuf:"bytes,23,opt,name=field17009" json:"field17009,omitempty"`
-	Field17010             []*Message0               `protobuf:"bytes,131,rep,name=field17010" json:"field17010,omitempty"`
-	Field17011             []string                  `protobuf:"bytes,133,rep,name=field17011" json:"field17011,omitempty"`
-	Field17012             []*UnusedEmptyMessage     `protobuf:"bytes,142,rep,name=field17012" json:"field17012,omitempty"`
-	Field17013             []string                  `protobuf:"bytes,143,rep,name=field17013" json:"field17013,omitempty"`
-	Field17014             []*UnusedEmptyMessage     `protobuf:"bytes,153,rep,name=field17014" json:"field17014,omitempty"`
-	Field17015             []*Message0               `protobuf:"bytes,170,rep,name=field17015" json:"field17015,omitempty"`
-	Field17016             []string                  `protobuf:"bytes,171,rep,name=field17016" json:"field17016,omitempty"`
-	Field17017             []string                  `protobuf:"bytes,172,rep,name=field17017" json:"field17017,omitempty"`
-	Field17018             []string                  `protobuf:"bytes,173,rep,name=field17018" json:"field17018,omitempty"`
-	Field17019             []string                  `protobuf:"bytes,174,rep,name=field17019" json:"field17019,omitempty"`
-	Field17020             []string                  `protobuf:"bytes,175,rep,name=field17020" json:"field17020,omitempty"`
-	Field17021             []string                  `protobuf:"bytes,186,rep,name=field17021" json:"field17021,omitempty"`
-	Field17022             []string                  `protobuf:"bytes,101,rep,name=field17022" json:"field17022,omitempty"`
-	Field17023             []*Message0               `protobuf:"bytes,102,rep,name=field17023" json:"field17023,omitempty"`
-	Field17024             []string                  `protobuf:"bytes,274,rep,name=field17024" json:"field17024,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field16946      *string               `protobuf:"bytes,1,opt,name=field16946" json:"field16946,omitempty"`
+	Field16947      *string               `protobuf:"bytes,2,opt,name=field16947" json:"field16947,omitempty"`
+	Field16948      *string               `protobuf:"bytes,3,opt,name=field16948" json:"field16948,omitempty"`
+	Field16949      *string               `protobuf:"bytes,4,opt,name=field16949" json:"field16949,omitempty"`
+	Field16950      *string               `protobuf:"bytes,5,opt,name=field16950" json:"field16950,omitempty"`
+	Field16951      *UnusedEmptyMessage   `protobuf:"bytes,872,opt,name=field16951" json:"field16951,omitempty"`
+	Field16952      []*Message0           `protobuf:"bytes,16,rep,name=field16952" json:"field16952,omitempty"`
+	Field16953      []*UnusedEmptyMessage `protobuf:"bytes,54,rep,name=field16953" json:"field16953,omitempty"`
+	Field16954      []*Message0           `protobuf:"bytes,55,rep,name=field16954" json:"field16954,omitempty"`
+	Field16955      []string              `protobuf:"bytes,58,rep,name=field16955" json:"field16955,omitempty"`
+	Field16956      []string              `protobuf:"bytes,59,rep,name=field16956" json:"field16956,omitempty"`
+	Field16957      []string              `protobuf:"bytes,62,rep,name=field16957" json:"field16957,omitempty"`
+	Field16958      []string              `protobuf:"bytes,37,rep,name=field16958" json:"field16958,omitempty"`
+	Field16959      []string              `protobuf:"bytes,18,rep,name=field16959" json:"field16959,omitempty"`
+	Field16960      []*UnusedEmptyMessage `protobuf:"bytes,38,rep,name=field16960" json:"field16960,omitempty"`
+	Field16961      []*Message0           `protobuf:"bytes,67,rep,name=field16961" json:"field16961,omitempty"`
+	Field16962      []*Message0           `protobuf:"bytes,130,rep,name=field16962" json:"field16962,omitempty"`
+	Field16963      []*UnusedEmptyMessage `protobuf:"bytes,136,rep,name=field16963" json:"field16963,omitempty"`
+	Field16964      []string              `protobuf:"bytes,138,rep,name=field16964" json:"field16964,omitempty"`
+	Field16965      []*UnusedEmptyMessage `protobuf:"bytes,156,rep,name=field16965" json:"field16965,omitempty"`
+	Field16966      []string              `protobuf:"bytes,139,rep,name=field16966" json:"field16966,omitempty"`
+	Field16967      []*UnusedEmptyMessage `protobuf:"bytes,126,rep,name=field16967" json:"field16967,omitempty"`
+	Field16968      []string              `protobuf:"bytes,152,rep,name=field16968" json:"field16968,omitempty"`
+	Field16969      []*Message0           `protobuf:"bytes,183,rep,name=field16969" json:"field16969,omitempty"`
+	Field16970      []string              `protobuf:"bytes,168,rep,name=field16970" json:"field16970,omitempty"`
+	Field16971      []string              `protobuf:"bytes,212,rep,name=field16971" json:"field16971,omitempty"`
+	Field16972      []string              `protobuf:"bytes,213,rep,name=field16972" json:"field16972,omitempty"`
+	Field16973      []*UnusedEmptyMessage `protobuf:"bytes,189,rep,name=field16973" json:"field16973,omitempty"`
+	Field16974      []*UnusedEmptyMessage `protobuf:"bytes,190,rep,name=field16974" json:"field16974,omitempty"`
+	Field16975      []string              `protobuf:"bytes,191,rep,name=field16975" json:"field16975,omitempty"`
+	Field16976      []string              `protobuf:"bytes,192,rep,name=field16976" json:"field16976,omitempty"`
+	Field16977      []*Message0           `protobuf:"bytes,193,rep,name=field16977" json:"field16977,omitempty"`
+	Field16978      []*UnusedEmptyMessage `protobuf:"bytes,194,rep,name=field16978" json:"field16978,omitempty"`
+	Field16979      []*UnusedEmptyMessage `protobuf:"bytes,195,rep,name=field16979" json:"field16979,omitempty"`
+	Field16980      []int32               `protobuf:"varint,196,rep,name=field16980" json:"field16980,omitempty"`
+	Field16981      []*UnusedEmptyMessage `protobuf:"bytes,95,rep,name=field16981" json:"field16981,omitempty"`
+	Field16982      []string              `protobuf:"bytes,96,rep,name=field16982" json:"field16982,omitempty"`
+	Field16983      []*UnusedEmptyMessage `protobuf:"bytes,97,rep,name=field16983" json:"field16983,omitempty"`
+	Field16984      []string              `protobuf:"bytes,1086,rep,name=field16984" json:"field16984,omitempty"`
+	Field16985      []*UnusedEmptyMessage `protobuf:"bytes,98,rep,name=field16985" json:"field16985,omitempty"`
+	Field16986      []string              `protobuf:"bytes,99,rep,name=field16986" json:"field16986,omitempty"`
+	Field16987      []string              `protobuf:"bytes,100,rep,name=field16987" json:"field16987,omitempty"`
+	Field16988      []string              `protobuf:"bytes,48,rep,name=field16988" json:"field16988,omitempty"`
+	Field16989      *string               `protobuf:"bytes,22,opt,name=field16989" json:"field16989,omitempty"`
+	Field16990      []*UnusedEmptyMessage `protobuf:"bytes,51,rep,name=field16990" json:"field16990,omitempty"`
+	Field16991      []string              `protobuf:"bytes,81,rep,name=field16991" json:"field16991,omitempty"`
+	Field16992      []string              `protobuf:"bytes,85,rep,name=field16992" json:"field16992,omitempty"`
+	Field16993      []string              `protobuf:"bytes,169,rep,name=field16993" json:"field16993,omitempty"`
+	Field16994      *UnusedEmptyMessage   `protobuf:"bytes,260,opt,name=field16994" json:"field16994,omitempty"`
+	Field16995      *int32                `protobuf:"varint,198,opt,name=field16995" json:"field16995,omitempty"`
+	Field16996      *int32                `protobuf:"varint,204,opt,name=field16996" json:"field16996,omitempty"`
+	Field16997      *string               `protobuf:"bytes,1087,opt,name=field16997" json:"field16997,omitempty"`
+	Field16998      []string              `protobuf:"bytes,197,rep,name=field16998" json:"field16998,omitempty"`
+	Field16999      []string              `protobuf:"bytes,206,rep,name=field16999" json:"field16999,omitempty"`
+	Field17000      *string               `protobuf:"bytes,211,opt,name=field17000" json:"field17000,omitempty"`
+	Field17001      []string              `protobuf:"bytes,205,rep,name=field17001" json:"field17001,omitempty"`
+	Field17002      []*UnusedEmptyMessage `protobuf:"bytes,68,rep,name=field17002" json:"field17002,omitempty"`
+	Field17003      []*UnusedEmptyMessage `protobuf:"bytes,69,rep,name=field17003" json:"field17003,omitempty"`
+	Field17004      []*UnusedEmptyMessage `protobuf:"bytes,70,rep,name=field17004" json:"field17004,omitempty"`
+	Field17005      []*UnusedEmptyMessage `protobuf:"bytes,71,rep,name=field17005" json:"field17005,omitempty"`
+	Field17006      []*UnusedEmptyMessage `protobuf:"bytes,72,rep,name=field17006" json:"field17006,omitempty"`
+	Field17007      []*UnusedEmptyMessage `protobuf:"bytes,19,rep,name=field17007" json:"field17007,omitempty"`
+	Field17008      []*UnusedEmptyMessage `protobuf:"bytes,24,rep,name=field17008" json:"field17008,omitempty"`
+	Field17009      *UnusedEmptyMessage   `protobuf:"bytes,23,opt,name=field17009" json:"field17009,omitempty"`
+	Field17010      []*Message0           `protobuf:"bytes,131,rep,name=field17010" json:"field17010,omitempty"`
+	Field17011      []string              `protobuf:"bytes,133,rep,name=field17011" json:"field17011,omitempty"`
+	Field17012      []*UnusedEmptyMessage `protobuf:"bytes,142,rep,name=field17012" json:"field17012,omitempty"`
+	Field17013      []string              `protobuf:"bytes,143,rep,name=field17013" json:"field17013,omitempty"`
+	Field17014      []*UnusedEmptyMessage `protobuf:"bytes,153,rep,name=field17014" json:"field17014,omitempty"`
+	Field17015      []*Message0           `protobuf:"bytes,170,rep,name=field17015" json:"field17015,omitempty"`
+	Field17016      []string              `protobuf:"bytes,171,rep,name=field17016" json:"field17016,omitempty"`
+	Field17017      []string              `protobuf:"bytes,172,rep,name=field17017" json:"field17017,omitempty"`
+	Field17018      []string              `protobuf:"bytes,173,rep,name=field17018" json:"field17018,omitempty"`
+	Field17019      []string              `protobuf:"bytes,174,rep,name=field17019" json:"field17019,omitempty"`
+	Field17020      []string              `protobuf:"bytes,175,rep,name=field17020" json:"field17020,omitempty"`
+	Field17021      []string              `protobuf:"bytes,186,rep,name=field17021" json:"field17021,omitempty"`
+	Field17022      []string              `protobuf:"bytes,101,rep,name=field17022" json:"field17022,omitempty"`
+	Field17023      []*Message0           `protobuf:"bytes,102,rep,name=field17023" json:"field17023,omitempty"`
+	Field17024      []string              `protobuf:"bytes,274,rep,name=field17024" json:"field17024,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message16945) Reset() {
@@ -4734,11 +4694,10 @@
 }
 
 type Message34791_Message34792 struct {
-	Field34808           *string                 `protobuf:"bytes,3,req,name=field34808" json:"field34808,omitempty"`
-	Field34809           *string                 `protobuf:"bytes,4,opt,name=field34809" json:"field34809,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field34808    *string `protobuf:"bytes,3,req,name=field34808" json:"field34808,omitempty"`
+	Field34809    *string `protobuf:"bytes,4,opt,name=field34809" json:"field34809,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message34791_Message34792) Reset() {
@@ -4779,14 +4738,13 @@
 }
 
 type Message36876_Message36877 struct {
-	Field37044           *string                 `protobuf:"bytes,112,req,name=field37044" json:"field37044,omitempty"`
-	Field37045           *int32                  `protobuf:"varint,113,opt,name=field37045" json:"field37045,omitempty"`
-	Field37046           []byte                  `protobuf:"bytes,114,opt,name=field37046" json:"field37046,omitempty"`
-	Field37047           *int32                  `protobuf:"varint,115,opt,name=field37047" json:"field37047,omitempty"`
-	Field37048           *int32                  `protobuf:"varint,157,opt,name=field37048" json:"field37048,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37044    *string `protobuf:"bytes,112,req,name=field37044" json:"field37044,omitempty"`
+	Field37045    *int32  `protobuf:"varint,113,opt,name=field37045" json:"field37045,omitempty"`
+	Field37046    []byte  `protobuf:"bytes,114,opt,name=field37046" json:"field37046,omitempty"`
+	Field37047    *int32  `protobuf:"varint,115,opt,name=field37047" json:"field37047,omitempty"`
+	Field37048    *int32  `protobuf:"varint,157,opt,name=field37048" json:"field37048,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36877) Reset() {
@@ -4848,9 +4806,8 @@
 }
 
 type Message36876_Message36878 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36878) Reset() {
@@ -4877,11 +4834,10 @@
 }
 
 type Message36876_Message36879 struct {
-	Field37050           *string                 `protobuf:"bytes,56,req,name=field37050" json:"field37050,omitempty"`
-	Field37051           *int32                  `protobuf:"varint,69,opt,name=field37051" json:"field37051,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37050    *string `protobuf:"bytes,56,req,name=field37050" json:"field37050,omitempty"`
+	Field37051    *int32  `protobuf:"varint,69,opt,name=field37051" json:"field37051,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36879) Reset() {
@@ -4922,9 +4878,8 @@
 }
 
 type Message36876_Message36880 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36880) Reset() {
@@ -4951,9 +4906,8 @@
 }
 
 type Message36876_Message36881 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36881) Reset() {
@@ -4980,9 +4934,8 @@
 }
 
 type Message36876_Message36882 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36882) Reset() {
@@ -5009,9 +4962,8 @@
 }
 
 type Message36876_Message36883 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36883) Reset() {
@@ -5038,9 +4990,8 @@
 }
 
 type Message36876_Message36884 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36884) Reset() {
@@ -5067,9 +5018,8 @@
 }
 
 type Message36876_Message36885 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36885) Reset() {
@@ -5096,9 +5046,8 @@
 }
 
 type Message36876_Message36886 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36886) Reset() {
@@ -5125,9 +5074,8 @@
 }
 
 type Message36876_Message36887 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36887) Reset() {
@@ -5154,15 +5102,14 @@
 }
 
 type Message36876_Message36888 struct {
-	Field37089           *uint64                 `protobuf:"varint,75,opt,name=field37089" json:"field37089,omitempty"`
-	Field37090           *bool                   `protobuf:"varint,76,opt,name=field37090" json:"field37090,omitempty"`
-	Field37091           *uint64                 `protobuf:"varint,165,opt,name=field37091" json:"field37091,omitempty"`
-	Field37092           *float64                `protobuf:"fixed64,166,opt,name=field37092" json:"field37092,omitempty"`
-	Field37093           *uint64                 `protobuf:"varint,109,opt,name=field37093" json:"field37093,omitempty"`
-	Field37094           []byte                  `protobuf:"bytes,122,opt,name=field37094" json:"field37094,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37089    *uint64  `protobuf:"varint,75,opt,name=field37089" json:"field37089,omitempty"`
+	Field37090    *bool    `protobuf:"varint,76,opt,name=field37090" json:"field37090,omitempty"`
+	Field37091    *uint64  `protobuf:"varint,165,opt,name=field37091" json:"field37091,omitempty"`
+	Field37092    *float64 `protobuf:"fixed64,166,opt,name=field37092" json:"field37092,omitempty"`
+	Field37093    *uint64  `protobuf:"varint,109,opt,name=field37093" json:"field37093,omitempty"`
+	Field37094    []byte   `protobuf:"bytes,122,opt,name=field37094" json:"field37094,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36888) Reset() {
@@ -5231,34 +5178,33 @@
 }
 
 type Message36876_Message36889 struct {
-	Field37095           *int64                  `protobuf:"varint,117,opt,name=field37095" json:"field37095,omitempty"`
-	Field37096           *string                 `protobuf:"bytes,145,opt,name=field37096" json:"field37096,omitempty"`
-	Field37097           *int32                  `protobuf:"varint,123,opt,name=field37097" json:"field37097,omitempty"`
-	Field37098           *bool                   `protobuf:"varint,163,opt,name=field37098" json:"field37098,omitempty"`
-	Field37099           *int32                  `protobuf:"varint,164,opt,name=field37099" json:"field37099,omitempty"`
-	Field37100           *int32                  `protobuf:"varint,149,opt,name=field37100" json:"field37100,omitempty"`
-	Field37101           *UnusedEmptyMessage     `protobuf:"bytes,129,opt,name=field37101" json:"field37101,omitempty"`
-	Field37102           *Message13174           `protobuf:"bytes,124,opt,name=field37102" json:"field37102,omitempty"`
-	Field37103           *Message13169           `protobuf:"bytes,128,opt,name=field37103" json:"field37103,omitempty"`
-	Field37104           *uint64                 `protobuf:"varint,132,opt,name=field37104" json:"field37104,omitempty"`
-	Field37105           []Enum36890             `protobuf:"varint,131,rep,name=field37105,enum=benchmarks.google_message3.Enum36890" json:"field37105,omitempty"`
-	Field37106           *bool                   `protobuf:"varint,134,opt,name=field37106" json:"field37106,omitempty"`
-	Field37107           *bool                   `protobuf:"varint,140,opt,name=field37107" json:"field37107,omitempty"`
-	Field37108           *UnusedEmptyMessage     `protobuf:"bytes,135,opt,name=field37108" json:"field37108,omitempty"`
-	Field37109           *float32                `protobuf:"fixed32,136,opt,name=field37109" json:"field37109,omitempty"`
-	Field37110           *float32                `protobuf:"fixed32,156,opt,name=field37110" json:"field37110,omitempty"`
-	Field37111           *bool                   `protobuf:"varint,142,opt,name=field37111" json:"field37111,omitempty"`
-	Field37112           *int64                  `protobuf:"varint,167,opt,name=field37112" json:"field37112,omitempty"`
-	Field37113           *UnusedEmptyMessage     `protobuf:"bytes,146,opt,name=field37113" json:"field37113,omitempty"`
-	Field37114           *bool                   `protobuf:"varint,148,opt,name=field37114" json:"field37114,omitempty"`
-	Field37115           *UnusedEmptyMessage     `protobuf:"bytes,154,opt,name=field37115" json:"field37115,omitempty"`
-	Field37116           *UnusedEnum             `protobuf:"varint,158,opt,name=field37116,enum=benchmarks.google_message3.UnusedEnum" json:"field37116,omitempty"`
-	Field37117           []UnusedEnum            `protobuf:"varint,159,rep,name=field37117,enum=benchmarks.google_message3.UnusedEnum" json:"field37117,omitempty"`
-	Field37118           *int32                  `protobuf:"varint,160,opt,name=field37118" json:"field37118,omitempty"`
-	Field37119           []string                `protobuf:"bytes,161,rep,name=field37119" json:"field37119,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37095    *int64              `protobuf:"varint,117,opt,name=field37095" json:"field37095,omitempty"`
+	Field37096    *string             `protobuf:"bytes,145,opt,name=field37096" json:"field37096,omitempty"`
+	Field37097    *int32              `protobuf:"varint,123,opt,name=field37097" json:"field37097,omitempty"`
+	Field37098    *bool               `protobuf:"varint,163,opt,name=field37098" json:"field37098,omitempty"`
+	Field37099    *int32              `protobuf:"varint,164,opt,name=field37099" json:"field37099,omitempty"`
+	Field37100    *int32              `protobuf:"varint,149,opt,name=field37100" json:"field37100,omitempty"`
+	Field37101    *UnusedEmptyMessage `protobuf:"bytes,129,opt,name=field37101" json:"field37101,omitempty"`
+	Field37102    *Message13174       `protobuf:"bytes,124,opt,name=field37102" json:"field37102,omitempty"`
+	Field37103    *Message13169       `protobuf:"bytes,128,opt,name=field37103" json:"field37103,omitempty"`
+	Field37104    *uint64             `protobuf:"varint,132,opt,name=field37104" json:"field37104,omitempty"`
+	Field37105    []Enum36890         `protobuf:"varint,131,rep,name=field37105,enum=benchmarks.google_message3.Enum36890" json:"field37105,omitempty"`
+	Field37106    *bool               `protobuf:"varint,134,opt,name=field37106" json:"field37106,omitempty"`
+	Field37107    *bool               `protobuf:"varint,140,opt,name=field37107" json:"field37107,omitempty"`
+	Field37108    *UnusedEmptyMessage `protobuf:"bytes,135,opt,name=field37108" json:"field37108,omitempty"`
+	Field37109    *float32            `protobuf:"fixed32,136,opt,name=field37109" json:"field37109,omitempty"`
+	Field37110    *float32            `protobuf:"fixed32,156,opt,name=field37110" json:"field37110,omitempty"`
+	Field37111    *bool               `protobuf:"varint,142,opt,name=field37111" json:"field37111,omitempty"`
+	Field37112    *int64              `protobuf:"varint,167,opt,name=field37112" json:"field37112,omitempty"`
+	Field37113    *UnusedEmptyMessage `protobuf:"bytes,146,opt,name=field37113" json:"field37113,omitempty"`
+	Field37114    *bool               `protobuf:"varint,148,opt,name=field37114" json:"field37114,omitempty"`
+	Field37115    *UnusedEmptyMessage `protobuf:"bytes,154,opt,name=field37115" json:"field37115,omitempty"`
+	Field37116    *UnusedEnum         `protobuf:"varint,158,opt,name=field37116,enum=benchmarks.google_message3.UnusedEnum" json:"field37116,omitempty"`
+	Field37117    []UnusedEnum        `protobuf:"varint,159,rep,name=field37117,enum=benchmarks.google_message3.UnusedEnum" json:"field37117,omitempty"`
+	Field37118    *int32              `protobuf:"varint,160,opt,name=field37118" json:"field37118,omitempty"`
+	Field37119    []string            `protobuf:"bytes,161,rep,name=field37119" json:"field37119,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36889) Reset() {
@@ -5460,9 +5406,8 @@
 }
 
 type Message36876_Message36910 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36910) Reset() {
@@ -5489,13 +5434,12 @@
 }
 
 type Message36876_Message36911 struct {
-	Field37121           *UnusedEmptyMessage     `protobuf:"bytes,127,opt,name=field37121" json:"field37121,omitempty"`
-	Field37122           *Message35538           `protobuf:"bytes,130,opt,name=field37122" json:"field37122,omitempty"`
-	Field37123           *Message35540           `protobuf:"bytes,144,opt,name=field37123" json:"field37123,omitempty"`
-	Field37124           *Message35542           `protobuf:"bytes,150,opt,name=field37124" json:"field37124,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37121    *UnusedEmptyMessage `protobuf:"bytes,127,opt,name=field37121" json:"field37121,omitempty"`
+	Field37122    *Message35538       `protobuf:"bytes,130,opt,name=field37122" json:"field37122,omitempty"`
+	Field37123    *Message35540       `protobuf:"bytes,144,opt,name=field37123" json:"field37123,omitempty"`
+	Field37124    *Message35542       `protobuf:"bytes,150,opt,name=field37124" json:"field37124,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36911) Reset() {
@@ -5550,11 +5494,10 @@
 }
 
 type Message36876_Message36912 struct {
-	Field37125           *Message3901            `protobuf:"bytes,153,opt,name=field37125" json:"field37125,omitempty"`
-	Field37126           *Message3901            `protobuf:"bytes,162,opt,name=field37126" json:"field37126,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37125    *Message3901 `protobuf:"bytes,153,opt,name=field37125" json:"field37125,omitempty"`
+	Field37126    *Message3901 `protobuf:"bytes,162,opt,name=field37126" json:"field37126,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36876_Message36912) Reset() {
@@ -5595,15 +5538,14 @@
 }
 
 type Message17783_Message17784 struct {
-	Field18162           *string                 `protobuf:"bytes,5,opt,name=field18162" json:"field18162,omitempty"`
-	Field18163           *string                 `protobuf:"bytes,6,opt,name=field18163" json:"field18163,omitempty"`
-	Field18164           *string                 `protobuf:"bytes,7,opt,name=field18164" json:"field18164,omitempty"`
-	Field18165           []string                `protobuf:"bytes,8,rep,name=field18165" json:"field18165,omitempty"`
-	Field18166           *string                 `protobuf:"bytes,17,opt,name=field18166" json:"field18166,omitempty"`
-	Field18167           *string                 `protobuf:"bytes,18,opt,name=field18167" json:"field18167,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field18162    *string  `protobuf:"bytes,5,opt,name=field18162" json:"field18162,omitempty"`
+	Field18163    *string  `protobuf:"bytes,6,opt,name=field18163" json:"field18163,omitempty"`
+	Field18164    *string  `protobuf:"bytes,7,opt,name=field18164" json:"field18164,omitempty"`
+	Field18165    []string `protobuf:"bytes,8,rep,name=field18165" json:"field18165,omitempty"`
+	Field18166    *string  `protobuf:"bytes,17,opt,name=field18166" json:"field18166,omitempty"`
+	Field18167    *string  `protobuf:"bytes,18,opt,name=field18167" json:"field18167,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message17783_Message17784) Reset() {
@@ -5672,15 +5614,14 @@
 }
 
 type Message17783_Message17785 struct {
-	Field18168           *string                 `protobuf:"bytes,10,opt,name=field18168" json:"field18168,omitempty"`
-	Field18169           *string                 `protobuf:"bytes,11,opt,name=field18169" json:"field18169,omitempty"`
-	Field18170           *Message17783           `protobuf:"bytes,12,opt,name=field18170" json:"field18170,omitempty"`
-	Field18171           *string                 `protobuf:"bytes,13,opt,name=field18171" json:"field18171,omitempty"`
-	Field18172           *string                 `protobuf:"bytes,14,opt,name=field18172" json:"field18172,omitempty"`
-	Field18173           []string                `protobuf:"bytes,15,rep,name=field18173" json:"field18173,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field18168    *string       `protobuf:"bytes,10,opt,name=field18168" json:"field18168,omitempty"`
+	Field18169    *string       `protobuf:"bytes,11,opt,name=field18169" json:"field18169,omitempty"`
+	Field18170    *Message17783 `protobuf:"bytes,12,opt,name=field18170" json:"field18170,omitempty"`
+	Field18171    *string       `protobuf:"bytes,13,opt,name=field18171" json:"field18171,omitempty"`
+	Field18172    *string       `protobuf:"bytes,14,opt,name=field18172" json:"field18172,omitempty"`
+	Field18173    []string      `protobuf:"bytes,15,rep,name=field18173" json:"field18173,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message17783_Message17785) Reset() {
@@ -7872,6 +7813,602 @@
 	file_datasets_google_message3_benchmark_message3_5_proto_init()
 	file_datasets_google_message3_benchmark_message3_7_proto_init()
 	file_datasets_google_message3_benchmark_message3_8_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message34390); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message34624); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message34791); i {
+			case 14:
+				return &v.sizeCache
+			case 15:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35483); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35807); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37487); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13062); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message952); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876); i {
+			case 63:
+				return &v.sizeCache
+			case 64:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message1328); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6850); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6863); i {
+			case 33:
+				return &v.sizeCache
+			case 34:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6871); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7547); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7648); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7865); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7928); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7919); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7920); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7921); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8511); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8512); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8513); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8514); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8515); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10320); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10321); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10322); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11988); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12668); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12825); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16478); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16552); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16660); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16727); i {
+			case 24:
+				return &v.sizeCache
+			case 25:
+				return &v.unknownFields
+			case 26:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16725); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message17726); i {
+			case 22:
+				return &v.sizeCache
+			case 23:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message17782); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message17783); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16945); i {
+			case 79:
+				return &v.sizeCache
+			case 80:
+				return &v.unknownFields
+			case 81:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message34791_Message34792); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36877); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36878); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36879); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36880); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36881); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36882); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36883); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36884); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36885); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36886); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36887); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36888); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36889); i {
+			case 25:
+				return &v.sizeCache
+			case 26:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36910); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36911); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36876_Message36912); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message17783_Message17784); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_1_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message17783_Message17785); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message3_benchmark_message3_1_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
index ea0d0d1..0269ec7 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
@@ -18,14 +18,13 @@
 )
 
 type Message22853 struct {
-	Field22869           *Enum22854              `protobuf:"varint,1,opt,name=field22869,enum=benchmarks.google_message3.Enum22854" json:"field22869,omitempty"`
-	Field22870           []uint32                `protobuf:"varint,2,rep,packed,name=field22870" json:"field22870,omitempty"`
-	Field22871           []float32               `protobuf:"fixed32,3,rep,packed,name=field22871" json:"field22871,omitempty"`
-	Field22872           []float32               `protobuf:"fixed32,5,rep,packed,name=field22872" json:"field22872,omitempty"`
-	Field22873           *UnusedEmptyMessage     `protobuf:"bytes,4,opt,name=field22873" json:"field22873,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field22869    *Enum22854          `protobuf:"varint,1,opt,name=field22869,enum=benchmarks.google_message3.Enum22854" json:"field22869,omitempty"`
+	Field22870    []uint32            `protobuf:"varint,2,rep,packed,name=field22870" json:"field22870,omitempty"`
+	Field22871    []float32           `protobuf:"fixed32,3,rep,packed,name=field22871" json:"field22871,omitempty"`
+	Field22872    []float32           `protobuf:"fixed32,5,rep,packed,name=field22872" json:"field22872,omitempty"`
+	Field22873    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field22873" json:"field22873,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message22853) Reset() {
@@ -87,34 +86,33 @@
 }
 
 type Message24345 struct {
-	Field24533           *string                 `protobuf:"bytes,1,opt,name=field24533" json:"field24533,omitempty"`
-	Field24534           *UnusedEnum             `protobuf:"varint,22,opt,name=field24534,enum=benchmarks.google_message3.UnusedEnum" json:"field24534,omitempty"`
-	Field24535           *Message24346           `protobuf:"bytes,2,opt,name=field24535" json:"field24535,omitempty"`
-	Field24536           *string                 `protobuf:"bytes,3,opt,name=field24536" json:"field24536,omitempty"`
-	Field24537           *string                 `protobuf:"bytes,4,opt,name=field24537" json:"field24537,omitempty"`
-	Field24538           *UnusedEnum             `protobuf:"varint,23,opt,name=field24538,enum=benchmarks.google_message3.UnusedEnum" json:"field24538,omitempty"`
-	Field24539           *string                 `protobuf:"bytes,5,opt,name=field24539" json:"field24539,omitempty"`
-	Field24540           *string                 `protobuf:"bytes,6,req,name=field24540" json:"field24540,omitempty"`
-	Field24541           *string                 `protobuf:"bytes,7,opt,name=field24541" json:"field24541,omitempty"`
-	Field24542           *string                 `protobuf:"bytes,8,opt,name=field24542" json:"field24542,omitempty"`
-	Field24543           *Message24316           `protobuf:"bytes,9,opt,name=field24543" json:"field24543,omitempty"`
-	Field24544           *Message24376           `protobuf:"bytes,10,opt,name=field24544" json:"field24544,omitempty"`
-	Field24545           *string                 `protobuf:"bytes,11,opt,name=field24545" json:"field24545,omitempty"`
-	Field24546           *string                 `protobuf:"bytes,19,opt,name=field24546" json:"field24546,omitempty"`
-	Field24547           *string                 `protobuf:"bytes,20,opt,name=field24547" json:"field24547,omitempty"`
-	Field24548           *string                 `protobuf:"bytes,21,opt,name=field24548" json:"field24548,omitempty"`
-	Field24549           *UnusedEmptyMessage     `protobuf:"bytes,12,opt,name=field24549" json:"field24549,omitempty"`
-	Field24550           *UnusedEmptyMessage     `protobuf:"bytes,13,opt,name=field24550" json:"field24550,omitempty"`
-	Field24551           []string                `protobuf:"bytes,14,rep,name=field24551" json:"field24551,omitempty"`
-	Field24552           *string                 `protobuf:"bytes,15,opt,name=field24552" json:"field24552,omitempty"`
-	Field24553           *int32                  `protobuf:"varint,18,opt,name=field24553" json:"field24553,omitempty"`
-	Field24554           *Message24379           `protobuf:"bytes,16,opt,name=field24554" json:"field24554,omitempty"`
-	Field24555           *string                 `protobuf:"bytes,17,opt,name=field24555" json:"field24555,omitempty"`
-	Field24556           []*Message24356         `protobuf:"bytes,24,rep,name=field24556" json:"field24556,omitempty"`
-	Field24557           []*Message24366         `protobuf:"bytes,25,rep,name=field24557" json:"field24557,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24533    *string             `protobuf:"bytes,1,opt,name=field24533" json:"field24533,omitempty"`
+	Field24534    *UnusedEnum         `protobuf:"varint,22,opt,name=field24534,enum=benchmarks.google_message3.UnusedEnum" json:"field24534,omitempty"`
+	Field24535    *Message24346       `protobuf:"bytes,2,opt,name=field24535" json:"field24535,omitempty"`
+	Field24536    *string             `protobuf:"bytes,3,opt,name=field24536" json:"field24536,omitempty"`
+	Field24537    *string             `protobuf:"bytes,4,opt,name=field24537" json:"field24537,omitempty"`
+	Field24538    *UnusedEnum         `protobuf:"varint,23,opt,name=field24538,enum=benchmarks.google_message3.UnusedEnum" json:"field24538,omitempty"`
+	Field24539    *string             `protobuf:"bytes,5,opt,name=field24539" json:"field24539,omitempty"`
+	Field24540    *string             `protobuf:"bytes,6,req,name=field24540" json:"field24540,omitempty"`
+	Field24541    *string             `protobuf:"bytes,7,opt,name=field24541" json:"field24541,omitempty"`
+	Field24542    *string             `protobuf:"bytes,8,opt,name=field24542" json:"field24542,omitempty"`
+	Field24543    *Message24316       `protobuf:"bytes,9,opt,name=field24543" json:"field24543,omitempty"`
+	Field24544    *Message24376       `protobuf:"bytes,10,opt,name=field24544" json:"field24544,omitempty"`
+	Field24545    *string             `protobuf:"bytes,11,opt,name=field24545" json:"field24545,omitempty"`
+	Field24546    *string             `protobuf:"bytes,19,opt,name=field24546" json:"field24546,omitempty"`
+	Field24547    *string             `protobuf:"bytes,20,opt,name=field24547" json:"field24547,omitempty"`
+	Field24548    *string             `protobuf:"bytes,21,opt,name=field24548" json:"field24548,omitempty"`
+	Field24549    *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field24549" json:"field24549,omitempty"`
+	Field24550    *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field24550" json:"field24550,omitempty"`
+	Field24551    []string            `protobuf:"bytes,14,rep,name=field24551" json:"field24551,omitempty"`
+	Field24552    *string             `protobuf:"bytes,15,opt,name=field24552" json:"field24552,omitempty"`
+	Field24553    *int32              `protobuf:"varint,18,opt,name=field24553" json:"field24553,omitempty"`
+	Field24554    *Message24379       `protobuf:"bytes,16,opt,name=field24554" json:"field24554,omitempty"`
+	Field24555    *string             `protobuf:"bytes,17,opt,name=field24555" json:"field24555,omitempty"`
+	Field24556    []*Message24356     `protobuf:"bytes,24,rep,name=field24556" json:"field24556,omitempty"`
+	Field24557    []*Message24366     `protobuf:"bytes,25,rep,name=field24557" json:"field24557,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24345) Reset() {
@@ -316,11 +314,10 @@
 }
 
 type Message24403 struct {
-	Field24681           *Message24401           `protobuf:"bytes,1,opt,name=field24681" json:"field24681,omitempty"`
-	Field24682           *Message24402           `protobuf:"bytes,2,opt,name=field24682" json:"field24682,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24681    *Message24401 `protobuf:"bytes,1,opt,name=field24681" json:"field24681,omitempty"`
+	Field24682    *Message24402 `protobuf:"bytes,2,opt,name=field24682" json:"field24682,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24403) Reset() {
@@ -361,34 +358,33 @@
 }
 
 type Message24391 struct {
-	Field24631           *string                 `protobuf:"bytes,1,opt,name=field24631" json:"field24631,omitempty"`
-	Field24632           *string                 `protobuf:"bytes,2,opt,name=field24632" json:"field24632,omitempty"`
-	Field24633           []string                `protobuf:"bytes,3,rep,name=field24633" json:"field24633,omitempty"`
-	Field24634           *string                 `protobuf:"bytes,4,opt,name=field24634" json:"field24634,omitempty"`
-	Field24635           []string                `protobuf:"bytes,5,rep,name=field24635" json:"field24635,omitempty"`
-	Field24636           []string                `protobuf:"bytes,16,rep,name=field24636" json:"field24636,omitempty"`
-	Field24637           *string                 `protobuf:"bytes,17,opt,name=field24637" json:"field24637,omitempty"`
-	Field24638           *UnusedEmptyMessage     `protobuf:"bytes,25,opt,name=field24638" json:"field24638,omitempty"`
-	Field24639           *string                 `protobuf:"bytes,7,opt,name=field24639" json:"field24639,omitempty"`
-	Field24640           *string                 `protobuf:"bytes,18,opt,name=field24640" json:"field24640,omitempty"`
-	Field24641           *string                 `protobuf:"bytes,19,opt,name=field24641" json:"field24641,omitempty"`
-	Field24642           *string                 `protobuf:"bytes,20,opt,name=field24642" json:"field24642,omitempty"`
-	Field24643           *int32                  `protobuf:"varint,24,opt,name=field24643" json:"field24643,omitempty"`
-	Field24644           *Message24379           `protobuf:"bytes,8,opt,name=field24644" json:"field24644,omitempty"`
-	Field24645           []*UnusedEmptyMessage   `protobuf:"bytes,9,rep,name=field24645" json:"field24645,omitempty"`
-	Field24646           *UnusedEmptyMessage     `protobuf:"bytes,10,opt,name=field24646" json:"field24646,omitempty"`
-	Field24647           *UnusedEmptyMessage     `protobuf:"bytes,11,opt,name=field24647" json:"field24647,omitempty"`
-	Field24648           *UnusedEmptyMessage     `protobuf:"bytes,12,opt,name=field24648" json:"field24648,omitempty"`
-	Field24649           []*UnusedEmptyMessage   `protobuf:"bytes,13,rep,name=field24649" json:"field24649,omitempty"`
-	Field24650           *UnusedEmptyMessage     `protobuf:"bytes,14,opt,name=field24650" json:"field24650,omitempty"`
-	Field24651           *string                 `protobuf:"bytes,21,opt,name=field24651" json:"field24651,omitempty"`
-	Field24652           *int32                  `protobuf:"varint,22,opt,name=field24652" json:"field24652,omitempty"`
-	Field24653           *int32                  `protobuf:"varint,23,opt,name=field24653" json:"field24653,omitempty"`
-	Field24654           []string                `protobuf:"bytes,15,rep,name=field24654" json:"field24654,omitempty"`
-	Field24655           []string                `protobuf:"bytes,6,rep,name=field24655" json:"field24655,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24631    *string               `protobuf:"bytes,1,opt,name=field24631" json:"field24631,omitempty"`
+	Field24632    *string               `protobuf:"bytes,2,opt,name=field24632" json:"field24632,omitempty"`
+	Field24633    []string              `protobuf:"bytes,3,rep,name=field24633" json:"field24633,omitempty"`
+	Field24634    *string               `protobuf:"bytes,4,opt,name=field24634" json:"field24634,omitempty"`
+	Field24635    []string              `protobuf:"bytes,5,rep,name=field24635" json:"field24635,omitempty"`
+	Field24636    []string              `protobuf:"bytes,16,rep,name=field24636" json:"field24636,omitempty"`
+	Field24637    *string               `protobuf:"bytes,17,opt,name=field24637" json:"field24637,omitempty"`
+	Field24638    *UnusedEmptyMessage   `protobuf:"bytes,25,opt,name=field24638" json:"field24638,omitempty"`
+	Field24639    *string               `protobuf:"bytes,7,opt,name=field24639" json:"field24639,omitempty"`
+	Field24640    *string               `protobuf:"bytes,18,opt,name=field24640" json:"field24640,omitempty"`
+	Field24641    *string               `protobuf:"bytes,19,opt,name=field24641" json:"field24641,omitempty"`
+	Field24642    *string               `protobuf:"bytes,20,opt,name=field24642" json:"field24642,omitempty"`
+	Field24643    *int32                `protobuf:"varint,24,opt,name=field24643" json:"field24643,omitempty"`
+	Field24644    *Message24379         `protobuf:"bytes,8,opt,name=field24644" json:"field24644,omitempty"`
+	Field24645    []*UnusedEmptyMessage `protobuf:"bytes,9,rep,name=field24645" json:"field24645,omitempty"`
+	Field24646    *UnusedEmptyMessage   `protobuf:"bytes,10,opt,name=field24646" json:"field24646,omitempty"`
+	Field24647    *UnusedEmptyMessage   `protobuf:"bytes,11,opt,name=field24647" json:"field24647,omitempty"`
+	Field24648    *UnusedEmptyMessage   `protobuf:"bytes,12,opt,name=field24648" json:"field24648,omitempty"`
+	Field24649    []*UnusedEmptyMessage `protobuf:"bytes,13,rep,name=field24649" json:"field24649,omitempty"`
+	Field24650    *UnusedEmptyMessage   `protobuf:"bytes,14,opt,name=field24650" json:"field24650,omitempty"`
+	Field24651    *string               `protobuf:"bytes,21,opt,name=field24651" json:"field24651,omitempty"`
+	Field24652    *int32                `protobuf:"varint,22,opt,name=field24652" json:"field24652,omitempty"`
+	Field24653    *int32                `protobuf:"varint,23,opt,name=field24653" json:"field24653,omitempty"`
+	Field24654    []string              `protobuf:"bytes,15,rep,name=field24654" json:"field24654,omitempty"`
+	Field24655    []string              `protobuf:"bytes,6,rep,name=field24655" json:"field24655,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24391) Reset() {
@@ -590,9 +586,8 @@
 }
 
 type Message27454 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message27454) Reset() {
@@ -619,14 +614,13 @@
 }
 
 type Message27357 struct {
-	Field27410           *string                 `protobuf:"bytes,1,opt,name=field27410" json:"field27410,omitempty"`
-	Field27411           *float32                `protobuf:"fixed32,2,opt,name=field27411" json:"field27411,omitempty"`
-	Field27412           *string                 `protobuf:"bytes,3,opt,name=field27412" json:"field27412,omitempty"`
-	Field27413           *bool                   `protobuf:"varint,4,opt,name=field27413" json:"field27413,omitempty"`
-	Field27414           *bool                   `protobuf:"varint,5,opt,name=field27414" json:"field27414,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field27410    *string  `protobuf:"bytes,1,opt,name=field27410" json:"field27410,omitempty"`
+	Field27411    *float32 `protobuf:"fixed32,2,opt,name=field27411" json:"field27411,omitempty"`
+	Field27412    *string  `protobuf:"bytes,3,opt,name=field27412" json:"field27412,omitempty"`
+	Field27413    *bool    `protobuf:"varint,4,opt,name=field27413" json:"field27413,omitempty"`
+	Field27414    *bool    `protobuf:"varint,5,opt,name=field27414" json:"field27414,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message27357) Reset() {
@@ -688,13 +682,12 @@
 }
 
 type Message27360 struct {
-	Field27426           *Message27358           `protobuf:"bytes,1,opt,name=field27426" json:"field27426,omitempty"`
-	Field27427           *Enum27361              `protobuf:"varint,2,opt,name=field27427,enum=benchmarks.google_message3.Enum27361" json:"field27427,omitempty"`
-	Field27428           *Message27358           `protobuf:"bytes,3,opt,name=field27428" json:"field27428,omitempty"`
-	Field27429           []*UnusedEmptyMessage   `protobuf:"bytes,4,rep,name=field27429" json:"field27429,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field27426    *Message27358         `protobuf:"bytes,1,opt,name=field27426" json:"field27426,omitempty"`
+	Field27427    *Enum27361            `protobuf:"varint,2,opt,name=field27427,enum=benchmarks.google_message3.Enum27361" json:"field27427,omitempty"`
+	Field27428    *Message27358         `protobuf:"bytes,3,opt,name=field27428" json:"field27428,omitempty"`
+	Field27429    []*UnusedEmptyMessage `protobuf:"bytes,4,rep,name=field27429" json:"field27429,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message27360) Reset() {
@@ -749,14 +742,13 @@
 }
 
 type Message34387 struct {
-	Field34446           *string                 `protobuf:"bytes,1,opt,name=field34446" json:"field34446,omitempty"`
-	Field34447           []*Message34381         `protobuf:"bytes,2,rep,name=field34447" json:"field34447,omitempty"`
-	Field34448           *UnusedEnum             `protobuf:"varint,3,opt,name=field34448,enum=benchmarks.google_message3.UnusedEnum" json:"field34448,omitempty"`
-	Field34449           *Enum34388              `protobuf:"varint,4,opt,name=field34449,enum=benchmarks.google_message3.Enum34388" json:"field34449,omitempty"`
-	Field34450           *int64                  `protobuf:"varint,5,opt,name=field34450" json:"field34450,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field34446    *string         `protobuf:"bytes,1,opt,name=field34446" json:"field34446,omitempty"`
+	Field34447    []*Message34381 `protobuf:"bytes,2,rep,name=field34447" json:"field34447,omitempty"`
+	Field34448    *UnusedEnum     `protobuf:"varint,3,opt,name=field34448,enum=benchmarks.google_message3.UnusedEnum" json:"field34448,omitempty"`
+	Field34449    *Enum34388      `protobuf:"varint,4,opt,name=field34449,enum=benchmarks.google_message3.Enum34388" json:"field34449,omitempty"`
+	Field34450    *int64          `protobuf:"varint,5,opt,name=field34450" json:"field34450,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message34387) Reset() {
@@ -818,27 +810,26 @@
 }
 
 type Message34621 struct {
-	Field34651           *float64                `protobuf:"fixed64,1,opt,name=field34651" json:"field34651,omitempty"`
-	Field34652           *float64                `protobuf:"fixed64,2,opt,name=field34652" json:"field34652,omitempty"`
-	Field34653           *float64                `protobuf:"fixed64,3,opt,name=field34653" json:"field34653,omitempty"`
-	Field34654           *float64                `protobuf:"fixed64,4,opt,name=field34654" json:"field34654,omitempty"`
-	Field34655           *float64                `protobuf:"fixed64,11,opt,name=field34655" json:"field34655,omitempty"`
-	Field34656           *UnusedEmptyMessage     `protobuf:"bytes,13,opt,name=field34656" json:"field34656,omitempty"`
-	Field34657           *Message34619           `protobuf:"bytes,14,opt,name=field34657" json:"field34657,omitempty"`
-	Field34658           *string                 `protobuf:"bytes,5,opt,name=field34658" json:"field34658,omitempty"`
-	Field34659           *string                 `protobuf:"bytes,9,opt,name=field34659" json:"field34659,omitempty"`
-	Field34660           *float64                `protobuf:"fixed64,12,opt,name=field34660" json:"field34660,omitempty"`
-	Field34661           []byte                  `protobuf:"bytes,19,opt,name=field34661" json:"field34661,omitempty"`
-	Field34662           *string                 `protobuf:"bytes,15,opt,name=field34662" json:"field34662,omitempty"`
-	Field34663           *string                 `protobuf:"bytes,16,opt,name=field34663" json:"field34663,omitempty"`
-	Field34664           *string                 `protobuf:"bytes,17,opt,name=field34664" json:"field34664,omitempty"`
-	Field34665           *UnusedEmptyMessage     `protobuf:"bytes,18,opt,name=field34665" json:"field34665,omitempty"`
-	Field34666           *Message34621           `protobuf:"bytes,20,opt,name=field34666" json:"field34666,omitempty"`
-	Field34667           []*UnusedEmptyMessage   `protobuf:"bytes,100,rep,name=field34667" json:"field34667,omitempty"`
-	Field34668           *UnusedEmptyMessage     `protobuf:"bytes,101,opt,name=field34668" json:"field34668,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field34651    *float64              `protobuf:"fixed64,1,opt,name=field34651" json:"field34651,omitempty"`
+	Field34652    *float64              `protobuf:"fixed64,2,opt,name=field34652" json:"field34652,omitempty"`
+	Field34653    *float64              `protobuf:"fixed64,3,opt,name=field34653" json:"field34653,omitempty"`
+	Field34654    *float64              `protobuf:"fixed64,4,opt,name=field34654" json:"field34654,omitempty"`
+	Field34655    *float64              `protobuf:"fixed64,11,opt,name=field34655" json:"field34655,omitempty"`
+	Field34656    *UnusedEmptyMessage   `protobuf:"bytes,13,opt,name=field34656" json:"field34656,omitempty"`
+	Field34657    *Message34619         `protobuf:"bytes,14,opt,name=field34657" json:"field34657,omitempty"`
+	Field34658    *string               `protobuf:"bytes,5,opt,name=field34658" json:"field34658,omitempty"`
+	Field34659    *string               `protobuf:"bytes,9,opt,name=field34659" json:"field34659,omitempty"`
+	Field34660    *float64              `protobuf:"fixed64,12,opt,name=field34660" json:"field34660,omitempty"`
+	Field34661    []byte                `protobuf:"bytes,19,opt,name=field34661" json:"field34661,omitempty"`
+	Field34662    *string               `protobuf:"bytes,15,opt,name=field34662" json:"field34662,omitempty"`
+	Field34663    *string               `protobuf:"bytes,16,opt,name=field34663" json:"field34663,omitempty"`
+	Field34664    *string               `protobuf:"bytes,17,opt,name=field34664" json:"field34664,omitempty"`
+	Field34665    *UnusedEmptyMessage   `protobuf:"bytes,18,opt,name=field34665" json:"field34665,omitempty"`
+	Field34666    *Message34621         `protobuf:"bytes,20,opt,name=field34666" json:"field34666,omitempty"`
+	Field34667    []*UnusedEmptyMessage `protobuf:"bytes,100,rep,name=field34667" json:"field34667,omitempty"`
+	Field34668    *UnusedEmptyMessage   `protobuf:"bytes,101,opt,name=field34668" json:"field34668,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message34621) Reset() {
@@ -991,23 +982,22 @@
 }
 
 type Message35476 struct {
-	Field35484           *string                 `protobuf:"bytes,1,opt,name=field35484" json:"field35484,omitempty"`
-	Field35485           *string                 `protobuf:"bytes,2,opt,name=field35485" json:"field35485,omitempty"`
-	Field35486           *string                 `protobuf:"bytes,3,opt,name=field35486" json:"field35486,omitempty"`
-	Field35487           *Enum35477              `protobuf:"varint,4,opt,name=field35487,enum=benchmarks.google_message3.Enum35477" json:"field35487,omitempty"`
-	Field35488           *float32                `protobuf:"fixed32,5,opt,name=field35488" json:"field35488,omitempty"`
-	Field35489           *float32                `protobuf:"fixed32,6,opt,name=field35489" json:"field35489,omitempty"`
-	Field35490           *float32                `protobuf:"fixed32,7,opt,name=field35490" json:"field35490,omitempty"`
-	Field35491           *float32                `protobuf:"fixed32,8,opt,name=field35491" json:"field35491,omitempty"`
-	Field35492           *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field35492" json:"field35492,omitempty"`
-	Field35493           *int32                  `protobuf:"varint,10,opt,name=field35493" json:"field35493,omitempty"`
-	Field35494           *int32                  `protobuf:"varint,11,opt,name=field35494" json:"field35494,omitempty"`
-	Field35495           *int32                  `protobuf:"varint,12,opt,name=field35495" json:"field35495,omitempty"`
-	Field35496           *string                 `protobuf:"bytes,13,opt,name=field35496" json:"field35496,omitempty"`
-	Field35497           *string                 `protobuf:"bytes,14,opt,name=field35497" json:"field35497,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35484    *string             `protobuf:"bytes,1,opt,name=field35484" json:"field35484,omitempty"`
+	Field35485    *string             `protobuf:"bytes,2,opt,name=field35485" json:"field35485,omitempty"`
+	Field35486    *string             `protobuf:"bytes,3,opt,name=field35486" json:"field35486,omitempty"`
+	Field35487    *Enum35477          `protobuf:"varint,4,opt,name=field35487,enum=benchmarks.google_message3.Enum35477" json:"field35487,omitempty"`
+	Field35488    *float32            `protobuf:"fixed32,5,opt,name=field35488" json:"field35488,omitempty"`
+	Field35489    *float32            `protobuf:"fixed32,6,opt,name=field35489" json:"field35489,omitempty"`
+	Field35490    *float32            `protobuf:"fixed32,7,opt,name=field35490" json:"field35490,omitempty"`
+	Field35491    *float32            `protobuf:"fixed32,8,opt,name=field35491" json:"field35491,omitempty"`
+	Field35492    *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field35492" json:"field35492,omitempty"`
+	Field35493    *int32              `protobuf:"varint,10,opt,name=field35493" json:"field35493,omitempty"`
+	Field35494    *int32              `protobuf:"varint,11,opt,name=field35494" json:"field35494,omitempty"`
+	Field35495    *int32              `protobuf:"varint,12,opt,name=field35495" json:"field35495,omitempty"`
+	Field35496    *string             `protobuf:"bytes,13,opt,name=field35496" json:"field35496,omitempty"`
+	Field35497    *string             `protobuf:"bytes,14,opt,name=field35497" json:"field35497,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35476) Reset() {
@@ -1132,16 +1122,15 @@
 }
 
 type Message949 struct {
-	Field955             *string                 `protobuf:"bytes,1,opt,name=field955" json:"field955,omitempty"`
-	Field956             *int64                  `protobuf:"varint,2,opt,name=field956" json:"field956,omitempty"`
-	Field957             *int64                  `protobuf:"varint,3,opt,name=field957" json:"field957,omitempty"`
-	Field958             *Message730             `protobuf:"bytes,4,opt,name=field958" json:"field958,omitempty"`
-	Field959             []string                `protobuf:"bytes,5,rep,name=field959" json:"field959,omitempty"`
-	Field960             *string                 `protobuf:"bytes,6,opt,name=field960" json:"field960,omitempty"`
-	Field961             *bool                   `protobuf:"varint,7,opt,name=field961" json:"field961,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field955      *string     `protobuf:"bytes,1,opt,name=field955" json:"field955,omitempty"`
+	Field956      *int64      `protobuf:"varint,2,opt,name=field956" json:"field956,omitempty"`
+	Field957      *int64      `protobuf:"varint,3,opt,name=field957" json:"field957,omitempty"`
+	Field958      *Message730 `protobuf:"bytes,4,opt,name=field958" json:"field958,omitempty"`
+	Field959      []string    `protobuf:"bytes,5,rep,name=field959" json:"field959,omitempty"`
+	Field960      *string     `protobuf:"bytes,6,opt,name=field960" json:"field960,omitempty"`
+	Field961      *bool       `protobuf:"varint,7,opt,name=field961" json:"field961,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message949) Reset() {
@@ -1217,11 +1206,10 @@
 }
 
 type Message36869 struct {
-	Field36970           *int32                  `protobuf:"varint,1,opt,name=field36970" json:"field36970,omitempty"`
-	Field36971           *int32                  `protobuf:"varint,2,opt,name=field36971" json:"field36971,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field36970    *int32 `protobuf:"varint,1,opt,name=field36970" json:"field36970,omitempty"`
+	Field36971    *int32 `protobuf:"varint,2,opt,name=field36971" json:"field36971,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36869) Reset() {
@@ -1262,14 +1250,13 @@
 }
 
 type Message33968 struct {
-	Message33969         []*Message33968_Message33969 `protobuf:"group,1,rep,name=Message33969,json=message33969" json:"message33969,omitempty"`
-	Field33989           []*Message33958              `protobuf:"bytes,3,rep,name=field33989" json:"field33989,omitempty"`
-	Field33990           *UnusedEmptyMessage          `protobuf:"bytes,106,opt,name=field33990" json:"field33990,omitempty"`
-	Field33991           *bool                        `protobuf:"varint,108,opt,name=field33991" json:"field33991,omitempty"`
-	Field33992           *UnusedEnum                  `protobuf:"varint,107,opt,name=field33992,enum=benchmarks.google_message3.UnusedEnum" json:"field33992,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Message33969  []*Message33968_Message33969 `protobuf:"group,1,rep,name=Message33969,json=message33969" json:"message33969,omitempty"`
+	Field33989    []*Message33958              `protobuf:"bytes,3,rep,name=field33989" json:"field33989,omitempty"`
+	Field33990    *UnusedEmptyMessage          `protobuf:"bytes,106,opt,name=field33990" json:"field33990,omitempty"`
+	Field33991    *bool                        `protobuf:"varint,108,opt,name=field33991" json:"field33991,omitempty"`
+	Field33992    *UnusedEnum                  `protobuf:"varint,107,opt,name=field33992,enum=benchmarks.google_message3.UnusedEnum" json:"field33992,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message33968) Reset() {
@@ -1331,25 +1318,24 @@
 }
 
 type Message6644 struct {
-	Field6701            *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field6701" json:"field6701,omitempty"`
-	Field6702            *string                 `protobuf:"bytes,1,opt,name=field6702" json:"field6702,omitempty"`
-	Field6703            *float64                `protobuf:"fixed64,2,opt,name=field6703" json:"field6703,omitempty"`
-	Field6704            *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field6704" json:"field6704,omitempty"`
-	Field6705            []byte                  `protobuf:"bytes,3,opt,name=field6705" json:"field6705,omitempty"`
-	Field6706            []byte                  `protobuf:"bytes,19,opt,name=field6706" json:"field6706,omitempty"`
-	Field6707            *Message6637            `protobuf:"bytes,4,opt,name=field6707" json:"field6707,omitempty"`
-	Field6708            []*Message6126          `protobuf:"bytes,18,rep,name=field6708" json:"field6708,omitempty"`
-	Field6709            *bool                   `protobuf:"varint,6,opt,name=field6709" json:"field6709,omitempty"`
-	Field6710            *Message6643            `protobuf:"bytes,10,opt,name=field6710" json:"field6710,omitempty"`
-	Field6711            *string                 `protobuf:"bytes,12,opt,name=field6711" json:"field6711,omitempty"`
-	Field6712            *UnusedEmptyMessage     `protobuf:"bytes,14,opt,name=field6712" json:"field6712,omitempty"`
-	Field6713            *UnusedEmptyMessage     `protobuf:"bytes,15,opt,name=field6713" json:"field6713,omitempty"`
-	Field6714            *UnusedEmptyMessage     `protobuf:"bytes,16,opt,name=field6714" json:"field6714,omitempty"`
-	Field6715            *int32                  `protobuf:"varint,17,opt,name=field6715" json:"field6715,omitempty"`
-	Field6716            *UnusedEmptyMessage     `protobuf:"bytes,20,opt,name=field6716" json:"field6716,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6701     *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field6701" json:"field6701,omitempty"`
+	Field6702     *string             `protobuf:"bytes,1,opt,name=field6702" json:"field6702,omitempty"`
+	Field6703     *float64            `protobuf:"fixed64,2,opt,name=field6703" json:"field6703,omitempty"`
+	Field6704     *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field6704" json:"field6704,omitempty"`
+	Field6705     []byte              `protobuf:"bytes,3,opt,name=field6705" json:"field6705,omitempty"`
+	Field6706     []byte              `protobuf:"bytes,19,opt,name=field6706" json:"field6706,omitempty"`
+	Field6707     *Message6637        `protobuf:"bytes,4,opt,name=field6707" json:"field6707,omitempty"`
+	Field6708     []*Message6126      `protobuf:"bytes,18,rep,name=field6708" json:"field6708,omitempty"`
+	Field6709     *bool               `protobuf:"varint,6,opt,name=field6709" json:"field6709,omitempty"`
+	Field6710     *Message6643        `protobuf:"bytes,10,opt,name=field6710" json:"field6710,omitempty"`
+	Field6711     *string             `protobuf:"bytes,12,opt,name=field6711" json:"field6711,omitempty"`
+	Field6712     *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field6712" json:"field6712,omitempty"`
+	Field6713     *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field6713" json:"field6713,omitempty"`
+	Field6714     *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field6714" json:"field6714,omitempty"`
+	Field6715     *int32              `protobuf:"varint,17,opt,name=field6715" json:"field6715,omitempty"`
+	Field6716     *UnusedEmptyMessage `protobuf:"bytes,20,opt,name=field6716" json:"field6716,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6644) Reset() {
@@ -1488,10 +1474,9 @@
 }
 
 type Message18831 struct {
-	Message18832         []*Message18831_Message18832 `protobuf:"group,1,rep,name=Message18832,json=message18832" json:"message18832,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Message18832  []*Message18831_Message18832 `protobuf:"group,1,rep,name=Message18832,json=message18832" json:"message18832,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18831) Reset() {
@@ -1525,11 +1510,10 @@
 }
 
 type Message13090 struct {
-	Field13141           *Message13083           `protobuf:"bytes,1,opt,name=field13141" json:"field13141,omitempty"`
-	Field13142           *Message13088           `protobuf:"bytes,2,opt,name=field13142" json:"field13142,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13141    *Message13083 `protobuf:"bytes,1,opt,name=field13141" json:"field13141,omitempty"`
+	Field13142    *Message13088 `protobuf:"bytes,2,opt,name=field13142" json:"field13142,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13090) Reset() {
@@ -1570,14 +1554,13 @@
 }
 
 type Message11874 struct {
-	Field11888             *Message10391             `protobuf:"bytes,3,opt,name=field11888" json:"field11888,omitempty"`
-	Field11889             *string                   `protobuf:"bytes,4,opt,name=field11889" json:"field11889,omitempty"`
-	Field11890             *Message11873             `protobuf:"bytes,6,opt,name=field11890" json:"field11890,omitempty"`
-	Field11891             *bool                     `protobuf:"varint,7,opt,name=field11891" json:"field11891,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field11888      *Message10391 `protobuf:"bytes,3,opt,name=field11888" json:"field11888,omitempty"`
+	Field11889      *string       `protobuf:"bytes,4,opt,name=field11889" json:"field11889,omitempty"`
+	Field11890      *Message11873 `protobuf:"bytes,6,opt,name=field11890" json:"field11890,omitempty"`
+	Field11891      *bool         `protobuf:"varint,7,opt,name=field11891" json:"field11891,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message11874) Reset() {
@@ -1643,10 +1626,9 @@
 }
 
 type Message4144 struct {
-	Message4145          []*Message4144_Message4145 `protobuf:"group,1,rep,name=Message4145,json=message4145" json:"message4145,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Message4145   []*Message4144_Message4145 `protobuf:"group,1,rep,name=Message4145,json=message4145" json:"message4145,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message4144) Reset() {
@@ -1680,20 +1662,19 @@
 }
 
 type Message35573 struct {
-	Field35695           *uint64                      `protobuf:"fixed64,16,opt,name=field35695" json:"field35695,omitempty"`
-	Field35696           *string                      `protobuf:"bytes,1000,opt,name=field35696" json:"field35696,omitempty"`
-	Field35697           *string                      `protobuf:"bytes,1004,opt,name=field35697" json:"field35697,omitempty"`
-	Field35698           *int32                       `protobuf:"varint,1003,opt,name=field35698" json:"field35698,omitempty"`
-	Message35574         []*Message35573_Message35574 `protobuf:"group,1012,rep,name=Message35574,json=message35574" json:"message35574,omitempty"`
-	Field35700           *int64                       `protobuf:"varint,1011,opt,name=field35700" json:"field35700,omitempty"`
-	Field35701           *int64                       `protobuf:"varint,1005,opt,name=field35701" json:"field35701,omitempty"`
-	Field35702           *int64                       `protobuf:"varint,1006,opt,name=field35702" json:"field35702,omitempty"`
-	Field35703           *int64                       `protobuf:"varint,1007,opt,name=field35703" json:"field35703,omitempty"`
-	Field35704           *int64                       `protobuf:"varint,1008,opt,name=field35704" json:"field35704,omitempty"`
-	Message35575         []*Message35573_Message35575 `protobuf:"group,1,rep,name=Message35575,json=message35575" json:"message35575,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field35695    *uint64                      `protobuf:"fixed64,16,opt,name=field35695" json:"field35695,omitempty"`
+	Field35696    *string                      `protobuf:"bytes,1000,opt,name=field35696" json:"field35696,omitempty"`
+	Field35697    *string                      `protobuf:"bytes,1004,opt,name=field35697" json:"field35697,omitempty"`
+	Field35698    *int32                       `protobuf:"varint,1003,opt,name=field35698" json:"field35698,omitempty"`
+	Message35574  []*Message35573_Message35574 `protobuf:"group,1012,rep,name=Message35574,json=message35574" json:"message35574,omitempty"`
+	Field35700    *int64                       `protobuf:"varint,1011,opt,name=field35700" json:"field35700,omitempty"`
+	Field35701    *int64                       `protobuf:"varint,1005,opt,name=field35701" json:"field35701,omitempty"`
+	Field35702    *int64                       `protobuf:"varint,1006,opt,name=field35702" json:"field35702,omitempty"`
+	Field35703    *int64                       `protobuf:"varint,1007,opt,name=field35703" json:"field35703,omitempty"`
+	Field35704    *int64                       `protobuf:"varint,1008,opt,name=field35704" json:"field35704,omitempty"`
+	Message35575  []*Message35573_Message35575 `protobuf:"group,1,rep,name=Message35575,json=message35575" json:"message35575,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35573) Reset() {
@@ -1797,21 +1778,20 @@
 }
 
 type Message36858 struct {
-	Field36956           []int32                      `protobuf:"varint,1,rep,name=field36956" json:"field36956,omitempty"`
-	Field36957           []string                     `protobuf:"bytes,2,rep,name=field36957" json:"field36957,omitempty"`
-	Field36958           []string                     `protobuf:"bytes,12,rep,name=field36958" json:"field36958,omitempty"`
-	Field36959           *int32                       `protobuf:"varint,3,opt,name=field36959" json:"field36959,omitempty"`
-	Field36960           *int32                       `protobuf:"varint,4,opt,name=field36960" json:"field36960,omitempty"`
-	Field36961           *int32                       `protobuf:"varint,14,opt,name=field36961" json:"field36961,omitempty"`
-	Field36962           *string                      `protobuf:"bytes,11,opt,name=field36962" json:"field36962,omitempty"`
-	Field36963           *bool                        `protobuf:"varint,5,opt,name=field36963" json:"field36963,omitempty"`
-	Field36964           *bool                        `protobuf:"varint,13,opt,name=field36964" json:"field36964,omitempty"`
-	Field36965           *int64                       `protobuf:"varint,6,opt,name=field36965" json:"field36965,omitempty"`
-	Field36966           *Message35506                `protobuf:"bytes,7,opt,name=field36966" json:"field36966,omitempty"`
-	Message36859         []*Message36858_Message36859 `protobuf:"group,8,rep,name=Message36859,json=message36859" json:"message36859,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field36956    []int32                      `protobuf:"varint,1,rep,name=field36956" json:"field36956,omitempty"`
+	Field36957    []string                     `protobuf:"bytes,2,rep,name=field36957" json:"field36957,omitempty"`
+	Field36958    []string                     `protobuf:"bytes,12,rep,name=field36958" json:"field36958,omitempty"`
+	Field36959    *int32                       `protobuf:"varint,3,opt,name=field36959" json:"field36959,omitempty"`
+	Field36960    *int32                       `protobuf:"varint,4,opt,name=field36960" json:"field36960,omitempty"`
+	Field36961    *int32                       `protobuf:"varint,14,opt,name=field36961" json:"field36961,omitempty"`
+	Field36962    *string                      `protobuf:"bytes,11,opt,name=field36962" json:"field36962,omitempty"`
+	Field36963    *bool                        `protobuf:"varint,5,opt,name=field36963" json:"field36963,omitempty"`
+	Field36964    *bool                        `protobuf:"varint,13,opt,name=field36964" json:"field36964,omitempty"`
+	Field36965    *int64                       `protobuf:"varint,6,opt,name=field36965" json:"field36965,omitempty"`
+	Field36966    *Message35506                `protobuf:"bytes,7,opt,name=field36966" json:"field36966,omitempty"`
+	Message36859  []*Message36858_Message36859 `protobuf:"group,8,rep,name=Message36859,json=message36859" json:"message36859,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36858) Reset() {
@@ -1922,30 +1902,29 @@
 }
 
 type Message13174 struct {
-	Field13237           *int32                  `protobuf:"varint,6,req,name=field13237" json:"field13237,omitempty"`
-	Field13238           *int32                  `protobuf:"varint,3,opt,name=field13238" json:"field13238,omitempty"`
-	Field13239           *int32                  `protobuf:"varint,4,req,name=field13239" json:"field13239,omitempty"`
-	Field13240           *int32                  `protobuf:"varint,8,opt,name=field13240" json:"field13240,omitempty"`
-	Field13241           *float64                `protobuf:"fixed64,5,opt,name=field13241" json:"field13241,omitempty"`
-	Field13242           *float64                `protobuf:"fixed64,7,opt,name=field13242" json:"field13242,omitempty"`
-	Field13243           *int32                  `protobuf:"varint,17,opt,name=field13243" json:"field13243,omitempty"`
-	Field13244           *int32                  `protobuf:"varint,19,opt,name=field13244" json:"field13244,omitempty"`
-	Field13245           *float64                `protobuf:"fixed64,20,opt,name=field13245" json:"field13245,omitempty"`
-	Field13246           *int32                  `protobuf:"varint,9,opt,name=field13246" json:"field13246,omitempty"`
-	Field13247           *float64                `protobuf:"fixed64,10,opt,name=field13247" json:"field13247,omitempty"`
-	Field13248           *int32                  `protobuf:"varint,11,opt,name=field13248" json:"field13248,omitempty"`
-	Field13249           *Message13151           `protobuf:"bytes,21,opt,name=field13249" json:"field13249,omitempty"`
-	Field13250           *int32                  `protobuf:"varint,1,opt,name=field13250" json:"field13250,omitempty"`
-	Field13251           *float64                `protobuf:"fixed64,2,opt,name=field13251" json:"field13251,omitempty"`
-	Field13252           *float64                `protobuf:"fixed64,15,opt,name=field13252" json:"field13252,omitempty"`
-	Field13253           *float64                `protobuf:"fixed64,16,opt,name=field13253" json:"field13253,omitempty"`
-	Field13254           *float64                `protobuf:"fixed64,12,opt,name=field13254" json:"field13254,omitempty"`
-	Field13255           *float64                `protobuf:"fixed64,13,opt,name=field13255" json:"field13255,omitempty"`
-	Field13256           *float64                `protobuf:"fixed64,14,opt,name=field13256" json:"field13256,omitempty"`
-	Field13257           *int32                  `protobuf:"varint,18,opt,name=field13257" json:"field13257,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13237    *int32        `protobuf:"varint,6,req,name=field13237" json:"field13237,omitempty"`
+	Field13238    *int32        `protobuf:"varint,3,opt,name=field13238" json:"field13238,omitempty"`
+	Field13239    *int32        `protobuf:"varint,4,req,name=field13239" json:"field13239,omitempty"`
+	Field13240    *int32        `protobuf:"varint,8,opt,name=field13240" json:"field13240,omitempty"`
+	Field13241    *float64      `protobuf:"fixed64,5,opt,name=field13241" json:"field13241,omitempty"`
+	Field13242    *float64      `protobuf:"fixed64,7,opt,name=field13242" json:"field13242,omitempty"`
+	Field13243    *int32        `protobuf:"varint,17,opt,name=field13243" json:"field13243,omitempty"`
+	Field13244    *int32        `protobuf:"varint,19,opt,name=field13244" json:"field13244,omitempty"`
+	Field13245    *float64      `protobuf:"fixed64,20,opt,name=field13245" json:"field13245,omitempty"`
+	Field13246    *int32        `protobuf:"varint,9,opt,name=field13246" json:"field13246,omitempty"`
+	Field13247    *float64      `protobuf:"fixed64,10,opt,name=field13247" json:"field13247,omitempty"`
+	Field13248    *int32        `protobuf:"varint,11,opt,name=field13248" json:"field13248,omitempty"`
+	Field13249    *Message13151 `protobuf:"bytes,21,opt,name=field13249" json:"field13249,omitempty"`
+	Field13250    *int32        `protobuf:"varint,1,opt,name=field13250" json:"field13250,omitempty"`
+	Field13251    *float64      `protobuf:"fixed64,2,opt,name=field13251" json:"field13251,omitempty"`
+	Field13252    *float64      `protobuf:"fixed64,15,opt,name=field13252" json:"field13252,omitempty"`
+	Field13253    *float64      `protobuf:"fixed64,16,opt,name=field13253" json:"field13253,omitempty"`
+	Field13254    *float64      `protobuf:"fixed64,12,opt,name=field13254" json:"field13254,omitempty"`
+	Field13255    *float64      `protobuf:"fixed64,13,opt,name=field13255" json:"field13255,omitempty"`
+	Field13256    *float64      `protobuf:"fixed64,14,opt,name=field13256" json:"field13256,omitempty"`
+	Field13257    *int32        `protobuf:"varint,18,opt,name=field13257" json:"field13257,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13174) Reset() {
@@ -2119,114 +2098,113 @@
 }
 
 type Message18283 struct {
-	Field18478             *UnusedEmptyMessage       `protobuf:"bytes,1,opt,name=field18478" json:"field18478,omitempty"`
-	Field18479             *int32                    `protobuf:"varint,4,opt,name=field18479" json:"field18479,omitempty"`
-	Field18480             *int32                    `protobuf:"varint,106,opt,name=field18480" json:"field18480,omitempty"`
-	Field18481             *int32                    `protobuf:"varint,107,opt,name=field18481" json:"field18481,omitempty"`
-	Field18482             *int32                    `protobuf:"varint,108,opt,name=field18482" json:"field18482,omitempty"`
-	Field18483             *int32                    `protobuf:"varint,109,opt,name=field18483" json:"field18483,omitempty"`
-	Field18484             *int32                    `protobuf:"varint,105,opt,name=field18484" json:"field18484,omitempty"`
-	Field18485             *int32                    `protobuf:"varint,113,opt,name=field18485" json:"field18485,omitempty"`
-	Field18486             *int32                    `protobuf:"varint,114,opt,name=field18486" json:"field18486,omitempty"`
-	Field18487             *int32                    `protobuf:"varint,124,opt,name=field18487" json:"field18487,omitempty"`
-	Field18488             *int32                    `protobuf:"varint,125,opt,name=field18488" json:"field18488,omitempty"`
-	Field18489             *int32                    `protobuf:"varint,128,opt,name=field18489" json:"field18489,omitempty"`
-	Field18490             *int32                    `protobuf:"varint,135,opt,name=field18490" json:"field18490,omitempty"`
-	Field18491             *bool                     `protobuf:"varint,166,opt,name=field18491" json:"field18491,omitempty"`
-	Field18492             *bool                     `protobuf:"varint,136,opt,name=field18492" json:"field18492,omitempty"`
-	Field18493             *int32                    `protobuf:"varint,140,opt,name=field18493" json:"field18493,omitempty"`
-	Field18494             *int32                    `protobuf:"varint,171,opt,name=field18494" json:"field18494,omitempty"`
-	Field18495             *int32                    `protobuf:"varint,148,opt,name=field18495" json:"field18495,omitempty"`
-	Field18496             *int32                    `protobuf:"varint,145,opt,name=field18496" json:"field18496,omitempty"`
-	Field18497             *float32                  `protobuf:"fixed32,117,opt,name=field18497" json:"field18497,omitempty"`
-	Field18498             *int32                    `protobuf:"varint,146,opt,name=field18498" json:"field18498,omitempty"`
-	Field18499             *string                   `protobuf:"bytes,3,opt,name=field18499" json:"field18499,omitempty"`
-	Field18500             *UnusedEmptyMessage       `protobuf:"bytes,5,opt,name=field18500" json:"field18500,omitempty"`
-	Field18501             *UnusedEmptyMessage       `protobuf:"bytes,6,opt,name=field18501" json:"field18501,omitempty"`
-	Field18502             *UnusedEmptyMessage       `protobuf:"bytes,9,opt,name=field18502" json:"field18502,omitempty"`
-	Field18503             *Message18253             `protobuf:"bytes,155,opt,name=field18503" json:"field18503,omitempty"`
-	Field18504             *UnusedEmptyMessage       `protobuf:"bytes,184,opt,name=field18504" json:"field18504,omitempty"`
-	Field18505             *UnusedEmptyMessage       `protobuf:"bytes,163,opt,name=field18505" json:"field18505,omitempty"`
-	Field18506             *UnusedEmptyMessage       `protobuf:"bytes,16,opt,name=field18506" json:"field18506,omitempty"`
-	Field18507             []int32                   `protobuf:"varint,20,rep,name=field18507" json:"field18507,omitempty"`
-	Field18508             []int32                   `protobuf:"varint,7,rep,name=field18508" json:"field18508,omitempty"`
-	Field18509             []string                  `protobuf:"bytes,194,rep,name=field18509" json:"field18509,omitempty"`
-	Field18510             []byte                    `protobuf:"bytes,30,opt,name=field18510" json:"field18510,omitempty"`
-	Field18511             *int32                    `protobuf:"varint,31,opt,name=field18511" json:"field18511,omitempty"`
-	Field18512             *UnusedEmptyMessage       `protobuf:"bytes,178,opt,name=field18512" json:"field18512,omitempty"`
-	Field18513             *string                   `protobuf:"bytes,8,opt,name=field18513" json:"field18513,omitempty"`
-	Field18514             *float32                  `protobuf:"fixed32,2,opt,name=field18514" json:"field18514,omitempty"`
-	Field18515             *float32                  `protobuf:"fixed32,100,opt,name=field18515" json:"field18515,omitempty"`
-	Field18516             *float32                  `protobuf:"fixed32,101,opt,name=field18516" json:"field18516,omitempty"`
-	Field18517             *float32                  `protobuf:"fixed32,102,opt,name=field18517" json:"field18517,omitempty"`
-	Field18518             *int32                    `protobuf:"varint,103,opt,name=field18518" json:"field18518,omitempty"`
-	Field18519             []*UnusedEmptyMessage     `protobuf:"bytes,104,rep,name=field18519" json:"field18519,omitempty"`
-	Field18520             *int32                    `protobuf:"varint,110,opt,name=field18520" json:"field18520,omitempty"`
-	Field18521             *int32                    `protobuf:"varint,112,opt,name=field18521" json:"field18521,omitempty"`
-	Field18522             *UnusedEmptyMessage       `protobuf:"bytes,111,opt,name=field18522" json:"field18522,omitempty"`
-	Field18523             *UnusedEmptyMessage       `protobuf:"bytes,115,opt,name=field18523" json:"field18523,omitempty"`
-	Field18524             *UnusedEmptyMessage       `protobuf:"bytes,119,opt,name=field18524" json:"field18524,omitempty"`
-	Field18525             *UnusedEmptyMessage       `protobuf:"bytes,127,opt,name=field18525" json:"field18525,omitempty"`
-	Field18526             *UnusedEmptyMessage       `protobuf:"bytes,185,opt,name=field18526" json:"field18526,omitempty"`
-	Field18527             *int32                    `protobuf:"varint,120,opt,name=field18527" json:"field18527,omitempty"`
-	Field18528             *int32                    `protobuf:"varint,132,opt,name=field18528" json:"field18528,omitempty"`
-	Field18529             *UnusedEmptyMessage       `protobuf:"bytes,126,opt,name=field18529" json:"field18529,omitempty"`
-	Field18530             *UnusedEmptyMessage       `protobuf:"bytes,129,opt,name=field18530" json:"field18530,omitempty"`
-	Field18531             *UnusedEmptyMessage       `protobuf:"bytes,131,opt,name=field18531" json:"field18531,omitempty"`
-	Field18532             *uint64                   `protobuf:"fixed64,150,opt,name=field18532" json:"field18532,omitempty"`
-	Field18533             *int32                    `protobuf:"varint,133,opt,name=field18533" json:"field18533,omitempty"`
-	Field18534             *int32                    `protobuf:"varint,134,opt,name=field18534" json:"field18534,omitempty"`
-	Field18535             *int32                    `protobuf:"varint,139,opt,name=field18535" json:"field18535,omitempty"`
-	Field18536             *uint64                   `protobuf:"fixed64,137,opt,name=field18536" json:"field18536,omitempty"`
-	Field18537             *uint64                   `protobuf:"fixed64,138,opt,name=field18537" json:"field18537,omitempty"`
-	Field18538             *UnusedEmptyMessage       `protobuf:"bytes,141,opt,name=field18538" json:"field18538,omitempty"`
-	Field18539             *int32                    `protobuf:"varint,142,opt,name=field18539" json:"field18539,omitempty"`
-	Field18540             *int32                    `protobuf:"varint,181,opt,name=field18540" json:"field18540,omitempty"`
-	Field18541             *Message16816             `protobuf:"bytes,143,opt,name=field18541" json:"field18541,omitempty"`
-	Field18542             *Message16685             `protobuf:"bytes,154,opt,name=field18542" json:"field18542,omitempty"`
-	Field18543             *int32                    `protobuf:"varint,144,opt,name=field18543" json:"field18543,omitempty"`
-	Field18544             *int64                    `protobuf:"varint,147,opt,name=field18544" json:"field18544,omitempty"`
-	Field18545             *int64                    `protobuf:"varint,149,opt,name=field18545" json:"field18545,omitempty"`
-	Field18546             *int32                    `protobuf:"varint,151,opt,name=field18546" json:"field18546,omitempty"`
-	Field18547             *int32                    `protobuf:"varint,152,opt,name=field18547" json:"field18547,omitempty"`
-	Field18548             *int32                    `protobuf:"varint,153,opt,name=field18548" json:"field18548,omitempty"`
-	Field18549             *float32                  `protobuf:"fixed32,161,opt,name=field18549" json:"field18549,omitempty"`
-	Field18550             *Message0                 `protobuf:"bytes,123,opt,name=field18550" json:"field18550,omitempty"`
-	Field18551             []int64                   `protobuf:"varint,156,rep,name=field18551" json:"field18551,omitempty"`
-	Field18552             *int32                    `protobuf:"varint,157,opt,name=field18552" json:"field18552,omitempty"`
-	Field18553             []uint64                  `protobuf:"fixed64,188,rep,name=field18553" json:"field18553,omitempty"`
-	Field18554             *int32                    `protobuf:"varint,158,opt,name=field18554" json:"field18554,omitempty"`
-	Field18555             *UnusedEmptyMessage       `protobuf:"bytes,159,opt,name=field18555" json:"field18555,omitempty"`
-	Field18556             *bool                     `protobuf:"varint,160,opt,name=field18556" json:"field18556,omitempty"`
-	Field18557             *uint64                   `protobuf:"varint,162,opt,name=field18557" json:"field18557,omitempty"`
-	Field18558             *int32                    `protobuf:"varint,164,opt,name=field18558" json:"field18558,omitempty"`
-	Field18559             *UnusedEmptyMessage       `protobuf:"bytes,10,opt,name=field18559" json:"field18559,omitempty"`
-	Field18560             *UnusedEmptyMessage       `protobuf:"bytes,167,opt,name=field18560" json:"field18560,omitempty"`
-	Field18561             *int32                    `protobuf:"varint,168,opt,name=field18561" json:"field18561,omitempty"`
-	Field18562             []uint64                  `protobuf:"fixed64,169,rep,name=field18562" json:"field18562,omitempty"`
-	Field18563             []string                  `protobuf:"bytes,170,rep,name=field18563" json:"field18563,omitempty"`
-	Field18564             *UnusedEmptyMessage       `protobuf:"bytes,172,opt,name=field18564" json:"field18564,omitempty"`
-	Field18565             *int64                    `protobuf:"varint,173,opt,name=field18565" json:"field18565,omitempty"`
-	Field18566             *UnusedEmptyMessage       `protobuf:"bytes,174,opt,name=field18566" json:"field18566,omitempty"`
-	Field18567             *int64                    `protobuf:"varint,175,opt,name=field18567" json:"field18567,omitempty"`
-	Field18568             *uint32                   `protobuf:"varint,189,opt,name=field18568" json:"field18568,omitempty"`
-	Field18569             *UnusedEmptyMessage       `protobuf:"bytes,176,opt,name=field18569" json:"field18569,omitempty"`
-	Field18570             *UnusedEmptyMessage       `protobuf:"bytes,177,opt,name=field18570" json:"field18570,omitempty"`
-	Field18571             *uint32                   `protobuf:"varint,179,opt,name=field18571" json:"field18571,omitempty"`
-	Field18572             *uint32                   `protobuf:"varint,180,opt,name=field18572" json:"field18572,omitempty"`
-	Field18573             *UnusedEmptyMessage       `protobuf:"bytes,182,opt,name=field18573" json:"field18573,omitempty"`
-	Field18574             *UnusedEmptyMessage       `protobuf:"bytes,183,opt,name=field18574" json:"field18574,omitempty"`
-	Field18575             *UnusedEmptyMessage       `protobuf:"bytes,121,opt,name=field18575" json:"field18575,omitempty"`
-	Field18576             *UnusedEmptyMessage       `protobuf:"bytes,186,opt,name=field18576" json:"field18576,omitempty"`
-	Field18577             *UnusedEmptyMessage       `protobuf:"bytes,187,opt,name=field18577" json:"field18577,omitempty"`
-	Field18578             *UnusedEmptyMessage       `protobuf:"bytes,190,opt,name=field18578" json:"field18578,omitempty"`
-	Field18579             *int32                    `protobuf:"varint,191,opt,name=field18579" json:"field18579,omitempty"`
-	Field18580             *float32                  `protobuf:"fixed32,192,opt,name=field18580" json:"field18580,omitempty"`
-	Field18581             *bool                     `protobuf:"varint,193,opt,name=field18581" json:"field18581,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field18478      *UnusedEmptyMessage   `protobuf:"bytes,1,opt,name=field18478" json:"field18478,omitempty"`
+	Field18479      *int32                `protobuf:"varint,4,opt,name=field18479" json:"field18479,omitempty"`
+	Field18480      *int32                `protobuf:"varint,106,opt,name=field18480" json:"field18480,omitempty"`
+	Field18481      *int32                `protobuf:"varint,107,opt,name=field18481" json:"field18481,omitempty"`
+	Field18482      *int32                `protobuf:"varint,108,opt,name=field18482" json:"field18482,omitempty"`
+	Field18483      *int32                `protobuf:"varint,109,opt,name=field18483" json:"field18483,omitempty"`
+	Field18484      *int32                `protobuf:"varint,105,opt,name=field18484" json:"field18484,omitempty"`
+	Field18485      *int32                `protobuf:"varint,113,opt,name=field18485" json:"field18485,omitempty"`
+	Field18486      *int32                `protobuf:"varint,114,opt,name=field18486" json:"field18486,omitempty"`
+	Field18487      *int32                `protobuf:"varint,124,opt,name=field18487" json:"field18487,omitempty"`
+	Field18488      *int32                `protobuf:"varint,125,opt,name=field18488" json:"field18488,omitempty"`
+	Field18489      *int32                `protobuf:"varint,128,opt,name=field18489" json:"field18489,omitempty"`
+	Field18490      *int32                `protobuf:"varint,135,opt,name=field18490" json:"field18490,omitempty"`
+	Field18491      *bool                 `protobuf:"varint,166,opt,name=field18491" json:"field18491,omitempty"`
+	Field18492      *bool                 `protobuf:"varint,136,opt,name=field18492" json:"field18492,omitempty"`
+	Field18493      *int32                `protobuf:"varint,140,opt,name=field18493" json:"field18493,omitempty"`
+	Field18494      *int32                `protobuf:"varint,171,opt,name=field18494" json:"field18494,omitempty"`
+	Field18495      *int32                `protobuf:"varint,148,opt,name=field18495" json:"field18495,omitempty"`
+	Field18496      *int32                `protobuf:"varint,145,opt,name=field18496" json:"field18496,omitempty"`
+	Field18497      *float32              `protobuf:"fixed32,117,opt,name=field18497" json:"field18497,omitempty"`
+	Field18498      *int32                `protobuf:"varint,146,opt,name=field18498" json:"field18498,omitempty"`
+	Field18499      *string               `protobuf:"bytes,3,opt,name=field18499" json:"field18499,omitempty"`
+	Field18500      *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field18500" json:"field18500,omitempty"`
+	Field18501      *UnusedEmptyMessage   `protobuf:"bytes,6,opt,name=field18501" json:"field18501,omitempty"`
+	Field18502      *UnusedEmptyMessage   `protobuf:"bytes,9,opt,name=field18502" json:"field18502,omitempty"`
+	Field18503      *Message18253         `protobuf:"bytes,155,opt,name=field18503" json:"field18503,omitempty"`
+	Field18504      *UnusedEmptyMessage   `protobuf:"bytes,184,opt,name=field18504" json:"field18504,omitempty"`
+	Field18505      *UnusedEmptyMessage   `protobuf:"bytes,163,opt,name=field18505" json:"field18505,omitempty"`
+	Field18506      *UnusedEmptyMessage   `protobuf:"bytes,16,opt,name=field18506" json:"field18506,omitempty"`
+	Field18507      []int32               `protobuf:"varint,20,rep,name=field18507" json:"field18507,omitempty"`
+	Field18508      []int32               `protobuf:"varint,7,rep,name=field18508" json:"field18508,omitempty"`
+	Field18509      []string              `protobuf:"bytes,194,rep,name=field18509" json:"field18509,omitempty"`
+	Field18510      []byte                `protobuf:"bytes,30,opt,name=field18510" json:"field18510,omitempty"`
+	Field18511      *int32                `protobuf:"varint,31,opt,name=field18511" json:"field18511,omitempty"`
+	Field18512      *UnusedEmptyMessage   `protobuf:"bytes,178,opt,name=field18512" json:"field18512,omitempty"`
+	Field18513      *string               `protobuf:"bytes,8,opt,name=field18513" json:"field18513,omitempty"`
+	Field18514      *float32              `protobuf:"fixed32,2,opt,name=field18514" json:"field18514,omitempty"`
+	Field18515      *float32              `protobuf:"fixed32,100,opt,name=field18515" json:"field18515,omitempty"`
+	Field18516      *float32              `protobuf:"fixed32,101,opt,name=field18516" json:"field18516,omitempty"`
+	Field18517      *float32              `protobuf:"fixed32,102,opt,name=field18517" json:"field18517,omitempty"`
+	Field18518      *int32                `protobuf:"varint,103,opt,name=field18518" json:"field18518,omitempty"`
+	Field18519      []*UnusedEmptyMessage `protobuf:"bytes,104,rep,name=field18519" json:"field18519,omitempty"`
+	Field18520      *int32                `protobuf:"varint,110,opt,name=field18520" json:"field18520,omitempty"`
+	Field18521      *int32                `protobuf:"varint,112,opt,name=field18521" json:"field18521,omitempty"`
+	Field18522      *UnusedEmptyMessage   `protobuf:"bytes,111,opt,name=field18522" json:"field18522,omitempty"`
+	Field18523      *UnusedEmptyMessage   `protobuf:"bytes,115,opt,name=field18523" json:"field18523,omitempty"`
+	Field18524      *UnusedEmptyMessage   `protobuf:"bytes,119,opt,name=field18524" json:"field18524,omitempty"`
+	Field18525      *UnusedEmptyMessage   `protobuf:"bytes,127,opt,name=field18525" json:"field18525,omitempty"`
+	Field18526      *UnusedEmptyMessage   `protobuf:"bytes,185,opt,name=field18526" json:"field18526,omitempty"`
+	Field18527      *int32                `protobuf:"varint,120,opt,name=field18527" json:"field18527,omitempty"`
+	Field18528      *int32                `protobuf:"varint,132,opt,name=field18528" json:"field18528,omitempty"`
+	Field18529      *UnusedEmptyMessage   `protobuf:"bytes,126,opt,name=field18529" json:"field18529,omitempty"`
+	Field18530      *UnusedEmptyMessage   `protobuf:"bytes,129,opt,name=field18530" json:"field18530,omitempty"`
+	Field18531      *UnusedEmptyMessage   `protobuf:"bytes,131,opt,name=field18531" json:"field18531,omitempty"`
+	Field18532      *uint64               `protobuf:"fixed64,150,opt,name=field18532" json:"field18532,omitempty"`
+	Field18533      *int32                `protobuf:"varint,133,opt,name=field18533" json:"field18533,omitempty"`
+	Field18534      *int32                `protobuf:"varint,134,opt,name=field18534" json:"field18534,omitempty"`
+	Field18535      *int32                `protobuf:"varint,139,opt,name=field18535" json:"field18535,omitempty"`
+	Field18536      *uint64               `protobuf:"fixed64,137,opt,name=field18536" json:"field18536,omitempty"`
+	Field18537      *uint64               `protobuf:"fixed64,138,opt,name=field18537" json:"field18537,omitempty"`
+	Field18538      *UnusedEmptyMessage   `protobuf:"bytes,141,opt,name=field18538" json:"field18538,omitempty"`
+	Field18539      *int32                `protobuf:"varint,142,opt,name=field18539" json:"field18539,omitempty"`
+	Field18540      *int32                `protobuf:"varint,181,opt,name=field18540" json:"field18540,omitempty"`
+	Field18541      *Message16816         `protobuf:"bytes,143,opt,name=field18541" json:"field18541,omitempty"`
+	Field18542      *Message16685         `protobuf:"bytes,154,opt,name=field18542" json:"field18542,omitempty"`
+	Field18543      *int32                `protobuf:"varint,144,opt,name=field18543" json:"field18543,omitempty"`
+	Field18544      *int64                `protobuf:"varint,147,opt,name=field18544" json:"field18544,omitempty"`
+	Field18545      *int64                `protobuf:"varint,149,opt,name=field18545" json:"field18545,omitempty"`
+	Field18546      *int32                `protobuf:"varint,151,opt,name=field18546" json:"field18546,omitempty"`
+	Field18547      *int32                `protobuf:"varint,152,opt,name=field18547" json:"field18547,omitempty"`
+	Field18548      *int32                `protobuf:"varint,153,opt,name=field18548" json:"field18548,omitempty"`
+	Field18549      *float32              `protobuf:"fixed32,161,opt,name=field18549" json:"field18549,omitempty"`
+	Field18550      *Message0             `protobuf:"bytes,123,opt,name=field18550" json:"field18550,omitempty"`
+	Field18551      []int64               `protobuf:"varint,156,rep,name=field18551" json:"field18551,omitempty"`
+	Field18552      *int32                `protobuf:"varint,157,opt,name=field18552" json:"field18552,omitempty"`
+	Field18553      []uint64              `protobuf:"fixed64,188,rep,name=field18553" json:"field18553,omitempty"`
+	Field18554      *int32                `protobuf:"varint,158,opt,name=field18554" json:"field18554,omitempty"`
+	Field18555      *UnusedEmptyMessage   `protobuf:"bytes,159,opt,name=field18555" json:"field18555,omitempty"`
+	Field18556      *bool                 `protobuf:"varint,160,opt,name=field18556" json:"field18556,omitempty"`
+	Field18557      *uint64               `protobuf:"varint,162,opt,name=field18557" json:"field18557,omitempty"`
+	Field18558      *int32                `protobuf:"varint,164,opt,name=field18558" json:"field18558,omitempty"`
+	Field18559      *UnusedEmptyMessage   `protobuf:"bytes,10,opt,name=field18559" json:"field18559,omitempty"`
+	Field18560      *UnusedEmptyMessage   `protobuf:"bytes,167,opt,name=field18560" json:"field18560,omitempty"`
+	Field18561      *int32                `protobuf:"varint,168,opt,name=field18561" json:"field18561,omitempty"`
+	Field18562      []uint64              `protobuf:"fixed64,169,rep,name=field18562" json:"field18562,omitempty"`
+	Field18563      []string              `protobuf:"bytes,170,rep,name=field18563" json:"field18563,omitempty"`
+	Field18564      *UnusedEmptyMessage   `protobuf:"bytes,172,opt,name=field18564" json:"field18564,omitempty"`
+	Field18565      *int64                `protobuf:"varint,173,opt,name=field18565" json:"field18565,omitempty"`
+	Field18566      *UnusedEmptyMessage   `protobuf:"bytes,174,opt,name=field18566" json:"field18566,omitempty"`
+	Field18567      *int64                `protobuf:"varint,175,opt,name=field18567" json:"field18567,omitempty"`
+	Field18568      *uint32               `protobuf:"varint,189,opt,name=field18568" json:"field18568,omitempty"`
+	Field18569      *UnusedEmptyMessage   `protobuf:"bytes,176,opt,name=field18569" json:"field18569,omitempty"`
+	Field18570      *UnusedEmptyMessage   `protobuf:"bytes,177,opt,name=field18570" json:"field18570,omitempty"`
+	Field18571      *uint32               `protobuf:"varint,179,opt,name=field18571" json:"field18571,omitempty"`
+	Field18572      *uint32               `protobuf:"varint,180,opt,name=field18572" json:"field18572,omitempty"`
+	Field18573      *UnusedEmptyMessage   `protobuf:"bytes,182,opt,name=field18573" json:"field18573,omitempty"`
+	Field18574      *UnusedEmptyMessage   `protobuf:"bytes,183,opt,name=field18574" json:"field18574,omitempty"`
+	Field18575      *UnusedEmptyMessage   `protobuf:"bytes,121,opt,name=field18575" json:"field18575,omitempty"`
+	Field18576      *UnusedEmptyMessage   `protobuf:"bytes,186,opt,name=field18576" json:"field18576,omitempty"`
+	Field18577      *UnusedEmptyMessage   `protobuf:"bytes,187,opt,name=field18577" json:"field18577,omitempty"`
+	Field18578      *UnusedEmptyMessage   `protobuf:"bytes,190,opt,name=field18578" json:"field18578,omitempty"`
+	Field18579      *int32                `protobuf:"varint,191,opt,name=field18579" json:"field18579,omitempty"`
+	Field18580      *float32              `protobuf:"fixed32,192,opt,name=field18580" json:"field18580,omitempty"`
+	Field18581      *bool                 `protobuf:"varint,193,opt,name=field18581" json:"field18581,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message18283) Reset() {
@@ -2993,12 +2971,11 @@
 }
 
 type Message13169 struct {
-	Field13223           []*Message13168         `protobuf:"bytes,1,rep,name=field13223" json:"field13223,omitempty"`
-	Field13224           *Message13167           `protobuf:"bytes,2,req,name=field13224" json:"field13224,omitempty"`
-	Field13225           *string                 `protobuf:"bytes,3,opt,name=field13225" json:"field13225,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13223    []*Message13168 `protobuf:"bytes,1,rep,name=field13223" json:"field13223,omitempty"`
+	Field13224    *Message13167   `protobuf:"bytes,2,req,name=field13224" json:"field13224,omitempty"`
+	Field13225    *string         `protobuf:"bytes,3,opt,name=field13225" json:"field13225,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13169) Reset() {
@@ -3046,10 +3023,9 @@
 }
 
 type Message19255 struct {
-	Field19257           *string                 `protobuf:"bytes,1,opt,name=field19257" json:"field19257,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field19257    *string `protobuf:"bytes,1,opt,name=field19257" json:"field19257,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message19255) Reset() {
@@ -3083,12 +3059,11 @@
 }
 
 type Message35542 struct {
-	Field35543           *bool                   `protobuf:"varint,1,opt,name=field35543" json:"field35543,omitempty"`
-	Field35544           *bool                   `protobuf:"varint,2,opt,name=field35544" json:"field35544,omitempty"`
-	Field35545           *bool                   `protobuf:"varint,3,opt,name=field35545" json:"field35545,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35543    *bool `protobuf:"varint,1,opt,name=field35543" json:"field35543,omitempty"`
+	Field35544    *bool `protobuf:"varint,2,opt,name=field35544" json:"field35544,omitempty"`
+	Field35545    *bool `protobuf:"varint,3,opt,name=field35545" json:"field35545,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35542) Reset() {
@@ -3136,21 +3111,20 @@
 }
 
 type Message3901 struct {
-	Field3990            *int32                  `protobuf:"varint,1,opt,name=field3990" json:"field3990,omitempty"`
-	Field3991            *int32                  `protobuf:"varint,2,opt,name=field3991" json:"field3991,omitempty"`
-	Field3992            *int32                  `protobuf:"varint,3,opt,name=field3992" json:"field3992,omitempty"`
-	Field3993            *int32                  `protobuf:"varint,4,opt,name=field3993" json:"field3993,omitempty"`
-	Field3994            *int32                  `protobuf:"varint,7,opt,name=field3994" json:"field3994,omitempty"`
-	Field3995            *int32                  `protobuf:"varint,8,opt,name=field3995" json:"field3995,omitempty"`
-	Field3996            *int32                  `protobuf:"varint,9,opt,name=field3996" json:"field3996,omitempty"`
-	Field3997            *int32                  `protobuf:"varint,10,opt,name=field3997" json:"field3997,omitempty"`
-	Field3998            *int32                  `protobuf:"varint,11,opt,name=field3998" json:"field3998,omitempty"`
-	Field3999            *int32                  `protobuf:"varint,12,opt,name=field3999" json:"field3999,omitempty"`
-	Field4000            *UnusedEnum             `protobuf:"varint,6,opt,name=field4000,enum=benchmarks.google_message3.UnusedEnum" json:"field4000,omitempty"`
-	Field4001            *int32                  `protobuf:"varint,5,opt,name=field4001" json:"field4001,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3990     *int32      `protobuf:"varint,1,opt,name=field3990" json:"field3990,omitempty"`
+	Field3991     *int32      `protobuf:"varint,2,opt,name=field3991" json:"field3991,omitempty"`
+	Field3992     *int32      `protobuf:"varint,3,opt,name=field3992" json:"field3992,omitempty"`
+	Field3993     *int32      `protobuf:"varint,4,opt,name=field3993" json:"field3993,omitempty"`
+	Field3994     *int32      `protobuf:"varint,7,opt,name=field3994" json:"field3994,omitempty"`
+	Field3995     *int32      `protobuf:"varint,8,opt,name=field3995" json:"field3995,omitempty"`
+	Field3996     *int32      `protobuf:"varint,9,opt,name=field3996" json:"field3996,omitempty"`
+	Field3997     *int32      `protobuf:"varint,10,opt,name=field3997" json:"field3997,omitempty"`
+	Field3998     *int32      `protobuf:"varint,11,opt,name=field3998" json:"field3998,omitempty"`
+	Field3999     *int32      `protobuf:"varint,12,opt,name=field3999" json:"field3999,omitempty"`
+	Field4000     *UnusedEnum `protobuf:"varint,6,opt,name=field4000,enum=benchmarks.google_message3.UnusedEnum" json:"field4000,omitempty"`
+	Field4001     *int32      `protobuf:"varint,5,opt,name=field4001" json:"field4001,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3901) Reset() {
@@ -3261,9 +3235,8 @@
 }
 
 type Message33968_Message33969 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message33968_Message33969) Reset() {
@@ -3290,16 +3263,15 @@
 }
 
 type Message18831_Message18832 struct {
-	Field18836           *int32                                    `protobuf:"varint,2,opt,name=field18836" json:"field18836,omitempty"`
-	Field18837           *string                                   `protobuf:"bytes,5,opt,name=field18837" json:"field18837,omitempty"`
-	Field18838           *float32                                  `protobuf:"fixed32,3,opt,name=field18838" json:"field18838,omitempty"`
-	Field18839           *float32                                  `protobuf:"fixed32,9,opt,name=field18839" json:"field18839,omitempty"`
-	Field18840           *int32                                    `protobuf:"varint,11,opt,name=field18840" json:"field18840,omitempty"`
-	Field18841           []uint64                                  `protobuf:"varint,4,rep,name=field18841" json:"field18841,omitempty"`
-	Message18833         []*Message18831_Message18832_Message18833 `protobuf:"group,6,rep,name=Message18833,json=message18833" json:"message18833,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                                  `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields                   `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache                       `json:"-"`
+	Field18836    *int32                                    `protobuf:"varint,2,opt,name=field18836" json:"field18836,omitempty"`
+	Field18837    *string                                   `protobuf:"bytes,5,opt,name=field18837" json:"field18837,omitempty"`
+	Field18838    *float32                                  `protobuf:"fixed32,3,opt,name=field18838" json:"field18838,omitempty"`
+	Field18839    *float32                                  `protobuf:"fixed32,9,opt,name=field18839" json:"field18839,omitempty"`
+	Field18840    *int32                                    `protobuf:"varint,11,opt,name=field18840" json:"field18840,omitempty"`
+	Field18841    []uint64                                  `protobuf:"varint,4,rep,name=field18841" json:"field18841,omitempty"`
+	Message18833  []*Message18831_Message18832_Message18833 `protobuf:"group,6,rep,name=Message18833,json=message18833" json:"message18833,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18831_Message18832) Reset() {
@@ -3375,14 +3347,13 @@
 }
 
 type Message18831_Message18832_Message18833 struct {
-	Field18843           *uint64                 `protobuf:"varint,7,req,name=field18843" json:"field18843,omitempty"`
-	Field18844           *string                 `protobuf:"bytes,8,opt,name=field18844" json:"field18844,omitempty"`
-	Field18845           *float32                `protobuf:"fixed32,10,opt,name=field18845" json:"field18845,omitempty"`
-	Field18846           *int32                  `protobuf:"varint,12,opt,name=field18846" json:"field18846,omitempty"`
-	Field18847           *bool                   `protobuf:"varint,13,opt,name=field18847" json:"field18847,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field18843    *uint64  `protobuf:"varint,7,req,name=field18843" json:"field18843,omitempty"`
+	Field18844    *string  `protobuf:"bytes,8,opt,name=field18844" json:"field18844,omitempty"`
+	Field18845    *float32 `protobuf:"fixed32,10,opt,name=field18845" json:"field18845,omitempty"`
+	Field18846    *int32   `protobuf:"varint,12,opt,name=field18846" json:"field18846,omitempty"`
+	Field18847    *bool    `protobuf:"varint,13,opt,name=field18847" json:"field18847,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18831_Message18832_Message18833) Reset() {
@@ -3444,15 +3415,14 @@
 }
 
 type Message4144_Message4145 struct {
-	Field4165            *Enum4146               `protobuf:"varint,2,req,name=field4165,enum=benchmarks.google_message3.Enum4146" json:"field4165,omitempty"`
-	Field4166            *int32                  `protobuf:"varint,3,req,name=field4166" json:"field4166,omitempty"`
-	Field4167            *Enum4160               `protobuf:"varint,9,opt,name=field4167,enum=benchmarks.google_message3.Enum4160" json:"field4167,omitempty"`
-	Field4168            []byte                  `protobuf:"bytes,4,opt,name=field4168" json:"field4168,omitempty"`
-	Field4169            *Enum4152               `protobuf:"varint,5,opt,name=field4169,enum=benchmarks.google_message3.Enum4152" json:"field4169,omitempty"`
-	Field4170            *string                 `protobuf:"bytes,6,opt,name=field4170" json:"field4170,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field4165     *Enum4146 `protobuf:"varint,2,req,name=field4165,enum=benchmarks.google_message3.Enum4146" json:"field4165,omitempty"`
+	Field4166     *int32    `protobuf:"varint,3,req,name=field4166" json:"field4166,omitempty"`
+	Field4167     *Enum4160 `protobuf:"varint,9,opt,name=field4167,enum=benchmarks.google_message3.Enum4160" json:"field4167,omitempty"`
+	Field4168     []byte    `protobuf:"bytes,4,opt,name=field4168" json:"field4168,omitempty"`
+	Field4169     *Enum4152 `protobuf:"varint,5,opt,name=field4169,enum=benchmarks.google_message3.Enum4152" json:"field4169,omitempty"`
+	Field4170     *string   `protobuf:"bytes,6,opt,name=field4170" json:"field4170,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message4144_Message4145) Reset() {
@@ -3521,9 +3491,8 @@
 }
 
 type Message35573_Message35574 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35573_Message35574) Reset() {
@@ -3550,47 +3519,46 @@
 }
 
 type Message35573_Message35575 struct {
-	Field35709           *int64                                  `protobuf:"varint,2,opt,name=field35709" json:"field35709,omitempty"`
-	Field35710           *string                                 `protobuf:"bytes,3,opt,name=field35710" json:"field35710,omitempty"`
-	Field35711           *string                                 `protobuf:"bytes,19,opt,name=field35711" json:"field35711,omitempty"`
-	Field35712           *int32                                  `protobuf:"varint,20,opt,name=field35712" json:"field35712,omitempty"`
-	Field35713           *int32                                  `protobuf:"varint,21,opt,name=field35713" json:"field35713,omitempty"`
-	Field35714           *int32                                  `protobuf:"varint,22,opt,name=field35714" json:"field35714,omitempty"`
-	Field35715           *bool                                   `protobuf:"varint,23,opt,name=field35715" json:"field35715,omitempty"`
-	Field35716           *int32                                  `protobuf:"varint,47,opt,name=field35716" json:"field35716,omitempty"`
-	Field35717           *int32                                  `protobuf:"varint,48,opt,name=field35717" json:"field35717,omitempty"`
-	Field35718           *bool                                   `protobuf:"varint,24,opt,name=field35718" json:"field35718,omitempty"`
-	Field35719           *uint64                                 `protobuf:"fixed64,25,opt,name=field35719" json:"field35719,omitempty"`
-	Field35720           []byte                                  `protobuf:"bytes,52,opt,name=field35720" json:"field35720,omitempty"`
-	Field35721           *int32                                  `protobuf:"varint,18,opt,name=field35721" json:"field35721,omitempty"`
-	Field35722           *uint32                                 `protobuf:"fixed32,43,opt,name=field35722" json:"field35722,omitempty"`
-	Field35723           *bool                                   `protobuf:"varint,26,opt,name=field35723" json:"field35723,omitempty"`
-	Field35724           *int32                                  `protobuf:"varint,27,opt,name=field35724" json:"field35724,omitempty"`
-	Field35725           *int32                                  `protobuf:"varint,17,opt,name=field35725" json:"field35725,omitempty"`
-	Field35726           *bool                                   `protobuf:"varint,45,opt,name=field35726" json:"field35726,omitempty"`
-	Field35727           []int32                                 `protobuf:"varint,33,rep,name=field35727" json:"field35727,omitempty"`
-	Field35728           []int32                                 `protobuf:"varint,58,rep,name=field35728" json:"field35728,omitempty"`
-	Field35729           *float32                                `protobuf:"fixed32,34,opt,name=field35729" json:"field35729,omitempty"`
-	Field35730           *float32                                `protobuf:"fixed32,1009,opt,name=field35730" json:"field35730,omitempty"`
-	Field35731           *int32                                  `protobuf:"varint,28,opt,name=field35731" json:"field35731,omitempty"`
-	Field35732           []uint64                                `protobuf:"fixed64,1001,rep,name=field35732" json:"field35732,omitempty"`
-	Field35733           []uint64                                `protobuf:"fixed64,1002,rep,name=field35733" json:"field35733,omitempty"`
-	Field35734           *int32                                  `protobuf:"varint,44,opt,name=field35734" json:"field35734,omitempty"`
-	Field35735           *int32                                  `protobuf:"varint,50,opt,name=field35735" json:"field35735,omitempty"`
-	Field35736           *int32                                  `protobuf:"varint,36,opt,name=field35736" json:"field35736,omitempty"`
-	Field35737           *int32                                  `protobuf:"varint,40,opt,name=field35737" json:"field35737,omitempty"`
-	Field35738           *bool                                   `protobuf:"varint,1016,opt,name=field35738" json:"field35738,omitempty"`
-	Field35739           *bool                                   `protobuf:"varint,1010,opt,name=field35739" json:"field35739,omitempty"`
-	Field35740           *int32                                  `protobuf:"varint,37,opt,name=field35740" json:"field35740,omitempty"`
-	Field35741           *int32                                  `protobuf:"varint,38,opt,name=field35741" json:"field35741,omitempty"`
-	Field35742           *string                                 `protobuf:"bytes,46,opt,name=field35742" json:"field35742,omitempty"`
-	Field35743           *uint32                                 `protobuf:"varint,60,opt,name=field35743" json:"field35743,omitempty"`
-	Field35744           [][]byte                                `protobuf:"bytes,56,rep,name=field35744" json:"field35744,omitempty"`
-	Field35745           *Message0                               `protobuf:"bytes,57,opt,name=field35745" json:"field35745,omitempty"`
-	Message35576         *Message35573_Message35575_Message35576 `protobuf:"group,4,req,name=Message35576,json=message35576" json:"message35576,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields                 `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache                     `json:"-"`
+	Field35709    *int64                                  `protobuf:"varint,2,opt,name=field35709" json:"field35709,omitempty"`
+	Field35710    *string                                 `protobuf:"bytes,3,opt,name=field35710" json:"field35710,omitempty"`
+	Field35711    *string                                 `protobuf:"bytes,19,opt,name=field35711" json:"field35711,omitempty"`
+	Field35712    *int32                                  `protobuf:"varint,20,opt,name=field35712" json:"field35712,omitempty"`
+	Field35713    *int32                                  `protobuf:"varint,21,opt,name=field35713" json:"field35713,omitempty"`
+	Field35714    *int32                                  `protobuf:"varint,22,opt,name=field35714" json:"field35714,omitempty"`
+	Field35715    *bool                                   `protobuf:"varint,23,opt,name=field35715" json:"field35715,omitempty"`
+	Field35716    *int32                                  `protobuf:"varint,47,opt,name=field35716" json:"field35716,omitempty"`
+	Field35717    *int32                                  `protobuf:"varint,48,opt,name=field35717" json:"field35717,omitempty"`
+	Field35718    *bool                                   `protobuf:"varint,24,opt,name=field35718" json:"field35718,omitempty"`
+	Field35719    *uint64                                 `protobuf:"fixed64,25,opt,name=field35719" json:"field35719,omitempty"`
+	Field35720    []byte                                  `protobuf:"bytes,52,opt,name=field35720" json:"field35720,omitempty"`
+	Field35721    *int32                                  `protobuf:"varint,18,opt,name=field35721" json:"field35721,omitempty"`
+	Field35722    *uint32                                 `protobuf:"fixed32,43,opt,name=field35722" json:"field35722,omitempty"`
+	Field35723    *bool                                   `protobuf:"varint,26,opt,name=field35723" json:"field35723,omitempty"`
+	Field35724    *int32                                  `protobuf:"varint,27,opt,name=field35724" json:"field35724,omitempty"`
+	Field35725    *int32                                  `protobuf:"varint,17,opt,name=field35725" json:"field35725,omitempty"`
+	Field35726    *bool                                   `protobuf:"varint,45,opt,name=field35726" json:"field35726,omitempty"`
+	Field35727    []int32                                 `protobuf:"varint,33,rep,name=field35727" json:"field35727,omitempty"`
+	Field35728    []int32                                 `protobuf:"varint,58,rep,name=field35728" json:"field35728,omitempty"`
+	Field35729    *float32                                `protobuf:"fixed32,34,opt,name=field35729" json:"field35729,omitempty"`
+	Field35730    *float32                                `protobuf:"fixed32,1009,opt,name=field35730" json:"field35730,omitempty"`
+	Field35731    *int32                                  `protobuf:"varint,28,opt,name=field35731" json:"field35731,omitempty"`
+	Field35732    []uint64                                `protobuf:"fixed64,1001,rep,name=field35732" json:"field35732,omitempty"`
+	Field35733    []uint64                                `protobuf:"fixed64,1002,rep,name=field35733" json:"field35733,omitempty"`
+	Field35734    *int32                                  `protobuf:"varint,44,opt,name=field35734" json:"field35734,omitempty"`
+	Field35735    *int32                                  `protobuf:"varint,50,opt,name=field35735" json:"field35735,omitempty"`
+	Field35736    *int32                                  `protobuf:"varint,36,opt,name=field35736" json:"field35736,omitempty"`
+	Field35737    *int32                                  `protobuf:"varint,40,opt,name=field35737" json:"field35737,omitempty"`
+	Field35738    *bool                                   `protobuf:"varint,1016,opt,name=field35738" json:"field35738,omitempty"`
+	Field35739    *bool                                   `protobuf:"varint,1010,opt,name=field35739" json:"field35739,omitempty"`
+	Field35740    *int32                                  `protobuf:"varint,37,opt,name=field35740" json:"field35740,omitempty"`
+	Field35741    *int32                                  `protobuf:"varint,38,opt,name=field35741" json:"field35741,omitempty"`
+	Field35742    *string                                 `protobuf:"bytes,46,opt,name=field35742" json:"field35742,omitempty"`
+	Field35743    *uint32                                 `protobuf:"varint,60,opt,name=field35743" json:"field35743,omitempty"`
+	Field35744    [][]byte                                `protobuf:"bytes,56,rep,name=field35744" json:"field35744,omitempty"`
+	Field35745    *Message0                               `protobuf:"bytes,57,opt,name=field35745" json:"field35745,omitempty"`
+	Message35576  *Message35573_Message35575_Message35576 `protobuf:"group,4,req,name=Message35576,json=message35576" json:"message35576,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35573_Message35575) Reset() {
@@ -3883,34 +3851,33 @@
 }
 
 type Message35573_Message35575_Message35576 struct {
-	Field35747           *uint64                 `protobuf:"fixed64,5,opt,name=field35747" json:"field35747,omitempty"`
-	Field35748           *int32                  `protobuf:"varint,6,opt,name=field35748" json:"field35748,omitempty"`
-	Field35749           *int32                  `protobuf:"varint,49,opt,name=field35749" json:"field35749,omitempty"`
-	Field35750           *int32                  `protobuf:"varint,7,opt,name=field35750" json:"field35750,omitempty"`
-	Field35751           *uint32                 `protobuf:"varint,59,opt,name=field35751" json:"field35751,omitempty"`
-	Field35752           *int32                  `protobuf:"varint,14,opt,name=field35752" json:"field35752,omitempty"`
-	Field35753           *int32                  `protobuf:"varint,15,opt,name=field35753" json:"field35753,omitempty"`
-	Field35754           *int32                  `protobuf:"varint,35,opt,name=field35754" json:"field35754,omitempty"`
-	Field35755           []byte                  `protobuf:"bytes,53,opt,name=field35755" json:"field35755,omitempty"`
-	Field35756           *int32                  `protobuf:"varint,8,opt,name=field35756" json:"field35756,omitempty"`
-	Field35757           *string                 `protobuf:"bytes,9,opt,name=field35757" json:"field35757,omitempty"`
-	Field35758           *uint64                 `protobuf:"fixed64,10,opt,name=field35758" json:"field35758,omitempty"`
-	Field35759           *int32                  `protobuf:"varint,11,opt,name=field35759" json:"field35759,omitempty"`
-	Field35760           *int32                  `protobuf:"varint,12,opt,name=field35760" json:"field35760,omitempty"`
-	Field35761           *int32                  `protobuf:"varint,41,opt,name=field35761" json:"field35761,omitempty"`
-	Field35762           *int32                  `protobuf:"varint,30,opt,name=field35762" json:"field35762,omitempty"`
-	Field35763           *int32                  `protobuf:"varint,31,opt,name=field35763" json:"field35763,omitempty"`
-	Field35764           *int32                  `protobuf:"varint,13,opt,name=field35764" json:"field35764,omitempty"`
-	Field35765           []byte                  `protobuf:"bytes,39,opt,name=field35765" json:"field35765,omitempty"`
-	Field35766           *string                 `protobuf:"bytes,29,opt,name=field35766" json:"field35766,omitempty"`
-	Field35767           *int32                  `protobuf:"varint,42,opt,name=field35767" json:"field35767,omitempty"`
-	Field35768           []int32                 `protobuf:"varint,32,rep,name=field35768" json:"field35768,omitempty"`
-	Field35769           []int32                 `protobuf:"varint,51,rep,name=field35769" json:"field35769,omitempty"`
-	Field35770           *int64                  `protobuf:"varint,54,opt,name=field35770" json:"field35770,omitempty"`
-	Field35771           *Message0               `protobuf:"bytes,55,opt,name=field35771" json:"field35771,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35747    *uint64   `protobuf:"fixed64,5,opt,name=field35747" json:"field35747,omitempty"`
+	Field35748    *int32    `protobuf:"varint,6,opt,name=field35748" json:"field35748,omitempty"`
+	Field35749    *int32    `protobuf:"varint,49,opt,name=field35749" json:"field35749,omitempty"`
+	Field35750    *int32    `protobuf:"varint,7,opt,name=field35750" json:"field35750,omitempty"`
+	Field35751    *uint32   `protobuf:"varint,59,opt,name=field35751" json:"field35751,omitempty"`
+	Field35752    *int32    `protobuf:"varint,14,opt,name=field35752" json:"field35752,omitempty"`
+	Field35753    *int32    `protobuf:"varint,15,opt,name=field35753" json:"field35753,omitempty"`
+	Field35754    *int32    `protobuf:"varint,35,opt,name=field35754" json:"field35754,omitempty"`
+	Field35755    []byte    `protobuf:"bytes,53,opt,name=field35755" json:"field35755,omitempty"`
+	Field35756    *int32    `protobuf:"varint,8,opt,name=field35756" json:"field35756,omitempty"`
+	Field35757    *string   `protobuf:"bytes,9,opt,name=field35757" json:"field35757,omitempty"`
+	Field35758    *uint64   `protobuf:"fixed64,10,opt,name=field35758" json:"field35758,omitempty"`
+	Field35759    *int32    `protobuf:"varint,11,opt,name=field35759" json:"field35759,omitempty"`
+	Field35760    *int32    `protobuf:"varint,12,opt,name=field35760" json:"field35760,omitempty"`
+	Field35761    *int32    `protobuf:"varint,41,opt,name=field35761" json:"field35761,omitempty"`
+	Field35762    *int32    `protobuf:"varint,30,opt,name=field35762" json:"field35762,omitempty"`
+	Field35763    *int32    `protobuf:"varint,31,opt,name=field35763" json:"field35763,omitempty"`
+	Field35764    *int32    `protobuf:"varint,13,opt,name=field35764" json:"field35764,omitempty"`
+	Field35765    []byte    `protobuf:"bytes,39,opt,name=field35765" json:"field35765,omitempty"`
+	Field35766    *string   `protobuf:"bytes,29,opt,name=field35766" json:"field35766,omitempty"`
+	Field35767    *int32    `protobuf:"varint,42,opt,name=field35767" json:"field35767,omitempty"`
+	Field35768    []int32   `protobuf:"varint,32,rep,name=field35768" json:"field35768,omitempty"`
+	Field35769    []int32   `protobuf:"varint,51,rep,name=field35769" json:"field35769,omitempty"`
+	Field35770    *int64    `protobuf:"varint,54,opt,name=field35770" json:"field35770,omitempty"`
+	Field35771    *Message0 `protobuf:"bytes,55,opt,name=field35771" json:"field35771,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35573_Message35575_Message35576) Reset() {
@@ -4112,11 +4079,10 @@
 }
 
 type Message36858_Message36859 struct {
-	Field36968           *Enum36860              `protobuf:"varint,9,req,name=field36968,enum=benchmarks.google_message3.Enum36860" json:"field36968,omitempty"`
-	Field36969           *float32                `protobuf:"fixed32,10,opt,name=field36969" json:"field36969,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field36968    *Enum36860 `protobuf:"varint,9,req,name=field36968,enum=benchmarks.google_message3.Enum36860" json:"field36968,omitempty"`
+	Field36969    *float32   `protobuf:"fixed32,10,opt,name=field36969" json:"field36969,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message36858_Message36859) Reset() {
@@ -5557,6 +5523,352 @@
 	file_datasets_google_message3_benchmark_message3_5_proto_init()
 	file_datasets_google_message3_benchmark_message3_7_proto_init()
 	file_datasets_google_message3_benchmark_message3_8_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message22853); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24345); i {
+			case 25:
+				return &v.sizeCache
+			case 26:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24403); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24391); i {
+			case 25:
+				return &v.sizeCache
+			case 26:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message27454); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message27357); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message27360); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message34387); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message34621); i {
+			case 18:
+				return &v.sizeCache
+			case 19:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35476); i {
+			case 14:
+				return &v.sizeCache
+			case 15:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message949); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36869); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message33968); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6644); i {
+			case 16:
+				return &v.sizeCache
+			case 17:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18831); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13090); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11874); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			case 6:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message4144); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35573); i {
+			case 11:
+				return &v.sizeCache
+			case 12:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36858); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13174); i {
+			case 21:
+				return &v.sizeCache
+			case 22:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18283); i {
+			case 104:
+				return &v.sizeCache
+			case 105:
+				return &v.unknownFields
+			case 106:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13169); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message19255); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35542); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3901); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message33968_Message33969); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18831_Message18832); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18831_Message18832_Message18833); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message4144_Message4145); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35573_Message35574); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35573_Message35575); i {
+			case 38:
+				return &v.sizeCache
+			case 39:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35573_Message35575_Message35576); i {
+			case 25:
+				return &v.sizeCache
+			case 26:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_2_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message36858_Message36859); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message3_benchmark_message3_2_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go
index 4f0d844..11cf114 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go
@@ -18,21 +18,20 @@
 )
 
 type Message35546 struct {
-	Field35556           *int64                     `protobuf:"varint,1,opt,name=field35556" json:"field35556,omitempty"`
-	Field35557           *int32                     `protobuf:"varint,2,opt,name=field35557" json:"field35557,omitempty"`
-	Field35558           *bool                      `protobuf:"varint,3,opt,name=field35558" json:"field35558,omitempty"`
-	Field35559           *int64                     `protobuf:"varint,13,opt,name=field35559" json:"field35559,omitempty"`
-	Message35547         *Message35546_Message35547 `protobuf:"group,4,opt,name=Message35547,json=message35547" json:"message35547,omitempty"`
-	Message35548         *Message35546_Message35548 `protobuf:"group,10,opt,name=Message35548,json=message35548" json:"message35548,omitempty"`
-	Field35562           *bool                      `protobuf:"varint,14,opt,name=field35562" json:"field35562,omitempty"`
-	Field35563           *bool                      `protobuf:"varint,15,opt,name=field35563" json:"field35563,omitempty"`
-	Field35564           *int32                     `protobuf:"varint,16,opt,name=field35564" json:"field35564,omitempty"`
-	Field35565           *bool                      `protobuf:"varint,17,opt,name=field35565" json:"field35565,omitempty"`
-	Field35566           *bool                      `protobuf:"varint,18,opt,name=field35566" json:"field35566,omitempty"`
-	Field35567           *string                    `protobuf:"bytes,100,opt,name=field35567" json:"field35567,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Field35556    *int64                     `protobuf:"varint,1,opt,name=field35556" json:"field35556,omitempty"`
+	Field35557    *int32                     `protobuf:"varint,2,opt,name=field35557" json:"field35557,omitempty"`
+	Field35558    *bool                      `protobuf:"varint,3,opt,name=field35558" json:"field35558,omitempty"`
+	Field35559    *int64                     `protobuf:"varint,13,opt,name=field35559" json:"field35559,omitempty"`
+	Message35547  *Message35546_Message35547 `protobuf:"group,4,opt,name=Message35547,json=message35547" json:"message35547,omitempty"`
+	Message35548  *Message35546_Message35548 `protobuf:"group,10,opt,name=Message35548,json=message35548" json:"message35548,omitempty"`
+	Field35562    *bool                      `protobuf:"varint,14,opt,name=field35562" json:"field35562,omitempty"`
+	Field35563    *bool                      `protobuf:"varint,15,opt,name=field35563" json:"field35563,omitempty"`
+	Field35564    *int32                     `protobuf:"varint,16,opt,name=field35564" json:"field35564,omitempty"`
+	Field35565    *bool                      `protobuf:"varint,17,opt,name=field35565" json:"field35565,omitempty"`
+	Field35566    *bool                      `protobuf:"varint,18,opt,name=field35566" json:"field35566,omitempty"`
+	Field35567    *string                    `protobuf:"bytes,100,opt,name=field35567" json:"field35567,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35546) Reset() {
@@ -143,40 +142,39 @@
 }
 
 type Message2356 struct {
-	Field2368            *Message1374               `protobuf:"bytes,121,opt,name=field2368" json:"field2368,omitempty"`
-	Field2369            *uint64                    `protobuf:"varint,1,opt,name=field2369" json:"field2369,omitempty"`
-	Field2370            *int32                     `protobuf:"varint,2,opt,name=field2370" json:"field2370,omitempty"`
-	Field2371            *int32                     `protobuf:"varint,17,opt,name=field2371" json:"field2371,omitempty"`
-	Field2372            *string                    `protobuf:"bytes,3,req,name=field2372" json:"field2372,omitempty"`
-	Field2373            *int32                     `protobuf:"varint,7,opt,name=field2373" json:"field2373,omitempty"`
-	Field2374            []byte                     `protobuf:"bytes,8,opt,name=field2374" json:"field2374,omitempty"`
-	Field2375            *string                    `protobuf:"bytes,4,opt,name=field2375" json:"field2375,omitempty"`
-	Field2376            *string                    `protobuf:"bytes,101,opt,name=field2376" json:"field2376,omitempty"`
-	Field2377            *int32                     `protobuf:"varint,102,opt,name=field2377" json:"field2377,omitempty"`
-	Field2378            *int32                     `protobuf:"varint,103,opt,name=field2378" json:"field2378,omitempty"`
-	Field2379            *int32                     `protobuf:"varint,104,opt,name=field2379" json:"field2379,omitempty"`
-	Field2380            *int32                     `protobuf:"varint,113,opt,name=field2380" json:"field2380,omitempty"`
-	Field2381            *int32                     `protobuf:"varint,114,opt,name=field2381" json:"field2381,omitempty"`
-	Field2382            *int32                     `protobuf:"varint,115,opt,name=field2382" json:"field2382,omitempty"`
-	Field2383            *int32                     `protobuf:"varint,117,opt,name=field2383" json:"field2383,omitempty"`
-	Field2384            *int32                     `protobuf:"varint,118,opt,name=field2384" json:"field2384,omitempty"`
-	Field2385            *int32                     `protobuf:"varint,119,opt,name=field2385" json:"field2385,omitempty"`
-	Field2386            *int32                     `protobuf:"varint,105,opt,name=field2386" json:"field2386,omitempty"`
-	Field2387            []byte                     `protobuf:"bytes,5,opt,name=field2387" json:"field2387,omitempty"`
-	Message2357          *Message2356_Message2357   `protobuf:"group,6,opt,name=Message2357,json=message2357" json:"message2357,omitempty"`
-	Field2389            *string                    `protobuf:"bytes,120,opt,name=field2389" json:"field2389,omitempty"`
-	Message2358          *Message2356_Message2358   `protobuf:"group,107,opt,name=Message2358,json=message2358" json:"message2358,omitempty"`
-	Message2359          []*Message2356_Message2359 `protobuf:"group,40,rep,name=Message2359,json=message2359" json:"message2359,omitempty"`
-	Field2392            *int32                     `protobuf:"varint,50,opt,name=field2392" json:"field2392,omitempty"`
-	Field2393            *UnusedEmptyMessage        `protobuf:"bytes,60,opt,name=field2393" json:"field2393,omitempty"`
-	Field2394            *UnusedEmptyMessage        `protobuf:"bytes,70,opt,name=field2394" json:"field2394,omitempty"`
-	Field2395            *UnusedEmptyMessage        `protobuf:"bytes,80,opt,name=field2395" json:"field2395,omitempty"`
-	Field2396            *UnusedEmptyMessage        `protobuf:"bytes,90,opt,name=field2396" json:"field2396,omitempty"`
-	Field2397            *string                    `protobuf:"bytes,100,opt,name=field2397" json:"field2397,omitempty"`
-	Field2398            *string                    `protobuf:"bytes,123,opt,name=field2398" json:"field2398,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Field2368     *Message1374               `protobuf:"bytes,121,opt,name=field2368" json:"field2368,omitempty"`
+	Field2369     *uint64                    `protobuf:"varint,1,opt,name=field2369" json:"field2369,omitempty"`
+	Field2370     *int32                     `protobuf:"varint,2,opt,name=field2370" json:"field2370,omitempty"`
+	Field2371     *int32                     `protobuf:"varint,17,opt,name=field2371" json:"field2371,omitempty"`
+	Field2372     *string                    `protobuf:"bytes,3,req,name=field2372" json:"field2372,omitempty"`
+	Field2373     *int32                     `protobuf:"varint,7,opt,name=field2373" json:"field2373,omitempty"`
+	Field2374     []byte                     `protobuf:"bytes,8,opt,name=field2374" json:"field2374,omitempty"`
+	Field2375     *string                    `protobuf:"bytes,4,opt,name=field2375" json:"field2375,omitempty"`
+	Field2376     *string                    `protobuf:"bytes,101,opt,name=field2376" json:"field2376,omitempty"`
+	Field2377     *int32                     `protobuf:"varint,102,opt,name=field2377" json:"field2377,omitempty"`
+	Field2378     *int32                     `protobuf:"varint,103,opt,name=field2378" json:"field2378,omitempty"`
+	Field2379     *int32                     `protobuf:"varint,104,opt,name=field2379" json:"field2379,omitempty"`
+	Field2380     *int32                     `protobuf:"varint,113,opt,name=field2380" json:"field2380,omitempty"`
+	Field2381     *int32                     `protobuf:"varint,114,opt,name=field2381" json:"field2381,omitempty"`
+	Field2382     *int32                     `protobuf:"varint,115,opt,name=field2382" json:"field2382,omitempty"`
+	Field2383     *int32                     `protobuf:"varint,117,opt,name=field2383" json:"field2383,omitempty"`
+	Field2384     *int32                     `protobuf:"varint,118,opt,name=field2384" json:"field2384,omitempty"`
+	Field2385     *int32                     `protobuf:"varint,119,opt,name=field2385" json:"field2385,omitempty"`
+	Field2386     *int32                     `protobuf:"varint,105,opt,name=field2386" json:"field2386,omitempty"`
+	Field2387     []byte                     `protobuf:"bytes,5,opt,name=field2387" json:"field2387,omitempty"`
+	Message2357   *Message2356_Message2357   `protobuf:"group,6,opt,name=Message2357,json=message2357" json:"message2357,omitempty"`
+	Field2389     *string                    `protobuf:"bytes,120,opt,name=field2389" json:"field2389,omitempty"`
+	Message2358   *Message2356_Message2358   `protobuf:"group,107,opt,name=Message2358,json=message2358" json:"message2358,omitempty"`
+	Message2359   []*Message2356_Message2359 `protobuf:"group,40,rep,name=Message2359,json=message2359" json:"message2359,omitempty"`
+	Field2392     *int32                     `protobuf:"varint,50,opt,name=field2392" json:"field2392,omitempty"`
+	Field2393     *UnusedEmptyMessage        `protobuf:"bytes,60,opt,name=field2393" json:"field2393,omitempty"`
+	Field2394     *UnusedEmptyMessage        `protobuf:"bytes,70,opt,name=field2394" json:"field2394,omitempty"`
+	Field2395     *UnusedEmptyMessage        `protobuf:"bytes,80,opt,name=field2395" json:"field2395,omitempty"`
+	Field2396     *UnusedEmptyMessage        `protobuf:"bytes,90,opt,name=field2396" json:"field2396,omitempty"`
+	Field2397     *string                    `protobuf:"bytes,100,opt,name=field2397" json:"field2397,omitempty"`
+	Field2398     *string                    `protobuf:"bytes,123,opt,name=field2398" json:"field2398,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2356) Reset() {
@@ -420,51 +418,50 @@
 }
 
 type Message7029 struct {
-	Field7183            *int32                     `protobuf:"varint,1,req,name=field7183" json:"field7183,omitempty"`
-	Field7184            *int32                     `protobuf:"varint,2,opt,name=field7184" json:"field7184,omitempty"`
-	Field7185            *int32                     `protobuf:"varint,3,opt,name=field7185" json:"field7185,omitempty"`
-	Field7186            *int32                     `protobuf:"varint,4,opt,name=field7186" json:"field7186,omitempty"`
-	Field7187            *int32                     `protobuf:"varint,5,opt,name=field7187" json:"field7187,omitempty"`
-	Field7188            *int32                     `protobuf:"varint,6,opt,name=field7188" json:"field7188,omitempty"`
-	Field7189            *int32                     `protobuf:"varint,17,opt,name=field7189" json:"field7189,omitempty"`
-	Field7190            *int32                     `protobuf:"varint,18,opt,name=field7190" json:"field7190,omitempty"`
-	Field7191            *int32                     `protobuf:"varint,49,opt,name=field7191" json:"field7191,omitempty"`
-	Field7192            *int32                     `protobuf:"varint,28,opt,name=field7192" json:"field7192,omitempty"`
-	Field7193            *int32                     `protobuf:"varint,33,opt,name=field7193" json:"field7193,omitempty"`
-	Field7194            *int32                     `protobuf:"varint,25,opt,name=field7194" json:"field7194,omitempty"`
-	Field7195            *int32                     `protobuf:"varint,26,opt,name=field7195" json:"field7195,omitempty"`
-	Field7196            *int32                     `protobuf:"varint,40,opt,name=field7196" json:"field7196,omitempty"`
-	Field7197            *int32                     `protobuf:"varint,41,opt,name=field7197" json:"field7197,omitempty"`
-	Field7198            *int32                     `protobuf:"varint,42,opt,name=field7198" json:"field7198,omitempty"`
-	Field7199            *int32                     `protobuf:"varint,43,opt,name=field7199" json:"field7199,omitempty"`
-	Field7200            *int32                     `protobuf:"varint,19,opt,name=field7200" json:"field7200,omitempty"`
-	Field7201            *int32                     `protobuf:"varint,7,opt,name=field7201" json:"field7201,omitempty"`
-	Field7202            *int32                     `protobuf:"varint,8,opt,name=field7202" json:"field7202,omitempty"`
-	Field7203            *int32                     `protobuf:"varint,9,opt,name=field7203" json:"field7203,omitempty"`
-	Field7204            *int32                     `protobuf:"varint,10,opt,name=field7204" json:"field7204,omitempty"`
-	Field7205            *int32                     `protobuf:"varint,11,opt,name=field7205" json:"field7205,omitempty"`
-	Field7206            *int32                     `protobuf:"varint,12,opt,name=field7206" json:"field7206,omitempty"`
-	Message7030          []*Message7029_Message7030 `protobuf:"group,13,rep,name=Message7030,json=message7030" json:"message7030,omitempty"`
-	Message7031          []*Message7029_Message7031 `protobuf:"group,21,rep,name=Message7031,json=message7031" json:"message7031,omitempty"`
-	Field7209            *int32                     `protobuf:"varint,20,opt,name=field7209" json:"field7209,omitempty"`
-	Field7210            *float32                   `protobuf:"fixed32,27,opt,name=field7210" json:"field7210,omitempty"`
-	Field7211            *int32                     `protobuf:"varint,29,opt,name=field7211" json:"field7211,omitempty"`
-	Field7212            *int32                     `protobuf:"varint,32,opt,name=field7212" json:"field7212,omitempty"`
-	Field7213            *string                    `protobuf:"bytes,48,opt,name=field7213" json:"field7213,omitempty"`
-	Field7214            *bool                      `protobuf:"varint,34,opt,name=field7214" json:"field7214,omitempty"`
-	Field7215            *int32                     `protobuf:"varint,36,opt,name=field7215" json:"field7215,omitempty"`
-	Field7216            *float32                   `protobuf:"fixed32,37,opt,name=field7216" json:"field7216,omitempty"`
-	Field7217            *bool                      `protobuf:"varint,38,opt,name=field7217" json:"field7217,omitempty"`
-	Field7218            *bool                      `protobuf:"varint,39,opt,name=field7218" json:"field7218,omitempty"`
-	Field7219            *UnusedEmptyMessage        `protobuf:"bytes,44,opt,name=field7219" json:"field7219,omitempty"`
-	Field7220            *int32                     `protobuf:"varint,45,opt,name=field7220" json:"field7220,omitempty"`
-	Field7221            *int32                     `protobuf:"varint,46,opt,name=field7221" json:"field7221,omitempty"`
-	Field7222            *int32                     `protobuf:"varint,47,opt,name=field7222" json:"field7222,omitempty"`
-	Field7223            *UnusedEmptyMessage        `protobuf:"bytes,50,opt,name=field7223" json:"field7223,omitempty"`
-	Field7224            *int32                     `protobuf:"varint,51,opt,name=field7224" json:"field7224,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Field7183     *int32                     `protobuf:"varint,1,req,name=field7183" json:"field7183,omitempty"`
+	Field7184     *int32                     `protobuf:"varint,2,opt,name=field7184" json:"field7184,omitempty"`
+	Field7185     *int32                     `protobuf:"varint,3,opt,name=field7185" json:"field7185,omitempty"`
+	Field7186     *int32                     `protobuf:"varint,4,opt,name=field7186" json:"field7186,omitempty"`
+	Field7187     *int32                     `protobuf:"varint,5,opt,name=field7187" json:"field7187,omitempty"`
+	Field7188     *int32                     `protobuf:"varint,6,opt,name=field7188" json:"field7188,omitempty"`
+	Field7189     *int32                     `protobuf:"varint,17,opt,name=field7189" json:"field7189,omitempty"`
+	Field7190     *int32                     `protobuf:"varint,18,opt,name=field7190" json:"field7190,omitempty"`
+	Field7191     *int32                     `protobuf:"varint,49,opt,name=field7191" json:"field7191,omitempty"`
+	Field7192     *int32                     `protobuf:"varint,28,opt,name=field7192" json:"field7192,omitempty"`
+	Field7193     *int32                     `protobuf:"varint,33,opt,name=field7193" json:"field7193,omitempty"`
+	Field7194     *int32                     `protobuf:"varint,25,opt,name=field7194" json:"field7194,omitempty"`
+	Field7195     *int32                     `protobuf:"varint,26,opt,name=field7195" json:"field7195,omitempty"`
+	Field7196     *int32                     `protobuf:"varint,40,opt,name=field7196" json:"field7196,omitempty"`
+	Field7197     *int32                     `protobuf:"varint,41,opt,name=field7197" json:"field7197,omitempty"`
+	Field7198     *int32                     `protobuf:"varint,42,opt,name=field7198" json:"field7198,omitempty"`
+	Field7199     *int32                     `protobuf:"varint,43,opt,name=field7199" json:"field7199,omitempty"`
+	Field7200     *int32                     `protobuf:"varint,19,opt,name=field7200" json:"field7200,omitempty"`
+	Field7201     *int32                     `protobuf:"varint,7,opt,name=field7201" json:"field7201,omitempty"`
+	Field7202     *int32                     `protobuf:"varint,8,opt,name=field7202" json:"field7202,omitempty"`
+	Field7203     *int32                     `protobuf:"varint,9,opt,name=field7203" json:"field7203,omitempty"`
+	Field7204     *int32                     `protobuf:"varint,10,opt,name=field7204" json:"field7204,omitempty"`
+	Field7205     *int32                     `protobuf:"varint,11,opt,name=field7205" json:"field7205,omitempty"`
+	Field7206     *int32                     `protobuf:"varint,12,opt,name=field7206" json:"field7206,omitempty"`
+	Message7030   []*Message7029_Message7030 `protobuf:"group,13,rep,name=Message7030,json=message7030" json:"message7030,omitempty"`
+	Message7031   []*Message7029_Message7031 `protobuf:"group,21,rep,name=Message7031,json=message7031" json:"message7031,omitempty"`
+	Field7209     *int32                     `protobuf:"varint,20,opt,name=field7209" json:"field7209,omitempty"`
+	Field7210     *float32                   `protobuf:"fixed32,27,opt,name=field7210" json:"field7210,omitempty"`
+	Field7211     *int32                     `protobuf:"varint,29,opt,name=field7211" json:"field7211,omitempty"`
+	Field7212     *int32                     `protobuf:"varint,32,opt,name=field7212" json:"field7212,omitempty"`
+	Field7213     *string                    `protobuf:"bytes,48,opt,name=field7213" json:"field7213,omitempty"`
+	Field7214     *bool                      `protobuf:"varint,34,opt,name=field7214" json:"field7214,omitempty"`
+	Field7215     *int32                     `protobuf:"varint,36,opt,name=field7215" json:"field7215,omitempty"`
+	Field7216     *float32                   `protobuf:"fixed32,37,opt,name=field7216" json:"field7216,omitempty"`
+	Field7217     *bool                      `protobuf:"varint,38,opt,name=field7217" json:"field7217,omitempty"`
+	Field7218     *bool                      `protobuf:"varint,39,opt,name=field7218" json:"field7218,omitempty"`
+	Field7219     *UnusedEmptyMessage        `protobuf:"bytes,44,opt,name=field7219" json:"field7219,omitempty"`
+	Field7220     *int32                     `protobuf:"varint,45,opt,name=field7220" json:"field7220,omitempty"`
+	Field7221     *int32                     `protobuf:"varint,46,opt,name=field7221" json:"field7221,omitempty"`
+	Field7222     *int32                     `protobuf:"varint,47,opt,name=field7222" json:"field7222,omitempty"`
+	Field7223     *UnusedEmptyMessage        `protobuf:"bytes,50,opt,name=field7223" json:"field7223,omitempty"`
+	Field7224     *int32                     `protobuf:"varint,51,opt,name=field7224" json:"field7224,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7029) Reset() {
@@ -785,10 +782,9 @@
 }
 
 type Message35538 struct {
-	Field35539           *int64                  `protobuf:"varint,1,req,name=field35539" json:"field35539,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35539    *int64 `protobuf:"varint,1,req,name=field35539" json:"field35539,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35538) Reset() {
@@ -822,21 +818,20 @@
 }
 
 type Message18921 struct {
-	Field18946           *string                      `protobuf:"bytes,1,opt,name=field18946" json:"field18946,omitempty"`
-	Field18947           *uint64                      `protobuf:"fixed64,2,opt,name=field18947" json:"field18947,omitempty"`
-	Field18948           *int32                       `protobuf:"varint,3,opt,name=field18948" json:"field18948,omitempty"`
-	Field18949           *float64                     `protobuf:"fixed64,4,opt,name=field18949" json:"field18949,omitempty"`
-	Field18950           *bool                        `protobuf:"varint,17,opt,name=field18950" json:"field18950,omitempty"`
-	Field18951           *bool                        `protobuf:"varint,23,opt,name=field18951" json:"field18951,omitempty"`
-	Field18952           *UnusedEmptyMessage          `protobuf:"bytes,24,opt,name=field18952" json:"field18952,omitempty"`
-	Message18922         []*Message18921_Message18922 `protobuf:"group,5,rep,name=Message18922,json=message18922" json:"message18922,omitempty"`
-	Field18954           []*UnusedEmptyMessage        `protobuf:"bytes,29,rep,name=field18954" json:"field18954,omitempty"`
-	Field18955           []*Message18943              `protobuf:"bytes,30,rep,name=field18955" json:"field18955,omitempty"`
-	Field18956           []*Message18944              `protobuf:"bytes,31,rep,name=field18956" json:"field18956,omitempty"`
-	Field18957           []*UnusedEmptyMessage        `protobuf:"bytes,32,rep,name=field18957" json:"field18957,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field18946    *string                      `protobuf:"bytes,1,opt,name=field18946" json:"field18946,omitempty"`
+	Field18947    *uint64                      `protobuf:"fixed64,2,opt,name=field18947" json:"field18947,omitempty"`
+	Field18948    *int32                       `protobuf:"varint,3,opt,name=field18948" json:"field18948,omitempty"`
+	Field18949    *float64                     `protobuf:"fixed64,4,opt,name=field18949" json:"field18949,omitempty"`
+	Field18950    *bool                        `protobuf:"varint,17,opt,name=field18950" json:"field18950,omitempty"`
+	Field18951    *bool                        `protobuf:"varint,23,opt,name=field18951" json:"field18951,omitempty"`
+	Field18952    *UnusedEmptyMessage          `protobuf:"bytes,24,opt,name=field18952" json:"field18952,omitempty"`
+	Message18922  []*Message18921_Message18922 `protobuf:"group,5,rep,name=Message18922,json=message18922" json:"message18922,omitempty"`
+	Field18954    []*UnusedEmptyMessage        `protobuf:"bytes,29,rep,name=field18954" json:"field18954,omitempty"`
+	Field18955    []*Message18943              `protobuf:"bytes,30,rep,name=field18955" json:"field18955,omitempty"`
+	Field18956    []*Message18944              `protobuf:"bytes,31,rep,name=field18956" json:"field18956,omitempty"`
+	Field18957    []*UnusedEmptyMessage        `protobuf:"bytes,32,rep,name=field18957" json:"field18957,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18921) Reset() {
@@ -947,10 +942,9 @@
 }
 
 type Message35540 struct {
-	Field35541           *bool                   `protobuf:"varint,1,opt,name=field35541" json:"field35541,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35541    *bool `protobuf:"varint,1,opt,name=field35541" json:"field35541,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35540) Reset() {
@@ -984,10 +978,9 @@
 }
 
 type Message3886 struct {
-	Message3887          []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Message3887   []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3886) Reset() {
@@ -1021,17 +1014,16 @@
 }
 
 type Message6743 struct {
-	Field6759            *Message6721            `protobuf:"bytes,1,opt,name=field6759" json:"field6759,omitempty"`
-	Field6760            *Message6723            `protobuf:"bytes,2,opt,name=field6760" json:"field6760,omitempty"`
-	Field6761            *Message6723            `protobuf:"bytes,8,opt,name=field6761" json:"field6761,omitempty"`
-	Field6762            *Message6725            `protobuf:"bytes,3,opt,name=field6762" json:"field6762,omitempty"`
-	Field6763            *Message6726            `protobuf:"bytes,4,opt,name=field6763" json:"field6763,omitempty"`
-	Field6764            *Message6733            `protobuf:"bytes,5,opt,name=field6764" json:"field6764,omitempty"`
-	Field6765            *Message6734            `protobuf:"bytes,6,opt,name=field6765" json:"field6765,omitempty"`
-	Field6766            *Message6742            `protobuf:"bytes,7,opt,name=field6766" json:"field6766,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6759     *Message6721 `protobuf:"bytes,1,opt,name=field6759" json:"field6759,omitempty"`
+	Field6760     *Message6723 `protobuf:"bytes,2,opt,name=field6760" json:"field6760,omitempty"`
+	Field6761     *Message6723 `protobuf:"bytes,8,opt,name=field6761" json:"field6761,omitempty"`
+	Field6762     *Message6725 `protobuf:"bytes,3,opt,name=field6762" json:"field6762,omitempty"`
+	Field6763     *Message6726 `protobuf:"bytes,4,opt,name=field6763" json:"field6763,omitempty"`
+	Field6764     *Message6733 `protobuf:"bytes,5,opt,name=field6764" json:"field6764,omitempty"`
+	Field6765     *Message6734 `protobuf:"bytes,6,opt,name=field6765" json:"field6765,omitempty"`
+	Field6766     *Message6742 `protobuf:"bytes,7,opt,name=field6766" json:"field6766,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6743) Reset() {
@@ -1114,19 +1106,18 @@
 }
 
 type Message6773 struct {
-	Field6794            *Enum6769               `protobuf:"varint,1,opt,name=field6794,enum=benchmarks.google_message3.Enum6769" json:"field6794,omitempty"`
-	Field6795            *int32                  `protobuf:"varint,9,opt,name=field6795" json:"field6795,omitempty"`
-	Field6796            *UnusedEnum             `protobuf:"varint,10,opt,name=field6796,enum=benchmarks.google_message3.UnusedEnum" json:"field6796,omitempty"`
-	Field6797            *int32                  `protobuf:"varint,11,opt,name=field6797" json:"field6797,omitempty"`
-	Field6798            *int32                  `protobuf:"varint,2,opt,name=field6798" json:"field6798,omitempty"`
-	Field6799            *Enum6774               `protobuf:"varint,3,opt,name=field6799,enum=benchmarks.google_message3.Enum6774" json:"field6799,omitempty"`
-	Field6800            *float64                `protobuf:"fixed64,5,opt,name=field6800" json:"field6800,omitempty"`
-	Field6801            *float64                `protobuf:"fixed64,7,opt,name=field6801" json:"field6801,omitempty"`
-	Field6802            *float64                `protobuf:"fixed64,8,opt,name=field6802" json:"field6802,omitempty"`
-	Field6803            *Enum6782               `protobuf:"varint,6,opt,name=field6803,enum=benchmarks.google_message3.Enum6782" json:"field6803,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6794     *Enum6769   `protobuf:"varint,1,opt,name=field6794,enum=benchmarks.google_message3.Enum6769" json:"field6794,omitempty"`
+	Field6795     *int32      `protobuf:"varint,9,opt,name=field6795" json:"field6795,omitempty"`
+	Field6796     *UnusedEnum `protobuf:"varint,10,opt,name=field6796,enum=benchmarks.google_message3.UnusedEnum" json:"field6796,omitempty"`
+	Field6797     *int32      `protobuf:"varint,11,opt,name=field6797" json:"field6797,omitempty"`
+	Field6798     *int32      `protobuf:"varint,2,opt,name=field6798" json:"field6798,omitempty"`
+	Field6799     *Enum6774   `protobuf:"varint,3,opt,name=field6799,enum=benchmarks.google_message3.Enum6774" json:"field6799,omitempty"`
+	Field6800     *float64    `protobuf:"fixed64,5,opt,name=field6800" json:"field6800,omitempty"`
+	Field6801     *float64    `protobuf:"fixed64,7,opt,name=field6801" json:"field6801,omitempty"`
+	Field6802     *float64    `protobuf:"fixed64,8,opt,name=field6802" json:"field6802,omitempty"`
+	Field6803     *Enum6782   `protobuf:"varint,6,opt,name=field6803,enum=benchmarks.google_message3.Enum6782" json:"field6803,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6773) Reset() {
@@ -1223,36 +1214,35 @@
 }
 
 type Message8224 struct {
-	Field8255            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field8255" json:"field8255,omitempty"`
-	Field8256            *Message8184            `protobuf:"bytes,2,opt,name=field8256" json:"field8256,omitempty"`
-	Field8257            *Message7966            `protobuf:"bytes,3,opt,name=field8257" json:"field8257,omitempty"`
-	Field8258            *string                 `protobuf:"bytes,4,opt,name=field8258" json:"field8258,omitempty"`
-	Field8259            *string                 `protobuf:"bytes,5,opt,name=field8259" json:"field8259,omitempty"`
-	Field8260            *bool                   `protobuf:"varint,6,opt,name=field8260" json:"field8260,omitempty"`
-	Field8261            *int64                  `protobuf:"varint,7,opt,name=field8261" json:"field8261,omitempty"`
-	Field8262            *string                 `protobuf:"bytes,8,opt,name=field8262" json:"field8262,omitempty"`
-	Field8263            *int64                  `protobuf:"varint,9,opt,name=field8263" json:"field8263,omitempty"`
-	Field8264            *float64                `protobuf:"fixed64,10,opt,name=field8264" json:"field8264,omitempty"`
-	Field8265            *int64                  `protobuf:"varint,11,opt,name=field8265" json:"field8265,omitempty"`
-	Field8266            []string                `protobuf:"bytes,12,rep,name=field8266" json:"field8266,omitempty"`
-	Field8267            *int64                  `protobuf:"varint,13,opt,name=field8267" json:"field8267,omitempty"`
-	Field8268            *int32                  `protobuf:"varint,14,opt,name=field8268" json:"field8268,omitempty"`
-	Field8269            *int32                  `protobuf:"varint,15,opt,name=field8269" json:"field8269,omitempty"`
-	Field8270            *int64                  `protobuf:"varint,16,opt,name=field8270" json:"field8270,omitempty"`
-	Field8271            *float64                `protobuf:"fixed64,17,opt,name=field8271" json:"field8271,omitempty"`
-	Field8272            *UnusedEmptyMessage     `protobuf:"bytes,18,opt,name=field8272" json:"field8272,omitempty"`
-	Field8273            *UnusedEmptyMessage     `protobuf:"bytes,19,opt,name=field8273" json:"field8273,omitempty"`
-	Field8274            []*UnusedEmptyMessage   `protobuf:"bytes,20,rep,name=field8274" json:"field8274,omitempty"`
-	Field8275            *bool                   `protobuf:"varint,21,opt,name=field8275" json:"field8275,omitempty"`
-	Field8276            *UnusedEmptyMessage     `protobuf:"bytes,22,opt,name=field8276" json:"field8276,omitempty"`
-	Field8277            *UnusedEmptyMessage     `protobuf:"bytes,23,opt,name=field8277" json:"field8277,omitempty"`
-	Field8278            []*UnusedEmptyMessage   `protobuf:"bytes,24,rep,name=field8278" json:"field8278,omitempty"`
-	Field8279            *UnusedEmptyMessage     `protobuf:"bytes,25,opt,name=field8279" json:"field8279,omitempty"`
-	Field8280            *bool                   `protobuf:"varint,26,opt,name=field8280" json:"field8280,omitempty"`
-	Field8281            []*UnusedEmptyMessage   `protobuf:"bytes,27,rep,name=field8281" json:"field8281,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8255     *UnusedEmptyMessage   `protobuf:"bytes,1,opt,name=field8255" json:"field8255,omitempty"`
+	Field8256     *Message8184          `protobuf:"bytes,2,opt,name=field8256" json:"field8256,omitempty"`
+	Field8257     *Message7966          `protobuf:"bytes,3,opt,name=field8257" json:"field8257,omitempty"`
+	Field8258     *string               `protobuf:"bytes,4,opt,name=field8258" json:"field8258,omitempty"`
+	Field8259     *string               `protobuf:"bytes,5,opt,name=field8259" json:"field8259,omitempty"`
+	Field8260     *bool                 `protobuf:"varint,6,opt,name=field8260" json:"field8260,omitempty"`
+	Field8261     *int64                `protobuf:"varint,7,opt,name=field8261" json:"field8261,omitempty"`
+	Field8262     *string               `protobuf:"bytes,8,opt,name=field8262" json:"field8262,omitempty"`
+	Field8263     *int64                `protobuf:"varint,9,opt,name=field8263" json:"field8263,omitempty"`
+	Field8264     *float64              `protobuf:"fixed64,10,opt,name=field8264" json:"field8264,omitempty"`
+	Field8265     *int64                `protobuf:"varint,11,opt,name=field8265" json:"field8265,omitempty"`
+	Field8266     []string              `protobuf:"bytes,12,rep,name=field8266" json:"field8266,omitempty"`
+	Field8267     *int64                `protobuf:"varint,13,opt,name=field8267" json:"field8267,omitempty"`
+	Field8268     *int32                `protobuf:"varint,14,opt,name=field8268" json:"field8268,omitempty"`
+	Field8269     *int32                `protobuf:"varint,15,opt,name=field8269" json:"field8269,omitempty"`
+	Field8270     *int64                `protobuf:"varint,16,opt,name=field8270" json:"field8270,omitempty"`
+	Field8271     *float64              `protobuf:"fixed64,17,opt,name=field8271" json:"field8271,omitempty"`
+	Field8272     *UnusedEmptyMessage   `protobuf:"bytes,18,opt,name=field8272" json:"field8272,omitempty"`
+	Field8273     *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field8273" json:"field8273,omitempty"`
+	Field8274     []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field8274" json:"field8274,omitempty"`
+	Field8275     *bool                 `protobuf:"varint,21,opt,name=field8275" json:"field8275,omitempty"`
+	Field8276     *UnusedEmptyMessage   `protobuf:"bytes,22,opt,name=field8276" json:"field8276,omitempty"`
+	Field8277     *UnusedEmptyMessage   `protobuf:"bytes,23,opt,name=field8277" json:"field8277,omitempty"`
+	Field8278     []*UnusedEmptyMessage `protobuf:"bytes,24,rep,name=field8278" json:"field8278,omitempty"`
+	Field8279     *UnusedEmptyMessage   `protobuf:"bytes,25,opt,name=field8279" json:"field8279,omitempty"`
+	Field8280     *bool                 `protobuf:"varint,26,opt,name=field8280" json:"field8280,omitempty"`
+	Field8281     []*UnusedEmptyMessage `protobuf:"bytes,27,rep,name=field8281" json:"field8281,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8224) Reset() {
@@ -1468,18 +1458,17 @@
 }
 
 type Message8392 struct {
-	Field8395            *string                 `protobuf:"bytes,1,opt,name=field8395" json:"field8395,omitempty"`
-	Field8396            *string                 `protobuf:"bytes,2,opt,name=field8396" json:"field8396,omitempty"`
-	Field8397            *Message7966            `protobuf:"bytes,3,opt,name=field8397" json:"field8397,omitempty"`
-	Field8398            *string                 `protobuf:"bytes,4,opt,name=field8398" json:"field8398,omitempty"`
-	Field8399            *string                 `protobuf:"bytes,5,opt,name=field8399" json:"field8399,omitempty"`
-	Field8400            *string                 `protobuf:"bytes,6,opt,name=field8400" json:"field8400,omitempty"`
-	Field8401            *string                 `protobuf:"bytes,7,opt,name=field8401" json:"field8401,omitempty"`
-	Field8402            *string                 `protobuf:"bytes,8,opt,name=field8402" json:"field8402,omitempty"`
-	Field8403            *string                 `protobuf:"bytes,9,opt,name=field8403" json:"field8403,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8395     *string      `protobuf:"bytes,1,opt,name=field8395" json:"field8395,omitempty"`
+	Field8396     *string      `protobuf:"bytes,2,opt,name=field8396" json:"field8396,omitempty"`
+	Field8397     *Message7966 `protobuf:"bytes,3,opt,name=field8397" json:"field8397,omitempty"`
+	Field8398     *string      `protobuf:"bytes,4,opt,name=field8398" json:"field8398,omitempty"`
+	Field8399     *string      `protobuf:"bytes,5,opt,name=field8399" json:"field8399,omitempty"`
+	Field8400     *string      `protobuf:"bytes,6,opt,name=field8400" json:"field8400,omitempty"`
+	Field8401     *string      `protobuf:"bytes,7,opt,name=field8401" json:"field8401,omitempty"`
+	Field8402     *string      `protobuf:"bytes,8,opt,name=field8402" json:"field8402,omitempty"`
+	Field8403     *string      `protobuf:"bytes,9,opt,name=field8403" json:"field8403,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8392) Reset() {
@@ -1569,33 +1558,32 @@
 }
 
 type Message8130 struct {
-	Field8156            *string                 `protobuf:"bytes,1,opt,name=field8156" json:"field8156,omitempty"`
-	Field8157            *string                 `protobuf:"bytes,2,opt,name=field8157" json:"field8157,omitempty"`
-	Field8158            *string                 `protobuf:"bytes,4,opt,name=field8158" json:"field8158,omitempty"`
-	Field8159            *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field8159" json:"field8159,omitempty"`
-	Field8160            []string                `protobuf:"bytes,7,rep,name=field8160" json:"field8160,omitempty"`
-	Field8161            *int64                  `protobuf:"varint,8,opt,name=field8161" json:"field8161,omitempty"`
-	Field8162            *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field8162" json:"field8162,omitempty"`
-	Field8163            *string                 `protobuf:"bytes,10,opt,name=field8163" json:"field8163,omitempty"`
-	Field8164            *string                 `protobuf:"bytes,11,opt,name=field8164" json:"field8164,omitempty"`
-	Field8165            *string                 `protobuf:"bytes,12,opt,name=field8165" json:"field8165,omitempty"`
-	Field8166            *string                 `protobuf:"bytes,13,opt,name=field8166" json:"field8166,omitempty"`
-	Field8167            *UnusedEmptyMessage     `protobuf:"bytes,14,opt,name=field8167" json:"field8167,omitempty"`
-	Field8168            *UnusedEmptyMessage     `protobuf:"bytes,15,opt,name=field8168" json:"field8168,omitempty"`
-	Field8169            *string                 `protobuf:"bytes,16,opt,name=field8169" json:"field8169,omitempty"`
-	Field8170            *UnusedEnum             `protobuf:"varint,17,opt,name=field8170,enum=benchmarks.google_message3.UnusedEnum" json:"field8170,omitempty"`
-	Field8171            *UnusedEnum             `protobuf:"varint,18,opt,name=field8171,enum=benchmarks.google_message3.UnusedEnum" json:"field8171,omitempty"`
-	Field8172            *bool                   `protobuf:"varint,19,opt,name=field8172" json:"field8172,omitempty"`
-	Field8173            *bool                   `protobuf:"varint,20,opt,name=field8173" json:"field8173,omitempty"`
-	Field8174            *float64                `protobuf:"fixed64,21,opt,name=field8174" json:"field8174,omitempty"`
-	Field8175            *int32                  `protobuf:"varint,22,opt,name=field8175" json:"field8175,omitempty"`
-	Field8176            *int32                  `protobuf:"varint,23,opt,name=field8176" json:"field8176,omitempty"`
-	Field8177            *UnusedEmptyMessage     `protobuf:"bytes,24,opt,name=field8177" json:"field8177,omitempty"`
-	Field8178            []*UnusedEmptyMessage   `protobuf:"bytes,25,rep,name=field8178" json:"field8178,omitempty"`
-	Field8179            []*UnusedEmptyMessage   `protobuf:"bytes,26,rep,name=field8179" json:"field8179,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8156     *string               `protobuf:"bytes,1,opt,name=field8156" json:"field8156,omitempty"`
+	Field8157     *string               `protobuf:"bytes,2,opt,name=field8157" json:"field8157,omitempty"`
+	Field8158     *string               `protobuf:"bytes,4,opt,name=field8158" json:"field8158,omitempty"`
+	Field8159     *UnusedEmptyMessage   `protobuf:"bytes,6,opt,name=field8159" json:"field8159,omitempty"`
+	Field8160     []string              `protobuf:"bytes,7,rep,name=field8160" json:"field8160,omitempty"`
+	Field8161     *int64                `protobuf:"varint,8,opt,name=field8161" json:"field8161,omitempty"`
+	Field8162     *UnusedEmptyMessage   `protobuf:"bytes,9,opt,name=field8162" json:"field8162,omitempty"`
+	Field8163     *string               `protobuf:"bytes,10,opt,name=field8163" json:"field8163,omitempty"`
+	Field8164     *string               `protobuf:"bytes,11,opt,name=field8164" json:"field8164,omitempty"`
+	Field8165     *string               `protobuf:"bytes,12,opt,name=field8165" json:"field8165,omitempty"`
+	Field8166     *string               `protobuf:"bytes,13,opt,name=field8166" json:"field8166,omitempty"`
+	Field8167     *UnusedEmptyMessage   `protobuf:"bytes,14,opt,name=field8167" json:"field8167,omitempty"`
+	Field8168     *UnusedEmptyMessage   `protobuf:"bytes,15,opt,name=field8168" json:"field8168,omitempty"`
+	Field8169     *string               `protobuf:"bytes,16,opt,name=field8169" json:"field8169,omitempty"`
+	Field8170     *UnusedEnum           `protobuf:"varint,17,opt,name=field8170,enum=benchmarks.google_message3.UnusedEnum" json:"field8170,omitempty"`
+	Field8171     *UnusedEnum           `protobuf:"varint,18,opt,name=field8171,enum=benchmarks.google_message3.UnusedEnum" json:"field8171,omitempty"`
+	Field8172     *bool                 `protobuf:"varint,19,opt,name=field8172" json:"field8172,omitempty"`
+	Field8173     *bool                 `protobuf:"varint,20,opt,name=field8173" json:"field8173,omitempty"`
+	Field8174     *float64              `protobuf:"fixed64,21,opt,name=field8174" json:"field8174,omitempty"`
+	Field8175     *int32                `protobuf:"varint,22,opt,name=field8175" json:"field8175,omitempty"`
+	Field8176     *int32                `protobuf:"varint,23,opt,name=field8176" json:"field8176,omitempty"`
+	Field8177     *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field8177" json:"field8177,omitempty"`
+	Field8178     []*UnusedEmptyMessage `protobuf:"bytes,25,rep,name=field8178" json:"field8178,omitempty"`
+	Field8179     []*UnusedEmptyMessage `protobuf:"bytes,26,rep,name=field8179" json:"field8179,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8130) Reset() {
@@ -1790,17 +1778,16 @@
 }
 
 type Message8478 struct {
-	Field8489            *string                 `protobuf:"bytes,7,opt,name=field8489" json:"field8489,omitempty"`
-	Field8490            *Message7966            `protobuf:"bytes,1,opt,name=field8490" json:"field8490,omitempty"`
-	Field8491            *Message8476            `protobuf:"bytes,2,opt,name=field8491" json:"field8491,omitempty"`
-	Field8492            *int64                  `protobuf:"varint,3,opt,name=field8492" json:"field8492,omitempty"`
-	Field8493            *Message8476            `protobuf:"bytes,4,opt,name=field8493" json:"field8493,omitempty"`
-	Field8494            []*Message8477          `protobuf:"bytes,5,rep,name=field8494" json:"field8494,omitempty"`
-	Field8495            *Message8454            `protobuf:"bytes,6,opt,name=field8495" json:"field8495,omitempty"`
-	Field8496            *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field8496" json:"field8496,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8489     *string             `protobuf:"bytes,7,opt,name=field8489" json:"field8489,omitempty"`
+	Field8490     *Message7966        `protobuf:"bytes,1,opt,name=field8490" json:"field8490,omitempty"`
+	Field8491     *Message8476        `protobuf:"bytes,2,opt,name=field8491" json:"field8491,omitempty"`
+	Field8492     *int64              `protobuf:"varint,3,opt,name=field8492" json:"field8492,omitempty"`
+	Field8493     *Message8476        `protobuf:"bytes,4,opt,name=field8493" json:"field8493,omitempty"`
+	Field8494     []*Message8477      `protobuf:"bytes,5,rep,name=field8494" json:"field8494,omitempty"`
+	Field8495     *Message8454        `protobuf:"bytes,6,opt,name=field8495" json:"field8495,omitempty"`
+	Field8496     *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field8496" json:"field8496,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8478) Reset() {
@@ -1883,18 +1870,17 @@
 }
 
 type Message8479 struct {
-	Field8497            *Message8475            `protobuf:"bytes,1,opt,name=field8497" json:"field8497,omitempty"`
-	Field8498            *Message7966            `protobuf:"bytes,2,opt,name=field8498" json:"field8498,omitempty"`
-	Field8499            *Message8476            `protobuf:"bytes,3,opt,name=field8499" json:"field8499,omitempty"`
-	Field8500            *Message8476            `protobuf:"bytes,4,opt,name=field8500" json:"field8500,omitempty"`
-	Field8501            *string                 `protobuf:"bytes,6,opt,name=field8501" json:"field8501,omitempty"`
-	Field8502            *string                 `protobuf:"bytes,7,opt,name=field8502" json:"field8502,omitempty"`
-	Field8503            *Message7966            `protobuf:"bytes,8,opt,name=field8503" json:"field8503,omitempty"`
-	Field8504            *Message8455            `protobuf:"bytes,5,opt,name=field8504" json:"field8504,omitempty"`
-	Field8505            *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field8505" json:"field8505,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8497     *Message8475        `protobuf:"bytes,1,opt,name=field8497" json:"field8497,omitempty"`
+	Field8498     *Message7966        `protobuf:"bytes,2,opt,name=field8498" json:"field8498,omitempty"`
+	Field8499     *Message8476        `protobuf:"bytes,3,opt,name=field8499" json:"field8499,omitempty"`
+	Field8500     *Message8476        `protobuf:"bytes,4,opt,name=field8500" json:"field8500,omitempty"`
+	Field8501     *string             `protobuf:"bytes,6,opt,name=field8501" json:"field8501,omitempty"`
+	Field8502     *string             `protobuf:"bytes,7,opt,name=field8502" json:"field8502,omitempty"`
+	Field8503     *Message7966        `protobuf:"bytes,8,opt,name=field8503" json:"field8503,omitempty"`
+	Field8504     *Message8455        `protobuf:"bytes,5,opt,name=field8504" json:"field8504,omitempty"`
+	Field8505     *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field8505" json:"field8505,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8479) Reset() {
@@ -1984,16 +1970,15 @@
 }
 
 type Message10319 struct {
-	Field10340           *Enum10325              `protobuf:"varint,1,opt,name=field10340,enum=benchmarks.google_message3.Enum10325" json:"field10340,omitempty"`
-	Field10341           *int32                  `protobuf:"varint,4,opt,name=field10341" json:"field10341,omitempty"`
-	Field10342           *int32                  `protobuf:"varint,5,opt,name=field10342" json:"field10342,omitempty"`
-	Field10343           []byte                  `protobuf:"bytes,3,opt,name=field10343" json:"field10343,omitempty"`
-	Field10344           *string                 `protobuf:"bytes,2,opt,name=field10344" json:"field10344,omitempty"`
-	Field10345           *string                 `protobuf:"bytes,6,opt,name=field10345" json:"field10345,omitempty"`
-	Field10346           *string                 `protobuf:"bytes,7,opt,name=field10346" json:"field10346,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10340    *Enum10325 `protobuf:"varint,1,opt,name=field10340,enum=benchmarks.google_message3.Enum10325" json:"field10340,omitempty"`
+	Field10341    *int32     `protobuf:"varint,4,opt,name=field10341" json:"field10341,omitempty"`
+	Field10342    *int32     `protobuf:"varint,5,opt,name=field10342" json:"field10342,omitempty"`
+	Field10343    []byte     `protobuf:"bytes,3,opt,name=field10343" json:"field10343,omitempty"`
+	Field10344    *string    `protobuf:"bytes,2,opt,name=field10344" json:"field10344,omitempty"`
+	Field10345    *string    `protobuf:"bytes,6,opt,name=field10345" json:"field10345,omitempty"`
+	Field10346    *string    `protobuf:"bytes,7,opt,name=field10346" json:"field10346,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10319) Reset() {
@@ -2069,13 +2054,12 @@
 }
 
 type Message4016 struct {
-	Field4017            *int32                  `protobuf:"varint,1,req,name=field4017" json:"field4017,omitempty"`
-	Field4018            *int32                  `protobuf:"varint,2,req,name=field4018" json:"field4018,omitempty"`
-	Field4019            *int32                  `protobuf:"varint,3,req,name=field4019" json:"field4019,omitempty"`
-	Field4020            *int32                  `protobuf:"varint,4,req,name=field4020" json:"field4020,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field4017     *int32 `protobuf:"varint,1,req,name=field4017" json:"field4017,omitempty"`
+	Field4018     *int32 `protobuf:"varint,2,req,name=field4018" json:"field4018,omitempty"`
+	Field4019     *int32 `protobuf:"varint,3,req,name=field4019" json:"field4019,omitempty"`
+	Field4020     *int32 `protobuf:"varint,4,req,name=field4020" json:"field4020,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message4016) Reset() {
@@ -2130,13 +2114,12 @@
 }
 
 type Message12669 struct {
-	Field12681           *Message12559           `protobuf:"bytes,1,opt,name=field12681" json:"field12681,omitempty"`
-	Field12682           *float32                `protobuf:"fixed32,2,opt,name=field12682" json:"field12682,omitempty"`
-	Field12683           *bool                   `protobuf:"varint,3,opt,name=field12683" json:"field12683,omitempty"`
-	Field12684           *Enum12670              `protobuf:"varint,4,opt,name=field12684,enum=benchmarks.google_message3.Enum12670" json:"field12684,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12681    *Message12559 `protobuf:"bytes,1,opt,name=field12681" json:"field12681,omitempty"`
+	Field12682    *float32      `protobuf:"fixed32,2,opt,name=field12682" json:"field12682,omitempty"`
+	Field12683    *bool         `protobuf:"varint,3,opt,name=field12683" json:"field12683,omitempty"`
+	Field12684    *Enum12670    `protobuf:"varint,4,opt,name=field12684,enum=benchmarks.google_message3.Enum12670" json:"field12684,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12669) Reset() {
@@ -2191,15 +2174,14 @@
 }
 
 type Message12819 struct {
-	Field12834           *float64                `protobuf:"fixed64,1,opt,name=field12834" json:"field12834,omitempty"`
-	Field12835           *float64                `protobuf:"fixed64,2,opt,name=field12835" json:"field12835,omitempty"`
-	Field12836           *float64                `protobuf:"fixed64,3,opt,name=field12836" json:"field12836,omitempty"`
-	Field12837           *float64                `protobuf:"fixed64,4,opt,name=field12837" json:"field12837,omitempty"`
-	Field12838           *float64                `protobuf:"fixed64,5,opt,name=field12838" json:"field12838,omitempty"`
-	Field12839           *float64                `protobuf:"fixed64,6,opt,name=field12839" json:"field12839,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12834    *float64 `protobuf:"fixed64,1,opt,name=field12834" json:"field12834,omitempty"`
+	Field12835    *float64 `protobuf:"fixed64,2,opt,name=field12835" json:"field12835,omitempty"`
+	Field12836    *float64 `protobuf:"fixed64,3,opt,name=field12836" json:"field12836,omitempty"`
+	Field12837    *float64 `protobuf:"fixed64,4,opt,name=field12837" json:"field12837,omitempty"`
+	Field12838    *float64 `protobuf:"fixed64,5,opt,name=field12838" json:"field12838,omitempty"`
+	Field12839    *float64 `protobuf:"fixed64,6,opt,name=field12839" json:"field12839,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12819) Reset() {
@@ -2268,17 +2250,16 @@
 }
 
 type Message12820 struct {
-	Field12840           *int32                  `protobuf:"varint,1,opt,name=field12840" json:"field12840,omitempty"`
-	Field12841           *int32                  `protobuf:"varint,2,opt,name=field12841" json:"field12841,omitempty"`
-	Field12842           *int32                  `protobuf:"varint,3,opt,name=field12842" json:"field12842,omitempty"`
-	Field12843           *int32                  `protobuf:"varint,8,opt,name=field12843" json:"field12843,omitempty"`
-	Field12844           *int32                  `protobuf:"varint,4,opt,name=field12844" json:"field12844,omitempty"`
-	Field12845           *int32                  `protobuf:"varint,5,opt,name=field12845" json:"field12845,omitempty"`
-	Field12846           *int32                  `protobuf:"varint,6,opt,name=field12846" json:"field12846,omitempty"`
-	Field12847           *int32                  `protobuf:"varint,7,opt,name=field12847" json:"field12847,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12840    *int32 `protobuf:"varint,1,opt,name=field12840" json:"field12840,omitempty"`
+	Field12841    *int32 `protobuf:"varint,2,opt,name=field12841" json:"field12841,omitempty"`
+	Field12842    *int32 `protobuf:"varint,3,opt,name=field12842" json:"field12842,omitempty"`
+	Field12843    *int32 `protobuf:"varint,8,opt,name=field12843" json:"field12843,omitempty"`
+	Field12844    *int32 `protobuf:"varint,4,opt,name=field12844" json:"field12844,omitempty"`
+	Field12845    *int32 `protobuf:"varint,5,opt,name=field12845" json:"field12845,omitempty"`
+	Field12846    *int32 `protobuf:"varint,6,opt,name=field12846" json:"field12846,omitempty"`
+	Field12847    *int32 `protobuf:"varint,7,opt,name=field12847" json:"field12847,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12820) Reset() {
@@ -2361,14 +2342,13 @@
 }
 
 type Message12821 struct {
-	Field12848           *int32                  `protobuf:"varint,1,opt,name=field12848" json:"field12848,omitempty"`
-	Field12849           *int32                  `protobuf:"varint,2,opt,name=field12849" json:"field12849,omitempty"`
-	Field12850           *int32                  `protobuf:"varint,3,opt,name=field12850" json:"field12850,omitempty"`
-	Field12851           *int32                  `protobuf:"varint,4,opt,name=field12851" json:"field12851,omitempty"`
-	Field12852           *int32                  `protobuf:"varint,5,opt,name=field12852" json:"field12852,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12848    *int32 `protobuf:"varint,1,opt,name=field12848" json:"field12848,omitempty"`
+	Field12849    *int32 `protobuf:"varint,2,opt,name=field12849" json:"field12849,omitempty"`
+	Field12850    *int32 `protobuf:"varint,3,opt,name=field12850" json:"field12850,omitempty"`
+	Field12851    *int32 `protobuf:"varint,4,opt,name=field12851" json:"field12851,omitempty"`
+	Field12852    *int32 `protobuf:"varint,5,opt,name=field12852" json:"field12852,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12821) Reset() {
@@ -2430,14 +2410,13 @@
 }
 
 type Message12818 struct {
-	Field12829           *uint64                 `protobuf:"varint,1,opt,name=field12829" json:"field12829,omitempty"`
-	Field12830           *int32                  `protobuf:"varint,2,opt,name=field12830" json:"field12830,omitempty"`
-	Field12831           *int32                  `protobuf:"varint,3,opt,name=field12831" json:"field12831,omitempty"`
-	Field12832           *int32                  `protobuf:"varint,5,opt,name=field12832" json:"field12832,omitempty"`
-	Field12833           []*Message12817         `protobuf:"bytes,4,rep,name=field12833" json:"field12833,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12829    *uint64         `protobuf:"varint,1,opt,name=field12829" json:"field12829,omitempty"`
+	Field12830    *int32          `protobuf:"varint,2,opt,name=field12830" json:"field12830,omitempty"`
+	Field12831    *int32          `protobuf:"varint,3,opt,name=field12831" json:"field12831,omitempty"`
+	Field12832    *int32          `protobuf:"varint,5,opt,name=field12832" json:"field12832,omitempty"`
+	Field12833    []*Message12817 `protobuf:"bytes,4,rep,name=field12833" json:"field12833,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12818) Reset() {
@@ -2499,15 +2478,14 @@
 }
 
 type Message16479 struct {
-	Field16484           *Message16480           `protobuf:"bytes,1,opt,name=field16484" json:"field16484,omitempty"`
-	Field16485           *int32                  `protobuf:"varint,5,opt,name=field16485" json:"field16485,omitempty"`
-	Field16486           *float32                `protobuf:"fixed32,2,opt,name=field16486" json:"field16486,omitempty"`
-	Field16487           *uint32                 `protobuf:"varint,4,opt,name=field16487" json:"field16487,omitempty"`
-	Field16488           *bool                   `protobuf:"varint,3,opt,name=field16488" json:"field16488,omitempty"`
-	Field16489           *uint32                 `protobuf:"varint,6,opt,name=field16489" json:"field16489,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16484    *Message16480 `protobuf:"bytes,1,opt,name=field16484" json:"field16484,omitempty"`
+	Field16485    *int32        `protobuf:"varint,5,opt,name=field16485" json:"field16485,omitempty"`
+	Field16486    *float32      `protobuf:"fixed32,2,opt,name=field16486" json:"field16486,omitempty"`
+	Field16487    *uint32       `protobuf:"varint,4,opt,name=field16487" json:"field16487,omitempty"`
+	Field16488    *bool         `protobuf:"varint,3,opt,name=field16488" json:"field16488,omitempty"`
+	Field16489    *uint32       `protobuf:"varint,6,opt,name=field16489" json:"field16489,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16479) Reset() {
@@ -2576,14 +2554,13 @@
 }
 
 type Message16722 struct {
-	Field16752           *string                 `protobuf:"bytes,1,opt,name=field16752" json:"field16752,omitempty"`
-	Field16753           *string                 `protobuf:"bytes,2,opt,name=field16753" json:"field16753,omitempty"`
-	Field16754           *string                 `protobuf:"bytes,3,opt,name=field16754" json:"field16754,omitempty"`
-	Field16755           *int32                  `protobuf:"varint,5,opt,name=field16755" json:"field16755,omitempty"`
-	Field16756           *string                 `protobuf:"bytes,4,opt,name=field16756" json:"field16756,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16752    *string `protobuf:"bytes,1,opt,name=field16752" json:"field16752,omitempty"`
+	Field16753    *string `protobuf:"bytes,2,opt,name=field16753" json:"field16753,omitempty"`
+	Field16754    *string `protobuf:"bytes,3,opt,name=field16754" json:"field16754,omitempty"`
+	Field16755    *int32  `protobuf:"varint,5,opt,name=field16755" json:"field16755,omitempty"`
+	Field16756    *string `protobuf:"bytes,4,opt,name=field16756" json:"field16756,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16722) Reset() {
@@ -2645,22 +2622,21 @@
 }
 
 type Message16724 struct {
-	Field16761           *int64                  `protobuf:"varint,1,opt,name=field16761" json:"field16761,omitempty"`
-	Field16762           *float32                `protobuf:"fixed32,2,opt,name=field16762" json:"field16762,omitempty"`
-	Field16763           *int64                  `protobuf:"varint,3,opt,name=field16763" json:"field16763,omitempty"`
-	Field16764           *int64                  `protobuf:"varint,4,opt,name=field16764" json:"field16764,omitempty"`
-	Field16765           *bool                   `protobuf:"varint,5,opt,name=field16765" json:"field16765,omitempty"`
-	Field16766           []string                `protobuf:"bytes,6,rep,name=field16766" json:"field16766,omitempty"`
-	Field16767           []string                `protobuf:"bytes,7,rep,name=field16767" json:"field16767,omitempty"`
-	Field16768           *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field16768" json:"field16768,omitempty"`
-	Field16769           *bool                   `protobuf:"varint,9,opt,name=field16769" json:"field16769,omitempty"`
-	Field16770           *uint32                 `protobuf:"varint,10,opt,name=field16770" json:"field16770,omitempty"`
-	Field16771           *Enum16728              `protobuf:"varint,11,opt,name=field16771,enum=benchmarks.google_message3.Enum16728" json:"field16771,omitempty"`
-	Field16772           []int32                 `protobuf:"varint,12,rep,name=field16772" json:"field16772,omitempty"`
-	Field16773           *bool                   `protobuf:"varint,13,opt,name=field16773" json:"field16773,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16761    *int64              `protobuf:"varint,1,opt,name=field16761" json:"field16761,omitempty"`
+	Field16762    *float32            `protobuf:"fixed32,2,opt,name=field16762" json:"field16762,omitempty"`
+	Field16763    *int64              `protobuf:"varint,3,opt,name=field16763" json:"field16763,omitempty"`
+	Field16764    *int64              `protobuf:"varint,4,opt,name=field16764" json:"field16764,omitempty"`
+	Field16765    *bool               `protobuf:"varint,5,opt,name=field16765" json:"field16765,omitempty"`
+	Field16766    []string            `protobuf:"bytes,6,rep,name=field16766" json:"field16766,omitempty"`
+	Field16767    []string            `protobuf:"bytes,7,rep,name=field16767" json:"field16767,omitempty"`
+	Field16768    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field16768" json:"field16768,omitempty"`
+	Field16769    *bool               `protobuf:"varint,9,opt,name=field16769" json:"field16769,omitempty"`
+	Field16770    *uint32             `protobuf:"varint,10,opt,name=field16770" json:"field16770,omitempty"`
+	Field16771    *Enum16728          `protobuf:"varint,11,opt,name=field16771,enum=benchmarks.google_message3.Enum16728" json:"field16771,omitempty"`
+	Field16772    []int32             `protobuf:"varint,12,rep,name=field16772" json:"field16772,omitempty"`
+	Field16773    *bool               `protobuf:"varint,13,opt,name=field16773" json:"field16773,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16724) Reset() {
@@ -2778,9 +2754,8 @@
 }
 
 type Message17728 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message17728) Reset() {
@@ -2807,24 +2782,23 @@
 }
 
 type Message24356 struct {
-	Field24559           *string                 `protobuf:"bytes,1,opt,name=field24559" json:"field24559,omitempty"`
-	Field24560           *string                 `protobuf:"bytes,2,opt,name=field24560" json:"field24560,omitempty"`
-	Field24561           *int32                  `protobuf:"varint,14,opt,name=field24561" json:"field24561,omitempty"`
-	Field24562           *string                 `protobuf:"bytes,3,opt,name=field24562" json:"field24562,omitempty"`
-	Field24563           *string                 `protobuf:"bytes,4,opt,name=field24563" json:"field24563,omitempty"`
-	Field24564           *string                 `protobuf:"bytes,5,opt,name=field24564" json:"field24564,omitempty"`
-	Field24565           *UnusedEnum             `protobuf:"varint,13,opt,name=field24565,enum=benchmarks.google_message3.UnusedEnum" json:"field24565,omitempty"`
-	Field24566           *string                 `protobuf:"bytes,6,opt,name=field24566" json:"field24566,omitempty"`
-	Field24567           *Enum24361              `protobuf:"varint,12,opt,name=field24567,enum=benchmarks.google_message3.Enum24361" json:"field24567,omitempty"`
-	Field24568           *string                 `protobuf:"bytes,7,opt,name=field24568" json:"field24568,omitempty"`
-	Field24569           *string                 `protobuf:"bytes,8,opt,name=field24569" json:"field24569,omitempty"`
-	Field24570           *string                 `protobuf:"bytes,9,opt,name=field24570" json:"field24570,omitempty"`
-	Field24571           []*UnusedEmptyMessage   `protobuf:"bytes,10,rep,name=field24571" json:"field24571,omitempty"`
-	Field24572           []string                `protobuf:"bytes,11,rep,name=field24572" json:"field24572,omitempty"`
-	Field24573           []string                `protobuf:"bytes,15,rep,name=field24573" json:"field24573,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24559    *string               `protobuf:"bytes,1,opt,name=field24559" json:"field24559,omitempty"`
+	Field24560    *string               `protobuf:"bytes,2,opt,name=field24560" json:"field24560,omitempty"`
+	Field24561    *int32                `protobuf:"varint,14,opt,name=field24561" json:"field24561,omitempty"`
+	Field24562    *string               `protobuf:"bytes,3,opt,name=field24562" json:"field24562,omitempty"`
+	Field24563    *string               `protobuf:"bytes,4,opt,name=field24563" json:"field24563,omitempty"`
+	Field24564    *string               `protobuf:"bytes,5,opt,name=field24564" json:"field24564,omitempty"`
+	Field24565    *UnusedEnum           `protobuf:"varint,13,opt,name=field24565,enum=benchmarks.google_message3.UnusedEnum" json:"field24565,omitempty"`
+	Field24566    *string               `protobuf:"bytes,6,opt,name=field24566" json:"field24566,omitempty"`
+	Field24567    *Enum24361            `protobuf:"varint,12,opt,name=field24567,enum=benchmarks.google_message3.Enum24361" json:"field24567,omitempty"`
+	Field24568    *string               `protobuf:"bytes,7,opt,name=field24568" json:"field24568,omitempty"`
+	Field24569    *string               `protobuf:"bytes,8,opt,name=field24569" json:"field24569,omitempty"`
+	Field24570    *string               `protobuf:"bytes,9,opt,name=field24570" json:"field24570,omitempty"`
+	Field24571    []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field24571" json:"field24571,omitempty"`
+	Field24572    []string              `protobuf:"bytes,11,rep,name=field24572" json:"field24572,omitempty"`
+	Field24573    []string              `protobuf:"bytes,15,rep,name=field24573" json:"field24573,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24356) Reset() {
@@ -2956,23 +2930,22 @@
 }
 
 type Message24376 struct {
-	Field24589           *string                 `protobuf:"bytes,1,opt,name=field24589" json:"field24589,omitempty"`
-	Field24590           *string                 `protobuf:"bytes,2,opt,name=field24590" json:"field24590,omitempty"`
-	Field24591           *string                 `protobuf:"bytes,3,opt,name=field24591" json:"field24591,omitempty"`
-	Field24592           *Message24377           `protobuf:"bytes,4,req,name=field24592" json:"field24592,omitempty"`
-	Field24593           *Message24317           `protobuf:"bytes,5,opt,name=field24593" json:"field24593,omitempty"`
-	Field24594           *string                 `protobuf:"bytes,6,opt,name=field24594" json:"field24594,omitempty"`
-	Field24595           *Message24378           `protobuf:"bytes,7,opt,name=field24595" json:"field24595,omitempty"`
-	Field24596           []string                `protobuf:"bytes,8,rep,name=field24596" json:"field24596,omitempty"`
-	Field24597           []*UnusedEmptyMessage   `protobuf:"bytes,14,rep,name=field24597" json:"field24597,omitempty"`
-	Field24598           []string                `protobuf:"bytes,9,rep,name=field24598" json:"field24598,omitempty"`
-	Field24599           []string                `protobuf:"bytes,10,rep,name=field24599" json:"field24599,omitempty"`
-	Field24600           []string                `protobuf:"bytes,11,rep,name=field24600" json:"field24600,omitempty"`
-	Field24601           *string                 `protobuf:"bytes,12,opt,name=field24601" json:"field24601,omitempty"`
-	Field24602           []string                `protobuf:"bytes,13,rep,name=field24602" json:"field24602,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24589    *string               `protobuf:"bytes,1,opt,name=field24589" json:"field24589,omitempty"`
+	Field24590    *string               `protobuf:"bytes,2,opt,name=field24590" json:"field24590,omitempty"`
+	Field24591    *string               `protobuf:"bytes,3,opt,name=field24591" json:"field24591,omitempty"`
+	Field24592    *Message24377         `protobuf:"bytes,4,req,name=field24592" json:"field24592,omitempty"`
+	Field24593    *Message24317         `protobuf:"bytes,5,opt,name=field24593" json:"field24593,omitempty"`
+	Field24594    *string               `protobuf:"bytes,6,opt,name=field24594" json:"field24594,omitempty"`
+	Field24595    *Message24378         `protobuf:"bytes,7,opt,name=field24595" json:"field24595,omitempty"`
+	Field24596    []string              `protobuf:"bytes,8,rep,name=field24596" json:"field24596,omitempty"`
+	Field24597    []*UnusedEmptyMessage `protobuf:"bytes,14,rep,name=field24597" json:"field24597,omitempty"`
+	Field24598    []string              `protobuf:"bytes,9,rep,name=field24598" json:"field24598,omitempty"`
+	Field24599    []string              `protobuf:"bytes,10,rep,name=field24599" json:"field24599,omitempty"`
+	Field24600    []string              `protobuf:"bytes,11,rep,name=field24600" json:"field24600,omitempty"`
+	Field24601    *string               `protobuf:"bytes,12,opt,name=field24601" json:"field24601,omitempty"`
+	Field24602    []string              `protobuf:"bytes,13,rep,name=field24602" json:"field24602,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24376) Reset() {
@@ -3097,24 +3070,23 @@
 }
 
 type Message24366 struct {
-	Field24574           *string                 `protobuf:"bytes,1,opt,name=field24574" json:"field24574,omitempty"`
-	Field24575           *string                 `protobuf:"bytes,2,opt,name=field24575" json:"field24575,omitempty"`
-	Field24576           *string                 `protobuf:"bytes,3,opt,name=field24576" json:"field24576,omitempty"`
-	Field24577           *int32                  `protobuf:"varint,10,opt,name=field24577" json:"field24577,omitempty"`
-	Field24578           *string                 `protobuf:"bytes,13,opt,name=field24578" json:"field24578,omitempty"`
-	Field24579           *string                 `protobuf:"bytes,4,opt,name=field24579" json:"field24579,omitempty"`
-	Field24580           *string                 `protobuf:"bytes,5,opt,name=field24580" json:"field24580,omitempty"`
-	Field24581           *UnusedEnum             `protobuf:"varint,9,opt,name=field24581,enum=benchmarks.google_message3.UnusedEnum" json:"field24581,omitempty"`
-	Field24582           *string                 `protobuf:"bytes,14,opt,name=field24582" json:"field24582,omitempty"`
-	Field24583           *UnusedEnum             `protobuf:"varint,15,opt,name=field24583,enum=benchmarks.google_message3.UnusedEnum" json:"field24583,omitempty"`
-	Field24584           *string                 `protobuf:"bytes,6,opt,name=field24584" json:"field24584,omitempty"`
-	Field24585           *string                 `protobuf:"bytes,12,opt,name=field24585" json:"field24585,omitempty"`
-	Field24586           []*UnusedEmptyMessage   `protobuf:"bytes,7,rep,name=field24586" json:"field24586,omitempty"`
-	Field24587           []string                `protobuf:"bytes,8,rep,name=field24587" json:"field24587,omitempty"`
-	Field24588           []string                `protobuf:"bytes,11,rep,name=field24588" json:"field24588,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24574    *string               `protobuf:"bytes,1,opt,name=field24574" json:"field24574,omitempty"`
+	Field24575    *string               `protobuf:"bytes,2,opt,name=field24575" json:"field24575,omitempty"`
+	Field24576    *string               `protobuf:"bytes,3,opt,name=field24576" json:"field24576,omitempty"`
+	Field24577    *int32                `protobuf:"varint,10,opt,name=field24577" json:"field24577,omitempty"`
+	Field24578    *string               `protobuf:"bytes,13,opt,name=field24578" json:"field24578,omitempty"`
+	Field24579    *string               `protobuf:"bytes,4,opt,name=field24579" json:"field24579,omitempty"`
+	Field24580    *string               `protobuf:"bytes,5,opt,name=field24580" json:"field24580,omitempty"`
+	Field24581    *UnusedEnum           `protobuf:"varint,9,opt,name=field24581,enum=benchmarks.google_message3.UnusedEnum" json:"field24581,omitempty"`
+	Field24582    *string               `protobuf:"bytes,14,opt,name=field24582" json:"field24582,omitempty"`
+	Field24583    *UnusedEnum           `protobuf:"varint,15,opt,name=field24583,enum=benchmarks.google_message3.UnusedEnum" json:"field24583,omitempty"`
+	Field24584    *string               `protobuf:"bytes,6,opt,name=field24584" json:"field24584,omitempty"`
+	Field24585    *string               `protobuf:"bytes,12,opt,name=field24585" json:"field24585,omitempty"`
+	Field24586    []*UnusedEmptyMessage `protobuf:"bytes,7,rep,name=field24586" json:"field24586,omitempty"`
+	Field24587    []string              `protobuf:"bytes,8,rep,name=field24587" json:"field24587,omitempty"`
+	Field24588    []string              `protobuf:"bytes,11,rep,name=field24588" json:"field24588,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24366) Reset() {
@@ -3246,11 +3218,10 @@
 }
 
 type Message35546_Message35547 struct {
-	Field35569           *int32                  `protobuf:"varint,5,req,name=field35569" json:"field35569,omitempty"`
-	Field35570           *int32                  `protobuf:"varint,6,req,name=field35570" json:"field35570,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35569    *int32 `protobuf:"varint,5,req,name=field35569" json:"field35569,omitempty"`
+	Field35570    *int32 `protobuf:"varint,6,req,name=field35570" json:"field35570,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35546_Message35547) Reset() {
@@ -3291,11 +3262,10 @@
 }
 
 type Message35546_Message35548 struct {
-	Field35571           *int64                  `protobuf:"varint,11,req,name=field35571" json:"field35571,omitempty"`
-	Field35572           *int64                  `protobuf:"varint,12,req,name=field35572" json:"field35572,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35571    *int64 `protobuf:"varint,11,req,name=field35571" json:"field35571,omitempty"`
+	Field35572    *int64 `protobuf:"varint,12,req,name=field35572" json:"field35572,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35546_Message35548) Reset() {
@@ -3336,21 +3306,20 @@
 }
 
 type Message2356_Message2357 struct {
-	Field2399            *int64                  `protobuf:"varint,9,opt,name=field2399" json:"field2399,omitempty"`
-	Field2400            *int32                  `protobuf:"varint,10,opt,name=field2400" json:"field2400,omitempty"`
-	Field2401            *int32                  `protobuf:"varint,11,opt,name=field2401" json:"field2401,omitempty"`
-	Field2402            *int32                  `protobuf:"varint,12,opt,name=field2402" json:"field2402,omitempty"`
-	Field2403            *int32                  `protobuf:"varint,13,opt,name=field2403" json:"field2403,omitempty"`
-	Field2404            *int32                  `protobuf:"varint,116,opt,name=field2404" json:"field2404,omitempty"`
-	Field2405            *int32                  `protobuf:"varint,106,opt,name=field2405" json:"field2405,omitempty"`
-	Field2406            []byte                  `protobuf:"bytes,14,req,name=field2406" json:"field2406,omitempty"`
-	Field2407            *int32                  `protobuf:"varint,45,opt,name=field2407" json:"field2407,omitempty"`
-	Field2408            *int32                  `protobuf:"varint,112,opt,name=field2408" json:"field2408,omitempty"`
-	Field2409            *bool                   `protobuf:"varint,122,opt,name=field2409" json:"field2409,omitempty"`
-	Field2410            []byte                  `protobuf:"bytes,124,opt,name=field2410" json:"field2410,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field2399     *int64 `protobuf:"varint,9,opt,name=field2399" json:"field2399,omitempty"`
+	Field2400     *int32 `protobuf:"varint,10,opt,name=field2400" json:"field2400,omitempty"`
+	Field2401     *int32 `protobuf:"varint,11,opt,name=field2401" json:"field2401,omitempty"`
+	Field2402     *int32 `protobuf:"varint,12,opt,name=field2402" json:"field2402,omitempty"`
+	Field2403     *int32 `protobuf:"varint,13,opt,name=field2403" json:"field2403,omitempty"`
+	Field2404     *int32 `protobuf:"varint,116,opt,name=field2404" json:"field2404,omitempty"`
+	Field2405     *int32 `protobuf:"varint,106,opt,name=field2405" json:"field2405,omitempty"`
+	Field2406     []byte `protobuf:"bytes,14,req,name=field2406" json:"field2406,omitempty"`
+	Field2407     *int32 `protobuf:"varint,45,opt,name=field2407" json:"field2407,omitempty"`
+	Field2408     *int32 `protobuf:"varint,112,opt,name=field2408" json:"field2408,omitempty"`
+	Field2409     *bool  `protobuf:"varint,122,opt,name=field2409" json:"field2409,omitempty"`
+	Field2410     []byte `protobuf:"bytes,124,opt,name=field2410" json:"field2410,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2356_Message2357) Reset() {
@@ -3461,9 +3430,8 @@
 }
 
 type Message2356_Message2358 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2356_Message2358) Reset() {
@@ -3490,17 +3458,16 @@
 }
 
 type Message2356_Message2359 struct {
-	Field2413            *string                 `protobuf:"bytes,41,opt,name=field2413" json:"field2413,omitempty"`
-	Field2414            *string                 `protobuf:"bytes,42,opt,name=field2414" json:"field2414,omitempty"`
-	Field2415            *string                 `protobuf:"bytes,43,opt,name=field2415" json:"field2415,omitempty"`
-	Field2416            *string                 `protobuf:"bytes,44,opt,name=field2416" json:"field2416,omitempty"`
-	Field2417            *int32                  `protobuf:"varint,46,opt,name=field2417" json:"field2417,omitempty"`
-	Field2418            *string                 `protobuf:"bytes,47,opt,name=field2418" json:"field2418,omitempty"`
-	Field2419            *float32                `protobuf:"fixed32,110,opt,name=field2419" json:"field2419,omitempty"`
-	Field2420            *float32                `protobuf:"fixed32,111,opt,name=field2420" json:"field2420,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field2413     *string  `protobuf:"bytes,41,opt,name=field2413" json:"field2413,omitempty"`
+	Field2414     *string  `protobuf:"bytes,42,opt,name=field2414" json:"field2414,omitempty"`
+	Field2415     *string  `protobuf:"bytes,43,opt,name=field2415" json:"field2415,omitempty"`
+	Field2416     *string  `protobuf:"bytes,44,opt,name=field2416" json:"field2416,omitempty"`
+	Field2417     *int32   `protobuf:"varint,46,opt,name=field2417" json:"field2417,omitempty"`
+	Field2418     *string  `protobuf:"bytes,47,opt,name=field2418" json:"field2418,omitempty"`
+	Field2419     *float32 `protobuf:"fixed32,110,opt,name=field2419" json:"field2419,omitempty"`
+	Field2420     *float32 `protobuf:"fixed32,111,opt,name=field2420" json:"field2420,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2356_Message2359) Reset() {
@@ -3583,12 +3550,11 @@
 }
 
 type Message7029_Message7030 struct {
-	Field7226            *string                 `protobuf:"bytes,14,opt,name=field7226" json:"field7226,omitempty"`
-	Field7227            *string                 `protobuf:"bytes,15,opt,name=field7227" json:"field7227,omitempty"`
-	Field7228            *int64                  `protobuf:"varint,16,opt,name=field7228" json:"field7228,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7226     *string `protobuf:"bytes,14,opt,name=field7226" json:"field7226,omitempty"`
+	Field7227     *string `protobuf:"bytes,15,opt,name=field7227" json:"field7227,omitempty"`
+	Field7228     *int64  `protobuf:"varint,16,opt,name=field7228" json:"field7228,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7029_Message7030) Reset() {
@@ -3636,15 +3602,14 @@
 }
 
 type Message7029_Message7031 struct {
-	Field7229            *string                 `protobuf:"bytes,22,opt,name=field7229" json:"field7229,omitempty"`
-	Field7230            *int32                  `protobuf:"varint,23,opt,name=field7230" json:"field7230,omitempty"`
-	Field7231            *int32                  `protobuf:"varint,24,opt,name=field7231" json:"field7231,omitempty"`
-	Field7232            *int32                  `protobuf:"varint,30,opt,name=field7232" json:"field7232,omitempty"`
-	Field7233            *int32                  `protobuf:"varint,31,opt,name=field7233" json:"field7233,omitempty"`
-	Field7234            *int32                  `protobuf:"varint,35,opt,name=field7234" json:"field7234,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7229     *string `protobuf:"bytes,22,opt,name=field7229" json:"field7229,omitempty"`
+	Field7230     *int32  `protobuf:"varint,23,opt,name=field7230" json:"field7230,omitempty"`
+	Field7231     *int32  `protobuf:"varint,24,opt,name=field7231" json:"field7231,omitempty"`
+	Field7232     *int32  `protobuf:"varint,30,opt,name=field7232" json:"field7232,omitempty"`
+	Field7233     *int32  `protobuf:"varint,31,opt,name=field7233" json:"field7233,omitempty"`
+	Field7234     *int32  `protobuf:"varint,35,opt,name=field7234" json:"field7234,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7029_Message7031) Reset() {
@@ -3713,32 +3678,31 @@
 }
 
 type Message18921_Message18922 struct {
-	Field18959           *uint64                 `protobuf:"varint,6,opt,name=field18959" json:"field18959,omitempty"`
-	Field18960           *string                 `protobuf:"bytes,13,opt,name=field18960" json:"field18960,omitempty"`
-	Field18961           *bool                   `protobuf:"varint,21,opt,name=field18961" json:"field18961,omitempty"`
-	Field18962           *bool                   `protobuf:"varint,33,opt,name=field18962" json:"field18962,omitempty"`
-	Field18963           *int32                  `protobuf:"varint,7,opt,name=field18963" json:"field18963,omitempty"`
-	Field18964           *int32                  `protobuf:"varint,8,opt,name=field18964" json:"field18964,omitempty"`
-	Field18965           *string                 `protobuf:"bytes,9,opt,name=field18965" json:"field18965,omitempty"`
-	Field18966           *Message18856           `protobuf:"bytes,10,opt,name=field18966" json:"field18966,omitempty"`
-	Field18967           *uint64                 `protobuf:"varint,34,opt,name=field18967" json:"field18967,omitempty"`
-	Field18968           *UnusedEmptyMessage     `protobuf:"bytes,11,opt,name=field18968" json:"field18968,omitempty"`
-	Field18969           *uint64                 `protobuf:"varint,35,opt,name=field18969" json:"field18969,omitempty"`
-	Field18970           *float32                `protobuf:"fixed32,12,opt,name=field18970" json:"field18970,omitempty"`
-	Field18971           []string                `protobuf:"bytes,14,rep,name=field18971" json:"field18971,omitempty"`
-	Field18972           *bool                   `protobuf:"varint,15,opt,name=field18972" json:"field18972,omitempty"`
-	Field18973           *bool                   `protobuf:"varint,16,opt,name=field18973" json:"field18973,omitempty"`
-	Field18974           *float32                `protobuf:"fixed32,22,opt,name=field18974" json:"field18974,omitempty"`
-	Field18975           *int32                  `protobuf:"varint,18,opt,name=field18975" json:"field18975,omitempty"`
-	Field18976           *int32                  `protobuf:"varint,19,opt,name=field18976" json:"field18976,omitempty"`
-	Field18977           *int32                  `protobuf:"varint,20,opt,name=field18977" json:"field18977,omitempty"`
-	Field18978           *UnusedEmptyMessage     `protobuf:"bytes,25,opt,name=field18978" json:"field18978,omitempty"`
-	Field18979           *UnusedEnum             `protobuf:"varint,26,opt,name=field18979,enum=benchmarks.google_message3.UnusedEnum" json:"field18979,omitempty"`
-	Field18980           []string                `protobuf:"bytes,27,rep,name=field18980" json:"field18980,omitempty"`
-	Field18981           *float32                `protobuf:"fixed32,28,opt,name=field18981" json:"field18981,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field18959    *uint64             `protobuf:"varint,6,opt,name=field18959" json:"field18959,omitempty"`
+	Field18960    *string             `protobuf:"bytes,13,opt,name=field18960" json:"field18960,omitempty"`
+	Field18961    *bool               `protobuf:"varint,21,opt,name=field18961" json:"field18961,omitempty"`
+	Field18962    *bool               `protobuf:"varint,33,opt,name=field18962" json:"field18962,omitempty"`
+	Field18963    *int32              `protobuf:"varint,7,opt,name=field18963" json:"field18963,omitempty"`
+	Field18964    *int32              `protobuf:"varint,8,opt,name=field18964" json:"field18964,omitempty"`
+	Field18965    *string             `protobuf:"bytes,9,opt,name=field18965" json:"field18965,omitempty"`
+	Field18966    *Message18856       `protobuf:"bytes,10,opt,name=field18966" json:"field18966,omitempty"`
+	Field18967    *uint64             `protobuf:"varint,34,opt,name=field18967" json:"field18967,omitempty"`
+	Field18968    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field18968" json:"field18968,omitempty"`
+	Field18969    *uint64             `protobuf:"varint,35,opt,name=field18969" json:"field18969,omitempty"`
+	Field18970    *float32            `protobuf:"fixed32,12,opt,name=field18970" json:"field18970,omitempty"`
+	Field18971    []string            `protobuf:"bytes,14,rep,name=field18971" json:"field18971,omitempty"`
+	Field18972    *bool               `protobuf:"varint,15,opt,name=field18972" json:"field18972,omitempty"`
+	Field18973    *bool               `protobuf:"varint,16,opt,name=field18973" json:"field18973,omitempty"`
+	Field18974    *float32            `protobuf:"fixed32,22,opt,name=field18974" json:"field18974,omitempty"`
+	Field18975    *int32              `protobuf:"varint,18,opt,name=field18975" json:"field18975,omitempty"`
+	Field18976    *int32              `protobuf:"varint,19,opt,name=field18976" json:"field18976,omitempty"`
+	Field18977    *int32              `protobuf:"varint,20,opt,name=field18977" json:"field18977,omitempty"`
+	Field18978    *UnusedEmptyMessage `protobuf:"bytes,25,opt,name=field18978" json:"field18978,omitempty"`
+	Field18979    *UnusedEnum         `protobuf:"varint,26,opt,name=field18979,enum=benchmarks.google_message3.UnusedEnum" json:"field18979,omitempty"`
+	Field18980    []string            `protobuf:"bytes,27,rep,name=field18980" json:"field18980,omitempty"`
+	Field18981    *float32            `protobuf:"fixed32,28,opt,name=field18981" json:"field18981,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18921_Message18922) Reset() {
@@ -3926,13 +3890,12 @@
 }
 
 type Message3886_Message3887 struct {
-	Field3932            *string                 `protobuf:"bytes,2,req,name=field3932" json:"field3932,omitempty"`
-	Field3933            *string                 `protobuf:"bytes,9,opt,name=field3933" json:"field3933,omitempty"`
-	Field3934            *Message3850            `protobuf:"bytes,3,opt,name=field3934" json:"field3934,omitempty"`
-	Field3935            []byte                  `protobuf:"bytes,8,opt,name=field3935" json:"field3935,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3932     *string      `protobuf:"bytes,2,req,name=field3932" json:"field3932,omitempty"`
+	Field3933     *string      `protobuf:"bytes,9,opt,name=field3933" json:"field3933,omitempty"`
+	Field3934     *Message3850 `protobuf:"bytes,3,opt,name=field3934" json:"field3934,omitempty"`
+	Field3935     []byte       `protobuf:"bytes,8,opt,name=field3935" json:"field3935,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3886_Message3887) Reset() {
@@ -5196,6 +5159,378 @@
 	file_datasets_google_message3_benchmark_message3_5_proto_init()
 	file_datasets_google_message3_benchmark_message3_7_proto_init()
 	file_datasets_google_message3_benchmark_message3_8_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35546); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2356); i {
+			case 31:
+				return &v.sizeCache
+			case 32:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7029); i {
+			case 42:
+				return &v.sizeCache
+			case 43:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35538); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18921); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35540); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3886); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6743); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6773); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8224); i {
+			case 27:
+				return &v.sizeCache
+			case 28:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8392); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8130); i {
+			case 24:
+				return &v.sizeCache
+			case 25:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8478); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8479); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10319); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message4016); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12669); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12819); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12820); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12821); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12818); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16479); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16722); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16724); i {
+			case 13:
+				return &v.sizeCache
+			case 14:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message17728); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24356); i {
+			case 15:
+				return &v.sizeCache
+			case 16:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24376); i {
+			case 14:
+				return &v.sizeCache
+			case 15:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24366); i {
+			case 15:
+				return &v.sizeCache
+			case 16:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35546_Message35547); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35546_Message35548); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2356_Message2357); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2356_Message2358); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2356_Message2359); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7029_Message7030); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7029_Message7031); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18921_Message18922); i {
+			case 23:
+				return &v.sizeCache
+			case 24:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_3_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3886_Message3887); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message3_benchmark_message3_3_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
index eb925f1..d9519c5 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
@@ -18,9 +18,8 @@
 )
 
 type Message24346 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24346) Reset() {
@@ -47,10 +46,9 @@
 }
 
 type Message24401 struct {
-	Field24679           *Message24400           `protobuf:"bytes,1,opt,name=field24679" json:"field24679,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24679    *Message24400 `protobuf:"bytes,1,opt,name=field24679" json:"field24679,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24401) Reset() {
@@ -84,10 +82,9 @@
 }
 
 type Message24402 struct {
-	Field24680           *Message24400           `protobuf:"bytes,1,opt,name=field24680" json:"field24680,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24680    *Message24400 `protobuf:"bytes,1,opt,name=field24680" json:"field24680,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24402) Reset() {
@@ -121,27 +118,26 @@
 }
 
 type Message24379 struct {
-	Field24603           *string                 `protobuf:"bytes,1,opt,name=field24603" json:"field24603,omitempty"`
-	Field24604           *string                 `protobuf:"bytes,2,opt,name=field24604" json:"field24604,omitempty"`
-	Field24605           *string                 `protobuf:"bytes,3,opt,name=field24605" json:"field24605,omitempty"`
-	Field24606           *Message24380           `protobuf:"bytes,4,req,name=field24606" json:"field24606,omitempty"`
-	Field24607           *UnusedEmptyMessage     `protobuf:"bytes,5,opt,name=field24607" json:"field24607,omitempty"`
-	Field24608           *string                 `protobuf:"bytes,6,opt,name=field24608" json:"field24608,omitempty"`
-	Field24609           *Message24381           `protobuf:"bytes,7,opt,name=field24609" json:"field24609,omitempty"`
-	Field24610           []string                `protobuf:"bytes,8,rep,name=field24610" json:"field24610,omitempty"`
-	Field24611           []*UnusedEmptyMessage   `protobuf:"bytes,17,rep,name=field24611" json:"field24611,omitempty"`
-	Field24612           []string                `protobuf:"bytes,9,rep,name=field24612" json:"field24612,omitempty"`
-	Field24613           []string                `protobuf:"bytes,10,rep,name=field24613" json:"field24613,omitempty"`
-	Field24614           []string                `protobuf:"bytes,11,rep,name=field24614" json:"field24614,omitempty"`
-	Field24615           *string                 `protobuf:"bytes,14,opt,name=field24615" json:"field24615,omitempty"`
-	Field24616           *string                 `protobuf:"bytes,12,opt,name=field24616" json:"field24616,omitempty"`
-	Field24617           *string                 `protobuf:"bytes,16,opt,name=field24617" json:"field24617,omitempty"`
-	Field24618           []*UnusedEmptyMessage   `protobuf:"bytes,13,rep,name=field24618" json:"field24618,omitempty"`
-	Field24619           []string                `protobuf:"bytes,15,rep,name=field24619" json:"field24619,omitempty"`
-	Field24620           []string                `protobuf:"bytes,18,rep,name=field24620" json:"field24620,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24603    *string               `protobuf:"bytes,1,opt,name=field24603" json:"field24603,omitempty"`
+	Field24604    *string               `protobuf:"bytes,2,opt,name=field24604" json:"field24604,omitempty"`
+	Field24605    *string               `protobuf:"bytes,3,opt,name=field24605" json:"field24605,omitempty"`
+	Field24606    *Message24380         `protobuf:"bytes,4,req,name=field24606" json:"field24606,omitempty"`
+	Field24607    *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field24607" json:"field24607,omitempty"`
+	Field24608    *string               `protobuf:"bytes,6,opt,name=field24608" json:"field24608,omitempty"`
+	Field24609    *Message24381         `protobuf:"bytes,7,opt,name=field24609" json:"field24609,omitempty"`
+	Field24610    []string              `protobuf:"bytes,8,rep,name=field24610" json:"field24610,omitempty"`
+	Field24611    []*UnusedEmptyMessage `protobuf:"bytes,17,rep,name=field24611" json:"field24611,omitempty"`
+	Field24612    []string              `protobuf:"bytes,9,rep,name=field24612" json:"field24612,omitempty"`
+	Field24613    []string              `protobuf:"bytes,10,rep,name=field24613" json:"field24613,omitempty"`
+	Field24614    []string              `protobuf:"bytes,11,rep,name=field24614" json:"field24614,omitempty"`
+	Field24615    *string               `protobuf:"bytes,14,opt,name=field24615" json:"field24615,omitempty"`
+	Field24616    *string               `protobuf:"bytes,12,opt,name=field24616" json:"field24616,omitempty"`
+	Field24617    *string               `protobuf:"bytes,16,opt,name=field24617" json:"field24617,omitempty"`
+	Field24618    []*UnusedEmptyMessage `protobuf:"bytes,13,rep,name=field24618" json:"field24618,omitempty"`
+	Field24619    []string              `protobuf:"bytes,15,rep,name=field24619" json:"field24619,omitempty"`
+	Field24620    []string              `protobuf:"bytes,18,rep,name=field24620" json:"field24620,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24379) Reset() {
@@ -294,11 +290,10 @@
 }
 
 type Message27358 struct {
-	Field27415           *int32                  `protobuf:"varint,1,opt,name=field27415" json:"field27415,omitempty"`
-	Field27416           *int32                  `protobuf:"varint,2,opt,name=field27416" json:"field27416,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field27415    *int32 `protobuf:"varint,1,opt,name=field27415" json:"field27415,omitempty"`
+	Field27416    *int32 `protobuf:"varint,2,opt,name=field27416" json:"field27416,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message27358) Reset() {
@@ -339,19 +334,18 @@
 }
 
 type Message34381 struct {
-	Field34398           *string                 `protobuf:"bytes,1,opt,name=field34398" json:"field34398,omitempty"`
-	Field34399           *UnusedEmptyMessage     `protobuf:"bytes,2,opt,name=field34399" json:"field34399,omitempty"`
-	Field34400           *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field34400" json:"field34400,omitempty"`
-	Field34401           *UnusedEmptyMessage     `protobuf:"bytes,4,opt,name=field34401" json:"field34401,omitempty"`
-	Field34402           *UnusedEmptyMessage     `protobuf:"bytes,5,opt,name=field34402" json:"field34402,omitempty"`
-	Field34403           *bool                   `protobuf:"varint,6,opt,name=field34403" json:"field34403,omitempty"`
-	Field34404           *bool                   `protobuf:"varint,7,opt,name=field34404" json:"field34404,omitempty"`
-	Field34405           *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field34405" json:"field34405,omitempty"`
-	Field34406           *bool                   `protobuf:"varint,9,opt,name=field34406" json:"field34406,omitempty"`
-	Field34407           *UnusedEmptyMessage     `protobuf:"bytes,10,opt,name=field34407" json:"field34407,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field34398    *string             `protobuf:"bytes,1,opt,name=field34398" json:"field34398,omitempty"`
+	Field34399    *UnusedEmptyMessage `protobuf:"bytes,2,opt,name=field34399" json:"field34399,omitempty"`
+	Field34400    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field34400" json:"field34400,omitempty"`
+	Field34401    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field34401" json:"field34401,omitempty"`
+	Field34402    *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field34402" json:"field34402,omitempty"`
+	Field34403    *bool               `protobuf:"varint,6,opt,name=field34403" json:"field34403,omitempty"`
+	Field34404    *bool               `protobuf:"varint,7,opt,name=field34404" json:"field34404,omitempty"`
+	Field34405    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field34405" json:"field34405,omitempty"`
+	Field34406    *bool               `protobuf:"varint,9,opt,name=field34406" json:"field34406,omitempty"`
+	Field34407    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field34407" json:"field34407,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message34381) Reset() {
@@ -448,16 +442,15 @@
 }
 
 type Message34619 struct {
-	Field34641           *float64                `protobuf:"fixed64,1,opt,name=field34641" json:"field34641,omitempty"`
-	Field34642           *float64                `protobuf:"fixed64,2,opt,name=field34642" json:"field34642,omitempty"`
-	Field34643           *float64                `protobuf:"fixed64,3,opt,name=field34643" json:"field34643,omitempty"`
-	Field34644           *float64                `protobuf:"fixed64,4,opt,name=field34644" json:"field34644,omitempty"`
-	Field34645           *float64                `protobuf:"fixed64,11,opt,name=field34645" json:"field34645,omitempty"`
-	Field34646           *float64                `protobuf:"fixed64,5,opt,name=field34646" json:"field34646,omitempty"`
-	Field34647           *UnusedEmptyMessage     `protobuf:"bytes,100,opt,name=field34647" json:"field34647,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field34641    *float64            `protobuf:"fixed64,1,opt,name=field34641" json:"field34641,omitempty"`
+	Field34642    *float64            `protobuf:"fixed64,2,opt,name=field34642" json:"field34642,omitempty"`
+	Field34643    *float64            `protobuf:"fixed64,3,opt,name=field34643" json:"field34643,omitempty"`
+	Field34644    *float64            `protobuf:"fixed64,4,opt,name=field34644" json:"field34644,omitempty"`
+	Field34645    *float64            `protobuf:"fixed64,11,opt,name=field34645" json:"field34645,omitempty"`
+	Field34646    *float64            `protobuf:"fixed64,5,opt,name=field34646" json:"field34646,omitempty"`
+	Field34647    *UnusedEmptyMessage `protobuf:"bytes,100,opt,name=field34647" json:"field34647,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message34619) Reset() {
@@ -533,43 +526,42 @@
 }
 
 type Message730 struct {
-	Field897               *string                   `protobuf:"bytes,19,opt,name=field897" json:"field897,omitempty"`
-	Field898               []string                  `protobuf:"bytes,27,rep,name=field898" json:"field898,omitempty"`
-	Field899               []string                  `protobuf:"bytes,28,rep,name=field899" json:"field899,omitempty"`
-	Field900               []string                  `protobuf:"bytes,21,rep,name=field900" json:"field900,omitempty"`
-	Field901               *string                   `protobuf:"bytes,30,opt,name=field901" json:"field901,omitempty"`
-	Field902               []uint32                  `protobuf:"varint,20,rep,name=field902" json:"field902,omitempty"`
-	Field903               []uint32                  `protobuf:"varint,32,rep,name=field903" json:"field903,omitempty"`
-	Field904               []string                  `protobuf:"bytes,16,rep,name=field904" json:"field904,omitempty"`
-	Field905               []*Message697             `protobuf:"bytes,6,rep,name=field905" json:"field905,omitempty"`
-	Field906               []*Message704             `protobuf:"bytes,7,rep,name=field906" json:"field906,omitempty"`
-	Field907               []string                  `protobuf:"bytes,18,rep,name=field907" json:"field907,omitempty"`
-	Field908               []*Message703             `protobuf:"bytes,8,rep,name=field908" json:"field908,omitempty"`
-	Field909               []string                  `protobuf:"bytes,9,rep,name=field909" json:"field909,omitempty"`
-	Field910               *Message716               `protobuf:"bytes,10,opt,name=field910" json:"field910,omitempty"`
-	Field911               *Message718               `protobuf:"bytes,11,opt,name=field911" json:"field911,omitempty"`
-	Field912               *bool                     `protobuf:"varint,14,opt,name=field912" json:"field912,omitempty"`
-	Field913               []*Message715             `protobuf:"bytes,4,rep,name=field913" json:"field913,omitempty"`
-	Field914               []string                  `protobuf:"bytes,17,rep,name=field914" json:"field914,omitempty"`
-	Field915               []string                  `protobuf:"bytes,23,rep,name=field915" json:"field915,omitempty"`
-	Field916               []*Message719             `protobuf:"bytes,24,rep,name=field916" json:"field916,omitempty"`
-	Field917               []*Message728             `protobuf:"bytes,26,rep,name=field917" json:"field917,omitempty"`
-	Field918               []*Message702             `protobuf:"bytes,35,rep,name=field918" json:"field918,omitempty"`
-	Field919               *string                   `protobuf:"bytes,36,opt,name=field919" json:"field919,omitempty"`
-	Field920               []string                  `protobuf:"bytes,37,rep,name=field920" json:"field920,omitempty"`
-	Field921               *int64                    `protobuf:"varint,38,opt,name=field921" json:"field921,omitempty"`
-	Field922               []*UnusedEmptyMessage     `protobuf:"bytes,39,rep,name=field922" json:"field922,omitempty"`
-	Field923               []*UnusedEmptyMessage     `protobuf:"bytes,1,rep,name=field923" json:"field923,omitempty"`
-	Field924               *UnusedEmptyMessage       `protobuf:"bytes,2,opt,name=field924" json:"field924,omitempty"`
-	Field925               *UnusedEmptyMessage       `protobuf:"bytes,3,opt,name=field925" json:"field925,omitempty"`
-	Field926               *UnusedEmptyMessage       `protobuf:"bytes,5,opt,name=field926" json:"field926,omitempty"`
-	Field927               *UnusedEmptyMessage       `protobuf:"bytes,13,opt,name=field927" json:"field927,omitempty"`
-	Field928               []string                  `protobuf:"bytes,22,rep,name=field928" json:"field928,omitempty"`
-	Field929               []byte                    `protobuf:"bytes,31,opt,name=field929" json:"field929,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field897        *string               `protobuf:"bytes,19,opt,name=field897" json:"field897,omitempty"`
+	Field898        []string              `protobuf:"bytes,27,rep,name=field898" json:"field898,omitempty"`
+	Field899        []string              `protobuf:"bytes,28,rep,name=field899" json:"field899,omitempty"`
+	Field900        []string              `protobuf:"bytes,21,rep,name=field900" json:"field900,omitempty"`
+	Field901        *string               `protobuf:"bytes,30,opt,name=field901" json:"field901,omitempty"`
+	Field902        []uint32              `protobuf:"varint,20,rep,name=field902" json:"field902,omitempty"`
+	Field903        []uint32              `protobuf:"varint,32,rep,name=field903" json:"field903,omitempty"`
+	Field904        []string              `protobuf:"bytes,16,rep,name=field904" json:"field904,omitempty"`
+	Field905        []*Message697         `protobuf:"bytes,6,rep,name=field905" json:"field905,omitempty"`
+	Field906        []*Message704         `protobuf:"bytes,7,rep,name=field906" json:"field906,omitempty"`
+	Field907        []string              `protobuf:"bytes,18,rep,name=field907" json:"field907,omitempty"`
+	Field908        []*Message703         `protobuf:"bytes,8,rep,name=field908" json:"field908,omitempty"`
+	Field909        []string              `protobuf:"bytes,9,rep,name=field909" json:"field909,omitempty"`
+	Field910        *Message716           `protobuf:"bytes,10,opt,name=field910" json:"field910,omitempty"`
+	Field911        *Message718           `protobuf:"bytes,11,opt,name=field911" json:"field911,omitempty"`
+	Field912        *bool                 `protobuf:"varint,14,opt,name=field912" json:"field912,omitempty"`
+	Field913        []*Message715         `protobuf:"bytes,4,rep,name=field913" json:"field913,omitempty"`
+	Field914        []string              `protobuf:"bytes,17,rep,name=field914" json:"field914,omitempty"`
+	Field915        []string              `protobuf:"bytes,23,rep,name=field915" json:"field915,omitempty"`
+	Field916        []*Message719         `protobuf:"bytes,24,rep,name=field916" json:"field916,omitempty"`
+	Field917        []*Message728         `protobuf:"bytes,26,rep,name=field917" json:"field917,omitempty"`
+	Field918        []*Message702         `protobuf:"bytes,35,rep,name=field918" json:"field918,omitempty"`
+	Field919        *string               `protobuf:"bytes,36,opt,name=field919" json:"field919,omitempty"`
+	Field920        []string              `protobuf:"bytes,37,rep,name=field920" json:"field920,omitempty"`
+	Field921        *int64                `protobuf:"varint,38,opt,name=field921" json:"field921,omitempty"`
+	Field922        []*UnusedEmptyMessage `protobuf:"bytes,39,rep,name=field922" json:"field922,omitempty"`
+	Field923        []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field923" json:"field923,omitempty"`
+	Field924        *UnusedEmptyMessage   `protobuf:"bytes,2,opt,name=field924" json:"field924,omitempty"`
+	Field925        *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field925" json:"field925,omitempty"`
+	Field926        *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field926" json:"field926,omitempty"`
+	Field927        *UnusedEmptyMessage   `protobuf:"bytes,13,opt,name=field927" json:"field927,omitempty"`
+	Field928        []string              `protobuf:"bytes,22,rep,name=field928" json:"field928,omitempty"`
+	Field929        []byte                `protobuf:"bytes,31,opt,name=field929" json:"field929,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message730) Reset() {
@@ -839,13 +831,12 @@
 }
 
 type Message33958 struct {
-	Field33977           *string                      `protobuf:"bytes,1,opt,name=field33977" json:"field33977,omitempty"`
-	Field33978           *string                      `protobuf:"bytes,9,opt,name=field33978" json:"field33978,omitempty"`
-	Message33959         []*Message33958_Message33959 `protobuf:"group,2,rep,name=Message33959,json=message33959" json:"message33959,omitempty"`
-	Field33980           *Enum33960                   `protobuf:"varint,7,opt,name=field33980,enum=benchmarks.google_message3.Enum33960" json:"field33980,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field33977    *string                      `protobuf:"bytes,1,opt,name=field33977" json:"field33977,omitempty"`
+	Field33978    *string                      `protobuf:"bytes,9,opt,name=field33978" json:"field33978,omitempty"`
+	Message33959  []*Message33958_Message33959 `protobuf:"group,2,rep,name=Message33959,json=message33959" json:"message33959,omitempty"`
+	Field33980    *Enum33960                   `protobuf:"varint,7,opt,name=field33980,enum=benchmarks.google_message3.Enum33960" json:"field33980,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message33958) Reset() {
@@ -900,14 +891,13 @@
 }
 
 type Message6637 struct {
-	Field6670            *UnusedEmptyMessage     `protobuf:"bytes,2,opt,name=field6670" json:"field6670,omitempty"`
-	Field6671            []*UnusedEmptyMessage   `protobuf:"bytes,1,rep,name=field6671" json:"field6671,omitempty"`
-	Field6672            *int32                  `protobuf:"varint,3,opt,name=field6672" json:"field6672,omitempty"`
-	Field6673            []string                `protobuf:"bytes,4,rep,name=field6673" json:"field6673,omitempty"`
-	Field6674            *UnusedEmptyMessage     `protobuf:"bytes,5,opt,name=field6674" json:"field6674,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6670     *UnusedEmptyMessage   `protobuf:"bytes,2,opt,name=field6670" json:"field6670,omitempty"`
+	Field6671     []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field6671" json:"field6671,omitempty"`
+	Field6672     *int32                `protobuf:"varint,3,opt,name=field6672" json:"field6672,omitempty"`
+	Field6673     []string              `protobuf:"bytes,4,rep,name=field6673" json:"field6673,omitempty"`
+	Field6674     *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field6674" json:"field6674,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6637) Reset() {
@@ -969,27 +959,26 @@
 }
 
 type Message6643 struct {
-	Field6683            *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field6683" json:"field6683,omitempty"`
-	Field6684            *UnusedEmptyMessage     `protobuf:"bytes,4,opt,name=field6684" json:"field6684,omitempty"`
-	Field6685            *float64                `protobuf:"fixed64,5,opt,name=field6685" json:"field6685,omitempty"`
-	Field6686            *float64                `protobuf:"fixed64,6,opt,name=field6686" json:"field6686,omitempty"`
-	Field6687            *int32                  `protobuf:"varint,1,opt,name=field6687" json:"field6687,omitempty"`
-	Field6688            *int32                  `protobuf:"varint,2,opt,name=field6688" json:"field6688,omitempty"`
-	Field6689            *float64                `protobuf:"fixed64,9,opt,name=field6689" json:"field6689,omitempty"`
-	Field6690            []byte                  `protobuf:"bytes,10,opt,name=field6690" json:"field6690,omitempty"`
-	Field6691            *int32                  `protobuf:"varint,11,opt,name=field6691" json:"field6691,omitempty"`
-	Field6692            *bool                   `protobuf:"varint,12,opt,name=field6692" json:"field6692,omitempty"`
-	Field6693            *bool                   `protobuf:"varint,13,opt,name=field6693" json:"field6693,omitempty"`
-	Field6694            *Message6578            `protobuf:"bytes,15,opt,name=field6694" json:"field6694,omitempty"`
-	Field6695            *UnusedEnum             `protobuf:"varint,16,opt,name=field6695,enum=benchmarks.google_message3.UnusedEnum" json:"field6695,omitempty"`
-	Field6696            *int64                  `protobuf:"varint,17,opt,name=field6696" json:"field6696,omitempty"`
-	Field6697            []*UnusedEmptyMessage   `protobuf:"bytes,22,rep,name=field6697" json:"field6697,omitempty"`
-	Field6698            *UnusedEmptyMessage     `protobuf:"bytes,19,opt,name=field6698" json:"field6698,omitempty"`
-	Field6699            *UnusedEmptyMessage     `protobuf:"bytes,20,opt,name=field6699" json:"field6699,omitempty"`
-	Field6700            *int32                  `protobuf:"varint,21,opt,name=field6700" json:"field6700,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6683     *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field6683" json:"field6683,omitempty"`
+	Field6684     *UnusedEmptyMessage   `protobuf:"bytes,4,opt,name=field6684" json:"field6684,omitempty"`
+	Field6685     *float64              `protobuf:"fixed64,5,opt,name=field6685" json:"field6685,omitempty"`
+	Field6686     *float64              `protobuf:"fixed64,6,opt,name=field6686" json:"field6686,omitempty"`
+	Field6687     *int32                `protobuf:"varint,1,opt,name=field6687" json:"field6687,omitempty"`
+	Field6688     *int32                `protobuf:"varint,2,opt,name=field6688" json:"field6688,omitempty"`
+	Field6689     *float64              `protobuf:"fixed64,9,opt,name=field6689" json:"field6689,omitempty"`
+	Field6690     []byte                `protobuf:"bytes,10,opt,name=field6690" json:"field6690,omitempty"`
+	Field6691     *int32                `protobuf:"varint,11,opt,name=field6691" json:"field6691,omitempty"`
+	Field6692     *bool                 `protobuf:"varint,12,opt,name=field6692" json:"field6692,omitempty"`
+	Field6693     *bool                 `protobuf:"varint,13,opt,name=field6693" json:"field6693,omitempty"`
+	Field6694     *Message6578          `protobuf:"bytes,15,opt,name=field6694" json:"field6694,omitempty"`
+	Field6695     *UnusedEnum           `protobuf:"varint,16,opt,name=field6695,enum=benchmarks.google_message3.UnusedEnum" json:"field6695,omitempty"`
+	Field6696     *int64                `protobuf:"varint,17,opt,name=field6696" json:"field6696,omitempty"`
+	Field6697     []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field6697" json:"field6697,omitempty"`
+	Field6698     *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field6698" json:"field6698,omitempty"`
+	Field6699     *UnusedEmptyMessage   `protobuf:"bytes,20,opt,name=field6699" json:"field6699,omitempty"`
+	Field6700     *int32                `protobuf:"varint,21,opt,name=field6700" json:"field6700,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6643) Reset() {
@@ -1142,28 +1131,27 @@
 }
 
 type Message6126 struct {
-	Field6152            *string                 `protobuf:"bytes,1,req,name=field6152" json:"field6152,omitempty"`
-	Field6153            []*UnusedEmptyMessage   `protobuf:"bytes,9,rep,name=field6153" json:"field6153,omitempty"`
-	Field6154            *int32                  `protobuf:"varint,14,opt,name=field6154" json:"field6154,omitempty"`
-	Field6155            []byte                  `protobuf:"bytes,10,opt,name=field6155" json:"field6155,omitempty"`
-	Field6156            *Message6024            `protobuf:"bytes,12,opt,name=field6156" json:"field6156,omitempty"`
-	Field6157            *int32                  `protobuf:"varint,4,opt,name=field6157" json:"field6157,omitempty"`
-	Field6158            *string                 `protobuf:"bytes,5,opt,name=field6158" json:"field6158,omitempty"`
-	Field6159            *int32                  `protobuf:"varint,6,opt,name=field6159" json:"field6159,omitempty"`
-	Field6160            []int32                 `protobuf:"varint,2,rep,name=field6160" json:"field6160,omitempty"`
-	Field6161            []int32                 `protobuf:"varint,3,rep,name=field6161" json:"field6161,omitempty"`
-	Field6162            []*Message6052          `protobuf:"bytes,7,rep,name=field6162" json:"field6162,omitempty"`
-	Field6163            []*UnusedEmptyMessage   `protobuf:"bytes,11,rep,name=field6163" json:"field6163,omitempty"`
-	Field6164            *Enum6065               `protobuf:"varint,15,opt,name=field6164,enum=benchmarks.google_message3.Enum6065" json:"field6164,omitempty"`
-	Field6165            []*UnusedEmptyMessage   `protobuf:"bytes,8,rep,name=field6165" json:"field6165,omitempty"`
-	Field6166            *bool                   `protobuf:"varint,13,opt,name=field6166" json:"field6166,omitempty"`
-	Field6167            *bool                   `protobuf:"varint,16,opt,name=field6167" json:"field6167,omitempty"`
-	Field6168            *bool                   `protobuf:"varint,18,opt,name=field6168" json:"field6168,omitempty"`
-	Field6169            []*Message6054          `protobuf:"bytes,17,rep,name=field6169" json:"field6169,omitempty"`
-	Field6170            *int32                  `protobuf:"varint,19,opt,name=field6170" json:"field6170,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6152     *string               `protobuf:"bytes,1,req,name=field6152" json:"field6152,omitempty"`
+	Field6153     []*UnusedEmptyMessage `protobuf:"bytes,9,rep,name=field6153" json:"field6153,omitempty"`
+	Field6154     *int32                `protobuf:"varint,14,opt,name=field6154" json:"field6154,omitempty"`
+	Field6155     []byte                `protobuf:"bytes,10,opt,name=field6155" json:"field6155,omitempty"`
+	Field6156     *Message6024          `protobuf:"bytes,12,opt,name=field6156" json:"field6156,omitempty"`
+	Field6157     *int32                `protobuf:"varint,4,opt,name=field6157" json:"field6157,omitempty"`
+	Field6158     *string               `protobuf:"bytes,5,opt,name=field6158" json:"field6158,omitempty"`
+	Field6159     *int32                `protobuf:"varint,6,opt,name=field6159" json:"field6159,omitempty"`
+	Field6160     []int32               `protobuf:"varint,2,rep,name=field6160" json:"field6160,omitempty"`
+	Field6161     []int32               `protobuf:"varint,3,rep,name=field6161" json:"field6161,omitempty"`
+	Field6162     []*Message6052        `protobuf:"bytes,7,rep,name=field6162" json:"field6162,omitempty"`
+	Field6163     []*UnusedEmptyMessage `protobuf:"bytes,11,rep,name=field6163" json:"field6163,omitempty"`
+	Field6164     *Enum6065             `protobuf:"varint,15,opt,name=field6164,enum=benchmarks.google_message3.Enum6065" json:"field6164,omitempty"`
+	Field6165     []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field6165" json:"field6165,omitempty"`
+	Field6166     *bool                 `protobuf:"varint,13,opt,name=field6166" json:"field6166,omitempty"`
+	Field6167     *bool                 `protobuf:"varint,16,opt,name=field6167" json:"field6167,omitempty"`
+	Field6168     *bool                 `protobuf:"varint,18,opt,name=field6168" json:"field6168,omitempty"`
+	Field6169     []*Message6054        `protobuf:"bytes,17,rep,name=field6169" json:"field6169,omitempty"`
+	Field6170     *int32                `protobuf:"varint,19,opt,name=field6170" json:"field6170,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6126) Reset() {
@@ -1323,19 +1311,18 @@
 }
 
 type Message13083 struct {
-	Field13096           *float32                     `protobuf:"fixed32,1,opt,name=field13096" json:"field13096,omitempty"`
-	Message13084         []*Message13083_Message13084 `protobuf:"group,2,rep,name=Message13084,json=message13084" json:"message13084,omitempty"`
-	Field13098           *float32                     `protobuf:"fixed32,44,opt,name=field13098" json:"field13098,omitempty"`
-	Field13099           *float32                     `protobuf:"fixed32,45,opt,name=field13099" json:"field13099,omitempty"`
-	Field13100           *uint64                      `protobuf:"varint,46,opt,name=field13100" json:"field13100,omitempty"`
-	Field13101           *float32                     `protobuf:"fixed32,47,opt,name=field13101" json:"field13101,omitempty"`
-	Message13085         *Message13083_Message13085   `protobuf:"group,16,opt,name=Message13085,json=message13085" json:"message13085,omitempty"`
-	Message13086         []*Message13083_Message13086 `protobuf:"group,23,rep,name=Message13086,json=message13086" json:"message13086,omitempty"`
-	Message13087         []*Message13083_Message13087 `protobuf:"group,29,rep,name=Message13087,json=message13087" json:"message13087,omitempty"`
-	Field13105           *UnusedEmptyMessage          `protobuf:"bytes,43,opt,name=field13105" json:"field13105,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field13096    *float32                     `protobuf:"fixed32,1,opt,name=field13096" json:"field13096,omitempty"`
+	Message13084  []*Message13083_Message13084 `protobuf:"group,2,rep,name=Message13084,json=message13084" json:"message13084,omitempty"`
+	Field13098    *float32                     `protobuf:"fixed32,44,opt,name=field13098" json:"field13098,omitempty"`
+	Field13099    *float32                     `protobuf:"fixed32,45,opt,name=field13099" json:"field13099,omitempty"`
+	Field13100    *uint64                      `protobuf:"varint,46,opt,name=field13100" json:"field13100,omitempty"`
+	Field13101    *float32                     `protobuf:"fixed32,47,opt,name=field13101" json:"field13101,omitempty"`
+	Message13085  *Message13083_Message13085   `protobuf:"group,16,opt,name=Message13085,json=message13085" json:"message13085,omitempty"`
+	Message13086  []*Message13083_Message13086 `protobuf:"group,23,rep,name=Message13086,json=message13086" json:"message13086,omitempty"`
+	Message13087  []*Message13083_Message13087 `protobuf:"group,29,rep,name=Message13087,json=message13087" json:"message13087,omitempty"`
+	Field13105    *UnusedEmptyMessage          `protobuf:"bytes,43,opt,name=field13105" json:"field13105,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13083) Reset() {
@@ -1432,12 +1419,11 @@
 }
 
 type Message13088 struct {
-	Message13089         []*Message13088_Message13089 `protobuf:"group,1,rep,name=Message13089,json=message13089" json:"message13089,omitempty"`
-	Field13136           *int64                       `protobuf:"varint,4,opt,name=field13136" json:"field13136,omitempty"`
-	Field13137           *bool                        `protobuf:"varint,5,opt,name=field13137" json:"field13137,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Message13089  []*Message13088_Message13089 `protobuf:"group,1,rep,name=Message13089,json=message13089" json:"message13089,omitempty"`
+	Field13136    *int64                       `protobuf:"varint,4,opt,name=field13136" json:"field13136,omitempty"`
+	Field13137    *bool                        `protobuf:"varint,5,opt,name=field13137" json:"field13137,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13088) Reset() {
@@ -1485,18 +1471,17 @@
 }
 
 type Message10391 struct {
-	Field10411           *Enum10392              `protobuf:"varint,1,opt,name=field10411,enum=benchmarks.google_message3.Enum10392" json:"field10411,omitempty"`
-	Field10412           *UnusedEnum             `protobuf:"varint,2,opt,name=field10412,enum=benchmarks.google_message3.UnusedEnum" json:"field10412,omitempty"`
-	Field10413           *int64                  `protobuf:"varint,3,opt,name=field10413" json:"field10413,omitempty"`
-	Field10414           *string                 `protobuf:"bytes,4,opt,name=field10414" json:"field10414,omitempty"`
-	Field10415           *string                 `protobuf:"bytes,5,opt,name=field10415" json:"field10415,omitempty"`
-	Field10416           []byte                  `protobuf:"bytes,6,opt,name=field10416" json:"field10416,omitempty"`
-	Field10417           *bool                   `protobuf:"varint,8,opt,name=field10417" json:"field10417,omitempty"`
-	Field10418           *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field10418" json:"field10418,omitempty"`
-	Field10419           *bool                   `protobuf:"varint,10,opt,name=field10419" json:"field10419,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10411    *Enum10392          `protobuf:"varint,1,opt,name=field10411,enum=benchmarks.google_message3.Enum10392" json:"field10411,omitempty"`
+	Field10412    *UnusedEnum         `protobuf:"varint,2,opt,name=field10412,enum=benchmarks.google_message3.UnusedEnum" json:"field10412,omitempty"`
+	Field10413    *int64              `protobuf:"varint,3,opt,name=field10413" json:"field10413,omitempty"`
+	Field10414    *string             `protobuf:"bytes,4,opt,name=field10414" json:"field10414,omitempty"`
+	Field10415    *string             `protobuf:"bytes,5,opt,name=field10415" json:"field10415,omitempty"`
+	Field10416    []byte              `protobuf:"bytes,6,opt,name=field10416" json:"field10416,omitempty"`
+	Field10417    *bool               `protobuf:"varint,8,opt,name=field10417" json:"field10417,omitempty"`
+	Field10418    *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field10418" json:"field10418,omitempty"`
+	Field10419    *bool               `protobuf:"varint,10,opt,name=field10419" json:"field10419,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10391) Reset() {
@@ -1586,22 +1571,21 @@
 }
 
 type Message11873 struct {
-	Field11876             *string                   `protobuf:"bytes,1,opt,name=field11876" json:"field11876,omitempty"`
-	Field11877             *string                   `protobuf:"bytes,4,opt,name=field11877" json:"field11877,omitempty"`
-	Field11878             *Message10573             `protobuf:"bytes,5,opt,name=field11878" json:"field11878,omitempty"`
-	Field11879             *Message10582             `protobuf:"bytes,6,opt,name=field11879" json:"field11879,omitempty"`
-	Field11880             *Message10824             `protobuf:"bytes,7,opt,name=field11880" json:"field11880,omitempty"`
-	Field11881             *Message10773             `protobuf:"bytes,12,opt,name=field11881" json:"field11881,omitempty"`
-	Field11882             *Message11866             `protobuf:"bytes,8,opt,name=field11882" json:"field11882,omitempty"`
-	Field11883             *Message10818             `protobuf:"bytes,13,opt,name=field11883" json:"field11883,omitempty"`
-	Field11884             *UnusedEmptyMessage       `protobuf:"bytes,16,opt,name=field11884" json:"field11884,omitempty"`
-	Field11885             *Message10155             `protobuf:"bytes,11,opt,name=field11885" json:"field11885,omitempty"`
-	Field11886             *Message10469             `protobuf:"bytes,14,opt,name=field11886" json:"field11886,omitempty"`
-	Field11887             *UnusedEmptyMessage       `protobuf:"bytes,15,opt,name=field11887" json:"field11887,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field11876      *string             `protobuf:"bytes,1,opt,name=field11876" json:"field11876,omitempty"`
+	Field11877      *string             `protobuf:"bytes,4,opt,name=field11877" json:"field11877,omitempty"`
+	Field11878      *Message10573       `protobuf:"bytes,5,opt,name=field11878" json:"field11878,omitempty"`
+	Field11879      *Message10582       `protobuf:"bytes,6,opt,name=field11879" json:"field11879,omitempty"`
+	Field11880      *Message10824       `protobuf:"bytes,7,opt,name=field11880" json:"field11880,omitempty"`
+	Field11881      *Message10773       `protobuf:"bytes,12,opt,name=field11881" json:"field11881,omitempty"`
+	Field11882      *Message11866       `protobuf:"bytes,8,opt,name=field11882" json:"field11882,omitempty"`
+	Field11883      *Message10818       `protobuf:"bytes,13,opt,name=field11883" json:"field11883,omitempty"`
+	Field11884      *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field11884" json:"field11884,omitempty"`
+	Field11885      *Message10155       `protobuf:"bytes,11,opt,name=field11885" json:"field11885,omitempty"`
+	Field11886      *Message10469       `protobuf:"bytes,14,opt,name=field11886" json:"field11886,omitempty"`
+	Field11887      *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field11887" json:"field11887,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message11873) Reset() {
@@ -1722,13 +1706,12 @@
 }
 
 type Message35506 struct {
-	Field35524           *int32                  `protobuf:"varint,1,opt,name=field35524" json:"field35524,omitempty"`
-	Field35525           *string                 `protobuf:"bytes,2,opt,name=field35525" json:"field35525,omitempty"`
-	Field35526           *Enum35507              `protobuf:"varint,3,opt,name=field35526,enum=benchmarks.google_message3.Enum35507" json:"field35526,omitempty"`
-	Field35527           []*UnusedEmptyMessage   `protobuf:"bytes,4,rep,name=field35527" json:"field35527,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field35524    *int32                `protobuf:"varint,1,opt,name=field35524" json:"field35524,omitempty"`
+	Field35525    *string               `protobuf:"bytes,2,opt,name=field35525" json:"field35525,omitempty"`
+	Field35526    *Enum35507            `protobuf:"varint,3,opt,name=field35526,enum=benchmarks.google_message3.Enum35507" json:"field35526,omitempty"`
+	Field35527    []*UnusedEmptyMessage `protobuf:"bytes,4,rep,name=field35527" json:"field35527,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message35506) Reset() {
@@ -1783,10 +1766,9 @@
 }
 
 type Message13151 struct {
-	Field13158           []*Message13145         `protobuf:"bytes,1,rep,name=field13158" json:"field13158,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13158    []*Message13145 `protobuf:"bytes,1,rep,name=field13158" json:"field13158,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13151) Reset() {
@@ -1820,10 +1802,9 @@
 }
 
 type Message18253 struct {
-	Message18254         []*Message18253_Message18254 `protobuf:"group,1,rep,name=Message18254,json=message18254" json:"message18254,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Message18254  []*Message18253_Message18254 `protobuf:"group,1,rep,name=Message18254,json=message18254" json:"message18254,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18253) Reset() {
@@ -1857,10 +1838,9 @@
 }
 
 type Message16685 struct {
-	Field16694           []*Message16686         `protobuf:"bytes,2,rep,name=field16694" json:"field16694,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16694    []*Message16686 `protobuf:"bytes,2,rep,name=field16694" json:"field16694,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16685) Reset() {
@@ -1894,19 +1874,18 @@
 }
 
 type Message16816 struct {
-	Field16826           *float32                     `protobuf:"fixed32,1,opt,name=field16826" json:"field16826,omitempty"`
-	Field16827           *Enum16819                   `protobuf:"varint,2,opt,name=field16827,enum=benchmarks.google_message3.Enum16819" json:"field16827,omitempty"`
-	Field16828           *float32                     `protobuf:"fixed32,3,opt,name=field16828" json:"field16828,omitempty"`
-	Message16817         []*Message16816_Message16817 `protobuf:"group,4,rep,name=Message16817,json=message16817" json:"message16817,omitempty"`
-	Field16830           *bool                        `protobuf:"varint,7,opt,name=field16830" json:"field16830,omitempty"`
-	Field16831           *bool                        `protobuf:"varint,8,opt,name=field16831" json:"field16831,omitempty"`
-	Message16818         []*Message16816_Message16818 `protobuf:"group,12,rep,name=Message16818,json=message16818" json:"message16818,omitempty"`
-	Field16833           *string                      `protobuf:"bytes,10,opt,name=field16833" json:"field16833,omitempty"`
-	Field16834           *bool                        `protobuf:"varint,13,opt,name=field16834" json:"field16834,omitempty"`
-	Field16835           *bool                        `protobuf:"varint,14,opt,name=field16835" json:"field16835,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Field16826    *float32                     `protobuf:"fixed32,1,opt,name=field16826" json:"field16826,omitempty"`
+	Field16827    *Enum16819                   `protobuf:"varint,2,opt,name=field16827,enum=benchmarks.google_message3.Enum16819" json:"field16827,omitempty"`
+	Field16828    *float32                     `protobuf:"fixed32,3,opt,name=field16828" json:"field16828,omitempty"`
+	Message16817  []*Message16816_Message16817 `protobuf:"group,4,rep,name=Message16817,json=message16817" json:"message16817,omitempty"`
+	Field16830    *bool                        `protobuf:"varint,7,opt,name=field16830" json:"field16830,omitempty"`
+	Field16831    *bool                        `protobuf:"varint,8,opt,name=field16831" json:"field16831,omitempty"`
+	Message16818  []*Message16816_Message16818 `protobuf:"group,12,rep,name=Message16818,json=message16818" json:"message16818,omitempty"`
+	Field16833    *string                      `protobuf:"bytes,10,opt,name=field16833" json:"field16833,omitempty"`
+	Field16834    *bool                        `protobuf:"varint,13,opt,name=field16834" json:"field16834,omitempty"`
+	Field16835    *bool                        `protobuf:"varint,14,opt,name=field16835" json:"field16835,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16816) Reset() {
@@ -2003,20 +1982,19 @@
 }
 
 type Message13168 struct {
-	Field13212           *int32                  `protobuf:"varint,1,req,name=field13212" json:"field13212,omitempty"`
-	Field13213           *uint64                 `protobuf:"fixed64,7,opt,name=field13213" json:"field13213,omitempty"`
-	Field13214           *bool                   `protobuf:"varint,8,opt,name=field13214" json:"field13214,omitempty"`
-	Field13215           *uint64                 `protobuf:"fixed64,10,opt,name=field13215" json:"field13215,omitempty"`
-	Field13216           *bool                   `protobuf:"varint,11,opt,name=field13216" json:"field13216,omitempty"`
-	Field13217           *Message12796           `protobuf:"bytes,9,opt,name=field13217" json:"field13217,omitempty"`
-	Field13218           *float64                `protobuf:"fixed64,2,req,name=field13218" json:"field13218,omitempty"`
-	Field13219           *bool                   `protobuf:"varint,3,req,name=field13219" json:"field13219,omitempty"`
-	Field13220           *int32                  `protobuf:"varint,4,opt,name=field13220" json:"field13220,omitempty"`
-	Field13221           *bool                   `protobuf:"varint,5,req,name=field13221" json:"field13221,omitempty"`
-	Field13222           *int32                  `protobuf:"varint,6,opt,name=field13222" json:"field13222,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13212    *int32        `protobuf:"varint,1,req,name=field13212" json:"field13212,omitempty"`
+	Field13213    *uint64       `protobuf:"fixed64,7,opt,name=field13213" json:"field13213,omitempty"`
+	Field13214    *bool         `protobuf:"varint,8,opt,name=field13214" json:"field13214,omitempty"`
+	Field13215    *uint64       `protobuf:"fixed64,10,opt,name=field13215" json:"field13215,omitempty"`
+	Field13216    *bool         `protobuf:"varint,11,opt,name=field13216" json:"field13216,omitempty"`
+	Field13217    *Message12796 `protobuf:"bytes,9,opt,name=field13217" json:"field13217,omitempty"`
+	Field13218    *float64      `protobuf:"fixed64,2,req,name=field13218" json:"field13218,omitempty"`
+	Field13219    *bool         `protobuf:"varint,3,req,name=field13219" json:"field13219,omitempty"`
+	Field13220    *int32        `protobuf:"varint,4,opt,name=field13220" json:"field13220,omitempty"`
+	Field13221    *bool         `protobuf:"varint,5,req,name=field13221" json:"field13221,omitempty"`
+	Field13222    *int32        `protobuf:"varint,6,opt,name=field13222" json:"field13222,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13168) Reset() {
@@ -2120,22 +2098,21 @@
 }
 
 type Message13167 struct {
-	Field13199           *int32                  `protobuf:"varint,1,req,name=field13199" json:"field13199,omitempty"`
-	Field13200           *int32                  `protobuf:"varint,2,opt,name=field13200" json:"field13200,omitempty"`
-	Field13201           *int32                  `protobuf:"varint,3,opt,name=field13201" json:"field13201,omitempty"`
-	Field13202           *bool                   `protobuf:"varint,8,opt,name=field13202" json:"field13202,omitempty"`
-	Field13203           *uint64                 `protobuf:"fixed64,12,opt,name=field13203" json:"field13203,omitempty"`
-	Field13204           *bool                   `protobuf:"varint,13,opt,name=field13204" json:"field13204,omitempty"`
-	Field13205           *Message12796           `protobuf:"bytes,11,opt,name=field13205" json:"field13205,omitempty"`
-	Field13206           *uint64                 `protobuf:"fixed64,9,opt,name=field13206" json:"field13206,omitempty"`
-	Field13207           *bool                   `protobuf:"varint,10,opt,name=field13207" json:"field13207,omitempty"`
-	Field13208           []int32                 `protobuf:"varint,4,rep,name=field13208" json:"field13208,omitempty"`
-	Field13209           *int32                  `protobuf:"varint,5,opt,name=field13209" json:"field13209,omitempty"`
-	Field13210           *int32                  `protobuf:"varint,6,opt,name=field13210" json:"field13210,omitempty"`
-	Field13211           *int32                  `protobuf:"varint,7,opt,name=field13211" json:"field13211,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13199    *int32        `protobuf:"varint,1,req,name=field13199" json:"field13199,omitempty"`
+	Field13200    *int32        `protobuf:"varint,2,opt,name=field13200" json:"field13200,omitempty"`
+	Field13201    *int32        `protobuf:"varint,3,opt,name=field13201" json:"field13201,omitempty"`
+	Field13202    *bool         `protobuf:"varint,8,opt,name=field13202" json:"field13202,omitempty"`
+	Field13203    *uint64       `protobuf:"fixed64,12,opt,name=field13203" json:"field13203,omitempty"`
+	Field13204    *bool         `protobuf:"varint,13,opt,name=field13204" json:"field13204,omitempty"`
+	Field13205    *Message12796 `protobuf:"bytes,11,opt,name=field13205" json:"field13205,omitempty"`
+	Field13206    *uint64       `protobuf:"fixed64,9,opt,name=field13206" json:"field13206,omitempty"`
+	Field13207    *bool         `protobuf:"varint,10,opt,name=field13207" json:"field13207,omitempty"`
+	Field13208    []int32       `protobuf:"varint,4,rep,name=field13208" json:"field13208,omitempty"`
+	Field13209    *int32        `protobuf:"varint,5,opt,name=field13209" json:"field13209,omitempty"`
+	Field13210    *int32        `protobuf:"varint,6,opt,name=field13210" json:"field13210,omitempty"`
+	Field13211    *int32        `protobuf:"varint,7,opt,name=field13211" json:"field13211,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13167) Reset() {
@@ -2253,11 +2230,10 @@
 }
 
 type Message1374 struct {
-	Field1375            *string                 `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
-	Field1376            *string                 `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field1375     *string `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
+	Field1376     *string `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message1374) Reset() {
@@ -2298,9 +2274,8 @@
 }
 
 type Message18943 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18943) Reset() {
@@ -2327,9 +2302,8 @@
 }
 
 type Message18944 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18944) Reset() {
@@ -2356,40 +2330,39 @@
 }
 
 type Message18856 struct {
-	Field18857           *string                 `protobuf:"bytes,1,opt,name=field18857" json:"field18857,omitempty"`
-	Field18858           *string                 `protobuf:"bytes,2,opt,name=field18858" json:"field18858,omitempty"`
-	Field18859           *bool                   `protobuf:"varint,31,opt,name=field18859" json:"field18859,omitempty"`
-	Field18860           *string                 `protobuf:"bytes,26,opt,name=field18860" json:"field18860,omitempty"`
-	Field18861           *string                 `protobuf:"bytes,3,opt,name=field18861" json:"field18861,omitempty"`
-	Field18862           *string                 `protobuf:"bytes,4,opt,name=field18862" json:"field18862,omitempty"`
-	Field18863           *string                 `protobuf:"bytes,5,opt,name=field18863" json:"field18863,omitempty"`
-	Field18864           *string                 `protobuf:"bytes,17,opt,name=field18864" json:"field18864,omitempty"`
-	Field18865           *string                 `protobuf:"bytes,6,opt,name=field18865" json:"field18865,omitempty"`
-	Field18866           *string                 `protobuf:"bytes,7,opt,name=field18866" json:"field18866,omitempty"`
-	Field18867           *string                 `protobuf:"bytes,8,opt,name=field18867" json:"field18867,omitempty"`
-	Field18868           *string                 `protobuf:"bytes,9,opt,name=field18868" json:"field18868,omitempty"`
-	Field18869           *string                 `protobuf:"bytes,10,opt,name=field18869" json:"field18869,omitempty"`
-	Field18870           *string                 `protobuf:"bytes,11,opt,name=field18870" json:"field18870,omitempty"`
-	Field18871           *string                 `protobuf:"bytes,21,opt,name=field18871" json:"field18871,omitempty"`
-	Field18872           *string                 `protobuf:"bytes,18,opt,name=field18872" json:"field18872,omitempty"`
-	Field18873           *string                 `protobuf:"bytes,19,opt,name=field18873" json:"field18873,omitempty"`
-	Field18874           *string                 `protobuf:"bytes,20,opt,name=field18874" json:"field18874,omitempty"`
-	Field18875           *string                 `protobuf:"bytes,22,opt,name=field18875" json:"field18875,omitempty"`
-	Field18876           *string                 `protobuf:"bytes,23,opt,name=field18876" json:"field18876,omitempty"`
-	Field18877           *string                 `protobuf:"bytes,24,opt,name=field18877" json:"field18877,omitempty"`
-	Field18878           *string                 `protobuf:"bytes,25,opt,name=field18878" json:"field18878,omitempty"`
-	Field18879           *string                 `protobuf:"bytes,12,opt,name=field18879" json:"field18879,omitempty"`
-	Field18880           *string                 `protobuf:"bytes,13,opt,name=field18880" json:"field18880,omitempty"`
-	Field18881           *string                 `protobuf:"bytes,29,opt,name=field18881" json:"field18881,omitempty"`
-	Field18882           *string                 `protobuf:"bytes,30,opt,name=field18882" json:"field18882,omitempty"`
-	Field18883           *string                 `protobuf:"bytes,15,opt,name=field18883" json:"field18883,omitempty"`
-	Field18884           *string                 `protobuf:"bytes,16,opt,name=field18884" json:"field18884,omitempty"`
-	Field18885           []string                `protobuf:"bytes,14,rep,name=field18885" json:"field18885,omitempty"`
-	Field18886           *string                 `protobuf:"bytes,27,opt,name=field18886" json:"field18886,omitempty"`
-	Field18887           *string                 `protobuf:"bytes,28,opt,name=field18887" json:"field18887,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field18857    *string  `protobuf:"bytes,1,opt,name=field18857" json:"field18857,omitempty"`
+	Field18858    *string  `protobuf:"bytes,2,opt,name=field18858" json:"field18858,omitempty"`
+	Field18859    *bool    `protobuf:"varint,31,opt,name=field18859" json:"field18859,omitempty"`
+	Field18860    *string  `protobuf:"bytes,26,opt,name=field18860" json:"field18860,omitempty"`
+	Field18861    *string  `protobuf:"bytes,3,opt,name=field18861" json:"field18861,omitempty"`
+	Field18862    *string  `protobuf:"bytes,4,opt,name=field18862" json:"field18862,omitempty"`
+	Field18863    *string  `protobuf:"bytes,5,opt,name=field18863" json:"field18863,omitempty"`
+	Field18864    *string  `protobuf:"bytes,17,opt,name=field18864" json:"field18864,omitempty"`
+	Field18865    *string  `protobuf:"bytes,6,opt,name=field18865" json:"field18865,omitempty"`
+	Field18866    *string  `protobuf:"bytes,7,opt,name=field18866" json:"field18866,omitempty"`
+	Field18867    *string  `protobuf:"bytes,8,opt,name=field18867" json:"field18867,omitempty"`
+	Field18868    *string  `protobuf:"bytes,9,opt,name=field18868" json:"field18868,omitempty"`
+	Field18869    *string  `protobuf:"bytes,10,opt,name=field18869" json:"field18869,omitempty"`
+	Field18870    *string  `protobuf:"bytes,11,opt,name=field18870" json:"field18870,omitempty"`
+	Field18871    *string  `protobuf:"bytes,21,opt,name=field18871" json:"field18871,omitempty"`
+	Field18872    *string  `protobuf:"bytes,18,opt,name=field18872" json:"field18872,omitempty"`
+	Field18873    *string  `protobuf:"bytes,19,opt,name=field18873" json:"field18873,omitempty"`
+	Field18874    *string  `protobuf:"bytes,20,opt,name=field18874" json:"field18874,omitempty"`
+	Field18875    *string  `protobuf:"bytes,22,opt,name=field18875" json:"field18875,omitempty"`
+	Field18876    *string  `protobuf:"bytes,23,opt,name=field18876" json:"field18876,omitempty"`
+	Field18877    *string  `protobuf:"bytes,24,opt,name=field18877" json:"field18877,omitempty"`
+	Field18878    *string  `protobuf:"bytes,25,opt,name=field18878" json:"field18878,omitempty"`
+	Field18879    *string  `protobuf:"bytes,12,opt,name=field18879" json:"field18879,omitempty"`
+	Field18880    *string  `protobuf:"bytes,13,opt,name=field18880" json:"field18880,omitempty"`
+	Field18881    *string  `protobuf:"bytes,29,opt,name=field18881" json:"field18881,omitempty"`
+	Field18882    *string  `protobuf:"bytes,30,opt,name=field18882" json:"field18882,omitempty"`
+	Field18883    *string  `protobuf:"bytes,15,opt,name=field18883" json:"field18883,omitempty"`
+	Field18884    *string  `protobuf:"bytes,16,opt,name=field18884" json:"field18884,omitempty"`
+	Field18885    []string `protobuf:"bytes,14,rep,name=field18885" json:"field18885,omitempty"`
+	Field18886    *string  `protobuf:"bytes,27,opt,name=field18886" json:"field18886,omitempty"`
+	Field18887    *string  `protobuf:"bytes,28,opt,name=field18887" json:"field18887,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18856) Reset() {
@@ -2633,15 +2606,14 @@
 }
 
 type Message3850 struct {
-	Field3924            *Enum3851               `protobuf:"varint,2,opt,name=field3924,enum=benchmarks.google_message3.Enum3851" json:"field3924,omitempty"`
-	Field3925            *bool                   `protobuf:"varint,12,opt,name=field3925" json:"field3925,omitempty"`
-	Field3926            *int32                  `protobuf:"varint,4,opt,name=field3926" json:"field3926,omitempty"`
-	Field3927            *bool                   `protobuf:"varint,10,opt,name=field3927" json:"field3927,omitempty"`
-	Field3928            *bool                   `protobuf:"varint,13,opt,name=field3928" json:"field3928,omitempty"`
-	Field3929            *bool                   `protobuf:"varint,14,opt,name=field3929" json:"field3929,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3924     *Enum3851 `protobuf:"varint,2,opt,name=field3924,enum=benchmarks.google_message3.Enum3851" json:"field3924,omitempty"`
+	Field3925     *bool     `protobuf:"varint,12,opt,name=field3925" json:"field3925,omitempty"`
+	Field3926     *int32    `protobuf:"varint,4,opt,name=field3926" json:"field3926,omitempty"`
+	Field3927     *bool     `protobuf:"varint,10,opt,name=field3927" json:"field3927,omitempty"`
+	Field3928     *bool     `protobuf:"varint,13,opt,name=field3928" json:"field3928,omitempty"`
+	Field3929     *bool     `protobuf:"varint,14,opt,name=field3929" json:"field3929,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3850) Reset() {
@@ -2710,13 +2682,12 @@
 }
 
 type Message6721 struct {
-	Field6744            *Message6722            `protobuf:"bytes,1,opt,name=field6744" json:"field6744,omitempty"`
-	Field6745            *bool                   `protobuf:"varint,2,opt,name=field6745" json:"field6745,omitempty"`
-	Field6746            *bool                   `protobuf:"varint,3,opt,name=field6746" json:"field6746,omitempty"`
-	Field6747            *bool                   `protobuf:"varint,4,opt,name=field6747" json:"field6747,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6744     *Message6722 `protobuf:"bytes,1,opt,name=field6744" json:"field6744,omitempty"`
+	Field6745     *bool        `protobuf:"varint,2,opt,name=field6745" json:"field6745,omitempty"`
+	Field6746     *bool        `protobuf:"varint,3,opt,name=field6746" json:"field6746,omitempty"`
+	Field6747     *bool        `protobuf:"varint,4,opt,name=field6747" json:"field6747,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6721) Reset() {
@@ -2771,10 +2742,9 @@
 }
 
 type Message6742 struct {
-	Field6758            *bool                   `protobuf:"varint,1,opt,name=field6758" json:"field6758,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6758     *bool `protobuf:"varint,1,opt,name=field6758" json:"field6758,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6742) Reset() {
@@ -2808,11 +2778,10 @@
 }
 
 type Message6726 struct {
-	Field6752            *int64                  `protobuf:"varint,1,opt,name=field6752" json:"field6752,omitempty"`
-	Field6753            []*Message6727          `protobuf:"bytes,2,rep,name=field6753" json:"field6753,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6752     *int64         `protobuf:"varint,1,opt,name=field6752" json:"field6752,omitempty"`
+	Field6753     []*Message6727 `protobuf:"bytes,2,rep,name=field6753" json:"field6753,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6726) Reset() {
@@ -2853,12 +2822,11 @@
 }
 
 type Message6733 struct {
-	Field6754            *int64                  `protobuf:"varint,1,opt,name=field6754" json:"field6754,omitempty"`
-	Field6755            *int64                  `protobuf:"varint,2,opt,name=field6755" json:"field6755,omitempty"`
-	Field6756            *bool                   `protobuf:"varint,3,opt,name=field6756" json:"field6756,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6754     *int64 `protobuf:"varint,1,opt,name=field6754" json:"field6754,omitempty"`
+	Field6755     *int64 `protobuf:"varint,2,opt,name=field6755" json:"field6755,omitempty"`
+	Field6756     *bool  `protobuf:"varint,3,opt,name=field6756" json:"field6756,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6733) Reset() {
@@ -2906,11 +2874,10 @@
 }
 
 type Message6723 struct {
-	Field6748            *int64                  `protobuf:"varint,1,opt,name=field6748" json:"field6748,omitempty"`
-	Field6749            []*Message6724          `protobuf:"bytes,2,rep,name=field6749" json:"field6749,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6748     *int64         `protobuf:"varint,1,opt,name=field6748" json:"field6748,omitempty"`
+	Field6749     []*Message6724 `protobuf:"bytes,2,rep,name=field6749" json:"field6749,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6723) Reset() {
@@ -2951,11 +2918,10 @@
 }
 
 type Message6725 struct {
-	Field6750            *int32                  `protobuf:"varint,1,opt,name=field6750" json:"field6750,omitempty"`
-	Field6751            *int32                  `protobuf:"varint,2,opt,name=field6751" json:"field6751,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6750     *int32 `protobuf:"varint,1,opt,name=field6750" json:"field6750,omitempty"`
+	Field6751     *int32 `protobuf:"varint,2,opt,name=field6751" json:"field6751,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6725) Reset() {
@@ -2996,10 +2962,9 @@
 }
 
 type Message6734 struct {
-	Field6757            []*Message6735          `protobuf:"bytes,1,rep,name=field6757" json:"field6757,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6757     []*Message6735 `protobuf:"bytes,1,rep,name=field6757" json:"field6757,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6734) Reset() {
@@ -3033,12 +2998,11 @@
 }
 
 type Message8184 struct {
-	Field8228            *Message7966            `protobuf:"bytes,1,opt,name=field8228" json:"field8228,omitempty"`
-	Field8229            *bool                   `protobuf:"varint,2,opt,name=field8229" json:"field8229,omitempty"`
-	Field8230            []*Message8183          `protobuf:"bytes,3,rep,name=field8230" json:"field8230,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8228     *Message7966   `protobuf:"bytes,1,opt,name=field8228" json:"field8228,omitempty"`
+	Field8229     *bool          `protobuf:"varint,2,opt,name=field8229" json:"field8229,omitempty"`
+	Field8230     []*Message8183 `protobuf:"bytes,3,rep,name=field8230" json:"field8230,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8184) Reset() {
@@ -3086,12 +3050,11 @@
 }
 
 type Message8477 struct {
-	Field8486            *Message7966            `protobuf:"bytes,1,opt,name=field8486" json:"field8486,omitempty"`
-	Field8487            *int64                  `protobuf:"varint,2,opt,name=field8487" json:"field8487,omitempty"`
-	Field8488            *string                 `protobuf:"bytes,3,opt,name=field8488" json:"field8488,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8486     *Message7966 `protobuf:"bytes,1,opt,name=field8486" json:"field8486,omitempty"`
+	Field8487     *int64       `protobuf:"varint,2,opt,name=field8487" json:"field8487,omitempty"`
+	Field8488     *string      `protobuf:"bytes,3,opt,name=field8488" json:"field8488,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8477) Reset() {
@@ -3139,13 +3102,12 @@
 }
 
 type Message8454 struct {
-	Field8465            *Message8449            `protobuf:"bytes,1,opt,name=field8465" json:"field8465,omitempty"`
-	Field8466            *int64                  `protobuf:"varint,3,opt,name=field8466" json:"field8466,omitempty"`
-	Field8467            *int32                  `protobuf:"varint,4,opt,name=field8467" json:"field8467,omitempty"`
-	Field8468            *bool                   `protobuf:"varint,5,opt,name=field8468" json:"field8468,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8465     *Message8449 `protobuf:"bytes,1,opt,name=field8465" json:"field8465,omitempty"`
+	Field8466     *int64       `protobuf:"varint,3,opt,name=field8466" json:"field8466,omitempty"`
+	Field8467     *int32       `protobuf:"varint,4,opt,name=field8467" json:"field8467,omitempty"`
+	Field8468     *bool        `protobuf:"varint,5,opt,name=field8468" json:"field8468,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8454) Reset() {
@@ -3200,12 +3162,11 @@
 }
 
 type Message8476 struct {
-	Field8483            *string                 `protobuf:"bytes,1,opt,name=field8483" json:"field8483,omitempty"`
-	Field8484            *string                 `protobuf:"bytes,2,opt,name=field8484" json:"field8484,omitempty"`
-	Field8485            *string                 `protobuf:"bytes,3,opt,name=field8485" json:"field8485,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8483     *string `protobuf:"bytes,1,opt,name=field8483" json:"field8483,omitempty"`
+	Field8484     *string `protobuf:"bytes,2,opt,name=field8484" json:"field8484,omitempty"`
+	Field8485     *string `protobuf:"bytes,3,opt,name=field8485" json:"field8485,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8476) Reset() {
@@ -3253,13 +3214,12 @@
 }
 
 type Message8455 struct {
-	Field8470            *Message8449            `protobuf:"bytes,1,opt,name=field8470" json:"field8470,omitempty"`
-	Field8471            []*Message8456          `protobuf:"bytes,2,rep,name=field8471" json:"field8471,omitempty"`
-	Field8472            *Message8457            `protobuf:"bytes,5,opt,name=field8472" json:"field8472,omitempty"`
-	Field8473            *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field8473" json:"field8473,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8470     *Message8449        `protobuf:"bytes,1,opt,name=field8470" json:"field8470,omitempty"`
+	Field8471     []*Message8456      `protobuf:"bytes,2,rep,name=field8471" json:"field8471,omitempty"`
+	Field8472     *Message8457        `protobuf:"bytes,5,opt,name=field8472" json:"field8472,omitempty"`
+	Field8473     *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field8473" json:"field8473,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8455) Reset() {
@@ -3314,11 +3274,10 @@
 }
 
 type Message8475 struct {
-	Field8481            *string                 `protobuf:"bytes,1,opt,name=field8481" json:"field8481,omitempty"`
-	Field8482            *int64                  `protobuf:"varint,2,opt,name=field8482" json:"field8482,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8481     *string `protobuf:"bytes,1,opt,name=field8481" json:"field8481,omitempty"`
+	Field8482     *int64  `protobuf:"varint,2,opt,name=field8482" json:"field8482,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8475) Reset() {
@@ -3359,9 +3318,8 @@
 }
 
 type Message12559 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12559) Reset() {
@@ -3388,12 +3346,11 @@
 }
 
 type Message12817 struct {
-	Field12826           *int32                  `protobuf:"varint,1,opt,name=field12826" json:"field12826,omitempty"`
-	Field12827           *int32                  `protobuf:"varint,2,opt,name=field12827" json:"field12827,omitempty"`
-	Field12828           *int32                  `protobuf:"varint,3,opt,name=field12828" json:"field12828,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12826    *int32 `protobuf:"varint,1,opt,name=field12826" json:"field12826,omitempty"`
+	Field12827    *int32 `protobuf:"varint,2,opt,name=field12827" json:"field12827,omitempty"`
+	Field12828    *int32 `protobuf:"varint,3,opt,name=field12828" json:"field12828,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12817) Reset() {
@@ -3441,18 +3398,17 @@
 }
 
 type Message16480 struct {
-	Field16490           *Message13358           `protobuf:"bytes,1,opt,name=field16490" json:"field16490,omitempty"`
-	Field16491           *Enum16042              `protobuf:"varint,2,opt,name=field16491,enum=benchmarks.google_message3.Enum16042" json:"field16491,omitempty"`
-	Field16492           *Message13912           `protobuf:"bytes,3,opt,name=field16492" json:"field16492,omitempty"`
-	Field16493           *string                 `protobuf:"bytes,4,opt,name=field16493" json:"field16493,omitempty"`
-	Field16494           *string                 `protobuf:"bytes,5,opt,name=field16494" json:"field16494,omitempty"`
-	Field16495           *string                 `protobuf:"bytes,6,opt,name=field16495" json:"field16495,omitempty"`
-	Field16496           *string                 `protobuf:"bytes,7,opt,name=field16496" json:"field16496,omitempty"`
-	Field16497           *Message13358           `protobuf:"bytes,8,opt,name=field16497" json:"field16497,omitempty"`
-	Field16498           *uint32                 `protobuf:"fixed32,9,opt,name=field16498" json:"field16498,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field16490    *Message13358 `protobuf:"bytes,1,opt,name=field16490" json:"field16490,omitempty"`
+	Field16491    *Enum16042    `protobuf:"varint,2,opt,name=field16491,enum=benchmarks.google_message3.Enum16042" json:"field16491,omitempty"`
+	Field16492    *Message13912 `protobuf:"bytes,3,opt,name=field16492" json:"field16492,omitempty"`
+	Field16493    *string       `protobuf:"bytes,4,opt,name=field16493" json:"field16493,omitempty"`
+	Field16494    *string       `protobuf:"bytes,5,opt,name=field16494" json:"field16494,omitempty"`
+	Field16495    *string       `protobuf:"bytes,6,opt,name=field16495" json:"field16495,omitempty"`
+	Field16496    *string       `protobuf:"bytes,7,opt,name=field16496" json:"field16496,omitempty"`
+	Field16497    *Message13358 `protobuf:"bytes,8,opt,name=field16497" json:"field16497,omitempty"`
+	Field16498    *uint32       `protobuf:"fixed32,9,opt,name=field16498" json:"field16498,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16480) Reset() {
@@ -3542,38 +3498,37 @@
 }
 
 type Message24317 struct {
-	Field24446           *string                 `protobuf:"bytes,1,opt,name=field24446" json:"field24446,omitempty"`
-	Field24447           *Message24312           `protobuf:"bytes,2,opt,name=field24447" json:"field24447,omitempty"`
-	Field24448           []*Message24315         `protobuf:"bytes,3,rep,name=field24448" json:"field24448,omitempty"`
-	Field24449           []*Message24313         `protobuf:"bytes,4,rep,name=field24449" json:"field24449,omitempty"`
-	Field24450           []*Message24316         `protobuf:"bytes,5,rep,name=field24450" json:"field24450,omitempty"`
-	Field24451           []*UnusedEmptyMessage   `protobuf:"bytes,6,rep,name=field24451" json:"field24451,omitempty"`
-	Field24452           *UnusedEmptyMessage     `protobuf:"bytes,7,opt,name=field24452" json:"field24452,omitempty"`
-	Field24453           []string                `protobuf:"bytes,8,rep,name=field24453" json:"field24453,omitempty"`
-	Field24454           []string                `protobuf:"bytes,9,rep,name=field24454" json:"field24454,omitempty"`
-	Field24455           []string                `protobuf:"bytes,10,rep,name=field24455" json:"field24455,omitempty"`
-	Field24456           []string                `protobuf:"bytes,28,rep,name=field24456" json:"field24456,omitempty"`
-	Field24457           *string                 `protobuf:"bytes,11,opt,name=field24457" json:"field24457,omitempty"`
-	Field24458           *string                 `protobuf:"bytes,12,opt,name=field24458" json:"field24458,omitempty"`
-	Field24459           *string                 `protobuf:"bytes,13,opt,name=field24459" json:"field24459,omitempty"`
-	Field24460           *string                 `protobuf:"bytes,14,opt,name=field24460" json:"field24460,omitempty"`
-	Field24461           []string                `protobuf:"bytes,15,rep,name=field24461" json:"field24461,omitempty"`
-	Field24462           *string                 `protobuf:"bytes,16,opt,name=field24462" json:"field24462,omitempty"`
-	Field24463           []string                `protobuf:"bytes,17,rep,name=field24463" json:"field24463,omitempty"`
-	Field24464           []string                `protobuf:"bytes,18,rep,name=field24464" json:"field24464,omitempty"`
-	Field24465           []string                `protobuf:"bytes,19,rep,name=field24465" json:"field24465,omitempty"`
-	Field24466           []string                `protobuf:"bytes,20,rep,name=field24466" json:"field24466,omitempty"`
-	Field24467           []string                `protobuf:"bytes,21,rep,name=field24467" json:"field24467,omitempty"`
-	Field24468           []string                `protobuf:"bytes,22,rep,name=field24468" json:"field24468,omitempty"`
-	Field24469           []string                `protobuf:"bytes,23,rep,name=field24469" json:"field24469,omitempty"`
-	Field24470           []string                `protobuf:"bytes,24,rep,name=field24470" json:"field24470,omitempty"`
-	Field24471           *string                 `protobuf:"bytes,25,opt,name=field24471" json:"field24471,omitempty"`
-	Field24472           *string                 `protobuf:"bytes,26,opt,name=field24472" json:"field24472,omitempty"`
-	Field24473           []string                `protobuf:"bytes,27,rep,name=field24473" json:"field24473,omitempty"`
-	Field24474           *bool                   `protobuf:"varint,40,opt,name=field24474" json:"field24474,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24446    *string               `protobuf:"bytes,1,opt,name=field24446" json:"field24446,omitempty"`
+	Field24447    *Message24312         `protobuf:"bytes,2,opt,name=field24447" json:"field24447,omitempty"`
+	Field24448    []*Message24315       `protobuf:"bytes,3,rep,name=field24448" json:"field24448,omitempty"`
+	Field24449    []*Message24313       `protobuf:"bytes,4,rep,name=field24449" json:"field24449,omitempty"`
+	Field24450    []*Message24316       `protobuf:"bytes,5,rep,name=field24450" json:"field24450,omitempty"`
+	Field24451    []*UnusedEmptyMessage `protobuf:"bytes,6,rep,name=field24451" json:"field24451,omitempty"`
+	Field24452    *UnusedEmptyMessage   `protobuf:"bytes,7,opt,name=field24452" json:"field24452,omitempty"`
+	Field24453    []string              `protobuf:"bytes,8,rep,name=field24453" json:"field24453,omitempty"`
+	Field24454    []string              `protobuf:"bytes,9,rep,name=field24454" json:"field24454,omitempty"`
+	Field24455    []string              `protobuf:"bytes,10,rep,name=field24455" json:"field24455,omitempty"`
+	Field24456    []string              `protobuf:"bytes,28,rep,name=field24456" json:"field24456,omitempty"`
+	Field24457    *string               `protobuf:"bytes,11,opt,name=field24457" json:"field24457,omitempty"`
+	Field24458    *string               `protobuf:"bytes,12,opt,name=field24458" json:"field24458,omitempty"`
+	Field24459    *string               `protobuf:"bytes,13,opt,name=field24459" json:"field24459,omitempty"`
+	Field24460    *string               `protobuf:"bytes,14,opt,name=field24460" json:"field24460,omitempty"`
+	Field24461    []string              `protobuf:"bytes,15,rep,name=field24461" json:"field24461,omitempty"`
+	Field24462    *string               `protobuf:"bytes,16,opt,name=field24462" json:"field24462,omitempty"`
+	Field24463    []string              `protobuf:"bytes,17,rep,name=field24463" json:"field24463,omitempty"`
+	Field24464    []string              `protobuf:"bytes,18,rep,name=field24464" json:"field24464,omitempty"`
+	Field24465    []string              `protobuf:"bytes,19,rep,name=field24465" json:"field24465,omitempty"`
+	Field24466    []string              `protobuf:"bytes,20,rep,name=field24466" json:"field24466,omitempty"`
+	Field24467    []string              `protobuf:"bytes,21,rep,name=field24467" json:"field24467,omitempty"`
+	Field24468    []string              `protobuf:"bytes,22,rep,name=field24468" json:"field24468,omitempty"`
+	Field24469    []string              `protobuf:"bytes,23,rep,name=field24469" json:"field24469,omitempty"`
+	Field24470    []string              `protobuf:"bytes,24,rep,name=field24470" json:"field24470,omitempty"`
+	Field24471    *string               `protobuf:"bytes,25,opt,name=field24471" json:"field24471,omitempty"`
+	Field24472    *string               `protobuf:"bytes,26,opt,name=field24472" json:"field24472,omitempty"`
+	Field24473    []string              `protobuf:"bytes,27,rep,name=field24473" json:"field24473,omitempty"`
+	Field24474    *bool                 `protobuf:"varint,40,opt,name=field24474" json:"field24474,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24317) Reset() {
@@ -3803,15 +3758,14 @@
 }
 
 type Message33958_Message33959 struct {
-	Field33982           *string                 `protobuf:"bytes,3,req,name=field33982" json:"field33982,omitempty"`
-	Field33983           *string                 `protobuf:"bytes,4,opt,name=field33983" json:"field33983,omitempty"`
-	Field33984           *string                 `protobuf:"bytes,5,opt,name=field33984" json:"field33984,omitempty"`
-	Field33985           *uint64                 `protobuf:"fixed64,8,opt,name=field33985" json:"field33985,omitempty"`
-	Field33986           *bool                   `protobuf:"varint,10,opt,name=field33986" json:"field33986,omitempty"`
-	Field33987           *Message0               `protobuf:"bytes,6,opt,name=field33987" json:"field33987,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field33982    *string   `protobuf:"bytes,3,req,name=field33982" json:"field33982,omitempty"`
+	Field33983    *string   `protobuf:"bytes,4,opt,name=field33983" json:"field33983,omitempty"`
+	Field33984    *string   `protobuf:"bytes,5,opt,name=field33984" json:"field33984,omitempty"`
+	Field33985    *uint64   `protobuf:"fixed64,8,opt,name=field33985" json:"field33985,omitempty"`
+	Field33986    *bool     `protobuf:"varint,10,opt,name=field33986" json:"field33986,omitempty"`
+	Field33987    *Message0 `protobuf:"bytes,6,opt,name=field33987" json:"field33987,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message33958_Message33959) Reset() {
@@ -3880,13 +3834,12 @@
 }
 
 type Message13083_Message13084 struct {
-	Field13107           *float32                `protobuf:"fixed32,3,req,name=field13107" json:"field13107,omitempty"`
-	Field13108           *int32                  `protobuf:"varint,4,req,name=field13108" json:"field13108,omitempty"`
-	Field13109           *float32                `protobuf:"fixed32,5,opt,name=field13109" json:"field13109,omitempty"`
-	Field13110           []Enum13092             `protobuf:"varint,6,rep,name=field13110,enum=benchmarks.google_message3.Enum13092" json:"field13110,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13107    *float32    `protobuf:"fixed32,3,req,name=field13107" json:"field13107,omitempty"`
+	Field13108    *int32      `protobuf:"varint,4,req,name=field13108" json:"field13108,omitempty"`
+	Field13109    *float32    `protobuf:"fixed32,5,opt,name=field13109" json:"field13109,omitempty"`
+	Field13110    []Enum13092 `protobuf:"varint,6,rep,name=field13110,enum=benchmarks.google_message3.Enum13092" json:"field13110,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13083_Message13084) Reset() {
@@ -3941,9 +3894,8 @@
 }
 
 type Message13083_Message13085 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13083_Message13085) Reset() {
@@ -3970,9 +3922,8 @@
 }
 
 type Message13083_Message13086 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13083_Message13086) Reset() {
@@ -3999,9 +3950,8 @@
 }
 
 type Message13083_Message13087 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13083_Message13087) Reset() {
@@ -4028,11 +3978,10 @@
 }
 
 type Message13088_Message13089 struct {
-	Field13139           *string                 `protobuf:"bytes,2,req,name=field13139" json:"field13139,omitempty"`
-	Field13140           *float32                `protobuf:"fixed32,3,opt,name=field13140" json:"field13140,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13139    *string  `protobuf:"bytes,2,req,name=field13139" json:"field13139,omitempty"`
+	Field13140    *float32 `protobuf:"fixed32,3,opt,name=field13140" json:"field13140,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13088_Message13089) Reset() {
@@ -4073,11 +4022,10 @@
 }
 
 type Message18253_Message18254 struct {
-	Field18362           *uint64                 `protobuf:"fixed64,2,req,name=field18362" json:"field18362,omitempty"`
-	Field18363           *float64                `protobuf:"fixed64,3,req,name=field18363" json:"field18363,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field18362    *uint64  `protobuf:"fixed64,2,req,name=field18362" json:"field18362,omitempty"`
+	Field18363    *float64 `protobuf:"fixed64,3,req,name=field18363" json:"field18363,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message18253_Message18254) Reset() {
@@ -4118,9 +4066,8 @@
 }
 
 type Message16816_Message16817 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16816_Message16817) Reset() {
@@ -4147,9 +4094,8 @@
 }
 
 type Message16816_Message16818 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16816_Message16818) Reset() {
@@ -5479,6 +5425,552 @@
 	file_datasets_google_message3_benchmark_message3_6_proto_init()
 	file_datasets_google_message3_benchmark_message3_7_proto_init()
 	file_datasets_google_message3_benchmark_message3_8_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24346); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24401); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24402); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24379); i {
+			case 18:
+				return &v.sizeCache
+			case 19:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message27358); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message34381); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message34619); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message730); i {
+			case 33:
+				return &v.sizeCache
+			case 34:
+				return &v.unknownFields
+			case 35:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message33958); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6637); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6643); i {
+			case 18:
+				return &v.sizeCache
+			case 19:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6126); i {
+			case 19:
+				return &v.sizeCache
+			case 20:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13083); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13088); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10391); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11873); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			case 14:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message35506); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13151); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18253); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16685); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16816); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13168); i {
+			case 11:
+				return &v.sizeCache
+			case 12:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13167); i {
+			case 13:
+				return &v.sizeCache
+			case 14:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message1374); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18943); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18944); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18856); i {
+			case 31:
+				return &v.sizeCache
+			case 32:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3850); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6721); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6742); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6726); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6733); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6723); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6725); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6734); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8184); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8477); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8454); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8476); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8455); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8475); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12559); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12817); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16480); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24317); i {
+			case 29:
+				return &v.sizeCache
+			case 30:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message33958_Message33959); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13083_Message13084); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13083_Message13085); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13083_Message13086); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13083_Message13087); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13088_Message13089); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message18253_Message18254); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16816_Message16817); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_4_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16816_Message16818); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message3_benchmark_message3_4_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
index 20b5649..b813c01 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
@@ -18,9 +18,8 @@
 )
 
 type Message24377 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24377) Reset() {
@@ -47,9 +46,8 @@
 }
 
 type Message24378 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24378) Reset() {
@@ -76,14 +74,13 @@
 }
 
 type Message24400 struct {
-	Field24674           *int32                  `protobuf:"varint,1,opt,name=field24674" json:"field24674,omitempty"`
-	Field24675           *int32                  `protobuf:"varint,2,opt,name=field24675" json:"field24675,omitempty"`
-	Field24676           *int32                  `protobuf:"varint,3,opt,name=field24676" json:"field24676,omitempty"`
-	Field24677           *int32                  `protobuf:"varint,4,opt,name=field24677" json:"field24677,omitempty"`
-	Field24678           *int32                  `protobuf:"varint,5,opt,name=field24678" json:"field24678,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24674    *int32 `protobuf:"varint,1,opt,name=field24674" json:"field24674,omitempty"`
+	Field24675    *int32 `protobuf:"varint,2,opt,name=field24675" json:"field24675,omitempty"`
+	Field24676    *int32 `protobuf:"varint,3,opt,name=field24676" json:"field24676,omitempty"`
+	Field24677    *int32 `protobuf:"varint,4,opt,name=field24677" json:"field24677,omitempty"`
+	Field24678    *int32 `protobuf:"varint,5,opt,name=field24678" json:"field24678,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24400) Reset() {
@@ -145,9 +142,8 @@
 }
 
 type Message24380 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24380) Reset() {
@@ -174,9 +170,8 @@
 }
 
 type Message24381 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24381) Reset() {
@@ -203,13 +198,12 @@
 }
 
 type Message719 struct {
-	Field881             []string                `protobuf:"bytes,1,rep,name=field881" json:"field881,omitempty"`
-	Field882             []string                `protobuf:"bytes,2,rep,name=field882" json:"field882,omitempty"`
-	Field883             []string                `protobuf:"bytes,3,rep,name=field883" json:"field883,omitempty"`
-	Field884             *Enum720                `protobuf:"varint,4,opt,name=field884,enum=benchmarks.google_message3.Enum720" json:"field884,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field881      []string `protobuf:"bytes,1,rep,name=field881" json:"field881,omitempty"`
+	Field882      []string `protobuf:"bytes,2,rep,name=field882" json:"field882,omitempty"`
+	Field883      []string `protobuf:"bytes,3,rep,name=field883" json:"field883,omitempty"`
+	Field884      *Enum720 `protobuf:"varint,4,opt,name=field884,enum=benchmarks.google_message3.Enum720" json:"field884,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message719) Reset() {
@@ -264,19 +258,18 @@
 }
 
 type Message728 struct {
-	Field887               *string                   `protobuf:"bytes,1,req,name=field887" json:"field887,omitempty"`
-	Field888               []string                  `protobuf:"bytes,2,rep,name=field888" json:"field888,omitempty"`
-	Field889               []*Message703             `protobuf:"bytes,3,rep,name=field889" json:"field889,omitempty"`
-	Field890               []*Message715             `protobuf:"bytes,4,rep,name=field890" json:"field890,omitempty"`
-	Field891               []string                  `protobuf:"bytes,5,rep,name=field891" json:"field891,omitempty"`
-	Field892               []string                  `protobuf:"bytes,6,rep,name=field892" json:"field892,omitempty"`
-	Field893               *Message718               `protobuf:"bytes,7,opt,name=field893" json:"field893,omitempty"`
-	Field894               *Message716               `protobuf:"bytes,8,opt,name=field894" json:"field894,omitempty"`
-	Field895               []string                  `protobuf:"bytes,9,rep,name=field895" json:"field895,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field887        *string       `protobuf:"bytes,1,req,name=field887" json:"field887,omitempty"`
+	Field888        []string      `protobuf:"bytes,2,rep,name=field888" json:"field888,omitempty"`
+	Field889        []*Message703 `protobuf:"bytes,3,rep,name=field889" json:"field889,omitempty"`
+	Field890        []*Message715 `protobuf:"bytes,4,rep,name=field890" json:"field890,omitempty"`
+	Field891        []string      `protobuf:"bytes,5,rep,name=field891" json:"field891,omitempty"`
+	Field892        []string      `protobuf:"bytes,6,rep,name=field892" json:"field892,omitempty"`
+	Field893        *Message718   `protobuf:"bytes,7,opt,name=field893" json:"field893,omitempty"`
+	Field894        *Message716   `protobuf:"bytes,8,opt,name=field894" json:"field894,omitempty"`
+	Field895        []string      `protobuf:"bytes,9,rep,name=field895" json:"field895,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message728) Reset() {
@@ -377,16 +370,15 @@
 }
 
 type Message704 struct {
-	Field800             *string                 `protobuf:"bytes,1,opt,name=field800" json:"field800,omitempty"`
-	Field801             *string                 `protobuf:"bytes,7,opt,name=field801" json:"field801,omitempty"`
-	Field802             *string                 `protobuf:"bytes,2,opt,name=field802" json:"field802,omitempty"`
-	Field803             *string                 `protobuf:"bytes,3,opt,name=field803" json:"field803,omitempty"`
-	Field804             *string                 `protobuf:"bytes,4,opt,name=field804" json:"field804,omitempty"`
-	Field805             *string                 `protobuf:"bytes,5,opt,name=field805" json:"field805,omitempty"`
-	Field806             *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field806" json:"field806,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field800      *string             `protobuf:"bytes,1,opt,name=field800" json:"field800,omitempty"`
+	Field801      *string             `protobuf:"bytes,7,opt,name=field801" json:"field801,omitempty"`
+	Field802      *string             `protobuf:"bytes,2,opt,name=field802" json:"field802,omitempty"`
+	Field803      *string             `protobuf:"bytes,3,opt,name=field803" json:"field803,omitempty"`
+	Field804      *string             `protobuf:"bytes,4,opt,name=field804" json:"field804,omitempty"`
+	Field805      *string             `protobuf:"bytes,5,opt,name=field805" json:"field805,omitempty"`
+	Field806      *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field806" json:"field806,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message704) Reset() {
@@ -462,46 +454,45 @@
 }
 
 type Message697 struct {
-	Field743               *string                   `protobuf:"bytes,7,opt,name=field743" json:"field743,omitempty"`
-	Field744               []string                  `protobuf:"bytes,1,rep,name=field744" json:"field744,omitempty"`
-	Field745               []string                  `protobuf:"bytes,2,rep,name=field745" json:"field745,omitempty"`
-	Field746               []string                  `protobuf:"bytes,33,rep,name=field746" json:"field746,omitempty"`
-	Field747               []string                  `protobuf:"bytes,29,rep,name=field747" json:"field747,omitempty"`
-	Field748               []string                  `protobuf:"bytes,30,rep,name=field748" json:"field748,omitempty"`
-	Field749               []string                  `protobuf:"bytes,31,rep,name=field749" json:"field749,omitempty"`
-	Field750               []string                  `protobuf:"bytes,32,rep,name=field750" json:"field750,omitempty"`
-	Field751               []string                  `protobuf:"bytes,13,rep,name=field751" json:"field751,omitempty"`
-	Field752               []string                  `protobuf:"bytes,6,rep,name=field752" json:"field752,omitempty"`
-	Field753               []string                  `protobuf:"bytes,3,rep,name=field753" json:"field753,omitempty"`
-	Field754               []string                  `protobuf:"bytes,14,rep,name=field754" json:"field754,omitempty"`
-	Field755               []string                  `protobuf:"bytes,15,rep,name=field755" json:"field755,omitempty"`
-	Field756               []string                  `protobuf:"bytes,16,rep,name=field756" json:"field756,omitempty"`
-	Field757               []string                  `protobuf:"bytes,4,rep,name=field757" json:"field757,omitempty"`
-	Field758               []string                  `protobuf:"bytes,34,rep,name=field758" json:"field758,omitempty"`
-	Field759               []string                  `protobuf:"bytes,35,rep,name=field759" json:"field759,omitempty"`
-	Field760               []string                  `protobuf:"bytes,5,rep,name=field760" json:"field760,omitempty"`
-	Field761               []string                  `protobuf:"bytes,17,rep,name=field761" json:"field761,omitempty"`
-	Field762               []string                  `protobuf:"bytes,18,rep,name=field762" json:"field762,omitempty"`
-	Field763               []string                  `protobuf:"bytes,19,rep,name=field763" json:"field763,omitempty"`
-	Field764               *bool                     `protobuf:"varint,36,opt,name=field764" json:"field764,omitempty"`
-	Field765               []string                  `protobuf:"bytes,8,rep,name=field765" json:"field765,omitempty"`
-	Field766               []string                  `protobuf:"bytes,9,rep,name=field766" json:"field766,omitempty"`
-	Field767               *string                   `protobuf:"bytes,27,opt,name=field767" json:"field767,omitempty"`
-	Field768               *bool                     `protobuf:"varint,25,opt,name=field768" json:"field768,omitempty"`
-	Field769               *Message700               `protobuf:"bytes,10,opt,name=field769" json:"field769,omitempty"`
-	Field770               *bool                     `protobuf:"varint,11,opt,name=field770" json:"field770,omitempty"`
-	Field771               *bool                     `protobuf:"varint,24,opt,name=field771" json:"field771,omitempty"`
-	Field772               []string                  `protobuf:"bytes,12,rep,name=field772" json:"field772,omitempty"`
-	Field773               []string                  `protobuf:"bytes,20,rep,name=field773" json:"field773,omitempty"`
-	Field774               []string                  `protobuf:"bytes,21,rep,name=field774" json:"field774,omitempty"`
-	Field775               []string                  `protobuf:"bytes,22,rep,name=field775" json:"field775,omitempty"`
-	Field776               []*Message699             `protobuf:"bytes,23,rep,name=field776" json:"field776,omitempty"`
-	Field777               []*Message698             `protobuf:"bytes,37,rep,name=field777" json:"field777,omitempty"`
-	Field778               *int64                    `protobuf:"varint,38,opt,name=field778" json:"field778,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field743        *string       `protobuf:"bytes,7,opt,name=field743" json:"field743,omitempty"`
+	Field744        []string      `protobuf:"bytes,1,rep,name=field744" json:"field744,omitempty"`
+	Field745        []string      `protobuf:"bytes,2,rep,name=field745" json:"field745,omitempty"`
+	Field746        []string      `protobuf:"bytes,33,rep,name=field746" json:"field746,omitempty"`
+	Field747        []string      `protobuf:"bytes,29,rep,name=field747" json:"field747,omitempty"`
+	Field748        []string      `protobuf:"bytes,30,rep,name=field748" json:"field748,omitempty"`
+	Field749        []string      `protobuf:"bytes,31,rep,name=field749" json:"field749,omitempty"`
+	Field750        []string      `protobuf:"bytes,32,rep,name=field750" json:"field750,omitempty"`
+	Field751        []string      `protobuf:"bytes,13,rep,name=field751" json:"field751,omitempty"`
+	Field752        []string      `protobuf:"bytes,6,rep,name=field752" json:"field752,omitempty"`
+	Field753        []string      `protobuf:"bytes,3,rep,name=field753" json:"field753,omitempty"`
+	Field754        []string      `protobuf:"bytes,14,rep,name=field754" json:"field754,omitempty"`
+	Field755        []string      `protobuf:"bytes,15,rep,name=field755" json:"field755,omitempty"`
+	Field756        []string      `protobuf:"bytes,16,rep,name=field756" json:"field756,omitempty"`
+	Field757        []string      `protobuf:"bytes,4,rep,name=field757" json:"field757,omitempty"`
+	Field758        []string      `protobuf:"bytes,34,rep,name=field758" json:"field758,omitempty"`
+	Field759        []string      `protobuf:"bytes,35,rep,name=field759" json:"field759,omitempty"`
+	Field760        []string      `protobuf:"bytes,5,rep,name=field760" json:"field760,omitempty"`
+	Field761        []string      `protobuf:"bytes,17,rep,name=field761" json:"field761,omitempty"`
+	Field762        []string      `protobuf:"bytes,18,rep,name=field762" json:"field762,omitempty"`
+	Field763        []string      `protobuf:"bytes,19,rep,name=field763" json:"field763,omitempty"`
+	Field764        *bool         `protobuf:"varint,36,opt,name=field764" json:"field764,omitempty"`
+	Field765        []string      `protobuf:"bytes,8,rep,name=field765" json:"field765,omitempty"`
+	Field766        []string      `protobuf:"bytes,9,rep,name=field766" json:"field766,omitempty"`
+	Field767        *string       `protobuf:"bytes,27,opt,name=field767" json:"field767,omitempty"`
+	Field768        *bool         `protobuf:"varint,25,opt,name=field768" json:"field768,omitempty"`
+	Field769        *Message700   `protobuf:"bytes,10,opt,name=field769" json:"field769,omitempty"`
+	Field770        *bool         `protobuf:"varint,11,opt,name=field770" json:"field770,omitempty"`
+	Field771        *bool         `protobuf:"varint,24,opt,name=field771" json:"field771,omitempty"`
+	Field772        []string      `protobuf:"bytes,12,rep,name=field772" json:"field772,omitempty"`
+	Field773        []string      `protobuf:"bytes,20,rep,name=field773" json:"field773,omitempty"`
+	Field774        []string      `protobuf:"bytes,21,rep,name=field774" json:"field774,omitempty"`
+	Field775        []string      `protobuf:"bytes,22,rep,name=field775" json:"field775,omitempty"`
+	Field776        []*Message699 `protobuf:"bytes,23,rep,name=field776" json:"field776,omitempty"`
+	Field777        []*Message698 `protobuf:"bytes,37,rep,name=field777" json:"field777,omitempty"`
+	Field778        *int64        `protobuf:"varint,38,opt,name=field778" json:"field778,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message697) Reset() {
@@ -790,10 +781,9 @@
 }
 
 type Message0 struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `protobuf_messageset:"1" json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields `protobuf_messageset:"1"`
 }
 
 func (x *Message0) Reset() {
@@ -829,11 +819,10 @@
 }
 
 type Message6578 struct {
-	Field6632            *Enum6579               `protobuf:"varint,1,opt,name=field6632,enum=benchmarks.google_message3.Enum6579" json:"field6632,omitempty"`
-	Field6633            *Enum6588               `protobuf:"varint,2,opt,name=field6633,enum=benchmarks.google_message3.Enum6588" json:"field6633,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6632     *Enum6579 `protobuf:"varint,1,opt,name=field6632,enum=benchmarks.google_message3.Enum6579" json:"field6632,omitempty"`
+	Field6633     *Enum6588 `protobuf:"varint,2,opt,name=field6633,enum=benchmarks.google_message3.Enum6588" json:"field6633,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6578) Reset() {
@@ -874,12 +863,11 @@
 }
 
 type Message6024 struct {
-	Field6048            *Enum6025               `protobuf:"varint,1,opt,name=field6048,enum=benchmarks.google_message3.Enum6025" json:"field6048,omitempty"`
-	Field6049            *string                 `protobuf:"bytes,2,opt,name=field6049" json:"field6049,omitempty"`
-	Field6050            *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field6050" json:"field6050,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6048     *Enum6025           `protobuf:"varint,1,opt,name=field6048,enum=benchmarks.google_message3.Enum6025" json:"field6048,omitempty"`
+	Field6049     *string             `protobuf:"bytes,2,opt,name=field6049" json:"field6049,omitempty"`
+	Field6050     *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field6050" json:"field6050,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6024) Reset() {
@@ -927,11 +915,10 @@
 }
 
 type Message6052 struct {
-	Field6084            *string                 `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
-	Field6085            []byte                  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6084     *string `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
+	Field6085     []byte  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6052) Reset() {
@@ -972,11 +959,10 @@
 }
 
 type Message6054 struct {
-	Field6089            *string                 `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
-	Field6090            *string                 `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6089     *string `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
+	Field6090     *string `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6054) Reset() {
@@ -1017,12 +1003,11 @@
 }
 
 type Message10573 struct {
-	Field10580             []*Message10576           `protobuf:"bytes,1,rep,name=field10580" json:"field10580,omitempty"`
-	Field10581             *string                   `protobuf:"bytes,2,opt,name=field10581" json:"field10581,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field10580      []*Message10576 `protobuf:"bytes,1,rep,name=field10580" json:"field10580,omitempty"`
+	Field10581      *string         `protobuf:"bytes,2,opt,name=field10581" json:"field10581,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message10573) Reset() {
@@ -1072,11 +1057,10 @@
 }
 
 type Message10824 struct {
-	Field10825           *string                 `protobuf:"bytes,1,req,name=field10825" json:"field10825,omitempty"`
-	Field10826           *int32                  `protobuf:"varint,2,opt,name=field10826" json:"field10826,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10825    *string `protobuf:"bytes,1,req,name=field10825" json:"field10825,omitempty"`
+	Field10826    *int32  `protobuf:"varint,2,opt,name=field10826" json:"field10826,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10824) Reset() {
@@ -1117,15 +1101,14 @@
 }
 
 type Message10582 struct {
-	Field10583           *bool                   `protobuf:"varint,1,req,name=field10583" json:"field10583,omitempty"`
-	Field10584           *float64                `protobuf:"fixed64,2,req,name=field10584" json:"field10584,omitempty"`
-	Field10585           *bool                   `protobuf:"varint,3,opt,name=field10585" json:"field10585,omitempty"`
-	Field10586           *float64                `protobuf:"fixed64,4,opt,name=field10586" json:"field10586,omitempty"`
-	Field10587           *float64                `protobuf:"fixed64,5,opt,name=field10587" json:"field10587,omitempty"`
-	Field10588           *bool                   `protobuf:"varint,6,opt,name=field10588" json:"field10588,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10583    *bool    `protobuf:"varint,1,req,name=field10583" json:"field10583,omitempty"`
+	Field10584    *float64 `protobuf:"fixed64,2,req,name=field10584" json:"field10584,omitempty"`
+	Field10585    *bool    `protobuf:"varint,3,opt,name=field10585" json:"field10585,omitempty"`
+	Field10586    *float64 `protobuf:"fixed64,4,opt,name=field10586" json:"field10586,omitempty"`
+	Field10587    *float64 `protobuf:"fixed64,5,opt,name=field10587" json:"field10587,omitempty"`
+	Field10588    *bool    `protobuf:"varint,6,opt,name=field10588" json:"field10588,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10582) Reset() {
@@ -1194,80 +1177,79 @@
 }
 
 type Message10155 struct {
-	Field10195             *int32                       `protobuf:"varint,1,req,name=field10195" json:"field10195,omitempty"`
-	Field10196             *int32                       `protobuf:"varint,2,req,name=field10196" json:"field10196,omitempty"`
-	Field10197             *Enum10157                   `protobuf:"varint,59,opt,name=field10197,enum=benchmarks.google_message3.Enum10157" json:"field10197,omitempty"`
-	Field10198             *int32                       `protobuf:"varint,18,opt,name=field10198" json:"field10198,omitempty"`
-	Field10199             *int32                       `protobuf:"varint,19,opt,name=field10199" json:"field10199,omitempty"`
-	Field10200             *int32                       `protobuf:"varint,21,opt,name=field10200" json:"field10200,omitempty"`
-	Message10156           []*Message10155_Message10156 `protobuf:"group,50,rep,name=Message10156,json=message10156" json:"message10156,omitempty"`
-	Field10202             *int32                       `protobuf:"varint,3,opt,name=field10202" json:"field10202,omitempty"`
-	Field10203             *int32                       `protobuf:"varint,4,opt,name=field10203" json:"field10203,omitempty"`
-	Field10204             *int32                       `protobuf:"varint,5,opt,name=field10204" json:"field10204,omitempty"`
-	Field10205             *bool                        `protobuf:"varint,84,opt,name=field10205" json:"field10205,omitempty"`
-	Field10206             *bool                        `protobuf:"varint,33,opt,name=field10206" json:"field10206,omitempty"`
-	Field10207             *int32                       `protobuf:"varint,75,opt,name=field10207" json:"field10207,omitempty"`
-	Field10208             *float32                     `protobuf:"fixed32,26,opt,name=field10208" json:"field10208,omitempty"`
-	Field10209             *int32                       `protobuf:"varint,27,opt,name=field10209" json:"field10209,omitempty"`
-	Field10210             *int32                       `protobuf:"varint,49,opt,name=field10210" json:"field10210,omitempty"`
-	Field10211             *int32                       `protobuf:"varint,10,opt,name=field10211" json:"field10211,omitempty"`
-	Field10212             *float32                     `protobuf:"fixed32,78,opt,name=field10212" json:"field10212,omitempty"`
-	Field10213             *Message9151                 `protobuf:"bytes,91,opt,name=field10213" json:"field10213,omitempty"`
-	Field10214             *int32                       `protobuf:"varint,11,opt,name=field10214" json:"field10214,omitempty"`
-	Field10215             *int32                       `protobuf:"varint,12,opt,name=field10215" json:"field10215,omitempty"`
-	Field10216             *float32                     `protobuf:"fixed32,41,opt,name=field10216" json:"field10216,omitempty"`
-	Field10217             *Message10154                `protobuf:"bytes,61,opt,name=field10217" json:"field10217,omitempty"`
-	Field10218             *int32                       `protobuf:"varint,23,opt,name=field10218" json:"field10218,omitempty"`
-	Field10219             []byte                       `protobuf:"bytes,24,opt,name=field10219" json:"field10219,omitempty"`
-	Field10220             *int32                       `protobuf:"varint,65,opt,name=field10220" json:"field10220,omitempty"`
-	Field10221             [][]byte                     `protobuf:"bytes,66,rep,name=field10221" json:"field10221,omitempty"`
-	Field10222             *int32                       `protobuf:"varint,70,opt,name=field10222" json:"field10222,omitempty"`
-	Field10223             []byte                       `protobuf:"bytes,71,opt,name=field10223" json:"field10223,omitempty"`
-	Field10224             []uint64                     `protobuf:"fixed64,73,rep,name=field10224" json:"field10224,omitempty"`
-	Field10225             *float32                     `protobuf:"fixed32,29,opt,name=field10225" json:"field10225,omitempty"`
-	Field10226             *int32                       `protobuf:"varint,30,opt,name=field10226" json:"field10226,omitempty"`
-	Field10227             *float32                     `protobuf:"fixed32,31,opt,name=field10227" json:"field10227,omitempty"`
-	Field10228             *int32                       `protobuf:"varint,32,opt,name=field10228" json:"field10228,omitempty"`
-	Field10229             *float32                     `protobuf:"fixed32,34,opt,name=field10229" json:"field10229,omitempty"`
-	Field10230             *int32                       `protobuf:"varint,35,opt,name=field10230" json:"field10230,omitempty"`
-	Field10231             *string                      `protobuf:"bytes,22,opt,name=field10231" json:"field10231,omitempty"`
-	Field10232             *uint64                      `protobuf:"fixed64,13,opt,name=field10232" json:"field10232,omitempty"`
-	Field10233             *uint64                      `protobuf:"fixed64,20,opt,name=field10233" json:"field10233,omitempty"`
-	Field10234             *bool                        `protobuf:"varint,79,opt,name=field10234" json:"field10234,omitempty"`
-	Field10235             []Enum10167                  `protobuf:"varint,80,rep,packed,name=field10235,enum=benchmarks.google_message3.Enum10167" json:"field10235,omitempty"`
-	Field10236             *int32                       `protobuf:"varint,14,opt,name=field10236" json:"field10236,omitempty"`
-	Field10237             *int32                       `protobuf:"varint,15,opt,name=field10237" json:"field10237,omitempty"`
-	Field10238             *int32                       `protobuf:"varint,28,opt,name=field10238" json:"field10238,omitempty"`
-	Field10239             []string                     `protobuf:"bytes,16,rep,name=field10239" json:"field10239,omitempty"`
-	Field10240             *Message9182                 `protobuf:"bytes,17,opt,name=field10240" json:"field10240,omitempty"`
-	Field10241             *int32                       `protobuf:"varint,63,opt,name=field10241" json:"field10241,omitempty"`
-	Field10242             *float32                     `protobuf:"fixed32,64,opt,name=field10242" json:"field10242,omitempty"`
-	Field10243             *float32                     `protobuf:"fixed32,37,opt,name=field10243" json:"field10243,omitempty"`
-	Field10244             []float32                    `protobuf:"fixed32,43,rep,name=field10244" json:"field10244,omitempty"`
-	Field10245             *int32                       `protobuf:"varint,44,opt,name=field10245" json:"field10245,omitempty"`
-	Field10246             *Message9242                 `protobuf:"bytes,45,opt,name=field10246" json:"field10246,omitempty"`
-	Field10247             *UnusedEmptyMessage          `protobuf:"bytes,46,opt,name=field10247" json:"field10247,omitempty"`
-	Field10248             *UnusedEmptyMessage          `protobuf:"bytes,62,opt,name=field10248" json:"field10248,omitempty"`
-	Field10249             *Message8944                 `protobuf:"bytes,48,opt,name=field10249" json:"field10249,omitempty"`
-	Field10250             *UnusedEmptyMessage          `protobuf:"bytes,87,opt,name=field10250" json:"field10250,omitempty"`
-	Field10251             *int32                       `protobuf:"varint,58,opt,name=field10251" json:"field10251,omitempty"`
-	Field10252             *int32                       `protobuf:"varint,92,opt,name=field10252" json:"field10252,omitempty"`
-	Field10253             *Message9123                 `protobuf:"bytes,93,opt,name=field10253" json:"field10253,omitempty"`
-	Field10254             *Message9160                 `protobuf:"bytes,60,opt,name=field10254" json:"field10254,omitempty"`
-	Field10255             *Message8890                 `protobuf:"bytes,67,opt,name=field10255" json:"field10255,omitempty"`
-	Field10256             *string                      `protobuf:"bytes,69,opt,name=field10256" json:"field10256,omitempty"`
-	Field10257             *int64                       `protobuf:"varint,74,opt,name=field10257" json:"field10257,omitempty"`
-	Field10258             *float32                     `protobuf:"fixed32,82,opt,name=field10258" json:"field10258,omitempty"`
-	Field10259             *float32                     `protobuf:"fixed32,85,opt,name=field10259" json:"field10259,omitempty"`
-	Field10260             *float32                     `protobuf:"fixed32,86,opt,name=field10260" json:"field10260,omitempty"`
-	Field10261             *int64                       `protobuf:"varint,83,opt,name=field10261" json:"field10261,omitempty"`
-	Field10262             *string                      `protobuf:"bytes,77,opt,name=field10262" json:"field10262,omitempty"`
-	Field10263             *bool                        `protobuf:"varint,88,opt,name=field10263" json:"field10263,omitempty"`
-	Field10264             []*Message9628               `protobuf:"bytes,94,rep,name=field10264" json:"field10264,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                     `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields    `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache          `json:"-"`
+	Field10195      *int32                       `protobuf:"varint,1,req,name=field10195" json:"field10195,omitempty"`
+	Field10196      *int32                       `protobuf:"varint,2,req,name=field10196" json:"field10196,omitempty"`
+	Field10197      *Enum10157                   `protobuf:"varint,59,opt,name=field10197,enum=benchmarks.google_message3.Enum10157" json:"field10197,omitempty"`
+	Field10198      *int32                       `protobuf:"varint,18,opt,name=field10198" json:"field10198,omitempty"`
+	Field10199      *int32                       `protobuf:"varint,19,opt,name=field10199" json:"field10199,omitempty"`
+	Field10200      *int32                       `protobuf:"varint,21,opt,name=field10200" json:"field10200,omitempty"`
+	Message10156    []*Message10155_Message10156 `protobuf:"group,50,rep,name=Message10156,json=message10156" json:"message10156,omitempty"`
+	Field10202      *int32                       `protobuf:"varint,3,opt,name=field10202" json:"field10202,omitempty"`
+	Field10203      *int32                       `protobuf:"varint,4,opt,name=field10203" json:"field10203,omitempty"`
+	Field10204      *int32                       `protobuf:"varint,5,opt,name=field10204" json:"field10204,omitempty"`
+	Field10205      *bool                        `protobuf:"varint,84,opt,name=field10205" json:"field10205,omitempty"`
+	Field10206      *bool                        `protobuf:"varint,33,opt,name=field10206" json:"field10206,omitempty"`
+	Field10207      *int32                       `protobuf:"varint,75,opt,name=field10207" json:"field10207,omitempty"`
+	Field10208      *float32                     `protobuf:"fixed32,26,opt,name=field10208" json:"field10208,omitempty"`
+	Field10209      *int32                       `protobuf:"varint,27,opt,name=field10209" json:"field10209,omitempty"`
+	Field10210      *int32                       `protobuf:"varint,49,opt,name=field10210" json:"field10210,omitempty"`
+	Field10211      *int32                       `protobuf:"varint,10,opt,name=field10211" json:"field10211,omitempty"`
+	Field10212      *float32                     `protobuf:"fixed32,78,opt,name=field10212" json:"field10212,omitempty"`
+	Field10213      *Message9151                 `protobuf:"bytes,91,opt,name=field10213" json:"field10213,omitempty"`
+	Field10214      *int32                       `protobuf:"varint,11,opt,name=field10214" json:"field10214,omitempty"`
+	Field10215      *int32                       `protobuf:"varint,12,opt,name=field10215" json:"field10215,omitempty"`
+	Field10216      *float32                     `protobuf:"fixed32,41,opt,name=field10216" json:"field10216,omitempty"`
+	Field10217      *Message10154                `protobuf:"bytes,61,opt,name=field10217" json:"field10217,omitempty"`
+	Field10218      *int32                       `protobuf:"varint,23,opt,name=field10218" json:"field10218,omitempty"`
+	Field10219      []byte                       `protobuf:"bytes,24,opt,name=field10219" json:"field10219,omitempty"`
+	Field10220      *int32                       `protobuf:"varint,65,opt,name=field10220" json:"field10220,omitempty"`
+	Field10221      [][]byte                     `protobuf:"bytes,66,rep,name=field10221" json:"field10221,omitempty"`
+	Field10222      *int32                       `protobuf:"varint,70,opt,name=field10222" json:"field10222,omitempty"`
+	Field10223      []byte                       `protobuf:"bytes,71,opt,name=field10223" json:"field10223,omitempty"`
+	Field10224      []uint64                     `protobuf:"fixed64,73,rep,name=field10224" json:"field10224,omitempty"`
+	Field10225      *float32                     `protobuf:"fixed32,29,opt,name=field10225" json:"field10225,omitempty"`
+	Field10226      *int32                       `protobuf:"varint,30,opt,name=field10226" json:"field10226,omitempty"`
+	Field10227      *float32                     `protobuf:"fixed32,31,opt,name=field10227" json:"field10227,omitempty"`
+	Field10228      *int32                       `protobuf:"varint,32,opt,name=field10228" json:"field10228,omitempty"`
+	Field10229      *float32                     `protobuf:"fixed32,34,opt,name=field10229" json:"field10229,omitempty"`
+	Field10230      *int32                       `protobuf:"varint,35,opt,name=field10230" json:"field10230,omitempty"`
+	Field10231      *string                      `protobuf:"bytes,22,opt,name=field10231" json:"field10231,omitempty"`
+	Field10232      *uint64                      `protobuf:"fixed64,13,opt,name=field10232" json:"field10232,omitempty"`
+	Field10233      *uint64                      `protobuf:"fixed64,20,opt,name=field10233" json:"field10233,omitempty"`
+	Field10234      *bool                        `protobuf:"varint,79,opt,name=field10234" json:"field10234,omitempty"`
+	Field10235      []Enum10167                  `protobuf:"varint,80,rep,packed,name=field10235,enum=benchmarks.google_message3.Enum10167" json:"field10235,omitempty"`
+	Field10236      *int32                       `protobuf:"varint,14,opt,name=field10236" json:"field10236,omitempty"`
+	Field10237      *int32                       `protobuf:"varint,15,opt,name=field10237" json:"field10237,omitempty"`
+	Field10238      *int32                       `protobuf:"varint,28,opt,name=field10238" json:"field10238,omitempty"`
+	Field10239      []string                     `protobuf:"bytes,16,rep,name=field10239" json:"field10239,omitempty"`
+	Field10240      *Message9182                 `protobuf:"bytes,17,opt,name=field10240" json:"field10240,omitempty"`
+	Field10241      *int32                       `protobuf:"varint,63,opt,name=field10241" json:"field10241,omitempty"`
+	Field10242      *float32                     `protobuf:"fixed32,64,opt,name=field10242" json:"field10242,omitempty"`
+	Field10243      *float32                     `protobuf:"fixed32,37,opt,name=field10243" json:"field10243,omitempty"`
+	Field10244      []float32                    `protobuf:"fixed32,43,rep,name=field10244" json:"field10244,omitempty"`
+	Field10245      *int32                       `protobuf:"varint,44,opt,name=field10245" json:"field10245,omitempty"`
+	Field10246      *Message9242                 `protobuf:"bytes,45,opt,name=field10246" json:"field10246,omitempty"`
+	Field10247      *UnusedEmptyMessage          `protobuf:"bytes,46,opt,name=field10247" json:"field10247,omitempty"`
+	Field10248      *UnusedEmptyMessage          `protobuf:"bytes,62,opt,name=field10248" json:"field10248,omitempty"`
+	Field10249      *Message8944                 `protobuf:"bytes,48,opt,name=field10249" json:"field10249,omitempty"`
+	Field10250      *UnusedEmptyMessage          `protobuf:"bytes,87,opt,name=field10250" json:"field10250,omitempty"`
+	Field10251      *int32                       `protobuf:"varint,58,opt,name=field10251" json:"field10251,omitempty"`
+	Field10252      *int32                       `protobuf:"varint,92,opt,name=field10252" json:"field10252,omitempty"`
+	Field10253      *Message9123                 `protobuf:"bytes,93,opt,name=field10253" json:"field10253,omitempty"`
+	Field10254      *Message9160                 `protobuf:"bytes,60,opt,name=field10254" json:"field10254,omitempty"`
+	Field10255      *Message8890                 `protobuf:"bytes,67,opt,name=field10255" json:"field10255,omitempty"`
+	Field10256      *string                      `protobuf:"bytes,69,opt,name=field10256" json:"field10256,omitempty"`
+	Field10257      *int64                       `protobuf:"varint,74,opt,name=field10257" json:"field10257,omitempty"`
+	Field10258      *float32                     `protobuf:"fixed32,82,opt,name=field10258" json:"field10258,omitempty"`
+	Field10259      *float32                     `protobuf:"fixed32,85,opt,name=field10259" json:"field10259,omitempty"`
+	Field10260      *float32                     `protobuf:"fixed32,86,opt,name=field10260" json:"field10260,omitempty"`
+	Field10261      *int64                       `protobuf:"varint,83,opt,name=field10261" json:"field10261,omitempty"`
+	Field10262      *string                      `protobuf:"bytes,77,opt,name=field10262" json:"field10262,omitempty"`
+	Field10263      *bool                        `protobuf:"varint,88,opt,name=field10263" json:"field10263,omitempty"`
+	Field10264      []*Message9628               `protobuf:"bytes,94,rep,name=field10264" json:"field10264,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message10155) Reset() {
@@ -1794,14 +1776,13 @@
 }
 
 type Message11866 struct {
-	Field11868           *Message11014           `protobuf:"bytes,1,req,name=field11868" json:"field11868,omitempty"`
-	Field11869           *bool                   `protobuf:"varint,2,opt,name=field11869" json:"field11869,omitempty"`
-	Field11870           *float64                `protobuf:"fixed64,3,opt,name=field11870" json:"field11870,omitempty"`
-	Field11871           *float64                `protobuf:"fixed64,4,opt,name=field11871" json:"field11871,omitempty"`
-	Field11872           []*UnusedEmptyMessage   `protobuf:"bytes,5,rep,name=field11872" json:"field11872,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field11868    *Message11014         `protobuf:"bytes,1,req,name=field11868" json:"field11868,omitempty"`
+	Field11869    *bool                 `protobuf:"varint,2,opt,name=field11869" json:"field11869,omitempty"`
+	Field11870    *float64              `protobuf:"fixed64,3,opt,name=field11870" json:"field11870,omitempty"`
+	Field11871    *float64              `protobuf:"fixed64,4,opt,name=field11871" json:"field11871,omitempty"`
+	Field11872    []*UnusedEmptyMessage `protobuf:"bytes,5,rep,name=field11872" json:"field11872,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11866) Reset() {
@@ -1863,18 +1844,17 @@
 }
 
 type Message10469 struct {
-	Field10473           *string                 `protobuf:"bytes,1,opt,name=field10473" json:"field10473,omitempty"`
-	Field10474           *float32                `protobuf:"fixed32,2,opt,name=field10474" json:"field10474,omitempty"`
-	Field10475           *int32                  `protobuf:"varint,3,opt,name=field10475" json:"field10475,omitempty"`
-	Field10476           *int32                  `protobuf:"varint,4,opt,name=field10476" json:"field10476,omitempty"`
-	Field10477           *int32                  `protobuf:"varint,5,opt,name=field10477" json:"field10477,omitempty"`
-	Field10478           *bool                   `protobuf:"varint,6,opt,name=field10478" json:"field10478,omitempty"`
-	Field10479           *bool                   `protobuf:"varint,7,opt,name=field10479" json:"field10479,omitempty"`
-	Field10480           *int32                  `protobuf:"varint,8,opt,name=field10480" json:"field10480,omitempty"`
-	Field10481           *float32                `protobuf:"fixed32,9,opt,name=field10481" json:"field10481,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10473    *string  `protobuf:"bytes,1,opt,name=field10473" json:"field10473,omitempty"`
+	Field10474    *float32 `protobuf:"fixed32,2,opt,name=field10474" json:"field10474,omitempty"`
+	Field10475    *int32   `protobuf:"varint,3,opt,name=field10475" json:"field10475,omitempty"`
+	Field10476    *int32   `protobuf:"varint,4,opt,name=field10476" json:"field10476,omitempty"`
+	Field10477    *int32   `protobuf:"varint,5,opt,name=field10477" json:"field10477,omitempty"`
+	Field10478    *bool    `protobuf:"varint,6,opt,name=field10478" json:"field10478,omitempty"`
+	Field10479    *bool    `protobuf:"varint,7,opt,name=field10479" json:"field10479,omitempty"`
+	Field10480    *int32   `protobuf:"varint,8,opt,name=field10480" json:"field10480,omitempty"`
+	Field10481    *float32 `protobuf:"fixed32,9,opt,name=field10481" json:"field10481,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10469) Reset() {
@@ -1964,11 +1944,10 @@
 }
 
 type Message10818 struct {
-	Field10819           *Message10800           `protobuf:"bytes,1,opt,name=field10819" json:"field10819,omitempty"`
-	Field10820           *Message10801           `protobuf:"bytes,2,opt,name=field10820" json:"field10820,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10819    *Message10800 `protobuf:"bytes,1,opt,name=field10819" json:"field10819,omitempty"`
+	Field10820    *Message10801 `protobuf:"bytes,2,opt,name=field10820" json:"field10820,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10818) Reset() {
@@ -2009,32 +1988,31 @@
 }
 
 type Message10773 struct {
-	Field10774           *bool                   `protobuf:"varint,9,opt,name=field10774" json:"field10774,omitempty"`
-	Field10775           *bool                   `protobuf:"varint,1,opt,name=field10775" json:"field10775,omitempty"`
-	Field10776           *bool                   `protobuf:"varint,23,opt,name=field10776" json:"field10776,omitempty"`
-	Field10777           *bool                   `protobuf:"varint,2,opt,name=field10777" json:"field10777,omitempty"`
-	Field10778           *bool                   `protobuf:"varint,3,opt,name=field10778" json:"field10778,omitempty"`
-	Field10779           *int32                  `protobuf:"varint,4,opt,name=field10779" json:"field10779,omitempty"`
-	Field10780           *int32                  `protobuf:"varint,5,opt,name=field10780" json:"field10780,omitempty"`
-	Field10781           *int32                  `protobuf:"varint,6,opt,name=field10781" json:"field10781,omitempty"`
-	Field10782           *int32                  `protobuf:"varint,7,opt,name=field10782" json:"field10782,omitempty"`
-	Field10783           *int32                  `protobuf:"varint,8,opt,name=field10783" json:"field10783,omitempty"`
-	Field10784           *int32                  `protobuf:"varint,10,opt,name=field10784" json:"field10784,omitempty"`
-	Field10785           *Message10749           `protobuf:"bytes,11,opt,name=field10785" json:"field10785,omitempty"`
-	Field10786           []*UnusedEmptyMessage   `protobuf:"bytes,12,rep,name=field10786" json:"field10786,omitempty"`
-	Field10787           *bool                   `protobuf:"varint,13,opt,name=field10787" json:"field10787,omitempty"`
-	Field10788           *bool                   `protobuf:"varint,15,opt,name=field10788" json:"field10788,omitempty"`
-	Field10789           *bool                   `protobuf:"varint,16,opt,name=field10789" json:"field10789,omitempty"`
-	Field10790           *int32                  `protobuf:"varint,17,opt,name=field10790" json:"field10790,omitempty"`
-	Field10791           *int32                  `protobuf:"varint,18,opt,name=field10791" json:"field10791,omitempty"`
-	Field10792           *bool                   `protobuf:"varint,19,opt,name=field10792" json:"field10792,omitempty"`
-	Field10793           *bool                   `protobuf:"varint,20,opt,name=field10793" json:"field10793,omitempty"`
-	Field10794           *bool                   `protobuf:"varint,21,opt,name=field10794" json:"field10794,omitempty"`
-	Field10795           *UnusedEnum             `protobuf:"varint,14,opt,name=field10795,enum=benchmarks.google_message3.UnusedEnum" json:"field10795,omitempty"`
-	Field10796           *UnusedEnum             `protobuf:"varint,22,opt,name=field10796,enum=benchmarks.google_message3.UnusedEnum" json:"field10796,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10774    *bool                 `protobuf:"varint,9,opt,name=field10774" json:"field10774,omitempty"`
+	Field10775    *bool                 `protobuf:"varint,1,opt,name=field10775" json:"field10775,omitempty"`
+	Field10776    *bool                 `protobuf:"varint,23,opt,name=field10776" json:"field10776,omitempty"`
+	Field10777    *bool                 `protobuf:"varint,2,opt,name=field10777" json:"field10777,omitempty"`
+	Field10778    *bool                 `protobuf:"varint,3,opt,name=field10778" json:"field10778,omitempty"`
+	Field10779    *int32                `protobuf:"varint,4,opt,name=field10779" json:"field10779,omitempty"`
+	Field10780    *int32                `protobuf:"varint,5,opt,name=field10780" json:"field10780,omitempty"`
+	Field10781    *int32                `protobuf:"varint,6,opt,name=field10781" json:"field10781,omitempty"`
+	Field10782    *int32                `protobuf:"varint,7,opt,name=field10782" json:"field10782,omitempty"`
+	Field10783    *int32                `protobuf:"varint,8,opt,name=field10783" json:"field10783,omitempty"`
+	Field10784    *int32                `protobuf:"varint,10,opt,name=field10784" json:"field10784,omitempty"`
+	Field10785    *Message10749         `protobuf:"bytes,11,opt,name=field10785" json:"field10785,omitempty"`
+	Field10786    []*UnusedEmptyMessage `protobuf:"bytes,12,rep,name=field10786" json:"field10786,omitempty"`
+	Field10787    *bool                 `protobuf:"varint,13,opt,name=field10787" json:"field10787,omitempty"`
+	Field10788    *bool                 `protobuf:"varint,15,opt,name=field10788" json:"field10788,omitempty"`
+	Field10789    *bool                 `protobuf:"varint,16,opt,name=field10789" json:"field10789,omitempty"`
+	Field10790    *int32                `protobuf:"varint,17,opt,name=field10790" json:"field10790,omitempty"`
+	Field10791    *int32                `protobuf:"varint,18,opt,name=field10791" json:"field10791,omitempty"`
+	Field10792    *bool                 `protobuf:"varint,19,opt,name=field10792" json:"field10792,omitempty"`
+	Field10793    *bool                 `protobuf:"varint,20,opt,name=field10793" json:"field10793,omitempty"`
+	Field10794    *bool                 `protobuf:"varint,21,opt,name=field10794" json:"field10794,omitempty"`
+	Field10795    *UnusedEnum           `protobuf:"varint,14,opt,name=field10795,enum=benchmarks.google_message3.UnusedEnum" json:"field10795,omitempty"`
+	Field10796    *UnusedEnum           `protobuf:"varint,22,opt,name=field10796,enum=benchmarks.google_message3.UnusedEnum" json:"field10796,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10773) Reset() {
@@ -2222,13 +2200,12 @@
 }
 
 type Message13145 struct {
-	Field13155             *Enum13146                `protobuf:"varint,1,req,name=field13155,enum=benchmarks.google_message3.Enum13146" json:"field13155,omitempty"`
-	Field13156             *float32                  `protobuf:"fixed32,2,opt,name=field13156" json:"field13156,omitempty"`
-	Field13157             *float32                  `protobuf:"fixed32,3,opt,name=field13157" json:"field13157,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field13155      *Enum13146 `protobuf:"varint,1,req,name=field13155,enum=benchmarks.google_message3.Enum13146" json:"field13155,omitempty"`
+	Field13156      *float32   `protobuf:"fixed32,2,opt,name=field13156" json:"field13156,omitempty"`
+	Field13157      *float32   `protobuf:"fixed32,3,opt,name=field13157" json:"field13157,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message13145) Reset() {
@@ -2285,9 +2262,8 @@
 }
 
 type Message16686 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message16686) Reset() {
@@ -2314,11 +2290,10 @@
 }
 
 type Message12796 struct {
-	Field12800           []uint64                `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
-	Field12801           *uint64                 `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12800    []uint64 `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
+	Field12801    *uint64  `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12796) Reset() {
@@ -2359,9 +2334,8 @@
 }
 
 type Message6722 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6722) Reset() {
@@ -2388,9 +2362,8 @@
 }
 
 type Message6727 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6727) Reset() {
@@ -2417,9 +2390,8 @@
 }
 
 type Message6724 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6724) Reset() {
@@ -2446,9 +2418,8 @@
 }
 
 type Message6735 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6735) Reset() {
@@ -2475,11 +2446,10 @@
 }
 
 type Message8183 struct {
-	Field8226            *string                 `protobuf:"bytes,1,opt,name=field8226" json:"field8226,omitempty"`
-	Field8227            *string                 `protobuf:"bytes,2,opt,name=field8227" json:"field8227,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8226     *string `protobuf:"bytes,1,opt,name=field8226" json:"field8226,omitempty"`
+	Field8227     *string `protobuf:"bytes,2,opt,name=field8227" json:"field8227,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8183) Reset() {
@@ -2520,21 +2490,20 @@
 }
 
 type Message8301 struct {
-	Field8328              *string                   `protobuf:"bytes,1,opt,name=field8328" json:"field8328,omitempty"`
-	Field8329              *Message7966              `protobuf:"bytes,2,opt,name=field8329" json:"field8329,omitempty"`
-	Field8330              *string                   `protobuf:"bytes,3,opt,name=field8330" json:"field8330,omitempty"`
-	Field8331              *string                   `protobuf:"bytes,4,opt,name=field8331" json:"field8331,omitempty"`
-	Field8332              []*Message8290            `protobuf:"bytes,5,rep,name=field8332" json:"field8332,omitempty"`
-	Field8333              *Message7966              `protobuf:"bytes,6,opt,name=field8333" json:"field8333,omitempty"`
-	Field8334              []*Message8298            `protobuf:"bytes,7,rep,name=field8334" json:"field8334,omitempty"`
-	Field8335              *Message8300              `protobuf:"bytes,8,opt,name=field8335" json:"field8335,omitempty"`
-	Field8336              *int64                    `protobuf:"varint,9,opt,name=field8336" json:"field8336,omitempty"`
-	Field8337              *UnusedEmptyMessage       `protobuf:"bytes,10,opt,name=field8337" json:"field8337,omitempty"`
-	Field8338              *Message7965              `protobuf:"bytes,11,opt,name=field8338" json:"field8338,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field8328       *string             `protobuf:"bytes,1,opt,name=field8328" json:"field8328,omitempty"`
+	Field8329       *Message7966        `protobuf:"bytes,2,opt,name=field8329" json:"field8329,omitempty"`
+	Field8330       *string             `protobuf:"bytes,3,opt,name=field8330" json:"field8330,omitempty"`
+	Field8331       *string             `protobuf:"bytes,4,opt,name=field8331" json:"field8331,omitempty"`
+	Field8332       []*Message8290      `protobuf:"bytes,5,rep,name=field8332" json:"field8332,omitempty"`
+	Field8333       *Message7966        `protobuf:"bytes,6,opt,name=field8333" json:"field8333,omitempty"`
+	Field8334       []*Message8298      `protobuf:"bytes,7,rep,name=field8334" json:"field8334,omitempty"`
+	Field8335       *Message8300        `protobuf:"bytes,8,opt,name=field8335" json:"field8335,omitempty"`
+	Field8336       *int64              `protobuf:"varint,9,opt,name=field8336" json:"field8336,omitempty"`
+	Field8337       *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field8337" json:"field8337,omitempty"`
+	Field8338       *Message7965        `protobuf:"bytes,11,opt,name=field8338" json:"field8338,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message8301) Reset() {
@@ -2647,9 +2616,8 @@
 }
 
 type Message8456 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8456) Reset() {
@@ -2676,31 +2644,30 @@
 }
 
 type Message8302 struct {
-	Field8339              *string                   `protobuf:"bytes,1,opt,name=field8339" json:"field8339,omitempty"`
-	Field8340              *Message7966              `protobuf:"bytes,2,opt,name=field8340" json:"field8340,omitempty"`
-	Field8341              *string                   `protobuf:"bytes,3,opt,name=field8341" json:"field8341,omitempty"`
-	Field8342              *string                   `protobuf:"bytes,4,opt,name=field8342" json:"field8342,omitempty"`
-	Field8343              *string                   `protobuf:"bytes,5,opt,name=field8343" json:"field8343,omitempty"`
-	Field8344              *string                   `protobuf:"bytes,6,opt,name=field8344" json:"field8344,omitempty"`
-	Field8345              *string                   `protobuf:"bytes,7,opt,name=field8345" json:"field8345,omitempty"`
-	Field8346              *int64                    `protobuf:"varint,8,opt,name=field8346" json:"field8346,omitempty"`
-	Field8347              *int64                    `protobuf:"varint,9,opt,name=field8347" json:"field8347,omitempty"`
-	Field8348              []*Message8290            `protobuf:"bytes,10,rep,name=field8348" json:"field8348,omitempty"`
-	Field8349              *string                   `protobuf:"bytes,11,opt,name=field8349" json:"field8349,omitempty"`
-	Field8350              *UnusedEmptyMessage       `protobuf:"bytes,12,opt,name=field8350" json:"field8350,omitempty"`
-	Field8351              *Message8291              `protobuf:"bytes,13,opt,name=field8351" json:"field8351,omitempty"`
-	Field8352              *int64                    `protobuf:"varint,14,opt,name=field8352" json:"field8352,omitempty"`
-	Field8353              *Message8296              `protobuf:"bytes,15,opt,name=field8353" json:"field8353,omitempty"`
-	Field8354              *string                   `protobuf:"bytes,16,opt,name=field8354" json:"field8354,omitempty"`
-	Field8355              *UnusedEmptyMessage       `protobuf:"bytes,17,opt,name=field8355" json:"field8355,omitempty"`
-	Field8356              []int32                   `protobuf:"varint,18,rep,name=field8356" json:"field8356,omitempty"`
-	Field8357              []int32                   `protobuf:"varint,19,rep,name=field8357" json:"field8357,omitempty"`
-	Field8358              []*UnusedEmptyMessage     `protobuf:"bytes,20,rep,name=field8358" json:"field8358,omitempty"`
-	Field8359              *Message7965              `protobuf:"bytes,21,opt,name=field8359" json:"field8359,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field8339       *string               `protobuf:"bytes,1,opt,name=field8339" json:"field8339,omitempty"`
+	Field8340       *Message7966          `protobuf:"bytes,2,opt,name=field8340" json:"field8340,omitempty"`
+	Field8341       *string               `protobuf:"bytes,3,opt,name=field8341" json:"field8341,omitempty"`
+	Field8342       *string               `protobuf:"bytes,4,opt,name=field8342" json:"field8342,omitempty"`
+	Field8343       *string               `protobuf:"bytes,5,opt,name=field8343" json:"field8343,omitempty"`
+	Field8344       *string               `protobuf:"bytes,6,opt,name=field8344" json:"field8344,omitempty"`
+	Field8345       *string               `protobuf:"bytes,7,opt,name=field8345" json:"field8345,omitempty"`
+	Field8346       *int64                `protobuf:"varint,8,opt,name=field8346" json:"field8346,omitempty"`
+	Field8347       *int64                `protobuf:"varint,9,opt,name=field8347" json:"field8347,omitempty"`
+	Field8348       []*Message8290        `protobuf:"bytes,10,rep,name=field8348" json:"field8348,omitempty"`
+	Field8349       *string               `protobuf:"bytes,11,opt,name=field8349" json:"field8349,omitempty"`
+	Field8350       *UnusedEmptyMessage   `protobuf:"bytes,12,opt,name=field8350" json:"field8350,omitempty"`
+	Field8351       *Message8291          `protobuf:"bytes,13,opt,name=field8351" json:"field8351,omitempty"`
+	Field8352       *int64                `protobuf:"varint,14,opt,name=field8352" json:"field8352,omitempty"`
+	Field8353       *Message8296          `protobuf:"bytes,15,opt,name=field8353" json:"field8353,omitempty"`
+	Field8354       *string               `protobuf:"bytes,16,opt,name=field8354" json:"field8354,omitempty"`
+	Field8355       *UnusedEmptyMessage   `protobuf:"bytes,17,opt,name=field8355" json:"field8355,omitempty"`
+	Field8356       []int32               `protobuf:"varint,18,rep,name=field8356" json:"field8356,omitempty"`
+	Field8357       []int32               `protobuf:"varint,19,rep,name=field8357" json:"field8357,omitempty"`
+	Field8358       []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field8358" json:"field8358,omitempty"`
+	Field8359       *Message7965          `protobuf:"bytes,21,opt,name=field8359" json:"field8359,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message8302) Reset() {
@@ -2883,9 +2850,8 @@
 }
 
 type Message8457 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8457) Reset() {
@@ -2912,16 +2878,15 @@
 }
 
 type Message8449 struct {
-	Field8458            *string                 `protobuf:"bytes,1,opt,name=field8458" json:"field8458,omitempty"`
-	Field8459            *bool                   `protobuf:"varint,2,opt,name=field8459" json:"field8459,omitempty"`
-	Field8460            *Enum8450               `protobuf:"varint,3,opt,name=field8460,enum=benchmarks.google_message3.Enum8450" json:"field8460,omitempty"`
-	Field8461            []string                `protobuf:"bytes,4,rep,name=field8461" json:"field8461,omitempty"`
-	Field8462            *string                 `protobuf:"bytes,5,opt,name=field8462" json:"field8462,omitempty"`
-	Field8463            *string                 `protobuf:"bytes,6,opt,name=field8463" json:"field8463,omitempty"`
-	Field8464            *Message7966            `protobuf:"bytes,7,opt,name=field8464" json:"field8464,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8458     *string      `protobuf:"bytes,1,opt,name=field8458" json:"field8458,omitempty"`
+	Field8459     *bool        `protobuf:"varint,2,opt,name=field8459" json:"field8459,omitempty"`
+	Field8460     *Enum8450    `protobuf:"varint,3,opt,name=field8460,enum=benchmarks.google_message3.Enum8450" json:"field8460,omitempty"`
+	Field8461     []string     `protobuf:"bytes,4,rep,name=field8461" json:"field8461,omitempty"`
+	Field8462     *string      `protobuf:"bytes,5,opt,name=field8462" json:"field8462,omitempty"`
+	Field8463     *string      `protobuf:"bytes,6,opt,name=field8463" json:"field8463,omitempty"`
+	Field8464     *Message7966 `protobuf:"bytes,7,opt,name=field8464" json:"field8464,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8449) Reset() {
@@ -2997,12 +2962,11 @@
 }
 
 type Message13358 struct {
-	Field13359           *uint64                 `protobuf:"fixed64,1,req,name=field13359" json:"field13359,omitempty"`
-	Field13360           *uint64                 `protobuf:"fixed64,2,req,name=field13360" json:"field13360,omitempty"`
-	Field13361           *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field13361" json:"field13361,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13359    *uint64             `protobuf:"fixed64,1,req,name=field13359" json:"field13359,omitempty"`
+	Field13360    *uint64             `protobuf:"fixed64,2,req,name=field13360" json:"field13360,omitempty"`
+	Field13361    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field13361" json:"field13361,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13358) Reset() {
@@ -3050,13 +3014,12 @@
 }
 
 type Message13912 struct {
-	Field13913           *uint32                 `protobuf:"fixed32,1,req,name=field13913" json:"field13913,omitempty"`
-	Field13914           *uint32                 `protobuf:"fixed32,2,req,name=field13914" json:"field13914,omitempty"`
-	Field13915           *UnusedEmptyMessage     `protobuf:"bytes,500,opt,name=field13915" json:"field13915,omitempty"`
-	Field13916           *UnusedEmptyMessage     `protobuf:"bytes,15,opt,name=field13916" json:"field13916,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13913    *uint32             `protobuf:"fixed32,1,req,name=field13913" json:"field13913,omitempty"`
+	Field13914    *uint32             `protobuf:"fixed32,2,req,name=field13914" json:"field13914,omitempty"`
+	Field13915    *UnusedEmptyMessage `protobuf:"bytes,500,opt,name=field13915" json:"field13915,omitempty"`
+	Field13916    *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field13916" json:"field13916,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13912) Reset() {
@@ -3111,12 +3074,11 @@
 }
 
 type Message24316 struct {
-	Field24443           []string                `protobuf:"bytes,1,rep,name=field24443" json:"field24443,omitempty"`
-	Field24444           []string                `protobuf:"bytes,2,rep,name=field24444" json:"field24444,omitempty"`
-	Field24445           []string                `protobuf:"bytes,3,rep,name=field24445" json:"field24445,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24443    []string `protobuf:"bytes,1,rep,name=field24443" json:"field24443,omitempty"`
+	Field24444    []string `protobuf:"bytes,2,rep,name=field24444" json:"field24444,omitempty"`
+	Field24445    []string `protobuf:"bytes,3,rep,name=field24445" json:"field24445,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24316) Reset() {
@@ -3164,15 +3126,14 @@
 }
 
 type Message24312 struct {
-	Field24421           *string                 `protobuf:"bytes,1,opt,name=field24421" json:"field24421,omitempty"`
-	Field24422           *string                 `protobuf:"bytes,2,opt,name=field24422" json:"field24422,omitempty"`
-	Field24423           []string                `protobuf:"bytes,3,rep,name=field24423" json:"field24423,omitempty"`
-	Field24424           []string                `protobuf:"bytes,4,rep,name=field24424" json:"field24424,omitempty"`
-	Field24425           []string                `protobuf:"bytes,5,rep,name=field24425" json:"field24425,omitempty"`
-	Field24426           []string                `protobuf:"bytes,6,rep,name=field24426" json:"field24426,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24421    *string  `protobuf:"bytes,1,opt,name=field24421" json:"field24421,omitempty"`
+	Field24422    *string  `protobuf:"bytes,2,opt,name=field24422" json:"field24422,omitempty"`
+	Field24423    []string `protobuf:"bytes,3,rep,name=field24423" json:"field24423,omitempty"`
+	Field24424    []string `protobuf:"bytes,4,rep,name=field24424" json:"field24424,omitempty"`
+	Field24425    []string `protobuf:"bytes,5,rep,name=field24425" json:"field24425,omitempty"`
+	Field24426    []string `protobuf:"bytes,6,rep,name=field24426" json:"field24426,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24312) Reset() {
@@ -3241,19 +3202,18 @@
 }
 
 type Message24313 struct {
-	Field24427           *string                 `protobuf:"bytes,1,opt,name=field24427" json:"field24427,omitempty"`
-	Field24428           *string                 `protobuf:"bytes,2,opt,name=field24428" json:"field24428,omitempty"`
-	Field24429           []string                `protobuf:"bytes,3,rep,name=field24429" json:"field24429,omitempty"`
-	Field24430           *string                 `protobuf:"bytes,4,opt,name=field24430" json:"field24430,omitempty"`
-	Field24431           *string                 `protobuf:"bytes,5,opt,name=field24431" json:"field24431,omitempty"`
-	Field24432           *string                 `protobuf:"bytes,6,opt,name=field24432" json:"field24432,omitempty"`
-	Field24433           *string                 `protobuf:"bytes,7,opt,name=field24433" json:"field24433,omitempty"`
-	Field24434           []string                `protobuf:"bytes,8,rep,name=field24434" json:"field24434,omitempty"`
-	Field24435           *string                 `protobuf:"bytes,9,opt,name=field24435" json:"field24435,omitempty"`
-	Field24436           []string                `protobuf:"bytes,10,rep,name=field24436" json:"field24436,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24427    *string  `protobuf:"bytes,1,opt,name=field24427" json:"field24427,omitempty"`
+	Field24428    *string  `protobuf:"bytes,2,opt,name=field24428" json:"field24428,omitempty"`
+	Field24429    []string `protobuf:"bytes,3,rep,name=field24429" json:"field24429,omitempty"`
+	Field24430    *string  `protobuf:"bytes,4,opt,name=field24430" json:"field24430,omitempty"`
+	Field24431    *string  `protobuf:"bytes,5,opt,name=field24431" json:"field24431,omitempty"`
+	Field24432    *string  `protobuf:"bytes,6,opt,name=field24432" json:"field24432,omitempty"`
+	Field24433    *string  `protobuf:"bytes,7,opt,name=field24433" json:"field24433,omitempty"`
+	Field24434    []string `protobuf:"bytes,8,rep,name=field24434" json:"field24434,omitempty"`
+	Field24435    *string  `protobuf:"bytes,9,opt,name=field24435" json:"field24435,omitempty"`
+	Field24436    []string `protobuf:"bytes,10,rep,name=field24436" json:"field24436,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24313) Reset() {
@@ -3350,12 +3310,11 @@
 }
 
 type Message24315 struct {
-	Field24440           *string                 `protobuf:"bytes,1,req,name=field24440" json:"field24440,omitempty"`
-	Field24441           []string                `protobuf:"bytes,2,rep,name=field24441" json:"field24441,omitempty"`
-	Field24442           []string                `protobuf:"bytes,3,rep,name=field24442" json:"field24442,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field24440    *string  `protobuf:"bytes,1,req,name=field24440" json:"field24440,omitempty"`
+	Field24441    []string `protobuf:"bytes,2,rep,name=field24441" json:"field24441,omitempty"`
+	Field24442    []string `protobuf:"bytes,3,rep,name=field24442" json:"field24442,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message24315) Reset() {
@@ -3403,13 +3362,12 @@
 }
 
 type Message716 struct {
-	Field872             *string                 `protobuf:"bytes,1,req,name=field872" json:"field872,omitempty"`
-	Field873             *int32                  `protobuf:"varint,2,req,name=field873" json:"field873,omitempty"`
-	Field874             *bool                   `protobuf:"varint,3,opt,name=field874" json:"field874,omitempty"`
-	Field875             *Message717             `protobuf:"bytes,4,opt,name=field875" json:"field875,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field872      *string     `protobuf:"bytes,1,req,name=field872" json:"field872,omitempty"`
+	Field873      *int32      `protobuf:"varint,2,req,name=field873" json:"field873,omitempty"`
+	Field874      *bool       `protobuf:"varint,3,opt,name=field874" json:"field874,omitempty"`
+	Field875      *Message717 `protobuf:"bytes,4,opt,name=field875" json:"field875,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message716) Reset() {
@@ -3464,12 +3422,11 @@
 }
 
 type Message718 struct {
-	Field878             []string                `protobuf:"bytes,1,rep,name=field878" json:"field878,omitempty"`
-	Field879             []string                `protobuf:"bytes,2,rep,name=field879" json:"field879,omitempty"`
-	Field880             *string                 `protobuf:"bytes,3,opt,name=field880" json:"field880,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field878      []string `protobuf:"bytes,1,rep,name=field878" json:"field878,omitempty"`
+	Field879      []string `protobuf:"bytes,2,rep,name=field879" json:"field879,omitempty"`
+	Field880      *string  `protobuf:"bytes,3,opt,name=field880" json:"field880,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message718) Reset() {
@@ -3517,14 +3474,13 @@
 }
 
 type Message703 struct {
-	Field795             *string                 `protobuf:"bytes,1,req,name=field795" json:"field795,omitempty"`
-	Field796             []string                `protobuf:"bytes,2,rep,name=field796" json:"field796,omitempty"`
-	Field797             []string                `protobuf:"bytes,3,rep,name=field797" json:"field797,omitempty"`
-	Field798             *string                 `protobuf:"bytes,4,opt,name=field798" json:"field798,omitempty"`
-	Field799             []string                `protobuf:"bytes,5,rep,name=field799" json:"field799,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field795      *string  `protobuf:"bytes,1,req,name=field795" json:"field795,omitempty"`
+	Field796      []string `protobuf:"bytes,2,rep,name=field796" json:"field796,omitempty"`
+	Field797      []string `protobuf:"bytes,3,rep,name=field797" json:"field797,omitempty"`
+	Field798      *string  `protobuf:"bytes,4,opt,name=field798" json:"field798,omitempty"`
+	Field799      []string `protobuf:"bytes,5,rep,name=field799" json:"field799,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message703) Reset() {
@@ -3586,22 +3542,21 @@
 }
 
 type Message715 struct {
-	Field859             *string                 `protobuf:"bytes,1,req,name=field859" json:"field859,omitempty"`
-	Field860             *string                 `protobuf:"bytes,7,opt,name=field860" json:"field860,omitempty"`
-	Field861             []*Message707           `protobuf:"bytes,2,rep,name=field861" json:"field861,omitempty"`
-	Field862             []*Message708           `protobuf:"bytes,3,rep,name=field862" json:"field862,omitempty"`
-	Field863             []*Message711           `protobuf:"bytes,4,rep,name=field863" json:"field863,omitempty"`
-	Field864             []*Message712           `protobuf:"bytes,5,rep,name=field864" json:"field864,omitempty"`
-	Field865             []*Message713           `protobuf:"bytes,6,rep,name=field865" json:"field865,omitempty"`
-	Field866             []*Message714           `protobuf:"bytes,8,rep,name=field866" json:"field866,omitempty"`
-	Field867             []*Message710           `protobuf:"bytes,9,rep,name=field867" json:"field867,omitempty"`
-	Field868             []*Message709           `protobuf:"bytes,10,rep,name=field868" json:"field868,omitempty"`
-	Field869             []*Message705           `protobuf:"bytes,11,rep,name=field869" json:"field869,omitempty"`
-	Field870             []*Message702           `protobuf:"bytes,12,rep,name=field870" json:"field870,omitempty"`
-	Field871             []*Message706           `protobuf:"bytes,13,rep,name=field871" json:"field871,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field859      *string       `protobuf:"bytes,1,req,name=field859" json:"field859,omitempty"`
+	Field860      *string       `protobuf:"bytes,7,opt,name=field860" json:"field860,omitempty"`
+	Field861      []*Message707 `protobuf:"bytes,2,rep,name=field861" json:"field861,omitempty"`
+	Field862      []*Message708 `protobuf:"bytes,3,rep,name=field862" json:"field862,omitempty"`
+	Field863      []*Message711 `protobuf:"bytes,4,rep,name=field863" json:"field863,omitempty"`
+	Field864      []*Message712 `protobuf:"bytes,5,rep,name=field864" json:"field864,omitempty"`
+	Field865      []*Message713 `protobuf:"bytes,6,rep,name=field865" json:"field865,omitempty"`
+	Field866      []*Message714 `protobuf:"bytes,8,rep,name=field866" json:"field866,omitempty"`
+	Field867      []*Message710 `protobuf:"bytes,9,rep,name=field867" json:"field867,omitempty"`
+	Field868      []*Message709 `protobuf:"bytes,10,rep,name=field868" json:"field868,omitempty"`
+	Field869      []*Message705 `protobuf:"bytes,11,rep,name=field869" json:"field869,omitempty"`
+	Field870      []*Message702 `protobuf:"bytes,12,rep,name=field870" json:"field870,omitempty"`
+	Field871      []*Message706 `protobuf:"bytes,13,rep,name=field871" json:"field871,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message715) Reset() {
@@ -3719,11 +3674,10 @@
 }
 
 type Message700 struct {
-	Field789             []string                `protobuf:"bytes,1,rep,name=field789" json:"field789,omitempty"`
-	Field790             []string                `protobuf:"bytes,2,rep,name=field790" json:"field790,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field789      []string `protobuf:"bytes,1,rep,name=field789" json:"field789,omitempty"`
+	Field790      []string `protobuf:"bytes,2,rep,name=field790" json:"field790,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message700) Reset() {
@@ -3764,11 +3718,10 @@
 }
 
 type Message699 struct {
-	Field787             *string                 `protobuf:"bytes,1,req,name=field787" json:"field787,omitempty"`
-	Field788             []string                `protobuf:"bytes,2,rep,name=field788" json:"field788,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field787      *string  `protobuf:"bytes,1,req,name=field787" json:"field787,omitempty"`
+	Field788      []string `protobuf:"bytes,2,rep,name=field788" json:"field788,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message699) Reset() {
@@ -3809,17 +3762,16 @@
 }
 
 type Message698 struct {
-	Field779             *string                 `protobuf:"bytes,1,opt,name=field779" json:"field779,omitempty"`
-	Field780             *string                 `protobuf:"bytes,2,opt,name=field780" json:"field780,omitempty"`
-	Field781             *string                 `protobuf:"bytes,3,opt,name=field781" json:"field781,omitempty"`
-	Field782             *string                 `protobuf:"bytes,4,opt,name=field782" json:"field782,omitempty"`
-	Field783             *uint64                 `protobuf:"varint,5,opt,name=field783" json:"field783,omitempty"`
-	Field784             *uint32                 `protobuf:"varint,6,opt,name=field784" json:"field784,omitempty"`
-	Field785             *int64                  `protobuf:"varint,7,opt,name=field785" json:"field785,omitempty"`
-	Field786             []string                `protobuf:"bytes,8,rep,name=field786" json:"field786,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field779      *string  `protobuf:"bytes,1,opt,name=field779" json:"field779,omitempty"`
+	Field780      *string  `protobuf:"bytes,2,opt,name=field780" json:"field780,omitempty"`
+	Field781      *string  `protobuf:"bytes,3,opt,name=field781" json:"field781,omitempty"`
+	Field782      *string  `protobuf:"bytes,4,opt,name=field782" json:"field782,omitempty"`
+	Field783      *uint64  `protobuf:"varint,5,opt,name=field783" json:"field783,omitempty"`
+	Field784      *uint32  `protobuf:"varint,6,opt,name=field784" json:"field784,omitempty"`
+	Field785      *int64   `protobuf:"varint,7,opt,name=field785" json:"field785,omitempty"`
+	Field786      []string `protobuf:"bytes,8,rep,name=field786" json:"field786,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message698) Reset() {
@@ -3902,13 +3854,12 @@
 }
 
 type Message10155_Message10156 struct {
-	Field10266           *Enum8862               `protobuf:"varint,51,opt,name=field10266,enum=benchmarks.google_message3.Enum8862" json:"field10266,omitempty"`
-	Field10267           *int32                  `protobuf:"varint,52,opt,name=field10267" json:"field10267,omitempty"`
-	Field10268           *int32                  `protobuf:"varint,53,opt,name=field10268" json:"field10268,omitempty"`
-	Field10269           *int32                  `protobuf:"varint,54,opt,name=field10269" json:"field10269,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10266    *Enum8862 `protobuf:"varint,51,opt,name=field10266,enum=benchmarks.google_message3.Enum8862" json:"field10266,omitempty"`
+	Field10267    *int32    `protobuf:"varint,52,opt,name=field10267" json:"field10267,omitempty"`
+	Field10268    *int32    `protobuf:"varint,53,opt,name=field10268" json:"field10268,omitempty"`
+	Field10269    *int32    `protobuf:"varint,54,opt,name=field10269" json:"field10269,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10155_Message10156) Reset() {
@@ -5007,6 +4958,514 @@
 	file_datasets_google_message3_benchmark_message3_6_proto_init()
 	file_datasets_google_message3_benchmark_message3_7_proto_init()
 	file_datasets_google_message3_benchmark_message3_8_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24377); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24378); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24400); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24380); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24381); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message719); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message728); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			case 11:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message704); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message697); i {
+			case 36:
+				return &v.sizeCache
+			case 37:
+				return &v.unknownFields
+			case 38:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message0); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6578); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6024); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6052); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6054); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10573); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			case 4:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10824); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10582); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10155); i {
+			case 70:
+				return &v.sizeCache
+			case 71:
+				return &v.unknownFields
+			case 72:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11866); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10469); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10818); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10773); i {
+			case 23:
+				return &v.sizeCache
+			case 24:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13145); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			case 5:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message16686); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12796); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6722); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6727); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6724); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6735); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8183); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8301); i {
+			case 11:
+				return &v.sizeCache
+			case 12:
+				return &v.unknownFields
+			case 13:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8456); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8302); i {
+			case 21:
+				return &v.sizeCache
+			case 22:
+				return &v.unknownFields
+			case 23:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8457); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8449); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13358); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13912); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24316); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24312); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24313); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message24315); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message716); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message718); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message703); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message715); i {
+			case 13:
+				return &v.sizeCache
+			case 14:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message700); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message699); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message698); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_5_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10155_Message10156); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message3_benchmark_message3_5_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
index a09eb60..3ed17a1 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
@@ -18,9 +18,8 @@
 )
 
 type Message10576 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10576) Reset() {
@@ -47,11 +46,10 @@
 }
 
 type Message10154 struct {
-	Field10192           []byte                  `protobuf:"bytes,1,opt,name=field10192" json:"field10192,omitempty"`
-	Field10193           *int32                  `protobuf:"varint,2,opt,name=field10193" json:"field10193,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10192    []byte `protobuf:"bytes,1,opt,name=field10192" json:"field10192,omitempty"`
+	Field10193    *int32 `protobuf:"varint,2,opt,name=field10193" json:"field10193,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10154) Reset() {
@@ -92,71 +90,70 @@
 }
 
 type Message8944 struct {
-	Field9045            *string                 `protobuf:"bytes,2,opt,name=field9045" json:"field9045,omitempty"`
-	Field9046            *string                 `protobuf:"bytes,3,opt,name=field9046" json:"field9046,omitempty"`
-	Field9047            *string                 `protobuf:"bytes,23,opt,name=field9047" json:"field9047,omitempty"`
-	Field9048            *string                 `protobuf:"bytes,52,opt,name=field9048" json:"field9048,omitempty"`
-	Field9049            *int32                  `protobuf:"varint,53,opt,name=field9049" json:"field9049,omitempty"`
-	Field9050            *int32                  `protobuf:"varint,54,opt,name=field9050" json:"field9050,omitempty"`
-	Field9051            *float32                `protobuf:"fixed32,55,opt,name=field9051" json:"field9051,omitempty"`
-	Field9052            *float32                `protobuf:"fixed32,56,opt,name=field9052" json:"field9052,omitempty"`
-	Field9053            *string                 `protobuf:"bytes,57,opt,name=field9053" json:"field9053,omitempty"`
-	Field9054            *int64                  `protobuf:"varint,1,opt,name=field9054" json:"field9054,omitempty"`
-	Field9055            *bool                   `protobuf:"varint,4,opt,name=field9055" json:"field9055,omitempty"`
-	Field9056            *int32                  `protobuf:"varint,5,opt,name=field9056" json:"field9056,omitempty"`
-	Field9057            *int32                  `protobuf:"varint,6,opt,name=field9057" json:"field9057,omitempty"`
-	Field9058            *int32                  `protobuf:"varint,7,opt,name=field9058" json:"field9058,omitempty"`
-	Field9059            *float32                `protobuf:"fixed32,8,opt,name=field9059" json:"field9059,omitempty"`
-	Field9060            *float32                `protobuf:"fixed32,11,opt,name=field9060" json:"field9060,omitempty"`
-	Field9061            *float32                `protobuf:"fixed32,9,opt,name=field9061" json:"field9061,omitempty"`
-	Field9062            *float32                `protobuf:"fixed32,10,opt,name=field9062" json:"field9062,omitempty"`
-	Field9063            *float32                `protobuf:"fixed32,13,opt,name=field9063" json:"field9063,omitempty"`
-	Field9064            *bool                   `protobuf:"varint,14,opt,name=field9064" json:"field9064,omitempty"`
-	Field9065            *float32                `protobuf:"fixed32,70,opt,name=field9065" json:"field9065,omitempty"`
-	Field9066            *int32                  `protobuf:"varint,71,opt,name=field9066" json:"field9066,omitempty"`
-	Field9067            *Enum8945               `protobuf:"varint,15,opt,name=field9067,enum=benchmarks.google_message3.Enum8945" json:"field9067,omitempty"`
-	Field9068            *int32                  `protobuf:"varint,16,opt,name=field9068" json:"field9068,omitempty"`
-	Field9069            *int32                  `protobuf:"varint,17,opt,name=field9069" json:"field9069,omitempty"`
-	Field9070            *float32                `protobuf:"fixed32,18,opt,name=field9070" json:"field9070,omitempty"`
-	Field9071            *float32                `protobuf:"fixed32,19,opt,name=field9071" json:"field9071,omitempty"`
-	Field9072            *int32                  `protobuf:"varint,28,opt,name=field9072" json:"field9072,omitempty"`
-	Field9073            *int32                  `protobuf:"varint,29,opt,name=field9073" json:"field9073,omitempty"`
-	Field9074            *float32                `protobuf:"fixed32,60,opt,name=field9074" json:"field9074,omitempty"`
-	Field9075            *float32                `protobuf:"fixed32,61,opt,name=field9075" json:"field9075,omitempty"`
-	Field9076            *int32                  `protobuf:"varint,72,opt,name=field9076" json:"field9076,omitempty"`
-	Field9077            *int32                  `protobuf:"varint,73,opt,name=field9077" json:"field9077,omitempty"`
-	Field9078            *Enum8951               `protobuf:"varint,62,opt,name=field9078,enum=benchmarks.google_message3.Enum8951" json:"field9078,omitempty"`
-	Field9079            *string                 `protobuf:"bytes,20,opt,name=field9079" json:"field9079,omitempty"`
-	Field9080            *string                 `protobuf:"bytes,21,opt,name=field9080" json:"field9080,omitempty"`
-	Field9081            *string                 `protobuf:"bytes,22,opt,name=field9081" json:"field9081,omitempty"`
-	Field9082            *float64                `protobuf:"fixed64,31,opt,name=field9082" json:"field9082,omitempty"`
-	Field9083            *float64                `protobuf:"fixed64,32,opt,name=field9083" json:"field9083,omitempty"`
-	Field9084            *float64                `protobuf:"fixed64,33,opt,name=field9084" json:"field9084,omitempty"`
-	Field9085            *float64                `protobuf:"fixed64,36,opt,name=field9085" json:"field9085,omitempty"`
-	Field9086            *UnusedEnum             `protobuf:"varint,37,opt,name=field9086,enum=benchmarks.google_message3.UnusedEnum" json:"field9086,omitempty"`
-	Field9087            *float64                `protobuf:"fixed64,38,opt,name=field9087" json:"field9087,omitempty"`
-	Field9088            *float64                `protobuf:"fixed64,39,opt,name=field9088" json:"field9088,omitempty"`
-	Field9089            *float64                `protobuf:"fixed64,63,opt,name=field9089" json:"field9089,omitempty"`
-	Field9090            *float64                `protobuf:"fixed64,64,opt,name=field9090" json:"field9090,omitempty"`
-	Field9091            *float64                `protobuf:"fixed64,65,opt,name=field9091" json:"field9091,omitempty"`
-	Field9092            *float64                `protobuf:"fixed64,34,opt,name=field9092" json:"field9092,omitempty"`
-	Field9093            *UnusedEnum             `protobuf:"varint,35,opt,name=field9093,enum=benchmarks.google_message3.UnusedEnum" json:"field9093,omitempty"`
-	Field9094            *UnusedEnum             `protobuf:"varint,66,opt,name=field9094,enum=benchmarks.google_message3.UnusedEnum" json:"field9094,omitempty"`
-	Field9095            *string                 `protobuf:"bytes,40,opt,name=field9095" json:"field9095,omitempty"`
-	Field9096            *string                 `protobuf:"bytes,41,opt,name=field9096" json:"field9096,omitempty"`
-	Field9097            *string                 `protobuf:"bytes,42,opt,name=field9097" json:"field9097,omitempty"`
-	Field9098            *string                 `protobuf:"bytes,43,opt,name=field9098" json:"field9098,omitempty"`
-	Field9099            *string                 `protobuf:"bytes,44,opt,name=field9099" json:"field9099,omitempty"`
-	Field9100            *string                 `protobuf:"bytes,45,opt,name=field9100" json:"field9100,omitempty"`
-	Field9101            *string                 `protobuf:"bytes,46,opt,name=field9101" json:"field9101,omitempty"`
-	Field9102            *string                 `protobuf:"bytes,47,opt,name=field9102" json:"field9102,omitempty"`
-	Field9103            *string                 `protobuf:"bytes,48,opt,name=field9103" json:"field9103,omitempty"`
-	Field9104            *string                 `protobuf:"bytes,49,opt,name=field9104" json:"field9104,omitempty"`
-	Field9105            *Message8939            `protobuf:"bytes,100,opt,name=field9105" json:"field9105,omitempty"`
-	Field9106            *int64                  `protobuf:"varint,101,opt,name=field9106" json:"field9106,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9045     *string      `protobuf:"bytes,2,opt,name=field9045" json:"field9045,omitempty"`
+	Field9046     *string      `protobuf:"bytes,3,opt,name=field9046" json:"field9046,omitempty"`
+	Field9047     *string      `protobuf:"bytes,23,opt,name=field9047" json:"field9047,omitempty"`
+	Field9048     *string      `protobuf:"bytes,52,opt,name=field9048" json:"field9048,omitempty"`
+	Field9049     *int32       `protobuf:"varint,53,opt,name=field9049" json:"field9049,omitempty"`
+	Field9050     *int32       `protobuf:"varint,54,opt,name=field9050" json:"field9050,omitempty"`
+	Field9051     *float32     `protobuf:"fixed32,55,opt,name=field9051" json:"field9051,omitempty"`
+	Field9052     *float32     `protobuf:"fixed32,56,opt,name=field9052" json:"field9052,omitempty"`
+	Field9053     *string      `protobuf:"bytes,57,opt,name=field9053" json:"field9053,omitempty"`
+	Field9054     *int64       `protobuf:"varint,1,opt,name=field9054" json:"field9054,omitempty"`
+	Field9055     *bool        `protobuf:"varint,4,opt,name=field9055" json:"field9055,omitempty"`
+	Field9056     *int32       `protobuf:"varint,5,opt,name=field9056" json:"field9056,omitempty"`
+	Field9057     *int32       `protobuf:"varint,6,opt,name=field9057" json:"field9057,omitempty"`
+	Field9058     *int32       `protobuf:"varint,7,opt,name=field9058" json:"field9058,omitempty"`
+	Field9059     *float32     `protobuf:"fixed32,8,opt,name=field9059" json:"field9059,omitempty"`
+	Field9060     *float32     `protobuf:"fixed32,11,opt,name=field9060" json:"field9060,omitempty"`
+	Field9061     *float32     `protobuf:"fixed32,9,opt,name=field9061" json:"field9061,omitempty"`
+	Field9062     *float32     `protobuf:"fixed32,10,opt,name=field9062" json:"field9062,omitempty"`
+	Field9063     *float32     `protobuf:"fixed32,13,opt,name=field9063" json:"field9063,omitempty"`
+	Field9064     *bool        `protobuf:"varint,14,opt,name=field9064" json:"field9064,omitempty"`
+	Field9065     *float32     `protobuf:"fixed32,70,opt,name=field9065" json:"field9065,omitempty"`
+	Field9066     *int32       `protobuf:"varint,71,opt,name=field9066" json:"field9066,omitempty"`
+	Field9067     *Enum8945    `protobuf:"varint,15,opt,name=field9067,enum=benchmarks.google_message3.Enum8945" json:"field9067,omitempty"`
+	Field9068     *int32       `protobuf:"varint,16,opt,name=field9068" json:"field9068,omitempty"`
+	Field9069     *int32       `protobuf:"varint,17,opt,name=field9069" json:"field9069,omitempty"`
+	Field9070     *float32     `protobuf:"fixed32,18,opt,name=field9070" json:"field9070,omitempty"`
+	Field9071     *float32     `protobuf:"fixed32,19,opt,name=field9071" json:"field9071,omitempty"`
+	Field9072     *int32       `protobuf:"varint,28,opt,name=field9072" json:"field9072,omitempty"`
+	Field9073     *int32       `protobuf:"varint,29,opt,name=field9073" json:"field9073,omitempty"`
+	Field9074     *float32     `protobuf:"fixed32,60,opt,name=field9074" json:"field9074,omitempty"`
+	Field9075     *float32     `protobuf:"fixed32,61,opt,name=field9075" json:"field9075,omitempty"`
+	Field9076     *int32       `protobuf:"varint,72,opt,name=field9076" json:"field9076,omitempty"`
+	Field9077     *int32       `protobuf:"varint,73,opt,name=field9077" json:"field9077,omitempty"`
+	Field9078     *Enum8951    `protobuf:"varint,62,opt,name=field9078,enum=benchmarks.google_message3.Enum8951" json:"field9078,omitempty"`
+	Field9079     *string      `protobuf:"bytes,20,opt,name=field9079" json:"field9079,omitempty"`
+	Field9080     *string      `protobuf:"bytes,21,opt,name=field9080" json:"field9080,omitempty"`
+	Field9081     *string      `protobuf:"bytes,22,opt,name=field9081" json:"field9081,omitempty"`
+	Field9082     *float64     `protobuf:"fixed64,31,opt,name=field9082" json:"field9082,omitempty"`
+	Field9083     *float64     `protobuf:"fixed64,32,opt,name=field9083" json:"field9083,omitempty"`
+	Field9084     *float64     `protobuf:"fixed64,33,opt,name=field9084" json:"field9084,omitempty"`
+	Field9085     *float64     `protobuf:"fixed64,36,opt,name=field9085" json:"field9085,omitempty"`
+	Field9086     *UnusedEnum  `protobuf:"varint,37,opt,name=field9086,enum=benchmarks.google_message3.UnusedEnum" json:"field9086,omitempty"`
+	Field9087     *float64     `protobuf:"fixed64,38,opt,name=field9087" json:"field9087,omitempty"`
+	Field9088     *float64     `protobuf:"fixed64,39,opt,name=field9088" json:"field9088,omitempty"`
+	Field9089     *float64     `protobuf:"fixed64,63,opt,name=field9089" json:"field9089,omitempty"`
+	Field9090     *float64     `protobuf:"fixed64,64,opt,name=field9090" json:"field9090,omitempty"`
+	Field9091     *float64     `protobuf:"fixed64,65,opt,name=field9091" json:"field9091,omitempty"`
+	Field9092     *float64     `protobuf:"fixed64,34,opt,name=field9092" json:"field9092,omitempty"`
+	Field9093     *UnusedEnum  `protobuf:"varint,35,opt,name=field9093,enum=benchmarks.google_message3.UnusedEnum" json:"field9093,omitempty"`
+	Field9094     *UnusedEnum  `protobuf:"varint,66,opt,name=field9094,enum=benchmarks.google_message3.UnusedEnum" json:"field9094,omitempty"`
+	Field9095     *string      `protobuf:"bytes,40,opt,name=field9095" json:"field9095,omitempty"`
+	Field9096     *string      `protobuf:"bytes,41,opt,name=field9096" json:"field9096,omitempty"`
+	Field9097     *string      `protobuf:"bytes,42,opt,name=field9097" json:"field9097,omitempty"`
+	Field9098     *string      `protobuf:"bytes,43,opt,name=field9098" json:"field9098,omitempty"`
+	Field9099     *string      `protobuf:"bytes,44,opt,name=field9099" json:"field9099,omitempty"`
+	Field9100     *string      `protobuf:"bytes,45,opt,name=field9100" json:"field9100,omitempty"`
+	Field9101     *string      `protobuf:"bytes,46,opt,name=field9101" json:"field9101,omitempty"`
+	Field9102     *string      `protobuf:"bytes,47,opt,name=field9102" json:"field9102,omitempty"`
+	Field9103     *string      `protobuf:"bytes,48,opt,name=field9103" json:"field9103,omitempty"`
+	Field9104     *string      `protobuf:"bytes,49,opt,name=field9104" json:"field9104,omitempty"`
+	Field9105     *Message8939 `protobuf:"bytes,100,opt,name=field9105" json:"field9105,omitempty"`
+	Field9106     *int64       `protobuf:"varint,101,opt,name=field9106" json:"field9106,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8944) Reset() {
@@ -617,36 +614,35 @@
 }
 
 type Message9182 struct {
-	Field9205              *string                   `protobuf:"bytes,1,opt,name=field9205" json:"field9205,omitempty"`
-	Field9206              *string                   `protobuf:"bytes,2,opt,name=field9206" json:"field9206,omitempty"`
-	Field9207              *float32                  `protobuf:"fixed32,16,opt,name=field9207" json:"field9207,omitempty"`
-	Field9208              *int32                    `protobuf:"varint,17,opt,name=field9208" json:"field9208,omitempty"`
-	Field9209              *int32                    `protobuf:"varint,27,opt,name=field9209" json:"field9209,omitempty"`
-	Field9210              *int32                    `protobuf:"varint,7,opt,name=field9210" json:"field9210,omitempty"`
-	Field9211              *int32                    `protobuf:"varint,8,opt,name=field9211" json:"field9211,omitempty"`
-	Field9212              *float32                  `protobuf:"fixed32,26,opt,name=field9212" json:"field9212,omitempty"`
-	Field9213              *float32                  `protobuf:"fixed32,22,opt,name=field9213" json:"field9213,omitempty"`
-	Field9214              *bool                     `protobuf:"varint,28,opt,name=field9214" json:"field9214,omitempty"`
-	Field9215              []*UnusedEmptyMessage     `protobuf:"bytes,21,rep,name=field9215" json:"field9215,omitempty"`
-	Field9216              []*UnusedEmptyMessage     `protobuf:"bytes,25,rep,name=field9216" json:"field9216,omitempty"`
-	Field9217              []*Message9181            `protobuf:"bytes,29,rep,name=field9217" json:"field9217,omitempty"`
-	Field9218              *bool                     `protobuf:"varint,18,opt,name=field9218" json:"field9218,omitempty"`
-	Field9219              *bool                     `protobuf:"varint,19,opt,name=field9219" json:"field9219,omitempty"`
-	Field9220              *bool                     `protobuf:"varint,20,opt,name=field9220" json:"field9220,omitempty"`
-	Field9221              *Message9164              `protobuf:"bytes,30,opt,name=field9221" json:"field9221,omitempty"`
-	Field9222              *Message9165              `protobuf:"bytes,31,opt,name=field9222" json:"field9222,omitempty"`
-	Field9223              *Message9166              `protobuf:"bytes,32,opt,name=field9223" json:"field9223,omitempty"`
-	Field9224              *float32                  `protobuf:"fixed32,33,opt,name=field9224" json:"field9224,omitempty"`
-	Field9225              *Message9151              `protobuf:"bytes,34,opt,name=field9225" json:"field9225,omitempty"`
-	Field9226              *float32                  `protobuf:"fixed32,35,opt,name=field9226" json:"field9226,omitempty"`
-	Field9227              *float32                  `protobuf:"fixed32,36,opt,name=field9227" json:"field9227,omitempty"`
-	Field9228              *float32                  `protobuf:"fixed32,37,opt,name=field9228" json:"field9228,omitempty"`
-	Field9229              *float32                  `protobuf:"fixed32,38,opt,name=field9229" json:"field9229,omitempty"`
-	Field9230              *float32                  `protobuf:"fixed32,39,opt,name=field9230" json:"field9230,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field9205       *string               `protobuf:"bytes,1,opt,name=field9205" json:"field9205,omitempty"`
+	Field9206       *string               `protobuf:"bytes,2,opt,name=field9206" json:"field9206,omitempty"`
+	Field9207       *float32              `protobuf:"fixed32,16,opt,name=field9207" json:"field9207,omitempty"`
+	Field9208       *int32                `protobuf:"varint,17,opt,name=field9208" json:"field9208,omitempty"`
+	Field9209       *int32                `protobuf:"varint,27,opt,name=field9209" json:"field9209,omitempty"`
+	Field9210       *int32                `protobuf:"varint,7,opt,name=field9210" json:"field9210,omitempty"`
+	Field9211       *int32                `protobuf:"varint,8,opt,name=field9211" json:"field9211,omitempty"`
+	Field9212       *float32              `protobuf:"fixed32,26,opt,name=field9212" json:"field9212,omitempty"`
+	Field9213       *float32              `protobuf:"fixed32,22,opt,name=field9213" json:"field9213,omitempty"`
+	Field9214       *bool                 `protobuf:"varint,28,opt,name=field9214" json:"field9214,omitempty"`
+	Field9215       []*UnusedEmptyMessage `protobuf:"bytes,21,rep,name=field9215" json:"field9215,omitempty"`
+	Field9216       []*UnusedEmptyMessage `protobuf:"bytes,25,rep,name=field9216" json:"field9216,omitempty"`
+	Field9217       []*Message9181        `protobuf:"bytes,29,rep,name=field9217" json:"field9217,omitempty"`
+	Field9218       *bool                 `protobuf:"varint,18,opt,name=field9218" json:"field9218,omitempty"`
+	Field9219       *bool                 `protobuf:"varint,19,opt,name=field9219" json:"field9219,omitempty"`
+	Field9220       *bool                 `protobuf:"varint,20,opt,name=field9220" json:"field9220,omitempty"`
+	Field9221       *Message9164          `protobuf:"bytes,30,opt,name=field9221" json:"field9221,omitempty"`
+	Field9222       *Message9165          `protobuf:"bytes,31,opt,name=field9222" json:"field9222,omitempty"`
+	Field9223       *Message9166          `protobuf:"bytes,32,opt,name=field9223" json:"field9223,omitempty"`
+	Field9224       *float32              `protobuf:"fixed32,33,opt,name=field9224" json:"field9224,omitempty"`
+	Field9225       *Message9151          `protobuf:"bytes,34,opt,name=field9225" json:"field9225,omitempty"`
+	Field9226       *float32              `protobuf:"fixed32,35,opt,name=field9226" json:"field9226,omitempty"`
+	Field9227       *float32              `protobuf:"fixed32,36,opt,name=field9227" json:"field9227,omitempty"`
+	Field9228       *float32              `protobuf:"fixed32,37,opt,name=field9228" json:"field9228,omitempty"`
+	Field9229       *float32              `protobuf:"fixed32,38,opt,name=field9229" json:"field9229,omitempty"`
+	Field9230       *float32              `protobuf:"fixed32,39,opt,name=field9230" json:"field9230,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message9182) Reset() {
@@ -868,11 +864,10 @@
 }
 
 type Message9160 struct {
-	Field9161            *int32                  `protobuf:"varint,1,opt,name=field9161" json:"field9161,omitempty"`
-	Field9162            []byte                  `protobuf:"bytes,2,opt,name=field9162" json:"field9162,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9161     *int32 `protobuf:"varint,1,opt,name=field9161" json:"field9161,omitempty"`
+	Field9162     []byte `protobuf:"bytes,2,opt,name=field9162" json:"field9162,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9160) Reset() {
@@ -913,10 +908,9 @@
 }
 
 type Message9242 struct {
-	Field9327            []Enum9243              `protobuf:"varint,1,rep,name=field9327,enum=benchmarks.google_message3.Enum9243" json:"field9327,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9327     []Enum9243 `protobuf:"varint,1,rep,name=field9327,enum=benchmarks.google_message3.Enum9243" json:"field9327,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9242) Reset() {
@@ -950,10 +944,9 @@
 }
 
 type Message8890 struct {
-	Field8916            []*Message8888          `protobuf:"bytes,1,rep,name=field8916" json:"field8916,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8916     []*Message8888 `protobuf:"bytes,1,rep,name=field8916" json:"field8916,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8890) Reset() {
@@ -987,10 +980,9 @@
 }
 
 type Message9123 struct {
-	Field9135            *float32                `protobuf:"fixed32,1,opt,name=field9135" json:"field9135,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9135     *float32 `protobuf:"fixed32,1,opt,name=field9135" json:"field9135,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9123) Reset() {
@@ -1024,13 +1016,12 @@
 }
 
 type Message9628 struct {
-	Field9673            *Message9627            `protobuf:"bytes,1,opt,name=field9673" json:"field9673,omitempty"`
-	Field9674            *string                 `protobuf:"bytes,2,opt,name=field9674" json:"field9674,omitempty"`
-	Field9675            []int32                 `protobuf:"varint,3,rep,name=field9675" json:"field9675,omitempty"`
-	Field9676            *int32                  `protobuf:"varint,4,opt,name=field9676" json:"field9676,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9673     *Message9627 `protobuf:"bytes,1,opt,name=field9673" json:"field9673,omitempty"`
+	Field9674     *string      `protobuf:"bytes,2,opt,name=field9674" json:"field9674,omitempty"`
+	Field9675     []int32      `protobuf:"varint,3,rep,name=field9675" json:"field9675,omitempty"`
+	Field9676     *int32       `protobuf:"varint,4,opt,name=field9676" json:"field9676,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9628) Reset() {
@@ -1085,74 +1076,73 @@
 }
 
 type Message11014 struct {
-	Field11780           *int32                  `protobuf:"varint,40,opt,name=field11780" json:"field11780,omitempty"`
-	Field11781           *string                 `protobuf:"bytes,46,opt,name=field11781" json:"field11781,omitempty"`
-	Field11782           *bool                   `protobuf:"varint,47,opt,name=field11782" json:"field11782,omitempty"`
-	Field11783           *Enum11107              `protobuf:"varint,1,opt,name=field11783,enum=benchmarks.google_message3.Enum11107" json:"field11783,omitempty"`
-	Field11784           *int32                  `protobuf:"varint,2,opt,name=field11784" json:"field11784,omitempty"`
-	Field11785           *float64                `protobuf:"fixed64,4,opt,name=field11785" json:"field11785,omitempty"`
-	Field11786           *int32                  `protobuf:"varint,5,opt,name=field11786" json:"field11786,omitempty"`
-	Field11787           *int32                  `protobuf:"varint,6,opt,name=field11787" json:"field11787,omitempty"`
-	Field11788           *float64                `protobuf:"fixed64,7,opt,name=field11788" json:"field11788,omitempty"`
-	Field11789           *float64                `protobuf:"fixed64,8,opt,name=field11789" json:"field11789,omitempty"`
-	Field11790           *int64                  `protobuf:"varint,9,opt,name=field11790" json:"field11790,omitempty"`
-	Field11791           *bool                   `protobuf:"varint,10,opt,name=field11791" json:"field11791,omitempty"`
-	Field11792           *int64                  `protobuf:"varint,28,opt,name=field11792" json:"field11792,omitempty"`
-	Field11793           *bool                   `protobuf:"varint,37,opt,name=field11793" json:"field11793,omitempty"`
-	Field11794           *Enum11541              `protobuf:"varint,44,opt,name=field11794,enum=benchmarks.google_message3.Enum11541" json:"field11794,omitempty"`
-	Field11795           *float64                `protobuf:"fixed64,49,opt,name=field11795" json:"field11795,omitempty"`
-	Field11796           *float64                `protobuf:"fixed64,51,opt,name=field11796" json:"field11796,omitempty"`
-	Field11797           *int64                  `protobuf:"varint,54,opt,name=field11797" json:"field11797,omitempty"`
-	Field11798           *int64                  `protobuf:"varint,55,opt,name=field11798" json:"field11798,omitempty"`
-	Field11799           *UnusedEnum             `protobuf:"varint,57,opt,name=field11799,enum=benchmarks.google_message3.UnusedEnum" json:"field11799,omitempty"`
-	Field11800           *Enum11468              `protobuf:"varint,58,opt,name=field11800,enum=benchmarks.google_message3.Enum11468" json:"field11800,omitempty"`
-	Field11801           *int32                  `protobuf:"varint,59,opt,name=field11801" json:"field11801,omitempty"`
-	Field11802           *UnusedEnum             `protobuf:"varint,60,opt,name=field11802,enum=benchmarks.google_message3.UnusedEnum" json:"field11802,omitempty"`
-	Field11803           *int32                  `protobuf:"varint,61,opt,name=field11803" json:"field11803,omitempty"`
-	Field11804           *int32                  `protobuf:"varint,62,opt,name=field11804" json:"field11804,omitempty"`
-	Field11805           *int32                  `protobuf:"varint,69,opt,name=field11805" json:"field11805,omitempty"`
-	Field11806           *UnusedEmptyMessage     `protobuf:"bytes,68,opt,name=field11806" json:"field11806,omitempty"`
-	Field11807           []*Message11018         `protobuf:"bytes,71,rep,name=field11807" json:"field11807,omitempty"`
-	Field11808           *bool                   `protobuf:"varint,50,opt,name=field11808" json:"field11808,omitempty"`
-	Field11809           *bool                   `protobuf:"varint,56,opt,name=field11809" json:"field11809,omitempty"`
-	Field11810           *bool                   `protobuf:"varint,66,opt,name=field11810" json:"field11810,omitempty"`
-	Field11811           *bool                   `protobuf:"varint,63,opt,name=field11811" json:"field11811,omitempty"`
-	Field11812           *bool                   `protobuf:"varint,64,opt,name=field11812" json:"field11812,omitempty"`
-	Field11813           *bool                   `protobuf:"varint,65,opt,name=field11813" json:"field11813,omitempty"`
-	Field11814           *bool                   `protobuf:"varint,67,opt,name=field11814" json:"field11814,omitempty"`
-	Field11815           *Enum11107              `protobuf:"varint,15,opt,name=field11815,enum=benchmarks.google_message3.Enum11107" json:"field11815,omitempty"`
-	Field11816           *int64                  `protobuf:"varint,16,opt,name=field11816" json:"field11816,omitempty"`
-	Field11817           *float64                `protobuf:"fixed64,17,opt,name=field11817" json:"field11817,omitempty"`
-	Field11818           *int64                  `protobuf:"varint,18,opt,name=field11818" json:"field11818,omitempty"`
-	Field11819           *int32                  `protobuf:"varint,19,opt,name=field11819" json:"field11819,omitempty"`
-	Field11820           *int64                  `protobuf:"varint,20,opt,name=field11820" json:"field11820,omitempty"`
-	Field11821           *int32                  `protobuf:"varint,42,opt,name=field11821" json:"field11821,omitempty"`
-	Field11822           *int64                  `protobuf:"varint,52,opt,name=field11822" json:"field11822,omitempty"`
-	Field11823           *int64                  `protobuf:"varint,53,opt,name=field11823" json:"field11823,omitempty"`
-	Field11824           *int64                  `protobuf:"varint,41,opt,name=field11824" json:"field11824,omitempty"`
-	Field11825           *float64                `protobuf:"fixed64,48,opt,name=field11825" json:"field11825,omitempty"`
-	Field11826           []*Message11020         `protobuf:"bytes,70,rep,name=field11826" json:"field11826,omitempty"`
-	Field11827           []*UnusedEmptyMessage   `protobuf:"bytes,72,rep,name=field11827" json:"field11827,omitempty"`
-	Field11828           *float64                `protobuf:"fixed64,25,opt,name=field11828" json:"field11828,omitempty"`
-	Field11829           *string                 `protobuf:"bytes,26,opt,name=field11829" json:"field11829,omitempty"`
-	Field11830           *int64                  `protobuf:"varint,27,opt,name=field11830" json:"field11830,omitempty"`
-	Field11831           *int64                  `protobuf:"varint,32,opt,name=field11831" json:"field11831,omitempty"`
-	Field11832           *uint64                 `protobuf:"varint,33,opt,name=field11832" json:"field11832,omitempty"`
-	Field11833           *bool                   `protobuf:"varint,29,opt,name=field11833" json:"field11833,omitempty"`
-	Field11834           *bool                   `protobuf:"varint,34,opt,name=field11834" json:"field11834,omitempty"`
-	Field11835           *string                 `protobuf:"bytes,30,opt,name=field11835" json:"field11835,omitempty"`
-	Field11836           *int32                  `protobuf:"varint,3,opt,name=field11836" json:"field11836,omitempty"`
-	Field11837           *int32                  `protobuf:"varint,31,opt,name=field11837" json:"field11837,omitempty"`
-	Field11838           *int32                  `protobuf:"varint,73,opt,name=field11838" json:"field11838,omitempty"`
-	Field11839           *int32                  `protobuf:"varint,35,opt,name=field11839" json:"field11839,omitempty"`
-	Field11840           *Enum11022              `protobuf:"varint,36,opt,name=field11840,enum=benchmarks.google_message3.Enum11022" json:"field11840,omitempty"`
-	Field11841           *Message11013           `protobuf:"bytes,38,opt,name=field11841" json:"field11841,omitempty"`
-	Field11842           *float64                `protobuf:"fixed64,39,opt,name=field11842" json:"field11842,omitempty"`
-	Field11843           *int32                  `protobuf:"varint,45,opt,name=field11843" json:"field11843,omitempty"`
-	Field11844           *bool                   `protobuf:"varint,74,opt,name=field11844" json:"field11844,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field11780    *int32                `protobuf:"varint,40,opt,name=field11780" json:"field11780,omitempty"`
+	Field11781    *string               `protobuf:"bytes,46,opt,name=field11781" json:"field11781,omitempty"`
+	Field11782    *bool                 `protobuf:"varint,47,opt,name=field11782" json:"field11782,omitempty"`
+	Field11783    *Enum11107            `protobuf:"varint,1,opt,name=field11783,enum=benchmarks.google_message3.Enum11107" json:"field11783,omitempty"`
+	Field11784    *int32                `protobuf:"varint,2,opt,name=field11784" json:"field11784,omitempty"`
+	Field11785    *float64              `protobuf:"fixed64,4,opt,name=field11785" json:"field11785,omitempty"`
+	Field11786    *int32                `protobuf:"varint,5,opt,name=field11786" json:"field11786,omitempty"`
+	Field11787    *int32                `protobuf:"varint,6,opt,name=field11787" json:"field11787,omitempty"`
+	Field11788    *float64              `protobuf:"fixed64,7,opt,name=field11788" json:"field11788,omitempty"`
+	Field11789    *float64              `protobuf:"fixed64,8,opt,name=field11789" json:"field11789,omitempty"`
+	Field11790    *int64                `protobuf:"varint,9,opt,name=field11790" json:"field11790,omitempty"`
+	Field11791    *bool                 `protobuf:"varint,10,opt,name=field11791" json:"field11791,omitempty"`
+	Field11792    *int64                `protobuf:"varint,28,opt,name=field11792" json:"field11792,omitempty"`
+	Field11793    *bool                 `protobuf:"varint,37,opt,name=field11793" json:"field11793,omitempty"`
+	Field11794    *Enum11541            `protobuf:"varint,44,opt,name=field11794,enum=benchmarks.google_message3.Enum11541" json:"field11794,omitempty"`
+	Field11795    *float64              `protobuf:"fixed64,49,opt,name=field11795" json:"field11795,omitempty"`
+	Field11796    *float64              `protobuf:"fixed64,51,opt,name=field11796" json:"field11796,omitempty"`
+	Field11797    *int64                `protobuf:"varint,54,opt,name=field11797" json:"field11797,omitempty"`
+	Field11798    *int64                `protobuf:"varint,55,opt,name=field11798" json:"field11798,omitempty"`
+	Field11799    *UnusedEnum           `protobuf:"varint,57,opt,name=field11799,enum=benchmarks.google_message3.UnusedEnum" json:"field11799,omitempty"`
+	Field11800    *Enum11468            `protobuf:"varint,58,opt,name=field11800,enum=benchmarks.google_message3.Enum11468" json:"field11800,omitempty"`
+	Field11801    *int32                `protobuf:"varint,59,opt,name=field11801" json:"field11801,omitempty"`
+	Field11802    *UnusedEnum           `protobuf:"varint,60,opt,name=field11802,enum=benchmarks.google_message3.UnusedEnum" json:"field11802,omitempty"`
+	Field11803    *int32                `protobuf:"varint,61,opt,name=field11803" json:"field11803,omitempty"`
+	Field11804    *int32                `protobuf:"varint,62,opt,name=field11804" json:"field11804,omitempty"`
+	Field11805    *int32                `protobuf:"varint,69,opt,name=field11805" json:"field11805,omitempty"`
+	Field11806    *UnusedEmptyMessage   `protobuf:"bytes,68,opt,name=field11806" json:"field11806,omitempty"`
+	Field11807    []*Message11018       `protobuf:"bytes,71,rep,name=field11807" json:"field11807,omitempty"`
+	Field11808    *bool                 `protobuf:"varint,50,opt,name=field11808" json:"field11808,omitempty"`
+	Field11809    *bool                 `protobuf:"varint,56,opt,name=field11809" json:"field11809,omitempty"`
+	Field11810    *bool                 `protobuf:"varint,66,opt,name=field11810" json:"field11810,omitempty"`
+	Field11811    *bool                 `protobuf:"varint,63,opt,name=field11811" json:"field11811,omitempty"`
+	Field11812    *bool                 `protobuf:"varint,64,opt,name=field11812" json:"field11812,omitempty"`
+	Field11813    *bool                 `protobuf:"varint,65,opt,name=field11813" json:"field11813,omitempty"`
+	Field11814    *bool                 `protobuf:"varint,67,opt,name=field11814" json:"field11814,omitempty"`
+	Field11815    *Enum11107            `protobuf:"varint,15,opt,name=field11815,enum=benchmarks.google_message3.Enum11107" json:"field11815,omitempty"`
+	Field11816    *int64                `protobuf:"varint,16,opt,name=field11816" json:"field11816,omitempty"`
+	Field11817    *float64              `protobuf:"fixed64,17,opt,name=field11817" json:"field11817,omitempty"`
+	Field11818    *int64                `protobuf:"varint,18,opt,name=field11818" json:"field11818,omitempty"`
+	Field11819    *int32                `protobuf:"varint,19,opt,name=field11819" json:"field11819,omitempty"`
+	Field11820    *int64                `protobuf:"varint,20,opt,name=field11820" json:"field11820,omitempty"`
+	Field11821    *int32                `protobuf:"varint,42,opt,name=field11821" json:"field11821,omitempty"`
+	Field11822    *int64                `protobuf:"varint,52,opt,name=field11822" json:"field11822,omitempty"`
+	Field11823    *int64                `protobuf:"varint,53,opt,name=field11823" json:"field11823,omitempty"`
+	Field11824    *int64                `protobuf:"varint,41,opt,name=field11824" json:"field11824,omitempty"`
+	Field11825    *float64              `protobuf:"fixed64,48,opt,name=field11825" json:"field11825,omitempty"`
+	Field11826    []*Message11020       `protobuf:"bytes,70,rep,name=field11826" json:"field11826,omitempty"`
+	Field11827    []*UnusedEmptyMessage `protobuf:"bytes,72,rep,name=field11827" json:"field11827,omitempty"`
+	Field11828    *float64              `protobuf:"fixed64,25,opt,name=field11828" json:"field11828,omitempty"`
+	Field11829    *string               `protobuf:"bytes,26,opt,name=field11829" json:"field11829,omitempty"`
+	Field11830    *int64                `protobuf:"varint,27,opt,name=field11830" json:"field11830,omitempty"`
+	Field11831    *int64                `protobuf:"varint,32,opt,name=field11831" json:"field11831,omitempty"`
+	Field11832    *uint64               `protobuf:"varint,33,opt,name=field11832" json:"field11832,omitempty"`
+	Field11833    *bool                 `protobuf:"varint,29,opt,name=field11833" json:"field11833,omitempty"`
+	Field11834    *bool                 `protobuf:"varint,34,opt,name=field11834" json:"field11834,omitempty"`
+	Field11835    *string               `protobuf:"bytes,30,opt,name=field11835" json:"field11835,omitempty"`
+	Field11836    *int32                `protobuf:"varint,3,opt,name=field11836" json:"field11836,omitempty"`
+	Field11837    *int32                `protobuf:"varint,31,opt,name=field11837" json:"field11837,omitempty"`
+	Field11838    *int32                `protobuf:"varint,73,opt,name=field11838" json:"field11838,omitempty"`
+	Field11839    *int32                `protobuf:"varint,35,opt,name=field11839" json:"field11839,omitempty"`
+	Field11840    *Enum11022            `protobuf:"varint,36,opt,name=field11840,enum=benchmarks.google_message3.Enum11022" json:"field11840,omitempty"`
+	Field11841    *Message11013         `protobuf:"bytes,38,opt,name=field11841" json:"field11841,omitempty"`
+	Field11842    *float64              `protobuf:"fixed64,39,opt,name=field11842" json:"field11842,omitempty"`
+	Field11843    *int32                `protobuf:"varint,45,opt,name=field11843" json:"field11843,omitempty"`
+	Field11844    *bool                 `protobuf:"varint,74,opt,name=field11844" json:"field11844,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11014) Reset() {
@@ -1634,12 +1624,11 @@
 }
 
 type Message10801 struct {
-	Field10812           *Message10800           `protobuf:"bytes,1,opt,name=field10812" json:"field10812,omitempty"`
-	Field10813           []*Message10802         `protobuf:"bytes,2,rep,name=field10813" json:"field10813,omitempty"`
-	Field10814           *int32                  `protobuf:"varint,3,opt,name=field10814" json:"field10814,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10812    *Message10800   `protobuf:"bytes,1,opt,name=field10812" json:"field10812,omitempty"`
+	Field10813    []*Message10802 `protobuf:"bytes,2,rep,name=field10813" json:"field10813,omitempty"`
+	Field10814    *int32          `protobuf:"varint,3,opt,name=field10814" json:"field10814,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10801) Reset() {
@@ -1687,10 +1676,9 @@
 }
 
 type Message10749 struct {
-	Field10754           []*Message10748         `protobuf:"bytes,1,rep,name=field10754" json:"field10754,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10754    []*Message10748 `protobuf:"bytes,1,rep,name=field10754" json:"field10754,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10749) Reset() {
@@ -1724,12 +1712,11 @@
 }
 
 type Message8298 struct {
-	Field8321            *Message7966            `protobuf:"bytes,1,opt,name=field8321" json:"field8321,omitempty"`
-	Field8322            *int64                  `protobuf:"varint,2,opt,name=field8322" json:"field8322,omitempty"`
-	Field8323            *string                 `protobuf:"bytes,3,opt,name=field8323" json:"field8323,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8321     *Message7966 `protobuf:"bytes,1,opt,name=field8321" json:"field8321,omitempty"`
+	Field8322     *int64       `protobuf:"varint,2,opt,name=field8322" json:"field8322,omitempty"`
+	Field8323     *string      `protobuf:"bytes,3,opt,name=field8323" json:"field8323,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8298) Reset() {
@@ -1777,11 +1764,10 @@
 }
 
 type Message8300 struct {
-	Field8326            *string                 `protobuf:"bytes,1,opt,name=field8326" json:"field8326,omitempty"`
-	Field8327            *Message7966            `protobuf:"bytes,2,opt,name=field8327" json:"field8327,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8326     *string      `protobuf:"bytes,1,opt,name=field8326" json:"field8326,omitempty"`
+	Field8327     *Message7966 `protobuf:"bytes,2,opt,name=field8327" json:"field8327,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8300) Reset() {
@@ -1822,14 +1808,13 @@
 }
 
 type Message8291 struct {
-	Field8306            *string                 `protobuf:"bytes,1,opt,name=field8306" json:"field8306,omitempty"`
-	Field8307            *int32                  `protobuf:"varint,2,opt,name=field8307" json:"field8307,omitempty"`
-	Field8308            *string                 `protobuf:"bytes,3,opt,name=field8308" json:"field8308,omitempty"`
-	Field8309            *string                 `protobuf:"bytes,4,opt,name=field8309" json:"field8309,omitempty"`
-	Field8310            *Enum8292               `protobuf:"varint,5,opt,name=field8310,enum=benchmarks.google_message3.Enum8292" json:"field8310,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8306     *string   `protobuf:"bytes,1,opt,name=field8306" json:"field8306,omitempty"`
+	Field8307     *int32    `protobuf:"varint,2,opt,name=field8307" json:"field8307,omitempty"`
+	Field8308     *string   `protobuf:"bytes,3,opt,name=field8308" json:"field8308,omitempty"`
+	Field8309     *string   `protobuf:"bytes,4,opt,name=field8309" json:"field8309,omitempty"`
+	Field8310     *Enum8292 `protobuf:"varint,5,opt,name=field8310,enum=benchmarks.google_message3.Enum8292" json:"field8310,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8291) Reset() {
@@ -1891,15 +1876,14 @@
 }
 
 type Message8296 struct {
-	Field8311            *Message7966            `protobuf:"bytes,1,opt,name=field8311" json:"field8311,omitempty"`
-	Field8312            *string                 `protobuf:"bytes,2,opt,name=field8312" json:"field8312,omitempty"`
-	Field8313            *Message7966            `protobuf:"bytes,3,opt,name=field8313" json:"field8313,omitempty"`
-	Field8314            *int32                  `protobuf:"varint,4,opt,name=field8314" json:"field8314,omitempty"`
-	Field8315            *int32                  `protobuf:"varint,5,opt,name=field8315" json:"field8315,omitempty"`
-	Field8316            *string                 `protobuf:"bytes,6,opt,name=field8316" json:"field8316,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8311     *Message7966 `protobuf:"bytes,1,opt,name=field8311" json:"field8311,omitempty"`
+	Field8312     *string      `protobuf:"bytes,2,opt,name=field8312" json:"field8312,omitempty"`
+	Field8313     *Message7966 `protobuf:"bytes,3,opt,name=field8313" json:"field8313,omitempty"`
+	Field8314     *int32       `protobuf:"varint,4,opt,name=field8314" json:"field8314,omitempty"`
+	Field8315     *int32       `protobuf:"varint,5,opt,name=field8315" json:"field8315,omitempty"`
+	Field8316     *string      `protobuf:"bytes,6,opt,name=field8316" json:"field8316,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8296) Reset() {
@@ -1968,11 +1952,10 @@
 }
 
 type Message7965 struct {
-	Field7967            *int32                  `protobuf:"varint,1,opt,name=field7967" json:"field7967,omitempty"`
-	Field7968            *int32                  `protobuf:"varint,2,opt,name=field7968" json:"field7968,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7967     *int32 `protobuf:"varint,1,opt,name=field7967" json:"field7967,omitempty"`
+	Field7968     *int32 `protobuf:"varint,2,opt,name=field7968" json:"field7968,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7965) Reset() {
@@ -2013,11 +1996,10 @@
 }
 
 type Message8290 struct {
-	Field8304            *string                 `protobuf:"bytes,1,opt,name=field8304" json:"field8304,omitempty"`
-	Field8305            *string                 `protobuf:"bytes,2,opt,name=field8305" json:"field8305,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8304     *string `protobuf:"bytes,1,opt,name=field8304" json:"field8304,omitempty"`
+	Field8305     *string `protobuf:"bytes,2,opt,name=field8305" json:"field8305,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8290) Reset() {
@@ -2058,11 +2040,10 @@
 }
 
 type Message717 struct {
-	Field876             []string                `protobuf:"bytes,1,rep,name=field876" json:"field876,omitempty"`
-	Field877             *float64                `protobuf:"fixed64,2,opt,name=field877" json:"field877,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field876      []string `protobuf:"bytes,1,rep,name=field876" json:"field876,omitempty"`
+	Field877      *float64 `protobuf:"fixed64,2,opt,name=field877" json:"field877,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message717) Reset() {
@@ -2103,11 +2084,10 @@
 }
 
 type Message713 struct {
-	Field852             *Message708             `protobuf:"bytes,1,req,name=field852" json:"field852,omitempty"`
-	Field853             []string                `protobuf:"bytes,2,rep,name=field853" json:"field853,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field852      *Message708 `protobuf:"bytes,1,req,name=field852" json:"field852,omitempty"`
+	Field853      []string    `protobuf:"bytes,2,rep,name=field853" json:"field853,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message713) Reset() {
@@ -2148,16 +2128,15 @@
 }
 
 type Message705 struct {
-	Field807             *string                 `protobuf:"bytes,1,req,name=field807" json:"field807,omitempty"`
-	Field808             *string                 `protobuf:"bytes,2,opt,name=field808" json:"field808,omitempty"`
-	Field809             *string                 `protobuf:"bytes,3,opt,name=field809" json:"field809,omitempty"`
-	Field810             *bool                   `protobuf:"varint,4,opt,name=field810" json:"field810,omitempty"`
-	Field811             *string                 `protobuf:"bytes,5,opt,name=field811" json:"field811,omitempty"`
-	Field812             *string                 `protobuf:"bytes,6,opt,name=field812" json:"field812,omitempty"`
-	Field813             []string                `protobuf:"bytes,7,rep,name=field813" json:"field813,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field807      *string  `protobuf:"bytes,1,req,name=field807" json:"field807,omitempty"`
+	Field808      *string  `protobuf:"bytes,2,opt,name=field808" json:"field808,omitempty"`
+	Field809      *string  `protobuf:"bytes,3,opt,name=field809" json:"field809,omitempty"`
+	Field810      *bool    `protobuf:"varint,4,opt,name=field810" json:"field810,omitempty"`
+	Field811      *string  `protobuf:"bytes,5,opt,name=field811" json:"field811,omitempty"`
+	Field812      *string  `protobuf:"bytes,6,opt,name=field812" json:"field812,omitempty"`
+	Field813      []string `protobuf:"bytes,7,rep,name=field813" json:"field813,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message705) Reset() {
@@ -2233,14 +2212,13 @@
 }
 
 type Message709 struct {
-	Field829             []string                `protobuf:"bytes,1,rep,name=field829" json:"field829,omitempty"`
-	Field830             []string                `protobuf:"bytes,2,rep,name=field830" json:"field830,omitempty"`
-	Field831             []string                `protobuf:"bytes,3,rep,name=field831" json:"field831,omitempty"`
-	Field832             []string                `protobuf:"bytes,4,rep,name=field832" json:"field832,omitempty"`
-	Field833             []string                `protobuf:"bytes,5,rep,name=field833" json:"field833,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field829      []string `protobuf:"bytes,1,rep,name=field829" json:"field829,omitempty"`
+	Field830      []string `protobuf:"bytes,2,rep,name=field830" json:"field830,omitempty"`
+	Field831      []string `protobuf:"bytes,3,rep,name=field831" json:"field831,omitempty"`
+	Field832      []string `protobuf:"bytes,4,rep,name=field832" json:"field832,omitempty"`
+	Field833      []string `protobuf:"bytes,5,rep,name=field833" json:"field833,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message709) Reset() {
@@ -2302,11 +2280,10 @@
 }
 
 type Message702 struct {
-	Field793             *string                 `protobuf:"bytes,1,opt,name=field793" json:"field793,omitempty"`
-	Field794             *string                 `protobuf:"bytes,2,opt,name=field794" json:"field794,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field793      *string `protobuf:"bytes,1,opt,name=field793" json:"field793,omitempty"`
+	Field794      *string `protobuf:"bytes,2,opt,name=field794" json:"field794,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message702) Reset() {
@@ -2347,14 +2324,13 @@
 }
 
 type Message714 struct {
-	Field854             *string                 `protobuf:"bytes,1,opt,name=field854" json:"field854,omitempty"`
-	Field855             *string                 `protobuf:"bytes,2,opt,name=field855" json:"field855,omitempty"`
-	Field856             *string                 `protobuf:"bytes,3,opt,name=field856" json:"field856,omitempty"`
-	Field857             *string                 `protobuf:"bytes,4,opt,name=field857" json:"field857,omitempty"`
-	Field858             *uint32                 `protobuf:"varint,5,opt,name=field858" json:"field858,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field854      *string `protobuf:"bytes,1,opt,name=field854" json:"field854,omitempty"`
+	Field855      *string `protobuf:"bytes,2,opt,name=field855" json:"field855,omitempty"`
+	Field856      *string `protobuf:"bytes,3,opt,name=field856" json:"field856,omitempty"`
+	Field857      *string `protobuf:"bytes,4,opt,name=field857" json:"field857,omitempty"`
+	Field858      *uint32 `protobuf:"varint,5,opt,name=field858" json:"field858,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message714) Reset() {
@@ -2416,14 +2392,13 @@
 }
 
 type Message710 struct {
-	Field834             []string                `protobuf:"bytes,1,rep,name=field834" json:"field834,omitempty"`
-	Field835             *string                 `protobuf:"bytes,2,opt,name=field835" json:"field835,omitempty"`
-	Field836             *string                 `protobuf:"bytes,3,opt,name=field836" json:"field836,omitempty"`
-	Field837             []string                `protobuf:"bytes,4,rep,name=field837" json:"field837,omitempty"`
-	Field838             []string                `protobuf:"bytes,5,rep,name=field838" json:"field838,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field834      []string `protobuf:"bytes,1,rep,name=field834" json:"field834,omitempty"`
+	Field835      *string  `protobuf:"bytes,2,opt,name=field835" json:"field835,omitempty"`
+	Field836      *string  `protobuf:"bytes,3,opt,name=field836" json:"field836,omitempty"`
+	Field837      []string `protobuf:"bytes,4,rep,name=field837" json:"field837,omitempty"`
+	Field838      []string `protobuf:"bytes,5,rep,name=field838" json:"field838,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message710) Reset() {
@@ -2485,13 +2460,12 @@
 }
 
 type Message706 struct {
-	Field814             []string                `protobuf:"bytes,1,rep,name=field814" json:"field814,omitempty"`
-	Field815             *string                 `protobuf:"bytes,2,opt,name=field815" json:"field815,omitempty"`
-	Field816             []string                `protobuf:"bytes,3,rep,name=field816" json:"field816,omitempty"`
-	Field817             []string                `protobuf:"bytes,4,rep,name=field817" json:"field817,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field814      []string `protobuf:"bytes,1,rep,name=field814" json:"field814,omitempty"`
+	Field815      *string  `protobuf:"bytes,2,opt,name=field815" json:"field815,omitempty"`
+	Field816      []string `protobuf:"bytes,3,rep,name=field816" json:"field816,omitempty"`
+	Field817      []string `protobuf:"bytes,4,rep,name=field817" json:"field817,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message706) Reset() {
@@ -2546,14 +2520,13 @@
 }
 
 type Message707 struct {
-	Field818             *string                 `protobuf:"bytes,1,req,name=field818" json:"field818,omitempty"`
-	Field819             *string                 `protobuf:"bytes,2,req,name=field819" json:"field819,omitempty"`
-	Field820             *string                 `protobuf:"bytes,3,req,name=field820" json:"field820,omitempty"`
-	Field821             *bool                   `protobuf:"varint,4,opt,name=field821" json:"field821,omitempty"`
-	Field822             []string                `protobuf:"bytes,5,rep,name=field822" json:"field822,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field818      *string  `protobuf:"bytes,1,req,name=field818" json:"field818,omitempty"`
+	Field819      *string  `protobuf:"bytes,2,req,name=field819" json:"field819,omitempty"`
+	Field820      *string  `protobuf:"bytes,3,req,name=field820" json:"field820,omitempty"`
+	Field821      *bool    `protobuf:"varint,4,opt,name=field821" json:"field821,omitempty"`
+	Field822      []string `protobuf:"bytes,5,rep,name=field822" json:"field822,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message707) Reset() {
@@ -2615,13 +2588,12 @@
 }
 
 type Message711 struct {
-	Field839             *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field839" json:"field839,omitempty"`
-	Field840             []string                `protobuf:"bytes,4,rep,name=field840" json:"field840,omitempty"`
-	Field841             []string                `protobuf:"bytes,2,rep,name=field841" json:"field841,omitempty"`
-	Field842             []string                `protobuf:"bytes,3,rep,name=field842" json:"field842,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field839      *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field839" json:"field839,omitempty"`
+	Field840      []string            `protobuf:"bytes,4,rep,name=field840" json:"field840,omitempty"`
+	Field841      []string            `protobuf:"bytes,2,rep,name=field841" json:"field841,omitempty"`
+	Field842      []string            `protobuf:"bytes,3,rep,name=field842" json:"field842,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message711) Reset() {
@@ -2676,18 +2648,17 @@
 }
 
 type Message712 struct {
-	Field843             []string                `protobuf:"bytes,1,rep,name=field843" json:"field843,omitempty"`
-	Field844             *string                 `protobuf:"bytes,2,req,name=field844" json:"field844,omitempty"`
-	Field845             *string                 `protobuf:"bytes,3,opt,name=field845" json:"field845,omitempty"`
-	Field846             []string                `protobuf:"bytes,4,rep,name=field846" json:"field846,omitempty"`
-	Field847             []string                `protobuf:"bytes,5,rep,name=field847" json:"field847,omitempty"`
-	Field848             *string                 `protobuf:"bytes,6,opt,name=field848" json:"field848,omitempty"`
-	Field849             []string                `protobuf:"bytes,7,rep,name=field849" json:"field849,omitempty"`
-	Field850             *string                 `protobuf:"bytes,8,opt,name=field850" json:"field850,omitempty"`
-	Field851             *string                 `protobuf:"bytes,9,opt,name=field851" json:"field851,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field843      []string `protobuf:"bytes,1,rep,name=field843" json:"field843,omitempty"`
+	Field844      *string  `protobuf:"bytes,2,req,name=field844" json:"field844,omitempty"`
+	Field845      *string  `protobuf:"bytes,3,opt,name=field845" json:"field845,omitempty"`
+	Field846      []string `protobuf:"bytes,4,rep,name=field846" json:"field846,omitempty"`
+	Field847      []string `protobuf:"bytes,5,rep,name=field847" json:"field847,omitempty"`
+	Field848      *string  `protobuf:"bytes,6,opt,name=field848" json:"field848,omitempty"`
+	Field849      []string `protobuf:"bytes,7,rep,name=field849" json:"field849,omitempty"`
+	Field850      *string  `protobuf:"bytes,8,opt,name=field850" json:"field850,omitempty"`
+	Field851      *string  `protobuf:"bytes,9,opt,name=field851" json:"field851,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message712) Reset() {
@@ -2777,31 +2748,30 @@
 }
 
 type Message8939 struct {
-	Field9010            *string                    `protobuf:"bytes,1,opt,name=field9010" json:"field9010,omitempty"`
-	Field9011            *string                    `protobuf:"bytes,2,opt,name=field9011" json:"field9011,omitempty"`
-	Field9012            *string                    `protobuf:"bytes,3,opt,name=field9012" json:"field9012,omitempty"`
-	Field9013            []string                   `protobuf:"bytes,4,rep,name=field9013" json:"field9013,omitempty"`
-	Field9014            *string                    `protobuf:"bytes,5,opt,name=field9014" json:"field9014,omitempty"`
-	Message8940          []*Message8939_Message8940 `protobuf:"group,11,rep,name=Message8940,json=message8940" json:"message8940,omitempty"`
-	Field9016            *int64                     `protobuf:"varint,21,opt,name=field9016" json:"field9016,omitempty"`
-	Field9017            *int64                     `protobuf:"varint,22,opt,name=field9017" json:"field9017,omitempty"`
-	Field9018            *int64                     `protobuf:"varint,23,opt,name=field9018" json:"field9018,omitempty"`
-	Message8941          *Message8939_Message8941   `protobuf:"group,31,opt,name=Message8941,json=message8941" json:"message8941,omitempty"`
-	Field9020            *Message8942               `protobuf:"bytes,38,opt,name=field9020" json:"field9020,omitempty"`
-	Field9021            []*UnusedEmptyMessage      `protobuf:"bytes,39,rep,name=field9021" json:"field9021,omitempty"`
-	Field9022            []string                   `protobuf:"bytes,41,rep,name=field9022" json:"field9022,omitempty"`
-	Field9023            *string                    `protobuf:"bytes,42,opt,name=field9023" json:"field9023,omitempty"`
-	Field9024            *string                    `protobuf:"bytes,43,opt,name=field9024" json:"field9024,omitempty"`
-	Field9025            *string                    `protobuf:"bytes,44,opt,name=field9025" json:"field9025,omitempty"`
-	Field9026            *string                    `protobuf:"bytes,45,opt,name=field9026" json:"field9026,omitempty"`
-	Field9027            *string                    `protobuf:"bytes,46,opt,name=field9027" json:"field9027,omitempty"`
-	Field9028            *string                    `protobuf:"bytes,47,opt,name=field9028" json:"field9028,omitempty"`
-	Field9029            *UnusedEnum                `protobuf:"varint,48,opt,name=field9029,enum=benchmarks.google_message3.UnusedEnum" json:"field9029,omitempty"`
-	Field9030            *UnusedEnum                `protobuf:"varint,49,opt,name=field9030,enum=benchmarks.google_message3.UnusedEnum" json:"field9030,omitempty"`
-	Message8943          *Message8939_Message8943   `protobuf:"group,51,opt,name=Message8943,json=message8943" json:"message8943,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Field9010     *string                    `protobuf:"bytes,1,opt,name=field9010" json:"field9010,omitempty"`
+	Field9011     *string                    `protobuf:"bytes,2,opt,name=field9011" json:"field9011,omitempty"`
+	Field9012     *string                    `protobuf:"bytes,3,opt,name=field9012" json:"field9012,omitempty"`
+	Field9013     []string                   `protobuf:"bytes,4,rep,name=field9013" json:"field9013,omitempty"`
+	Field9014     *string                    `protobuf:"bytes,5,opt,name=field9014" json:"field9014,omitempty"`
+	Message8940   []*Message8939_Message8940 `protobuf:"group,11,rep,name=Message8940,json=message8940" json:"message8940,omitempty"`
+	Field9016     *int64                     `protobuf:"varint,21,opt,name=field9016" json:"field9016,omitempty"`
+	Field9017     *int64                     `protobuf:"varint,22,opt,name=field9017" json:"field9017,omitempty"`
+	Field9018     *int64                     `protobuf:"varint,23,opt,name=field9018" json:"field9018,omitempty"`
+	Message8941   *Message8939_Message8941   `protobuf:"group,31,opt,name=Message8941,json=message8941" json:"message8941,omitempty"`
+	Field9020     *Message8942               `protobuf:"bytes,38,opt,name=field9020" json:"field9020,omitempty"`
+	Field9021     []*UnusedEmptyMessage      `protobuf:"bytes,39,rep,name=field9021" json:"field9021,omitempty"`
+	Field9022     []string                   `protobuf:"bytes,41,rep,name=field9022" json:"field9022,omitempty"`
+	Field9023     *string                    `protobuf:"bytes,42,opt,name=field9023" json:"field9023,omitempty"`
+	Field9024     *string                    `protobuf:"bytes,43,opt,name=field9024" json:"field9024,omitempty"`
+	Field9025     *string                    `protobuf:"bytes,44,opt,name=field9025" json:"field9025,omitempty"`
+	Field9026     *string                    `protobuf:"bytes,45,opt,name=field9026" json:"field9026,omitempty"`
+	Field9027     *string                    `protobuf:"bytes,46,opt,name=field9027" json:"field9027,omitempty"`
+	Field9028     *string                    `protobuf:"bytes,47,opt,name=field9028" json:"field9028,omitempty"`
+	Field9029     *UnusedEnum                `protobuf:"varint,48,opt,name=field9029,enum=benchmarks.google_message3.UnusedEnum" json:"field9029,omitempty"`
+	Field9030     *UnusedEnum                `protobuf:"varint,49,opt,name=field9030,enum=benchmarks.google_message3.UnusedEnum" json:"field9030,omitempty"`
+	Message8943   *Message8939_Message8943   `protobuf:"group,51,opt,name=Message8943,json=message8943" json:"message8943,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8939) Reset() {
@@ -2982,10 +2952,9 @@
 }
 
 type Message9181 struct {
-	Field9204            *string                 `protobuf:"bytes,1,opt,name=field9204" json:"field9204,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9204     *string `protobuf:"bytes,1,opt,name=field9204" json:"field9204,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9181) Reset() {
@@ -3019,12 +2988,11 @@
 }
 
 type Message9164 struct {
-	Field9168            *int32                  `protobuf:"varint,1,opt,name=field9168" json:"field9168,omitempty"`
-	Field9169            *int32                  `protobuf:"varint,2,opt,name=field9169" json:"field9169,omitempty"`
-	Field9170            *int32                  `protobuf:"varint,3,opt,name=field9170" json:"field9170,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9168     *int32 `protobuf:"varint,1,opt,name=field9168" json:"field9168,omitempty"`
+	Field9169     *int32 `protobuf:"varint,2,opt,name=field9169" json:"field9169,omitempty"`
+	Field9170     *int32 `protobuf:"varint,3,opt,name=field9170" json:"field9170,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9164) Reset() {
@@ -3072,11 +3040,10 @@
 }
 
 type Message9165 struct {
-	Field9171            *float32                `protobuf:"fixed32,1,opt,name=field9171" json:"field9171,omitempty"`
-	Field9172            *float32                `protobuf:"fixed32,2,opt,name=field9172" json:"field9172,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9171     *float32 `protobuf:"fixed32,1,opt,name=field9171" json:"field9171,omitempty"`
+	Field9172     *float32 `protobuf:"fixed32,2,opt,name=field9172" json:"field9172,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9165) Reset() {
@@ -3117,11 +3084,10 @@
 }
 
 type Message9166 struct {
-	Field9173            *float32                `protobuf:"fixed32,1,opt,name=field9173" json:"field9173,omitempty"`
-	Field9174            *int32                  `protobuf:"varint,2,opt,name=field9174" json:"field9174,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9173     *float32 `protobuf:"fixed32,1,opt,name=field9173" json:"field9173,omitempty"`
+	Field9174     *int32   `protobuf:"varint,2,opt,name=field9174" json:"field9174,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9166) Reset() {
@@ -3162,17 +3128,16 @@
 }
 
 type Message9151 struct {
-	Field9152            *float64                `protobuf:"fixed64,1,opt,name=field9152" json:"field9152,omitempty"`
-	Field9153            *float64                `protobuf:"fixed64,2,opt,name=field9153" json:"field9153,omitempty"`
-	Field9154            *float32                `protobuf:"fixed32,3,opt,name=field9154" json:"field9154,omitempty"`
-	Field9155            *float32                `protobuf:"fixed32,4,opt,name=field9155" json:"field9155,omitempty"`
-	Field9156            *float32                `protobuf:"fixed32,5,opt,name=field9156" json:"field9156,omitempty"`
-	Field9157            *float32                `protobuf:"fixed32,6,opt,name=field9157" json:"field9157,omitempty"`
-	Field9158            *float32                `protobuf:"fixed32,7,opt,name=field9158" json:"field9158,omitempty"`
-	Field9159            *float32                `protobuf:"fixed32,8,opt,name=field9159" json:"field9159,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9152     *float64 `protobuf:"fixed64,1,opt,name=field9152" json:"field9152,omitempty"`
+	Field9153     *float64 `protobuf:"fixed64,2,opt,name=field9153" json:"field9153,omitempty"`
+	Field9154     *float32 `protobuf:"fixed32,3,opt,name=field9154" json:"field9154,omitempty"`
+	Field9155     *float32 `protobuf:"fixed32,4,opt,name=field9155" json:"field9155,omitempty"`
+	Field9156     *float32 `protobuf:"fixed32,5,opt,name=field9156" json:"field9156,omitempty"`
+	Field9157     *float32 `protobuf:"fixed32,6,opt,name=field9157" json:"field9157,omitempty"`
+	Field9158     *float32 `protobuf:"fixed32,7,opt,name=field9158" json:"field9158,omitempty"`
+	Field9159     *float32 `protobuf:"fixed32,8,opt,name=field9159" json:"field9159,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9151) Reset() {
@@ -3255,13 +3220,12 @@
 }
 
 type Message8888 struct {
-	Field8908            *int32                  `protobuf:"varint,1,opt,name=field8908" json:"field8908,omitempty"`
-	Field8909            *Enum8900               `protobuf:"varint,4,opt,name=field8909,enum=benchmarks.google_message3.Enum8900" json:"field8909,omitempty"`
-	Field8910            []int32                 `protobuf:"varint,2,rep,packed,name=field8910" json:"field8910,omitempty"`
-	Field8911            []byte                  `protobuf:"bytes,3,opt,name=field8911" json:"field8911,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8908     *int32    `protobuf:"varint,1,opt,name=field8908" json:"field8908,omitempty"`
+	Field8909     *Enum8900 `protobuf:"varint,4,opt,name=field8909,enum=benchmarks.google_message3.Enum8900" json:"field8909,omitempty"`
+	Field8910     []int32   `protobuf:"varint,2,rep,packed,name=field8910" json:"field8910,omitempty"`
+	Field8911     []byte    `protobuf:"bytes,3,opt,name=field8911" json:"field8911,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8888) Reset() {
@@ -3316,14 +3280,13 @@
 }
 
 type Message9627 struct {
-	Field9668            *int32                  `protobuf:"varint,1,req,name=field9668" json:"field9668,omitempty"`
-	Field9669            *int32                  `protobuf:"varint,2,req,name=field9669" json:"field9669,omitempty"`
-	Field9670            *int32                  `protobuf:"varint,3,req,name=field9670" json:"field9670,omitempty"`
-	Field9671            *int32                  `protobuf:"varint,4,req,name=field9671" json:"field9671,omitempty"`
-	Field9672            *float32                `protobuf:"fixed32,5,opt,name=field9672" json:"field9672,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9668     *int32   `protobuf:"varint,1,req,name=field9668" json:"field9668,omitempty"`
+	Field9669     *int32   `protobuf:"varint,2,req,name=field9669" json:"field9669,omitempty"`
+	Field9670     *int32   `protobuf:"varint,3,req,name=field9670" json:"field9670,omitempty"`
+	Field9671     *int32   `protobuf:"varint,4,req,name=field9671" json:"field9671,omitempty"`
+	Field9672     *float32 `protobuf:"fixed32,5,opt,name=field9672" json:"field9672,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message9627) Reset() {
@@ -3385,9 +3348,8 @@
 }
 
 type Message11020 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11020) Reset() {
@@ -3414,32 +3376,31 @@
 }
 
 type Message11013 struct {
-	Field11757           []byte                  `protobuf:"bytes,19,opt,name=field11757" json:"field11757,omitempty"`
-	Field11758           []byte                  `protobuf:"bytes,1,opt,name=field11758" json:"field11758,omitempty"`
-	Field11759           []byte                  `protobuf:"bytes,2,opt,name=field11759" json:"field11759,omitempty"`
-	Field11760           []byte                  `protobuf:"bytes,3,opt,name=field11760" json:"field11760,omitempty"`
-	Field11761           []byte                  `protobuf:"bytes,4,opt,name=field11761" json:"field11761,omitempty"`
-	Field11762           []byte                  `protobuf:"bytes,5,opt,name=field11762" json:"field11762,omitempty"`
-	Field11763           []byte                  `protobuf:"bytes,6,opt,name=field11763" json:"field11763,omitempty"`
-	Field11764           []byte                  `protobuf:"bytes,7,opt,name=field11764" json:"field11764,omitempty"`
-	Field11765           []byte                  `protobuf:"bytes,8,opt,name=field11765" json:"field11765,omitempty"`
-	Field11766           []byte                  `protobuf:"bytes,9,opt,name=field11766" json:"field11766,omitempty"`
-	Field11767           []byte                  `protobuf:"bytes,10,opt,name=field11767" json:"field11767,omitempty"`
-	Field11768           []byte                  `protobuf:"bytes,11,opt,name=field11768" json:"field11768,omitempty"`
-	Field11769           []byte                  `protobuf:"bytes,12,opt,name=field11769" json:"field11769,omitempty"`
-	Field11770           []byte                  `protobuf:"bytes,13,opt,name=field11770" json:"field11770,omitempty"`
-	Field11771           []byte                  `protobuf:"bytes,14,opt,name=field11771" json:"field11771,omitempty"`
-	Field11772           []byte                  `protobuf:"bytes,15,opt,name=field11772" json:"field11772,omitempty"`
-	Field11773           []byte                  `protobuf:"bytes,16,opt,name=field11773" json:"field11773,omitempty"`
-	Field11774           []byte                  `protobuf:"bytes,17,opt,name=field11774" json:"field11774,omitempty"`
-	Field11775           []byte                  `protobuf:"bytes,18,opt,name=field11775" json:"field11775,omitempty"`
-	Field11776           []byte                  `protobuf:"bytes,20,opt,name=field11776" json:"field11776,omitempty"`
-	Field11777           []byte                  `protobuf:"bytes,21,opt,name=field11777" json:"field11777,omitempty"`
-	Field11778           *UnusedEmptyMessage     `protobuf:"bytes,23,opt,name=field11778" json:"field11778,omitempty"`
-	Field11779           []*Message11011         `protobuf:"bytes,22,rep,name=field11779" json:"field11779,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field11757    []byte              `protobuf:"bytes,19,opt,name=field11757" json:"field11757,omitempty"`
+	Field11758    []byte              `protobuf:"bytes,1,opt,name=field11758" json:"field11758,omitempty"`
+	Field11759    []byte              `protobuf:"bytes,2,opt,name=field11759" json:"field11759,omitempty"`
+	Field11760    []byte              `protobuf:"bytes,3,opt,name=field11760" json:"field11760,omitempty"`
+	Field11761    []byte              `protobuf:"bytes,4,opt,name=field11761" json:"field11761,omitempty"`
+	Field11762    []byte              `protobuf:"bytes,5,opt,name=field11762" json:"field11762,omitempty"`
+	Field11763    []byte              `protobuf:"bytes,6,opt,name=field11763" json:"field11763,omitempty"`
+	Field11764    []byte              `protobuf:"bytes,7,opt,name=field11764" json:"field11764,omitempty"`
+	Field11765    []byte              `protobuf:"bytes,8,opt,name=field11765" json:"field11765,omitempty"`
+	Field11766    []byte              `protobuf:"bytes,9,opt,name=field11766" json:"field11766,omitempty"`
+	Field11767    []byte              `protobuf:"bytes,10,opt,name=field11767" json:"field11767,omitempty"`
+	Field11768    []byte              `protobuf:"bytes,11,opt,name=field11768" json:"field11768,omitempty"`
+	Field11769    []byte              `protobuf:"bytes,12,opt,name=field11769" json:"field11769,omitempty"`
+	Field11770    []byte              `protobuf:"bytes,13,opt,name=field11770" json:"field11770,omitempty"`
+	Field11771    []byte              `protobuf:"bytes,14,opt,name=field11771" json:"field11771,omitempty"`
+	Field11772    []byte              `protobuf:"bytes,15,opt,name=field11772" json:"field11772,omitempty"`
+	Field11773    []byte              `protobuf:"bytes,16,opt,name=field11773" json:"field11773,omitempty"`
+	Field11774    []byte              `protobuf:"bytes,17,opt,name=field11774" json:"field11774,omitempty"`
+	Field11775    []byte              `protobuf:"bytes,18,opt,name=field11775" json:"field11775,omitempty"`
+	Field11776    []byte              `protobuf:"bytes,20,opt,name=field11776" json:"field11776,omitempty"`
+	Field11777    []byte              `protobuf:"bytes,21,opt,name=field11777" json:"field11777,omitempty"`
+	Field11778    *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field11778" json:"field11778,omitempty"`
+	Field11779    []*Message11011     `protobuf:"bytes,22,rep,name=field11779" json:"field11779,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11013) Reset() {
@@ -3627,9 +3588,8 @@
 }
 
 type Message8939_Message8940 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8939_Message8940) Reset() {
@@ -3656,15 +3616,14 @@
 }
 
 type Message8939_Message8941 struct {
-	Field9033            *string                 `protobuf:"bytes,32,opt,name=field9033" json:"field9033,omitempty"`
-	Field9034            *string                 `protobuf:"bytes,33,opt,name=field9034" json:"field9034,omitempty"`
-	Field9035            *string                 `protobuf:"bytes,34,opt,name=field9035" json:"field9035,omitempty"`
-	Field9036            *string                 `protobuf:"bytes,35,opt,name=field9036" json:"field9036,omitempty"`
-	Field9037            *string                 `protobuf:"bytes,36,opt,name=field9037" json:"field9037,omitempty"`
-	Field9038            *string                 `protobuf:"bytes,37,opt,name=field9038" json:"field9038,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9033     *string `protobuf:"bytes,32,opt,name=field9033" json:"field9033,omitempty"`
+	Field9034     *string `protobuf:"bytes,33,opt,name=field9034" json:"field9034,omitempty"`
+	Field9035     *string `protobuf:"bytes,34,opt,name=field9035" json:"field9035,omitempty"`
+	Field9036     *string `protobuf:"bytes,35,opt,name=field9036" json:"field9036,omitempty"`
+	Field9037     *string `protobuf:"bytes,36,opt,name=field9037" json:"field9037,omitempty"`
+	Field9038     *string `protobuf:"bytes,37,opt,name=field9038" json:"field9038,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8939_Message8941) Reset() {
@@ -3733,15 +3692,14 @@
 }
 
 type Message8939_Message8943 struct {
-	Field9039            *string                 `protobuf:"bytes,1,opt,name=field9039" json:"field9039,omitempty"`
-	Field9040            *string                 `protobuf:"bytes,2,opt,name=field9040" json:"field9040,omitempty"`
-	Field9041            *string                 `protobuf:"bytes,3,opt,name=field9041" json:"field9041,omitempty"`
-	Field9042            *string                 `protobuf:"bytes,4,opt,name=field9042" json:"field9042,omitempty"`
-	Field9043            *string                 `protobuf:"bytes,5,opt,name=field9043" json:"field9043,omitempty"`
-	Field9044            *string                 `protobuf:"bytes,6,opt,name=field9044" json:"field9044,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field9039     *string `protobuf:"bytes,1,opt,name=field9039" json:"field9039,omitempty"`
+	Field9040     *string `protobuf:"bytes,2,opt,name=field9040" json:"field9040,omitempty"`
+	Field9041     *string `protobuf:"bytes,3,opt,name=field9041" json:"field9041,omitempty"`
+	Field9042     *string `protobuf:"bytes,4,opt,name=field9042" json:"field9042,omitempty"`
+	Field9043     *string `protobuf:"bytes,5,opt,name=field9043" json:"field9043,omitempty"`
+	Field9044     *string `protobuf:"bytes,6,opt,name=field9044" json:"field9044,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8939_Message8943) Reset() {
@@ -4749,6 +4707,430 @@
 	}
 	file_datasets_google_message3_benchmark_message3_7_proto_init()
 	file_datasets_google_message3_benchmark_message3_8_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10576); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10154); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8944); i {
+			case 62:
+				return &v.sizeCache
+			case 63:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9182); i {
+			case 26:
+				return &v.sizeCache
+			case 27:
+				return &v.unknownFields
+			case 28:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9160); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9242); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8890); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9123); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9628); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11014); i {
+			case 65:
+				return &v.sizeCache
+			case 66:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10801); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10749); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8298); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8300); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8291); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8296); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7965); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8290); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message717); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message713); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message705); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message709); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message702); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message714); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message710); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message706); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message707); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message711); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message712); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8939); i {
+			case 22:
+				return &v.sizeCache
+			case 23:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9181); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9164); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9165); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9166); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9151); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8888); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message9627); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11020); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11013); i {
+			case 23:
+				return &v.sizeCache
+			case 24:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8939_Message8940); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8939_Message8941); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_6_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8939_Message8943); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message3_benchmark_message3_6_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go
index 30d970a..6b9263e 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go
@@ -18,9 +18,8 @@
 )
 
 type Message11018 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11018) Reset() {
@@ -47,13 +46,12 @@
 }
 
 type Message10800 struct {
-	Field10808           *string                 `protobuf:"bytes,1,opt,name=field10808" json:"field10808,omitempty"`
-	Field10809           *int64                  `protobuf:"varint,2,opt,name=field10809" json:"field10809,omitempty"`
-	Field10810           *bool                   `protobuf:"varint,3,opt,name=field10810" json:"field10810,omitempty"`
-	Field10811           *float32                `protobuf:"fixed32,4,opt,name=field10811" json:"field10811,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10808    *string  `protobuf:"bytes,1,opt,name=field10808" json:"field10808,omitempty"`
+	Field10809    *int64   `protobuf:"varint,2,opt,name=field10809" json:"field10809,omitempty"`
+	Field10810    *bool    `protobuf:"varint,3,opt,name=field10810" json:"field10810,omitempty"`
+	Field10811    *float32 `protobuf:"fixed32,4,opt,name=field10811" json:"field10811,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10800) Reset() {
@@ -108,9 +106,8 @@
 }
 
 type Message10802 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10802) Reset() {
@@ -137,13 +134,12 @@
 }
 
 type Message10748 struct {
-	Field10750           *string                 `protobuf:"bytes,1,opt,name=field10750" json:"field10750,omitempty"`
-	Field10751           *int32                  `protobuf:"varint,2,opt,name=field10751" json:"field10751,omitempty"`
-	Field10752           *int32                  `protobuf:"varint,3,opt,name=field10752" json:"field10752,omitempty"`
-	Field10753           *int32                  `protobuf:"varint,4,opt,name=field10753" json:"field10753,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10750    *string `protobuf:"bytes,1,opt,name=field10750" json:"field10750,omitempty"`
+	Field10751    *int32  `protobuf:"varint,2,opt,name=field10751" json:"field10751,omitempty"`
+	Field10752    *int32  `protobuf:"varint,3,opt,name=field10752" json:"field10752,omitempty"`
+	Field10753    *int32  `protobuf:"varint,4,opt,name=field10753" json:"field10753,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10748) Reset() {
@@ -198,11 +194,10 @@
 }
 
 type Message7966 struct {
-	Field7969            *string                 `protobuf:"bytes,1,opt,name=field7969" json:"field7969,omitempty"`
-	Field7970            *bool                   `protobuf:"varint,2,opt,name=field7970" json:"field7970,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7969     *string `protobuf:"bytes,1,opt,name=field7969" json:"field7969,omitempty"`
+	Field7970     *bool   `protobuf:"varint,2,opt,name=field7970" json:"field7970,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7966) Reset() {
@@ -243,15 +238,14 @@
 }
 
 type Message708 struct {
-	Field823             *Message741             `protobuf:"bytes,1,opt,name=field823" json:"field823,omitempty"`
-	Field824             []string                `protobuf:"bytes,6,rep,name=field824" json:"field824,omitempty"`
-	Field825             *string                 `protobuf:"bytes,2,opt,name=field825" json:"field825,omitempty"`
-	Field826             *string                 `protobuf:"bytes,3,opt,name=field826" json:"field826,omitempty"`
-	Field827             []string                `protobuf:"bytes,4,rep,name=field827" json:"field827,omitempty"`
-	Field828             []string                `protobuf:"bytes,5,rep,name=field828" json:"field828,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field823      *Message741 `protobuf:"bytes,1,opt,name=field823" json:"field823,omitempty"`
+	Field824      []string    `protobuf:"bytes,6,rep,name=field824" json:"field824,omitempty"`
+	Field825      *string     `protobuf:"bytes,2,opt,name=field825" json:"field825,omitempty"`
+	Field826      *string     `protobuf:"bytes,3,opt,name=field826" json:"field826,omitempty"`
+	Field827      []string    `protobuf:"bytes,4,rep,name=field827" json:"field827,omitempty"`
+	Field828      []string    `protobuf:"bytes,5,rep,name=field828" json:"field828,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message708) Reset() {
@@ -320,9 +314,8 @@
 }
 
 type Message8942 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8942) Reset() {
@@ -349,11 +342,10 @@
 }
 
 type Message11011 struct {
-	Field11752           []byte                  `protobuf:"bytes,1,req,name=field11752" json:"field11752,omitempty"`
-	Field11753           []byte                  `protobuf:"bytes,2,req,name=field11753" json:"field11753,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field11752    []byte `protobuf:"bytes,1,req,name=field11752" json:"field11752,omitempty"`
+	Field11753    []byte `protobuf:"bytes,2,req,name=field11753" json:"field11753,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11011) Reset() {
@@ -394,9 +386,8 @@
 }
 
 type UnusedEmptyMessage struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *UnusedEmptyMessage) Reset() {
@@ -423,10 +414,9 @@
 }
 
 type Message741 struct {
-	Field936             []string                `protobuf:"bytes,1,rep,name=field936" json:"field936,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field936      []string `protobuf:"bytes,1,rep,name=field936" json:"field936,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message741) Reset() {
@@ -565,6 +555,108 @@
 	if File_datasets_google_message3_benchmark_message3_7_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11018); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10800); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10802); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10748); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7966); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message708); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8942); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11011); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UnusedEmptyMessage); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message3_benchmark_message3_7_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message741); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message3_benchmark_message3_7_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
index 0dc0eac..3027d94 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
@@ -18,25 +18,24 @@
 )
 
 type GoogleMessage4 struct {
-	Field37503           *int32                  `protobuf:"varint,1,opt,name=field37503" json:"field37503,omitempty"`
-	Field37504           *UnusedEmptyMessage     `protobuf:"bytes,2,opt,name=field37504" json:"field37504,omitempty"`
-	Field37505           *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field37505" json:"field37505,omitempty"`
-	Field37506           *UnusedEmptyMessage     `protobuf:"bytes,4,opt,name=field37506" json:"field37506,omitempty"`
-	Field37507           *UnusedEmptyMessage     `protobuf:"bytes,5,opt,name=field37507" json:"field37507,omitempty"`
-	Field37508           *Message37489           `protobuf:"bytes,6,opt,name=field37508" json:"field37508,omitempty"`
-	Field37509           *UnusedEmptyMessage     `protobuf:"bytes,7,opt,name=field37509" json:"field37509,omitempty"`
-	Field37510           *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field37510" json:"field37510,omitempty"`
-	Field37511           *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field37511" json:"field37511,omitempty"`
-	Field37512           *UnusedEmptyMessage     `protobuf:"bytes,10,opt,name=field37512" json:"field37512,omitempty"`
-	Field37513           *UnusedEmptyMessage     `protobuf:"bytes,11,opt,name=field37513" json:"field37513,omitempty"`
-	Field37514           *UnusedEmptyMessage     `protobuf:"bytes,12,opt,name=field37514" json:"field37514,omitempty"`
-	Field37515           *UnusedEmptyMessage     `protobuf:"bytes,13,opt,name=field37515" json:"field37515,omitempty"`
-	Field37516           *UnusedEmptyMessage     `protobuf:"bytes,14,opt,name=field37516" json:"field37516,omitempty"`
-	Field37517           *UnusedEmptyMessage     `protobuf:"bytes,15,opt,name=field37517" json:"field37517,omitempty"`
-	Field37518           *UnusedEmptyMessage     `protobuf:"bytes,16,opt,name=field37518" json:"field37518,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37503    *int32              `protobuf:"varint,1,opt,name=field37503" json:"field37503,omitempty"`
+	Field37504    *UnusedEmptyMessage `protobuf:"bytes,2,opt,name=field37504" json:"field37504,omitempty"`
+	Field37505    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field37505" json:"field37505,omitempty"`
+	Field37506    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37506" json:"field37506,omitempty"`
+	Field37507    *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field37507" json:"field37507,omitempty"`
+	Field37508    *Message37489       `protobuf:"bytes,6,opt,name=field37508" json:"field37508,omitempty"`
+	Field37509    *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37509" json:"field37509,omitempty"`
+	Field37510    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field37510" json:"field37510,omitempty"`
+	Field37511    *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field37511" json:"field37511,omitempty"`
+	Field37512    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field37512" json:"field37512,omitempty"`
+	Field37513    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37513" json:"field37513,omitempty"`
+	Field37514    *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field37514" json:"field37514,omitempty"`
+	Field37515    *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field37515" json:"field37515,omitempty"`
+	Field37516    *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field37516" json:"field37516,omitempty"`
+	Field37517    *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field37517" json:"field37517,omitempty"`
+	Field37518    *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field37518" json:"field37518,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GoogleMessage4) Reset() {
@@ -175,30 +174,29 @@
 }
 
 type Message37489 struct {
-	Field37534           *Message2517            `protobuf:"bytes,3,opt,name=field37534" json:"field37534,omitempty"`
-	Field37535           *Message7330            `protobuf:"bytes,4,opt,name=field37535" json:"field37535,omitempty"`
-	Field37536           *Message8815            `protobuf:"bytes,6,opt,name=field37536" json:"field37536,omitempty"`
-	Field37537           *Message8817            `protobuf:"bytes,7,opt,name=field37537" json:"field37537,omitempty"`
-	Field37538           *Message8835            `protobuf:"bytes,8,opt,name=field37538" json:"field37538,omitempty"`
-	Field37539           *Message8848            `protobuf:"bytes,9,opt,name=field37539" json:"field37539,omitempty"`
-	Field37540           *Message8856            `protobuf:"bytes,11,opt,name=field37540" json:"field37540,omitempty"`
-	Field37541           *Message12717           `protobuf:"bytes,15,opt,name=field37541" json:"field37541,omitempty"`
-	Field37542           *Message12748           `protobuf:"bytes,20,opt,name=field37542" json:"field37542,omitempty"`
-	Field37543           *Message7319            `protobuf:"bytes,22,opt,name=field37543" json:"field37543,omitempty"`
-	Field37544           *Message12908           `protobuf:"bytes,24,opt,name=field37544" json:"field37544,omitempty"`
-	Field37545           *Message12910           `protobuf:"bytes,25,opt,name=field37545" json:"field37545,omitempty"`
-	Field37546           *Message12960           `protobuf:"bytes,30,opt,name=field37546" json:"field37546,omitempty"`
-	Field37547           *Message176             `protobuf:"bytes,33,opt,name=field37547" json:"field37547,omitempty"`
-	Field37548           *Message13000           `protobuf:"bytes,34,opt,name=field37548" json:"field37548,omitempty"`
-	Field37549           *Message13035           `protobuf:"bytes,35,opt,name=field37549" json:"field37549,omitempty"`
-	Field37550           *Message37331           `protobuf:"bytes,36,opt,name=field37550" json:"field37550,omitempty"`
-	Field37551           *Message37329           `protobuf:"bytes,37,opt,name=field37551" json:"field37551,omitempty"`
-	Field37552           *Message37327           `protobuf:"bytes,38,opt,name=field37552" json:"field37552,omitempty"`
-	Field37553           *Message37333           `protobuf:"bytes,39,opt,name=field37553" json:"field37553,omitempty"`
-	Field37554           *Message37335           `protobuf:"bytes,40,opt,name=field37554" json:"field37554,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37534    *Message2517  `protobuf:"bytes,3,opt,name=field37534" json:"field37534,omitempty"`
+	Field37535    *Message7330  `protobuf:"bytes,4,opt,name=field37535" json:"field37535,omitempty"`
+	Field37536    *Message8815  `protobuf:"bytes,6,opt,name=field37536" json:"field37536,omitempty"`
+	Field37537    *Message8817  `protobuf:"bytes,7,opt,name=field37537" json:"field37537,omitempty"`
+	Field37538    *Message8835  `protobuf:"bytes,8,opt,name=field37538" json:"field37538,omitempty"`
+	Field37539    *Message8848  `protobuf:"bytes,9,opt,name=field37539" json:"field37539,omitempty"`
+	Field37540    *Message8856  `protobuf:"bytes,11,opt,name=field37540" json:"field37540,omitempty"`
+	Field37541    *Message12717 `protobuf:"bytes,15,opt,name=field37541" json:"field37541,omitempty"`
+	Field37542    *Message12748 `protobuf:"bytes,20,opt,name=field37542" json:"field37542,omitempty"`
+	Field37543    *Message7319  `protobuf:"bytes,22,opt,name=field37543" json:"field37543,omitempty"`
+	Field37544    *Message12908 `protobuf:"bytes,24,opt,name=field37544" json:"field37544,omitempty"`
+	Field37545    *Message12910 `protobuf:"bytes,25,opt,name=field37545" json:"field37545,omitempty"`
+	Field37546    *Message12960 `protobuf:"bytes,30,opt,name=field37546" json:"field37546,omitempty"`
+	Field37547    *Message176   `protobuf:"bytes,33,opt,name=field37547" json:"field37547,omitempty"`
+	Field37548    *Message13000 `protobuf:"bytes,34,opt,name=field37548" json:"field37548,omitempty"`
+	Field37549    *Message13035 `protobuf:"bytes,35,opt,name=field37549" json:"field37549,omitempty"`
+	Field37550    *Message37331 `protobuf:"bytes,36,opt,name=field37550" json:"field37550,omitempty"`
+	Field37551    *Message37329 `protobuf:"bytes,37,opt,name=field37551" json:"field37551,omitempty"`
+	Field37552    *Message37327 `protobuf:"bytes,38,opt,name=field37552" json:"field37552,omitempty"`
+	Field37553    *Message37333 `protobuf:"bytes,39,opt,name=field37553" json:"field37553,omitempty"`
+	Field37554    *Message37335 `protobuf:"bytes,40,opt,name=field37554" json:"field37554,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37489) Reset() {
@@ -372,11 +370,10 @@
 }
 
 type Message7319 struct {
-	Field7321            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field7321" json:"field7321,omitempty"`
-	Field7322            *UnusedEmptyMessage     `protobuf:"bytes,7,opt,name=field7322" json:"field7322,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7321     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7321" json:"field7321,omitempty"`
+	Field7322     *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field7322" json:"field7322,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7319) Reset() {
@@ -417,18 +414,17 @@
 }
 
 type Message12717 struct {
-	Field12719           *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field12719" json:"field12719,omitempty"`
-	Field12720           *string                 `protobuf:"bytes,2,opt,name=field12720" json:"field12720,omitempty"`
-	Field12721           *uint32                 `protobuf:"varint,3,opt,name=field12721" json:"field12721,omitempty"`
-	Field12722           *Message11976           `protobuf:"bytes,4,opt,name=field12722" json:"field12722,omitempty"`
-	Field12723           []*Message11948         `protobuf:"bytes,5,rep,name=field12723" json:"field12723,omitempty"`
-	Field12724           *Message11947           `protobuf:"bytes,6,opt,name=field12724" json:"field12724,omitempty"`
-	Field12725           *Message12687           `protobuf:"bytes,7,opt,name=field12725" json:"field12725,omitempty"`
-	Field12726           []*Message11948         `protobuf:"bytes,8,rep,name=field12726" json:"field12726,omitempty"`
-	Field12727           *int64                  `protobuf:"varint,9,opt,name=field12727" json:"field12727,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12719    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12719" json:"field12719,omitempty"`
+	Field12720    *string             `protobuf:"bytes,2,opt,name=field12720" json:"field12720,omitempty"`
+	Field12721    *uint32             `protobuf:"varint,3,opt,name=field12721" json:"field12721,omitempty"`
+	Field12722    *Message11976       `protobuf:"bytes,4,opt,name=field12722" json:"field12722,omitempty"`
+	Field12723    []*Message11948     `protobuf:"bytes,5,rep,name=field12723" json:"field12723,omitempty"`
+	Field12724    *Message11947       `protobuf:"bytes,6,opt,name=field12724" json:"field12724,omitempty"`
+	Field12725    *Message12687       `protobuf:"bytes,7,opt,name=field12725" json:"field12725,omitempty"`
+	Field12726    []*Message11948     `protobuf:"bytes,8,rep,name=field12726" json:"field12726,omitempty"`
+	Field12727    *int64              `protobuf:"varint,9,opt,name=field12727" json:"field12727,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12717) Reset() {
@@ -518,13 +514,12 @@
 }
 
 type Message37331 struct {
-	Field37367           *UnusedEmptyMessage     `protobuf:"bytes,4,opt,name=field37367" json:"field37367,omitempty"`
-	Field37368           *Message37326           `protobuf:"bytes,1,req,name=field37368" json:"field37368,omitempty"`
-	Field37369           *int64                  `protobuf:"varint,2,req,name=field37369" json:"field37369,omitempty"`
-	Field37370           []byte                  `protobuf:"bytes,3,req,name=field37370" json:"field37370,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37367    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37367" json:"field37367,omitempty"`
+	Field37368    *Message37326       `protobuf:"bytes,1,req,name=field37368" json:"field37368,omitempty"`
+	Field37369    *int64              `protobuf:"varint,2,req,name=field37369" json:"field37369,omitempty"`
+	Field37370    []byte              `protobuf:"bytes,3,req,name=field37370" json:"field37370,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37331) Reset() {
@@ -579,12 +574,11 @@
 }
 
 type Message8815 struct {
-	Field8819            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field8819" json:"field8819,omitempty"`
-	Field8820            []*Message8768          `protobuf:"bytes,2,rep,name=field8820" json:"field8820,omitempty"`
-	Field8821            *bool                   `protobuf:"varint,3,opt,name=field8821" json:"field8821,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8819     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8819" json:"field8819,omitempty"`
+	Field8820     []*Message8768      `protobuf:"bytes,2,rep,name=field8820" json:"field8820,omitempty"`
+	Field8821     *bool               `protobuf:"varint,3,opt,name=field8821" json:"field8821,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8815) Reset() {
@@ -632,15 +626,14 @@
 }
 
 type Message7330 struct {
-	Field7332            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field7332" json:"field7332,omitempty"`
-	Field7333            *Message3069            `protobuf:"bytes,2,opt,name=field7333" json:"field7333,omitempty"`
-	Field7334            *Message7320            `protobuf:"bytes,3,opt,name=field7334" json:"field7334,omitempty"`
-	Field7335            *UnusedEmptyMessage     `protobuf:"bytes,4,opt,name=field7335" json:"field7335,omitempty"`
-	Field7336            *bool                   `protobuf:"varint,5,opt,name=field7336" json:"field7336,omitempty"`
-	Field7337            *int64                  `protobuf:"varint,6,opt,name=field7337" json:"field7337,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7332     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7332" json:"field7332,omitempty"`
+	Field7333     *Message3069        `protobuf:"bytes,2,opt,name=field7333" json:"field7333,omitempty"`
+	Field7334     *Message7320        `protobuf:"bytes,3,opt,name=field7334" json:"field7334,omitempty"`
+	Field7335     *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field7335" json:"field7335,omitempty"`
+	Field7336     *bool               `protobuf:"varint,5,opt,name=field7336" json:"field7336,omitempty"`
+	Field7337     *int64              `protobuf:"varint,6,opt,name=field7337" json:"field7337,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7330) Reset() {
@@ -709,11 +702,10 @@
 }
 
 type Message12960 struct {
-	Field12962           *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field12962" json:"field12962,omitempty"`
-	Field12963           *Message12948           `protobuf:"bytes,2,opt,name=field12963" json:"field12963,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12962    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12962" json:"field12962,omitempty"`
+	Field12963    *Message12948       `protobuf:"bytes,2,opt,name=field12963" json:"field12963,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12960) Reset() {
@@ -754,68 +746,67 @@
 }
 
 type Message176 struct {
-	Field408             *string                  `protobuf:"bytes,1,req,name=field408" json:"field408,omitempty"`
-	Field409             *int32                   `protobuf:"varint,4,opt,name=field409" json:"field409,omitempty"`
-	Field410             *string                  `protobuf:"bytes,50,opt,name=field410" json:"field410,omitempty"`
-	Field411             *int32                   `protobuf:"varint,2,opt,name=field411" json:"field411,omitempty"`
-	Field412             *uint64                  `protobuf:"varint,47,opt,name=field412" json:"field412,omitempty"`
-	Field413             *string                  `protobuf:"bytes,56,opt,name=field413" json:"field413,omitempty"`
-	Field414             *int32                   `protobuf:"varint,24,opt,name=field414" json:"field414,omitempty"`
-	Field415             *string                  `protobuf:"bytes,21,opt,name=field415" json:"field415,omitempty"`
-	Field416             []byte                   `protobuf:"bytes,3,opt,name=field416" json:"field416,omitempty"`
-	Field417             *string                  `protobuf:"bytes,57,opt,name=field417" json:"field417,omitempty"`
-	Field418             *int32                   `protobuf:"varint,51,opt,name=field418" json:"field418,omitempty"`
-	Field419             *float32                 `protobuf:"fixed32,7,opt,name=field419" json:"field419,omitempty"`
-	Field420             *bool                    `protobuf:"varint,5,opt,name=field420" json:"field420,omitempty"`
-	Field421             *bool                    `protobuf:"varint,28,opt,name=field421" json:"field421,omitempty"`
-	Field422             *int32                   `protobuf:"varint,6,opt,name=field422" json:"field422,omitempty"`
-	Field423             []int32                  `protobuf:"varint,40,rep,name=field423" json:"field423,omitempty"`
-	Field424             *UnusedEmptyMessage      `protobuf:"bytes,41,opt,name=field424" json:"field424,omitempty"`
-	Field425             *bool                    `protobuf:"varint,25,opt,name=field425" json:"field425,omitempty"`
-	Field426             *uint64                  `protobuf:"varint,26,opt,name=field426" json:"field426,omitempty"`
-	Field427             *int32                   `protobuf:"varint,38,opt,name=field427" json:"field427,omitempty"`
-	Field428             []byte                   `protobuf:"bytes,15,opt,name=field428" json:"field428,omitempty"`
-	Field429             []byte                   `protobuf:"bytes,55,opt,name=field429" json:"field429,omitempty"`
-	Field430             []byte                   `protobuf:"bytes,16,opt,name=field430" json:"field430,omitempty"`
-	Field431             []byte                   `protobuf:"bytes,23,opt,name=field431" json:"field431,omitempty"`
-	Field432             *bool                    `protobuf:"varint,33,opt,name=field432" json:"field432,omitempty"`
-	Field433             []byte                   `protobuf:"bytes,31,opt,name=field433" json:"field433,omitempty"`
-	Field434             []byte                   `protobuf:"bytes,32,opt,name=field434" json:"field434,omitempty"`
-	Field435             *int32                   `protobuf:"varint,36,opt,name=field435" json:"field435,omitempty"`
-	Field436             *uint64                  `protobuf:"varint,17,opt,name=field436" json:"field436,omitempty"`
-	Field437             *int32                   `protobuf:"varint,45,opt,name=field437" json:"field437,omitempty"`
-	Field438             *uint64                  `protobuf:"varint,18,opt,name=field438" json:"field438,omitempty"`
-	Field439             *string                  `protobuf:"bytes,46,opt,name=field439" json:"field439,omitempty"`
-	Field440             *UnusedEmptyMessage      `protobuf:"bytes,64,opt,name=field440" json:"field440,omitempty"`
-	Field441             *int32                   `protobuf:"varint,39,opt,name=field441" json:"field441,omitempty"`
-	Field442             *uint64                  `protobuf:"varint,48,opt,name=field442" json:"field442,omitempty"`
-	Field443             []byte                   `protobuf:"bytes,19,opt,name=field443" json:"field443,omitempty"`
-	Field444             []byte                   `protobuf:"bytes,42,opt,name=field444" json:"field444,omitempty"`
-	Field445             []byte                   `protobuf:"bytes,43,opt,name=field445" json:"field445,omitempty"`
-	Field446             *string                  `protobuf:"bytes,44,opt,name=field446" json:"field446,omitempty"`
-	Field447             *string                  `protobuf:"bytes,49,opt,name=field447" json:"field447,omitempty"`
-	Field448             *int64                   `protobuf:"varint,20,opt,name=field448" json:"field448,omitempty"`
-	Field449             *bool                    `protobuf:"varint,53,opt,name=field449" json:"field449,omitempty"`
-	Field450             *UnusedEmptyMessage      `protobuf:"bytes,54,opt,name=field450" json:"field450,omitempty"`
-	Field451             []*UnusedEmptyMessage    `protobuf:"bytes,22,rep,name=field451" json:"field451,omitempty"`
-	Field452             *UnusedEnum              `protobuf:"varint,27,opt,name=field452,enum=benchmarks.google_message4.UnusedEnum" json:"field452,omitempty"`
-	Field453             *int32                   `protobuf:"varint,29,opt,name=field453" json:"field453,omitempty"`
-	Field454             *int32                   `protobuf:"varint,30,opt,name=field454" json:"field454,omitempty"`
-	Field455             *UnusedEnum              `protobuf:"varint,37,opt,name=field455,enum=benchmarks.google_message4.UnusedEnum" json:"field455,omitempty"`
-	Field456             *UnusedEnum              `protobuf:"varint,34,opt,name=field456,enum=benchmarks.google_message4.UnusedEnum" json:"field456,omitempty"`
-	Field457             *int32                   `protobuf:"varint,35,opt,name=field457" json:"field457,omitempty"`
-	Message178           []*Message176_Message178 `protobuf:"group,101,rep,name=Message178,json=message178" json:"message178,omitempty"`
-	Field459             *bool                    `protobuf:"varint,52,opt,name=field459" json:"field459,omitempty"`
-	Field460             *uint64                  `protobuf:"varint,58,opt,name=field460" json:"field460,omitempty"`
-	Field461             *uint64                  `protobuf:"varint,59,opt,name=field461" json:"field461,omitempty"`
-	Field462             *UnusedEmptyMessage      `protobuf:"bytes,60,opt,name=field462" json:"field462,omitempty"`
-	Field463             *UnusedEmptyMessage      `protobuf:"bytes,61,opt,name=field463" json:"field463,omitempty"`
-	Field464             *UnusedEnum              `protobuf:"varint,62,opt,name=field464,enum=benchmarks.google_message4.UnusedEnum" json:"field464,omitempty"`
-	Field465             []string                 `protobuf:"bytes,63,rep,name=field465" json:"field465,omitempty"`
-	Field466             *UnusedEmptyMessage      `protobuf:"bytes,65,opt,name=field466" json:"field466,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields  `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache      `json:"-"`
+	Field408      *string                  `protobuf:"bytes,1,req,name=field408" json:"field408,omitempty"`
+	Field409      *int32                   `protobuf:"varint,4,opt,name=field409" json:"field409,omitempty"`
+	Field410      *string                  `protobuf:"bytes,50,opt,name=field410" json:"field410,omitempty"`
+	Field411      *int32                   `protobuf:"varint,2,opt,name=field411" json:"field411,omitempty"`
+	Field412      *uint64                  `protobuf:"varint,47,opt,name=field412" json:"field412,omitempty"`
+	Field413      *string                  `protobuf:"bytes,56,opt,name=field413" json:"field413,omitempty"`
+	Field414      *int32                   `protobuf:"varint,24,opt,name=field414" json:"field414,omitempty"`
+	Field415      *string                  `protobuf:"bytes,21,opt,name=field415" json:"field415,omitempty"`
+	Field416      []byte                   `protobuf:"bytes,3,opt,name=field416" json:"field416,omitempty"`
+	Field417      *string                  `protobuf:"bytes,57,opt,name=field417" json:"field417,omitempty"`
+	Field418      *int32                   `protobuf:"varint,51,opt,name=field418" json:"field418,omitempty"`
+	Field419      *float32                 `protobuf:"fixed32,7,opt,name=field419" json:"field419,omitempty"`
+	Field420      *bool                    `protobuf:"varint,5,opt,name=field420" json:"field420,omitempty"`
+	Field421      *bool                    `protobuf:"varint,28,opt,name=field421" json:"field421,omitempty"`
+	Field422      *int32                   `protobuf:"varint,6,opt,name=field422" json:"field422,omitempty"`
+	Field423      []int32                  `protobuf:"varint,40,rep,name=field423" json:"field423,omitempty"`
+	Field424      *UnusedEmptyMessage      `protobuf:"bytes,41,opt,name=field424" json:"field424,omitempty"`
+	Field425      *bool                    `protobuf:"varint,25,opt,name=field425" json:"field425,omitempty"`
+	Field426      *uint64                  `protobuf:"varint,26,opt,name=field426" json:"field426,omitempty"`
+	Field427      *int32                   `protobuf:"varint,38,opt,name=field427" json:"field427,omitempty"`
+	Field428      []byte                   `protobuf:"bytes,15,opt,name=field428" json:"field428,omitempty"`
+	Field429      []byte                   `protobuf:"bytes,55,opt,name=field429" json:"field429,omitempty"`
+	Field430      []byte                   `protobuf:"bytes,16,opt,name=field430" json:"field430,omitempty"`
+	Field431      []byte                   `protobuf:"bytes,23,opt,name=field431" json:"field431,omitempty"`
+	Field432      *bool                    `protobuf:"varint,33,opt,name=field432" json:"field432,omitempty"`
+	Field433      []byte                   `protobuf:"bytes,31,opt,name=field433" json:"field433,omitempty"`
+	Field434      []byte                   `protobuf:"bytes,32,opt,name=field434" json:"field434,omitempty"`
+	Field435      *int32                   `protobuf:"varint,36,opt,name=field435" json:"field435,omitempty"`
+	Field436      *uint64                  `protobuf:"varint,17,opt,name=field436" json:"field436,omitempty"`
+	Field437      *int32                   `protobuf:"varint,45,opt,name=field437" json:"field437,omitempty"`
+	Field438      *uint64                  `protobuf:"varint,18,opt,name=field438" json:"field438,omitempty"`
+	Field439      *string                  `protobuf:"bytes,46,opt,name=field439" json:"field439,omitempty"`
+	Field440      *UnusedEmptyMessage      `protobuf:"bytes,64,opt,name=field440" json:"field440,omitempty"`
+	Field441      *int32                   `protobuf:"varint,39,opt,name=field441" json:"field441,omitempty"`
+	Field442      *uint64                  `protobuf:"varint,48,opt,name=field442" json:"field442,omitempty"`
+	Field443      []byte                   `protobuf:"bytes,19,opt,name=field443" json:"field443,omitempty"`
+	Field444      []byte                   `protobuf:"bytes,42,opt,name=field444" json:"field444,omitempty"`
+	Field445      []byte                   `protobuf:"bytes,43,opt,name=field445" json:"field445,omitempty"`
+	Field446      *string                  `protobuf:"bytes,44,opt,name=field446" json:"field446,omitempty"`
+	Field447      *string                  `protobuf:"bytes,49,opt,name=field447" json:"field447,omitempty"`
+	Field448      *int64                   `protobuf:"varint,20,opt,name=field448" json:"field448,omitempty"`
+	Field449      *bool                    `protobuf:"varint,53,opt,name=field449" json:"field449,omitempty"`
+	Field450      *UnusedEmptyMessage      `protobuf:"bytes,54,opt,name=field450" json:"field450,omitempty"`
+	Field451      []*UnusedEmptyMessage    `protobuf:"bytes,22,rep,name=field451" json:"field451,omitempty"`
+	Field452      *UnusedEnum              `protobuf:"varint,27,opt,name=field452,enum=benchmarks.google_message4.UnusedEnum" json:"field452,omitempty"`
+	Field453      *int32                   `protobuf:"varint,29,opt,name=field453" json:"field453,omitempty"`
+	Field454      *int32                   `protobuf:"varint,30,opt,name=field454" json:"field454,omitempty"`
+	Field455      *UnusedEnum              `protobuf:"varint,37,opt,name=field455,enum=benchmarks.google_message4.UnusedEnum" json:"field455,omitempty"`
+	Field456      *UnusedEnum              `protobuf:"varint,34,opt,name=field456,enum=benchmarks.google_message4.UnusedEnum" json:"field456,omitempty"`
+	Field457      *int32                   `protobuf:"varint,35,opt,name=field457" json:"field457,omitempty"`
+	Message178    []*Message176_Message178 `protobuf:"group,101,rep,name=Message178,json=message178" json:"message178,omitempty"`
+	Field459      *bool                    `protobuf:"varint,52,opt,name=field459" json:"field459,omitempty"`
+	Field460      *uint64                  `protobuf:"varint,58,opt,name=field460" json:"field460,omitempty"`
+	Field461      *uint64                  `protobuf:"varint,59,opt,name=field461" json:"field461,omitempty"`
+	Field462      *UnusedEmptyMessage      `protobuf:"bytes,60,opt,name=field462" json:"field462,omitempty"`
+	Field463      *UnusedEmptyMessage      `protobuf:"bytes,61,opt,name=field463" json:"field463,omitempty"`
+	Field464      *UnusedEnum              `protobuf:"varint,62,opt,name=field464,enum=benchmarks.google_message4.UnusedEnum" json:"field464,omitempty"`
+	Field465      []string                 `protobuf:"bytes,63,rep,name=field465" json:"field465,omitempty"`
+	Field466      *UnusedEmptyMessage      `protobuf:"bytes,65,opt,name=field466" json:"field466,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message176) Reset() {
@@ -1255,12 +1246,11 @@
 }
 
 type Message8817 struct {
-	Field8825            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field8825" json:"field8825,omitempty"`
-	Field8826            []*Message8768          `protobuf:"bytes,2,rep,name=field8826" json:"field8826,omitempty"`
-	Field8827            *string                 `protobuf:"bytes,3,opt,name=field8827" json:"field8827,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8825     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8825" json:"field8825,omitempty"`
+	Field8826     []*Message8768      `protobuf:"bytes,2,rep,name=field8826" json:"field8826,omitempty"`
+	Field8827     *string             `protobuf:"bytes,3,opt,name=field8827" json:"field8827,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8817) Reset() {
@@ -1308,12 +1298,11 @@
 }
 
 type Message8835 struct {
-	Field8837            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field8837" json:"field8837,omitempty"`
-	Field8838            []string                `protobuf:"bytes,2,rep,name=field8838" json:"field8838,omitempty"`
-	Field8839            *UnusedEnum             `protobuf:"varint,3,opt,name=field8839,enum=benchmarks.google_message4.UnusedEnum" json:"field8839,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8837     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8837" json:"field8837,omitempty"`
+	Field8838     []string            `protobuf:"bytes,2,rep,name=field8838" json:"field8838,omitempty"`
+	Field8839     *UnusedEnum         `protobuf:"varint,3,opt,name=field8839,enum=benchmarks.google_message4.UnusedEnum" json:"field8839,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8835) Reset() {
@@ -1361,12 +1350,11 @@
 }
 
 type Message37333 struct {
-	Field37372           *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field37372" json:"field37372,omitempty"`
-	Field37373           *Message37326           `protobuf:"bytes,1,req,name=field37373" json:"field37373,omitempty"`
-	Field37374           *uint64                 `protobuf:"varint,2,opt,name=field37374" json:"field37374,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37372    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field37372" json:"field37372,omitempty"`
+	Field37373    *Message37326       `protobuf:"bytes,1,req,name=field37373" json:"field37373,omitempty"`
+	Field37374    *uint64             `protobuf:"varint,2,opt,name=field37374" json:"field37374,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37333) Reset() {
@@ -1414,11 +1402,10 @@
 }
 
 type Message13000 struct {
-	Field13015           *int64                  `protobuf:"varint,1,opt,name=field13015" json:"field13015,omitempty"`
-	Field13016           []*Message12979         `protobuf:"bytes,2,rep,name=field13016" json:"field13016,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13015    *int64          `protobuf:"varint,1,opt,name=field13015" json:"field13015,omitempty"`
+	Field13016    []*Message12979 `protobuf:"bytes,2,rep,name=field13016" json:"field13016,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13000) Reset() {
@@ -1459,13 +1446,12 @@
 }
 
 type Message37335 struct {
-	Field37376           *UnusedEmptyMessage     `protobuf:"bytes,4,opt,name=field37376" json:"field37376,omitempty"`
-	Field37377           *Message37326           `protobuf:"bytes,1,req,name=field37377" json:"field37377,omitempty"`
-	Field37378           *Message37173           `protobuf:"bytes,2,req,name=field37378" json:"field37378,omitempty"`
-	Field37379           *uint64                 `protobuf:"varint,3,opt,name=field37379" json:"field37379,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37376    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37376" json:"field37376,omitempty"`
+	Field37377    *Message37326       `protobuf:"bytes,1,req,name=field37377" json:"field37377,omitempty"`
+	Field37378    *Message37173       `protobuf:"bytes,2,req,name=field37378" json:"field37378,omitempty"`
+	Field37379    *uint64             `protobuf:"varint,3,opt,name=field37379" json:"field37379,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37335) Reset() {
@@ -1520,12 +1506,11 @@
 }
 
 type Message8848 struct {
-	Field8850            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field8850" json:"field8850,omitempty"`
-	Field8851            *string                 `protobuf:"bytes,2,opt,name=field8851" json:"field8851,omitempty"`
-	Field8852            []byte                  `protobuf:"bytes,3,opt,name=field8852" json:"field8852,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8850     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8850" json:"field8850,omitempty"`
+	Field8851     *string             `protobuf:"bytes,2,opt,name=field8851" json:"field8851,omitempty"`
+	Field8852     []byte              `protobuf:"bytes,3,opt,name=field8852" json:"field8852,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8848) Reset() {
@@ -1573,11 +1558,10 @@
 }
 
 type Message13035 struct {
-	Field13058           *int64                  `protobuf:"varint,1,opt,name=field13058" json:"field13058,omitempty"`
-	Field13059           []int64                 `protobuf:"varint,2,rep,name=field13059" json:"field13059,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field13058    *int64  `protobuf:"varint,1,opt,name=field13058" json:"field13058,omitempty"`
+	Field13059    []int64 `protobuf:"varint,2,rep,name=field13059" json:"field13059,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message13035) Reset() {
@@ -1618,11 +1602,10 @@
 }
 
 type Message8856 struct {
-	Field8858            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field8858" json:"field8858,omitempty"`
-	Field8859            *string                 `protobuf:"bytes,2,opt,name=field8859" json:"field8859,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8858     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8858" json:"field8858,omitempty"`
+	Field8859     *string             `protobuf:"bytes,2,opt,name=field8859" json:"field8859,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8856) Reset() {
@@ -1663,15 +1646,14 @@
 }
 
 type Message12908 struct {
-	Field12912           *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field12912" json:"field12912,omitempty"`
-	Field12913           *string                 `protobuf:"bytes,2,opt,name=field12913" json:"field12913,omitempty"`
-	Field12914           *Message12799           `protobuf:"bytes,3,opt,name=field12914" json:"field12914,omitempty"`
-	Field12915           *int64                  `protobuf:"varint,4,opt,name=field12915" json:"field12915,omitempty"`
-	Field12916           *Message3804            `protobuf:"bytes,5,opt,name=field12916" json:"field12916,omitempty"`
-	Field12917           *Message12870           `protobuf:"bytes,6,opt,name=field12917" json:"field12917,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12912    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12912" json:"field12912,omitempty"`
+	Field12913    *string             `protobuf:"bytes,2,opt,name=field12913" json:"field12913,omitempty"`
+	Field12914    *Message12799       `protobuf:"bytes,3,opt,name=field12914" json:"field12914,omitempty"`
+	Field12915    *int64              `protobuf:"varint,4,opt,name=field12915" json:"field12915,omitempty"`
+	Field12916    *Message3804        `protobuf:"bytes,5,opt,name=field12916" json:"field12916,omitempty"`
+	Field12917    *Message12870       `protobuf:"bytes,6,opt,name=field12917" json:"field12917,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12908) Reset() {
@@ -1740,12 +1722,11 @@
 }
 
 type Message12910 struct {
-	Field12920           *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field12920" json:"field12920,omitempty"`
-	Field12921           *Message12818           `protobuf:"bytes,2,opt,name=field12921" json:"field12921,omitempty"`
-	Field12922           []*Message12903         `protobuf:"bytes,3,rep,name=field12922" json:"field12922,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12920    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12920" json:"field12920,omitempty"`
+	Field12921    *Message12818       `protobuf:"bytes,2,opt,name=field12921" json:"field12921,omitempty"`
+	Field12922    []*Message12903     `protobuf:"bytes,3,rep,name=field12922" json:"field12922,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12910) Reset() {
@@ -1793,20 +1774,19 @@
 }
 
 type Message37327 struct {
-	Field37347           *UnusedEmptyMessage     `protobuf:"bytes,11,opt,name=field37347" json:"field37347,omitempty"`
-	Field37348           *Message37326           `protobuf:"bytes,1,req,name=field37348" json:"field37348,omitempty"`
-	Field37349           *bool                   `protobuf:"varint,2,opt,name=field37349" json:"field37349,omitempty"`
-	Field37350           *bool                   `protobuf:"varint,3,opt,name=field37350" json:"field37350,omitempty"`
-	Field37351           *bool                   `protobuf:"varint,4,opt,name=field37351" json:"field37351,omitempty"`
-	Field37352           *bool                   `protobuf:"varint,5,opt,name=field37352" json:"field37352,omitempty"`
-	Field37353           *bool                   `protobuf:"varint,6,opt,name=field37353" json:"field37353,omitempty"`
-	Field37354           *UnusedEmptyMessage     `protobuf:"bytes,7,opt,name=field37354" json:"field37354,omitempty"`
-	Field37355           *uint64                 `protobuf:"varint,8,opt,name=field37355" json:"field37355,omitempty"`
-	Field37356           *bool                   `protobuf:"varint,9,opt,name=field37356" json:"field37356,omitempty"`
-	Field37357           *bool                   `protobuf:"varint,10,opt,name=field37357" json:"field37357,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37347    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37347" json:"field37347,omitempty"`
+	Field37348    *Message37326       `protobuf:"bytes,1,req,name=field37348" json:"field37348,omitempty"`
+	Field37349    *bool               `protobuf:"varint,2,opt,name=field37349" json:"field37349,omitempty"`
+	Field37350    *bool               `protobuf:"varint,3,opt,name=field37350" json:"field37350,omitempty"`
+	Field37351    *bool               `protobuf:"varint,4,opt,name=field37351" json:"field37351,omitempty"`
+	Field37352    *bool               `protobuf:"varint,5,opt,name=field37352" json:"field37352,omitempty"`
+	Field37353    *bool               `protobuf:"varint,6,opt,name=field37353" json:"field37353,omitempty"`
+	Field37354    *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37354" json:"field37354,omitempty"`
+	Field37355    *uint64             `protobuf:"varint,8,opt,name=field37355" json:"field37355,omitempty"`
+	Field37356    *bool               `protobuf:"varint,9,opt,name=field37356" json:"field37356,omitempty"`
+	Field37357    *bool               `protobuf:"varint,10,opt,name=field37357" json:"field37357,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37327) Reset() {
@@ -1910,14 +1890,13 @@
 }
 
 type Message37329 struct {
-	Field37359           *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field37359" json:"field37359,omitempty"`
-	Field37360           *Message37326           `protobuf:"bytes,1,req,name=field37360" json:"field37360,omitempty"`
-	Field37361           *int64                  `protobuf:"varint,2,req,name=field37361" json:"field37361,omitempty"`
-	Field37362           *int64                  `protobuf:"varint,3,req,name=field37362" json:"field37362,omitempty"`
-	Field37363           *bool                   `protobuf:"varint,4,opt,name=field37363" json:"field37363,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37359    *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field37359" json:"field37359,omitempty"`
+	Field37360    *Message37326       `protobuf:"bytes,1,req,name=field37360" json:"field37360,omitempty"`
+	Field37361    *int64              `protobuf:"varint,2,req,name=field37361" json:"field37361,omitempty"`
+	Field37362    *int64              `protobuf:"varint,3,req,name=field37362" json:"field37362,omitempty"`
+	Field37363    *bool               `protobuf:"varint,4,opt,name=field37363" json:"field37363,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37329) Reset() {
@@ -1979,14 +1958,13 @@
 }
 
 type Message2517 struct {
-	Field2519            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field2519" json:"field2519,omitempty"`
-	Field2520            *Message2356            `protobuf:"bytes,2,opt,name=field2520" json:"field2520,omitempty"`
-	Field2521            *Message0               `protobuf:"bytes,3,opt,name=field2521" json:"field2521,omitempty"`
-	Field2522            *Message2463            `protobuf:"bytes,4,opt,name=field2522" json:"field2522,omitempty"`
-	Field2523            []*Message971           `protobuf:"bytes,5,rep,name=field2523" json:"field2523,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field2519     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field2519" json:"field2519,omitempty"`
+	Field2520     *Message2356        `protobuf:"bytes,2,opt,name=field2520" json:"field2520,omitempty"`
+	Field2521     *Message0           `protobuf:"bytes,3,opt,name=field2521" json:"field2521,omitempty"`
+	Field2522     *Message2463        `protobuf:"bytes,4,opt,name=field2522" json:"field2522,omitempty"`
+	Field2523     []*Message971       `protobuf:"bytes,5,rep,name=field2523" json:"field2523,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2517) Reset() {
@@ -2048,13 +2026,12 @@
 }
 
 type Message12748 struct {
-	Field12754           *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field12754" json:"field12754,omitempty"`
-	Field12755           *string                 `protobuf:"bytes,2,opt,name=field12755" json:"field12755,omitempty"`
-	Field12756           *string                 `protobuf:"bytes,3,opt,name=field12756" json:"field12756,omitempty"`
-	Field12757           *Enum12735              `protobuf:"varint,4,opt,name=field12757,enum=benchmarks.google_message4.Enum12735" json:"field12757,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12754    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12754" json:"field12754,omitempty"`
+	Field12755    *string             `protobuf:"bytes,2,opt,name=field12755" json:"field12755,omitempty"`
+	Field12756    *string             `protobuf:"bytes,3,opt,name=field12756" json:"field12756,omitempty"`
+	Field12757    *Enum12735          `protobuf:"varint,4,opt,name=field12757,enum=benchmarks.google_message4.Enum12735" json:"field12757,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12748) Reset() {
@@ -2109,10 +2086,9 @@
 }
 
 type Message12687 struct {
-	Field12701           []*Message12686         `protobuf:"bytes,1,rep,name=field12701" json:"field12701,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12701    []*Message12686 `protobuf:"bytes,1,rep,name=field12701" json:"field12701,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12687) Reset() {
@@ -2146,12 +2122,11 @@
 }
 
 type Message11948 struct {
-	Field11954           *string                 `protobuf:"bytes,1,opt,name=field11954" json:"field11954,omitempty"`
-	Field11955           []*Message11949         `protobuf:"bytes,2,rep,name=field11955" json:"field11955,omitempty"`
-	Field11956           *bool                   `protobuf:"varint,3,opt,name=field11956" json:"field11956,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field11954    *string         `protobuf:"bytes,1,opt,name=field11954" json:"field11954,omitempty"`
+	Field11955    []*Message11949 `protobuf:"bytes,2,rep,name=field11955" json:"field11955,omitempty"`
+	Field11956    *bool           `protobuf:"varint,3,opt,name=field11956" json:"field11956,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11948) Reset() {
@@ -2199,10 +2174,9 @@
 }
 
 type Message11976 struct {
-	Field12002           []*Message11975         `protobuf:"bytes,1,rep,name=field12002" json:"field12002,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12002    []*Message11975 `protobuf:"bytes,1,rep,name=field12002" json:"field12002,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11976) Reset() {
@@ -2236,11 +2210,10 @@
 }
 
 type Message7320 struct {
-	Field7323            *UnusedEmptyMessage     `protobuf:"bytes,1,opt,name=field7323" json:"field7323,omitempty"`
-	Field7324            *Message7287            `protobuf:"bytes,8,opt,name=field7324" json:"field7324,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7323     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7323" json:"field7323,omitempty"`
+	Field7324     *Message7287        `protobuf:"bytes,8,opt,name=field7324" json:"field7324,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7320) Reset() {
@@ -2281,13 +2254,12 @@
 }
 
 type Message3069 struct {
-	Field3374              *Message3061               `protobuf:"bytes,1,opt,name=field3374" json:"field3374,omitempty"`
-	Field3375              []byte                     `protobuf:"bytes,2,opt,name=field3375" json:"field3375,omitempty"`
-	Message3070            []*Message3069_Message3070 `protobuf:"group,3,rep,name=Message3070,json=message3070" json:"message3070,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                   `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields  `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache        `json:"-"`
+	Field3374       *Message3061               `protobuf:"bytes,1,opt,name=field3374" json:"field3374,omitempty"`
+	Field3375       []byte                     `protobuf:"bytes,2,opt,name=field3375" json:"field3375,omitempty"`
+	Message3070     []*Message3069_Message3070 `protobuf:"group,3,rep,name=Message3070,json=message3070" json:"message3070,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message3069) Reset() {
@@ -2344,10 +2316,9 @@
 }
 
 type Message12948 struct {
-	Field12958           []*Message12949         `protobuf:"bytes,1,rep,name=field12958" json:"field12958,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12958    []*Message12949 `protobuf:"bytes,1,rep,name=field12958" json:"field12958,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12948) Reset() {
@@ -2381,16 +2352,15 @@
 }
 
 type Message8768 struct {
-	Field8782            *string                 `protobuf:"bytes,1,opt,name=field8782" json:"field8782,omitempty"`
-	Field8783            *Message8572            `protobuf:"bytes,2,opt,name=field8783" json:"field8783,omitempty"`
-	Field8784            *bool                   `protobuf:"varint,3,opt,name=field8784" json:"field8784,omitempty"`
-	Field8785            []*Message8774          `protobuf:"bytes,4,rep,name=field8785" json:"field8785,omitempty"`
-	Field8786            *int64                  `protobuf:"varint,5,opt,name=field8786" json:"field8786,omitempty"`
-	Field8787            *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field8787" json:"field8787,omitempty"`
-	Field8788            *string                 `protobuf:"bytes,7,opt,name=field8788" json:"field8788,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8782     *string             `protobuf:"bytes,1,opt,name=field8782" json:"field8782,omitempty"`
+	Field8783     *Message8572        `protobuf:"bytes,2,opt,name=field8783" json:"field8783,omitempty"`
+	Field8784     *bool               `protobuf:"varint,3,opt,name=field8784" json:"field8784,omitempty"`
+	Field8785     []*Message8774      `protobuf:"bytes,4,rep,name=field8785" json:"field8785,omitempty"`
+	Field8786     *int64              `protobuf:"varint,5,opt,name=field8786" json:"field8786,omitempty"`
+	Field8787     *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field8787" json:"field8787,omitempty"`
+	Field8788     *string             `protobuf:"bytes,7,opt,name=field8788" json:"field8788,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8768) Reset() {
@@ -2466,16 +2436,15 @@
 }
 
 type Message12979 struct {
-	Field12981           []byte                  `protobuf:"bytes,1,req,name=field12981" json:"field12981,omitempty"`
-	Field12982           []string                `protobuf:"bytes,2,rep,name=field12982" json:"field12982,omitempty"`
-	Field12983           *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field12983" json:"field12983,omitempty"`
-	Field12984           *int64                  `protobuf:"varint,4,opt,name=field12984" json:"field12984,omitempty"`
-	Field12985           *string                 `protobuf:"bytes,5,opt,name=field12985" json:"field12985,omitempty"`
-	Field12986           *int32                  `protobuf:"varint,6,opt,name=field12986" json:"field12986,omitempty"`
-	Field12987           *UnusedEmptyMessage     `protobuf:"bytes,7,opt,name=field12987" json:"field12987,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12981    []byte              `protobuf:"bytes,1,req,name=field12981" json:"field12981,omitempty"`
+	Field12982    []string            `protobuf:"bytes,2,rep,name=field12982" json:"field12982,omitempty"`
+	Field12983    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field12983" json:"field12983,omitempty"`
+	Field12984    *int64              `protobuf:"varint,4,opt,name=field12984" json:"field12984,omitempty"`
+	Field12985    *string             `protobuf:"bytes,5,opt,name=field12985" json:"field12985,omitempty"`
+	Field12986    *int32              `protobuf:"varint,6,opt,name=field12986" json:"field12986,omitempty"`
+	Field12987    *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field12987" json:"field12987,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12979) Reset() {
@@ -2551,34 +2520,33 @@
 }
 
 type Message37173 struct {
-	Field37252           *string                 `protobuf:"bytes,1,opt,name=field37252" json:"field37252,omitempty"`
-	Field37253           *int64                  `protobuf:"varint,2,opt,name=field37253" json:"field37253,omitempty"`
-	Field37254           *UnusedEnum             `protobuf:"varint,4,opt,name=field37254,enum=benchmarks.google_message4.UnusedEnum" json:"field37254,omitempty"`
-	Field37255           *bool                   `protobuf:"varint,5,opt,name=field37255" json:"field37255,omitempty"`
-	Field37256           *bool                   `protobuf:"varint,6,opt,name=field37256" json:"field37256,omitempty"`
-	Field37257           *bool                   `protobuf:"varint,7,opt,name=field37257" json:"field37257,omitempty"`
-	Field37258           *string                 `protobuf:"bytes,8,opt,name=field37258" json:"field37258,omitempty"`
-	Field37259           *string                 `protobuf:"bytes,9,opt,name=field37259" json:"field37259,omitempty"`
-	Field37260           *uint32                 `protobuf:"varint,10,opt,name=field37260" json:"field37260,omitempty"`
-	Field37261           *uint32                 `protobuf:"fixed32,11,opt,name=field37261" json:"field37261,omitempty"`
-	Field37262           *string                 `protobuf:"bytes,12,opt,name=field37262" json:"field37262,omitempty"`
-	Field37263           *string                 `protobuf:"bytes,13,opt,name=field37263" json:"field37263,omitempty"`
-	Field37264           *string                 `protobuf:"bytes,14,opt,name=field37264" json:"field37264,omitempty"`
-	Field37265           *int32                  `protobuf:"varint,15,opt,name=field37265" json:"field37265,omitempty"`
-	Field37266           *int64                  `protobuf:"varint,16,opt,name=field37266" json:"field37266,omitempty"`
-	Field37267           *int64                  `protobuf:"varint,17,opt,name=field37267" json:"field37267,omitempty"`
-	Field37268           *int32                  `protobuf:"varint,18,opt,name=field37268" json:"field37268,omitempty"`
-	Field37269           *int32                  `protobuf:"varint,19,opt,name=field37269" json:"field37269,omitempty"`
-	Field37270           *UnusedEmptyMessage     `protobuf:"bytes,20,opt,name=field37270" json:"field37270,omitempty"`
-	Field37271           *UnusedEmptyMessage     `protobuf:"bytes,21,opt,name=field37271" json:"field37271,omitempty"`
-	Field37272           *UnusedEmptyMessage     `protobuf:"bytes,22,opt,name=field37272" json:"field37272,omitempty"`
-	Field37273           *UnusedEmptyMessage     `protobuf:"bytes,23,opt,name=field37273" json:"field37273,omitempty"`
-	Field37274           *UnusedEmptyMessage     `protobuf:"bytes,24,opt,name=field37274" json:"field37274,omitempty"`
-	Field37275           *string                 `protobuf:"bytes,25,opt,name=field37275" json:"field37275,omitempty"`
-	Field37276           *bool                   `protobuf:"varint,26,opt,name=field37276" json:"field37276,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37252    *string             `protobuf:"bytes,1,opt,name=field37252" json:"field37252,omitempty"`
+	Field37253    *int64              `protobuf:"varint,2,opt,name=field37253" json:"field37253,omitempty"`
+	Field37254    *UnusedEnum         `protobuf:"varint,4,opt,name=field37254,enum=benchmarks.google_message4.UnusedEnum" json:"field37254,omitempty"`
+	Field37255    *bool               `protobuf:"varint,5,opt,name=field37255" json:"field37255,omitempty"`
+	Field37256    *bool               `protobuf:"varint,6,opt,name=field37256" json:"field37256,omitempty"`
+	Field37257    *bool               `protobuf:"varint,7,opt,name=field37257" json:"field37257,omitempty"`
+	Field37258    *string             `protobuf:"bytes,8,opt,name=field37258" json:"field37258,omitempty"`
+	Field37259    *string             `protobuf:"bytes,9,opt,name=field37259" json:"field37259,omitempty"`
+	Field37260    *uint32             `protobuf:"varint,10,opt,name=field37260" json:"field37260,omitempty"`
+	Field37261    *uint32             `protobuf:"fixed32,11,opt,name=field37261" json:"field37261,omitempty"`
+	Field37262    *string             `protobuf:"bytes,12,opt,name=field37262" json:"field37262,omitempty"`
+	Field37263    *string             `protobuf:"bytes,13,opt,name=field37263" json:"field37263,omitempty"`
+	Field37264    *string             `protobuf:"bytes,14,opt,name=field37264" json:"field37264,omitempty"`
+	Field37265    *int32              `protobuf:"varint,15,opt,name=field37265" json:"field37265,omitempty"`
+	Field37266    *int64              `protobuf:"varint,16,opt,name=field37266" json:"field37266,omitempty"`
+	Field37267    *int64              `protobuf:"varint,17,opt,name=field37267" json:"field37267,omitempty"`
+	Field37268    *int32              `protobuf:"varint,18,opt,name=field37268" json:"field37268,omitempty"`
+	Field37269    *int32              `protobuf:"varint,19,opt,name=field37269" json:"field37269,omitempty"`
+	Field37270    *UnusedEmptyMessage `protobuf:"bytes,20,opt,name=field37270" json:"field37270,omitempty"`
+	Field37271    *UnusedEmptyMessage `protobuf:"bytes,21,opt,name=field37271" json:"field37271,omitempty"`
+	Field37272    *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field37272" json:"field37272,omitempty"`
+	Field37273    *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field37273" json:"field37273,omitempty"`
+	Field37274    *UnusedEmptyMessage `protobuf:"bytes,24,opt,name=field37274" json:"field37274,omitempty"`
+	Field37275    *string             `protobuf:"bytes,25,opt,name=field37275" json:"field37275,omitempty"`
+	Field37276    *bool               `protobuf:"varint,26,opt,name=field37276" json:"field37276,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37173) Reset() {
@@ -2780,17 +2748,16 @@
 }
 
 type Message12799 struct {
-	Field12809           *string                 `protobuf:"bytes,1,req,name=field12809" json:"field12809,omitempty"`
-	Field12810           []uint64                `protobuf:"fixed64,2,rep,name=field12810" json:"field12810,omitempty"`
-	Field12811           []*Message12776         `protobuf:"bytes,8,rep,name=field12811" json:"field12811,omitempty"`
-	Field12812           []int32                 `protobuf:"varint,4,rep,name=field12812" json:"field12812,omitempty"`
-	Field12813           []*Message12798         `protobuf:"bytes,5,rep,name=field12813" json:"field12813,omitempty"`
-	Field12814           *int32                  `protobuf:"varint,3,req,name=field12814" json:"field12814,omitempty"`
-	Field12815           *int32                  `protobuf:"varint,6,opt,name=field12815" json:"field12815,omitempty"`
-	Field12816           *Message12797           `protobuf:"bytes,7,opt,name=field12816" json:"field12816,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12809    *string         `protobuf:"bytes,1,req,name=field12809" json:"field12809,omitempty"`
+	Field12810    []uint64        `protobuf:"fixed64,2,rep,name=field12810" json:"field12810,omitempty"`
+	Field12811    []*Message12776 `protobuf:"bytes,8,rep,name=field12811" json:"field12811,omitempty"`
+	Field12812    []int32         `protobuf:"varint,4,rep,name=field12812" json:"field12812,omitempty"`
+	Field12813    []*Message12798 `protobuf:"bytes,5,rep,name=field12813" json:"field12813,omitempty"`
+	Field12814    *int32          `protobuf:"varint,3,req,name=field12814" json:"field12814,omitempty"`
+	Field12815    *int32          `protobuf:"varint,6,opt,name=field12815" json:"field12815,omitempty"`
+	Field12816    *Message12797   `protobuf:"bytes,7,opt,name=field12816" json:"field12816,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12799) Reset() {
@@ -2873,29 +2840,28 @@
 }
 
 type Message12870 struct {
-	Field12879           *int32                  `protobuf:"varint,1,req,name=field12879" json:"field12879,omitempty"`
-	Field12880           *int32                  `protobuf:"varint,7,opt,name=field12880" json:"field12880,omitempty"`
-	Field12881           *int32                  `protobuf:"varint,2,req,name=field12881" json:"field12881,omitempty"`
-	Field12882           *uint64                 `protobuf:"varint,3,opt,name=field12882" json:"field12882,omitempty"`
-	Field12883           *string                 `protobuf:"bytes,2001,opt,name=field12883" json:"field12883,omitempty"`
-	Field12884           *uint64                 `protobuf:"fixed64,4,opt,name=field12884" json:"field12884,omitempty"`
-	Field12885           []uint64                `protobuf:"fixed64,14,rep,name=field12885" json:"field12885,omitempty"`
-	Field12886           *int32                  `protobuf:"varint,9,opt,name=field12886" json:"field12886,omitempty"`
-	Field12887           *int64                  `protobuf:"varint,18,opt,name=field12887" json:"field12887,omitempty"`
-	Field12888           []*Message12870         `protobuf:"bytes,8,rep,name=field12888" json:"field12888,omitempty"`
-	Field12889           *int32                  `protobuf:"varint,5,opt,name=field12889" json:"field12889,omitempty"`
-	Field12890           *uint64                 `protobuf:"varint,6,opt,name=field12890" json:"field12890,omitempty"`
-	Field12891           *int32                  `protobuf:"varint,10,opt,name=field12891" json:"field12891,omitempty"`
-	Field12892           *int32                  `protobuf:"varint,11,opt,name=field12892" json:"field12892,omitempty"`
-	Field12893           *float64                `protobuf:"fixed64,12,opt,name=field12893" json:"field12893,omitempty"`
-	Field12894           *Message12825           `protobuf:"bytes,13,opt,name=field12894" json:"field12894,omitempty"`
-	Field12895           *float64                `protobuf:"fixed64,15,opt,name=field12895" json:"field12895,omitempty"`
-	Field12896           *string                 `protobuf:"bytes,16,opt,name=field12896" json:"field12896,omitempty"`
-	Field12897           *Enum12871              `protobuf:"varint,17,opt,name=field12897,enum=benchmarks.google_message4.Enum12871" json:"field12897,omitempty"`
-	Field12898           *int32                  `protobuf:"varint,19,opt,name=field12898" json:"field12898,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12879    *int32          `protobuf:"varint,1,req,name=field12879" json:"field12879,omitempty"`
+	Field12880    *int32          `protobuf:"varint,7,opt,name=field12880" json:"field12880,omitempty"`
+	Field12881    *int32          `protobuf:"varint,2,req,name=field12881" json:"field12881,omitempty"`
+	Field12882    *uint64         `protobuf:"varint,3,opt,name=field12882" json:"field12882,omitempty"`
+	Field12883    *string         `protobuf:"bytes,2001,opt,name=field12883" json:"field12883,omitempty"`
+	Field12884    *uint64         `protobuf:"fixed64,4,opt,name=field12884" json:"field12884,omitempty"`
+	Field12885    []uint64        `protobuf:"fixed64,14,rep,name=field12885" json:"field12885,omitempty"`
+	Field12886    *int32          `protobuf:"varint,9,opt,name=field12886" json:"field12886,omitempty"`
+	Field12887    *int64          `protobuf:"varint,18,opt,name=field12887" json:"field12887,omitempty"`
+	Field12888    []*Message12870 `protobuf:"bytes,8,rep,name=field12888" json:"field12888,omitempty"`
+	Field12889    *int32          `protobuf:"varint,5,opt,name=field12889" json:"field12889,omitempty"`
+	Field12890    *uint64         `protobuf:"varint,6,opt,name=field12890" json:"field12890,omitempty"`
+	Field12891    *int32          `protobuf:"varint,10,opt,name=field12891" json:"field12891,omitempty"`
+	Field12892    *int32          `protobuf:"varint,11,opt,name=field12892" json:"field12892,omitempty"`
+	Field12893    *float64        `protobuf:"fixed64,12,opt,name=field12893" json:"field12893,omitempty"`
+	Field12894    *Message12825   `protobuf:"bytes,13,opt,name=field12894" json:"field12894,omitempty"`
+	Field12895    *float64        `protobuf:"fixed64,15,opt,name=field12895" json:"field12895,omitempty"`
+	Field12896    *string         `protobuf:"bytes,16,opt,name=field12896" json:"field12896,omitempty"`
+	Field12897    *Enum12871      `protobuf:"varint,17,opt,name=field12897,enum=benchmarks.google_message4.Enum12871" json:"field12897,omitempty"`
+	Field12898    *int32          `protobuf:"varint,19,opt,name=field12898" json:"field12898,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12870) Reset() {
@@ -3062,16 +3028,15 @@
 }
 
 type Message3804 struct {
-	Field3818            *int64                  `protobuf:"varint,1,req,name=field3818" json:"field3818,omitempty"`
-	Field3819            *bool                   `protobuf:"varint,2,req,name=field3819" json:"field3819,omitempty"`
-	Field3820            []Enum3805              `protobuf:"varint,4,rep,name=field3820,enum=benchmarks.google_message4.Enum3805" json:"field3820,omitempty"`
-	Field3821            *int32                  `protobuf:"varint,5,opt,name=field3821" json:"field3821,omitempty"`
-	Field3822            *bool                   `protobuf:"varint,6,opt,name=field3822" json:"field3822,omitempty"`
-	Field3823            *int64                  `protobuf:"varint,7,opt,name=field3823" json:"field3823,omitempty"`
-	Field3824            *Enum3783               `protobuf:"varint,8,opt,name=field3824,enum=benchmarks.google_message4.Enum3783" json:"field3824,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3818     *int64     `protobuf:"varint,1,req,name=field3818" json:"field3818,omitempty"`
+	Field3819     *bool      `protobuf:"varint,2,req,name=field3819" json:"field3819,omitempty"`
+	Field3820     []Enum3805 `protobuf:"varint,4,rep,name=field3820,enum=benchmarks.google_message4.Enum3805" json:"field3820,omitempty"`
+	Field3821     *int32     `protobuf:"varint,5,opt,name=field3821" json:"field3821,omitempty"`
+	Field3822     *bool      `protobuf:"varint,6,opt,name=field3822" json:"field3822,omitempty"`
+	Field3823     *int64     `protobuf:"varint,7,opt,name=field3823" json:"field3823,omitempty"`
+	Field3824     *Enum3783  `protobuf:"varint,8,opt,name=field3824,enum=benchmarks.google_message4.Enum3783" json:"field3824,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3804) Reset() {
@@ -3147,12 +3112,11 @@
 }
 
 type Message12903 struct {
-	Field12905           *string                 `protobuf:"bytes,1,opt,name=field12905" json:"field12905,omitempty"`
-	Field12906           *Message8587            `protobuf:"bytes,2,opt,name=field12906" json:"field12906,omitempty"`
-	Field12907           []*Message8590          `protobuf:"bytes,3,rep,name=field12907" json:"field12907,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12905    *string        `protobuf:"bytes,1,opt,name=field12905" json:"field12905,omitempty"`
+	Field12906    *Message8587   `protobuf:"bytes,2,opt,name=field12906" json:"field12906,omitempty"`
+	Field12907    []*Message8590 `protobuf:"bytes,3,rep,name=field12907" json:"field12907,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12903) Reset() {
@@ -3200,11 +3164,10 @@
 }
 
 type Message37326 struct {
-	Field37345           *string                 `protobuf:"bytes,1,req,name=field37345" json:"field37345,omitempty"`
-	Field37346           *string                 `protobuf:"bytes,2,opt,name=field37346" json:"field37346,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field37345    *string `protobuf:"bytes,1,req,name=field37345" json:"field37345,omitempty"`
+	Field37346    *string `protobuf:"bytes,2,opt,name=field37346" json:"field37346,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message37326) Reset() {
@@ -3245,40 +3208,39 @@
 }
 
 type Message2356 struct {
-	Field2368            *Message1374               `protobuf:"bytes,121,opt,name=field2368" json:"field2368,omitempty"`
-	Field2369            *uint64                    `protobuf:"varint,1,opt,name=field2369" json:"field2369,omitempty"`
-	Field2370            *int32                     `protobuf:"varint,2,opt,name=field2370" json:"field2370,omitempty"`
-	Field2371            *int32                     `protobuf:"varint,17,opt,name=field2371" json:"field2371,omitempty"`
-	Field2372            *string                    `protobuf:"bytes,3,req,name=field2372" json:"field2372,omitempty"`
-	Field2373            *int32                     `protobuf:"varint,7,opt,name=field2373" json:"field2373,omitempty"`
-	Field2374            []byte                     `protobuf:"bytes,8,opt,name=field2374" json:"field2374,omitempty"`
-	Field2375            *string                    `protobuf:"bytes,4,opt,name=field2375" json:"field2375,omitempty"`
-	Field2376            *string                    `protobuf:"bytes,101,opt,name=field2376" json:"field2376,omitempty"`
-	Field2377            *int32                     `protobuf:"varint,102,opt,name=field2377" json:"field2377,omitempty"`
-	Field2378            *int32                     `protobuf:"varint,103,opt,name=field2378" json:"field2378,omitempty"`
-	Field2379            *int32                     `protobuf:"varint,104,opt,name=field2379" json:"field2379,omitempty"`
-	Field2380            *int32                     `protobuf:"varint,113,opt,name=field2380" json:"field2380,omitempty"`
-	Field2381            *int32                     `protobuf:"varint,114,opt,name=field2381" json:"field2381,omitempty"`
-	Field2382            *int32                     `protobuf:"varint,115,opt,name=field2382" json:"field2382,omitempty"`
-	Field2383            *int32                     `protobuf:"varint,117,opt,name=field2383" json:"field2383,omitempty"`
-	Field2384            *int32                     `protobuf:"varint,118,opt,name=field2384" json:"field2384,omitempty"`
-	Field2385            *int32                     `protobuf:"varint,119,opt,name=field2385" json:"field2385,omitempty"`
-	Field2386            *int32                     `protobuf:"varint,105,opt,name=field2386" json:"field2386,omitempty"`
-	Field2387            []byte                     `protobuf:"bytes,5,opt,name=field2387" json:"field2387,omitempty"`
-	Message2357          *Message2356_Message2357   `protobuf:"group,6,opt,name=Message2357,json=message2357" json:"message2357,omitempty"`
-	Field2389            *string                    `protobuf:"bytes,120,opt,name=field2389" json:"field2389,omitempty"`
-	Message2358          *Message2356_Message2358   `protobuf:"group,107,opt,name=Message2358,json=message2358" json:"message2358,omitempty"`
-	Message2359          []*Message2356_Message2359 `protobuf:"group,40,rep,name=Message2359,json=message2359" json:"message2359,omitempty"`
-	Field2392            *int32                     `protobuf:"varint,50,opt,name=field2392" json:"field2392,omitempty"`
-	Field2393            *UnusedEmptyMessage        `protobuf:"bytes,60,opt,name=field2393" json:"field2393,omitempty"`
-	Field2394            *UnusedEmptyMessage        `protobuf:"bytes,70,opt,name=field2394" json:"field2394,omitempty"`
-	Field2395            *UnusedEmptyMessage        `protobuf:"bytes,80,opt,name=field2395" json:"field2395,omitempty"`
-	Field2396            *UnusedEmptyMessage        `protobuf:"bytes,90,opt,name=field2396" json:"field2396,omitempty"`
-	Field2397            *string                    `protobuf:"bytes,100,opt,name=field2397" json:"field2397,omitempty"`
-	Field2398            *string                    `protobuf:"bytes,123,opt,name=field2398" json:"field2398,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Field2368     *Message1374               `protobuf:"bytes,121,opt,name=field2368" json:"field2368,omitempty"`
+	Field2369     *uint64                    `protobuf:"varint,1,opt,name=field2369" json:"field2369,omitempty"`
+	Field2370     *int32                     `protobuf:"varint,2,opt,name=field2370" json:"field2370,omitempty"`
+	Field2371     *int32                     `protobuf:"varint,17,opt,name=field2371" json:"field2371,omitempty"`
+	Field2372     *string                    `protobuf:"bytes,3,req,name=field2372" json:"field2372,omitempty"`
+	Field2373     *int32                     `protobuf:"varint,7,opt,name=field2373" json:"field2373,omitempty"`
+	Field2374     []byte                     `protobuf:"bytes,8,opt,name=field2374" json:"field2374,omitempty"`
+	Field2375     *string                    `protobuf:"bytes,4,opt,name=field2375" json:"field2375,omitempty"`
+	Field2376     *string                    `protobuf:"bytes,101,opt,name=field2376" json:"field2376,omitempty"`
+	Field2377     *int32                     `protobuf:"varint,102,opt,name=field2377" json:"field2377,omitempty"`
+	Field2378     *int32                     `protobuf:"varint,103,opt,name=field2378" json:"field2378,omitempty"`
+	Field2379     *int32                     `protobuf:"varint,104,opt,name=field2379" json:"field2379,omitempty"`
+	Field2380     *int32                     `protobuf:"varint,113,opt,name=field2380" json:"field2380,omitempty"`
+	Field2381     *int32                     `protobuf:"varint,114,opt,name=field2381" json:"field2381,omitempty"`
+	Field2382     *int32                     `protobuf:"varint,115,opt,name=field2382" json:"field2382,omitempty"`
+	Field2383     *int32                     `protobuf:"varint,117,opt,name=field2383" json:"field2383,omitempty"`
+	Field2384     *int32                     `protobuf:"varint,118,opt,name=field2384" json:"field2384,omitempty"`
+	Field2385     *int32                     `protobuf:"varint,119,opt,name=field2385" json:"field2385,omitempty"`
+	Field2386     *int32                     `protobuf:"varint,105,opt,name=field2386" json:"field2386,omitempty"`
+	Field2387     []byte                     `protobuf:"bytes,5,opt,name=field2387" json:"field2387,omitempty"`
+	Message2357   *Message2356_Message2357   `protobuf:"group,6,opt,name=Message2357,json=message2357" json:"message2357,omitempty"`
+	Field2389     *string                    `protobuf:"bytes,120,opt,name=field2389" json:"field2389,omitempty"`
+	Message2358   *Message2356_Message2358   `protobuf:"group,107,opt,name=Message2358,json=message2358" json:"message2358,omitempty"`
+	Message2359   []*Message2356_Message2359 `protobuf:"group,40,rep,name=Message2359,json=message2359" json:"message2359,omitempty"`
+	Field2392     *int32                     `protobuf:"varint,50,opt,name=field2392" json:"field2392,omitempty"`
+	Field2393     *UnusedEmptyMessage        `protobuf:"bytes,60,opt,name=field2393" json:"field2393,omitempty"`
+	Field2394     *UnusedEmptyMessage        `protobuf:"bytes,70,opt,name=field2394" json:"field2394,omitempty"`
+	Field2395     *UnusedEmptyMessage        `protobuf:"bytes,80,opt,name=field2395" json:"field2395,omitempty"`
+	Field2396     *UnusedEmptyMessage        `protobuf:"bytes,90,opt,name=field2396" json:"field2396,omitempty"`
+	Field2397     *string                    `protobuf:"bytes,100,opt,name=field2397" json:"field2397,omitempty"`
+	Field2398     *string                    `protobuf:"bytes,123,opt,name=field2398" json:"field2398,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2356) Reset() {
@@ -3522,10 +3484,9 @@
 }
 
 type Message0 struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `protobuf_messageset:"1" json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields `protobuf_messageset:"1"`
 }
 
 func (x *Message0) Reset() {
@@ -3561,12 +3522,11 @@
 }
 
 type Message971 struct {
-	Field972             *string                 `protobuf:"bytes,1,opt,name=field972" json:"field972,omitempty"`
-	Field973             *int32                  `protobuf:"varint,2,opt,name=field973" json:"field973,omitempty"`
-	Field974             *bool                   `protobuf:"varint,3,opt,name=field974" json:"field974,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field972      *string `protobuf:"bytes,1,opt,name=field972" json:"field972,omitempty"`
+	Field973      *int32  `protobuf:"varint,2,opt,name=field973" json:"field973,omitempty"`
+	Field974      *bool   `protobuf:"varint,3,opt,name=field974" json:"field974,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message971) Reset() {
@@ -3614,9 +3574,8 @@
 }
 
 type Message176_Message178 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message176_Message178) Reset() {
@@ -3643,11 +3602,10 @@
 }
 
 type Message3069_Message3070 struct {
-	Field3378            *Enum3071               `protobuf:"varint,4,req,name=field3378,enum=benchmarks.google_message4.Enum3071" json:"field3378,omitempty"`
-	Field3379            []byte                  `protobuf:"bytes,5,req,name=field3379" json:"field3379,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3378     *Enum3071 `protobuf:"varint,4,req,name=field3378,enum=benchmarks.google_message4.Enum3071" json:"field3378,omitempty"`
+	Field3379     []byte    `protobuf:"bytes,5,req,name=field3379" json:"field3379,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3069_Message3070) Reset() {
@@ -3688,21 +3646,20 @@
 }
 
 type Message2356_Message2357 struct {
-	Field2399            *int64                  `protobuf:"varint,9,opt,name=field2399" json:"field2399,omitempty"`
-	Field2400            *int32                  `protobuf:"varint,10,opt,name=field2400" json:"field2400,omitempty"`
-	Field2401            *int32                  `protobuf:"varint,11,opt,name=field2401" json:"field2401,omitempty"`
-	Field2402            *int32                  `protobuf:"varint,12,opt,name=field2402" json:"field2402,omitempty"`
-	Field2403            *int32                  `protobuf:"varint,13,opt,name=field2403" json:"field2403,omitempty"`
-	Field2404            *int32                  `protobuf:"varint,116,opt,name=field2404" json:"field2404,omitempty"`
-	Field2405            *int32                  `protobuf:"varint,106,opt,name=field2405" json:"field2405,omitempty"`
-	Field2406            []byte                  `protobuf:"bytes,14,req,name=field2406" json:"field2406,omitempty"`
-	Field2407            *int32                  `protobuf:"varint,45,opt,name=field2407" json:"field2407,omitempty"`
-	Field2408            *int32                  `protobuf:"varint,112,opt,name=field2408" json:"field2408,omitempty"`
-	Field2409            *bool                   `protobuf:"varint,122,opt,name=field2409" json:"field2409,omitempty"`
-	Field2410            []byte                  `protobuf:"bytes,124,opt,name=field2410" json:"field2410,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field2399     *int64 `protobuf:"varint,9,opt,name=field2399" json:"field2399,omitempty"`
+	Field2400     *int32 `protobuf:"varint,10,opt,name=field2400" json:"field2400,omitempty"`
+	Field2401     *int32 `protobuf:"varint,11,opt,name=field2401" json:"field2401,omitempty"`
+	Field2402     *int32 `protobuf:"varint,12,opt,name=field2402" json:"field2402,omitempty"`
+	Field2403     *int32 `protobuf:"varint,13,opt,name=field2403" json:"field2403,omitempty"`
+	Field2404     *int32 `protobuf:"varint,116,opt,name=field2404" json:"field2404,omitempty"`
+	Field2405     *int32 `protobuf:"varint,106,opt,name=field2405" json:"field2405,omitempty"`
+	Field2406     []byte `protobuf:"bytes,14,req,name=field2406" json:"field2406,omitempty"`
+	Field2407     *int32 `protobuf:"varint,45,opt,name=field2407" json:"field2407,omitempty"`
+	Field2408     *int32 `protobuf:"varint,112,opt,name=field2408" json:"field2408,omitempty"`
+	Field2409     *bool  `protobuf:"varint,122,opt,name=field2409" json:"field2409,omitempty"`
+	Field2410     []byte `protobuf:"bytes,124,opt,name=field2410" json:"field2410,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2356_Message2357) Reset() {
@@ -3813,9 +3770,8 @@
 }
 
 type Message2356_Message2358 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2356_Message2358) Reset() {
@@ -3842,9 +3798,8 @@
 }
 
 type Message2356_Message2359 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2356_Message2359) Reset() {
@@ -5162,6 +5117,462 @@
 	file_datasets_google_message4_benchmark_message4_1_proto_init()
 	file_datasets_google_message4_benchmark_message4_2_proto_init()
 	file_datasets_google_message4_benchmark_message4_3_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GoogleMessage4); i {
+			case 16:
+				return &v.sizeCache
+			case 17:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37489); i {
+			case 21:
+				return &v.sizeCache
+			case 22:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7319); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12717); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37331); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8815); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7330); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12960); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message176); i {
+			case 59:
+				return &v.sizeCache
+			case 60:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8817); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8835); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37333); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13000); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37335); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8848); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message13035); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8856); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12908); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12910); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37327); i {
+			case 11:
+				return &v.sizeCache
+			case 12:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37329); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2517); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12748); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12687); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11948); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11976); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7320); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3069); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			case 5:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12948); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8768); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12979); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37173); i {
+			case 25:
+				return &v.sizeCache
+			case 26:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12799); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12870); i {
+			case 20:
+				return &v.sizeCache
+			case 21:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3804); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12903); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message37326); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2356); i {
+			case 31:
+				return &v.sizeCache
+			case 32:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message0); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message971); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message176_Message178); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3069_Message3070); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2356_Message2357); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2356_Message2358); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2356_Message2359); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message4_benchmark_message4_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
index b1697df..5a47082 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
@@ -18,10 +18,9 @@
 )
 
 type Message2463 struct {
-	Field2498            []*Message2462          `protobuf:"bytes,1,rep,name=field2498" json:"field2498,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field2498     []*Message2462 `protobuf:"bytes,1,rep,name=field2498" json:"field2498,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2463) Reset() {
@@ -55,11 +54,10 @@
 }
 
 type Message12686 struct {
-	Field12699           *string                 `protobuf:"bytes,1,opt,name=field12699" json:"field12699,omitempty"`
-	Field12700           *Message12685           `protobuf:"bytes,2,opt,name=field12700" json:"field12700,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12699    *string       `protobuf:"bytes,1,opt,name=field12699" json:"field12699,omitempty"`
+	Field12700    *Message12685 `protobuf:"bytes,2,opt,name=field12700" json:"field12700,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12686) Reset() {
@@ -100,9 +98,8 @@
 }
 
 type Message11949 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11949) Reset() {
@@ -129,19 +126,18 @@
 }
 
 type Message11975 struct {
-	Field11992           *string                 `protobuf:"bytes,1,opt,name=field11992" json:"field11992,omitempty"`
-	Field11993           *int32                  `protobuf:"varint,2,opt,name=field11993" json:"field11993,omitempty"`
-	Field11994           []*Message10320         `protobuf:"bytes,3,rep,name=field11994" json:"field11994,omitempty"`
-	Field11995           *Message11947           `protobuf:"bytes,4,opt,name=field11995" json:"field11995,omitempty"`
-	Field11996           *Message11920           `protobuf:"bytes,5,opt,name=field11996" json:"field11996,omitempty"`
-	Field11997           *bool                   `protobuf:"varint,6,opt,name=field11997" json:"field11997,omitempty"`
-	Field11998           []string                `protobuf:"bytes,7,rep,name=field11998" json:"field11998,omitempty"`
-	Field11999           *float32                `protobuf:"fixed32,8,opt,name=field11999" json:"field11999,omitempty"`
-	Field12000           []UnusedEnum            `protobuf:"varint,9,rep,name=field12000,enum=benchmarks.google_message4.UnusedEnum" json:"field12000,omitempty"`
-	Field12001           *int32                  `protobuf:"varint,11,opt,name=field12001" json:"field12001,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field11992    *string         `protobuf:"bytes,1,opt,name=field11992" json:"field11992,omitempty"`
+	Field11993    *int32          `protobuf:"varint,2,opt,name=field11993" json:"field11993,omitempty"`
+	Field11994    []*Message10320 `protobuf:"bytes,3,rep,name=field11994" json:"field11994,omitempty"`
+	Field11995    *Message11947   `protobuf:"bytes,4,opt,name=field11995" json:"field11995,omitempty"`
+	Field11996    *Message11920   `protobuf:"bytes,5,opt,name=field11996" json:"field11996,omitempty"`
+	Field11997    *bool           `protobuf:"varint,6,opt,name=field11997" json:"field11997,omitempty"`
+	Field11998    []string        `protobuf:"bytes,7,rep,name=field11998" json:"field11998,omitempty"`
+	Field11999    *float32        `protobuf:"fixed32,8,opt,name=field11999" json:"field11999,omitempty"`
+	Field12000    []UnusedEnum    `protobuf:"varint,9,rep,name=field12000,enum=benchmarks.google_message4.UnusedEnum" json:"field12000,omitempty"`
+	Field12001    *int32          `protobuf:"varint,11,opt,name=field12001" json:"field12001,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11975) Reset() {
@@ -238,17 +234,16 @@
 }
 
 type Message7287 struct {
-	Field7311            *Message6133            `protobuf:"bytes,1,opt,name=field7311" json:"field7311,omitempty"`
-	Field7312            *UnusedEmptyMessage     `protobuf:"bytes,8,opt,name=field7312" json:"field7312,omitempty"`
-	Field7313            *string                 `protobuf:"bytes,3,opt,name=field7313" json:"field7313,omitempty"`
-	Field7314            *Message6643            `protobuf:"bytes,4,opt,name=field7314" json:"field7314,omitempty"`
-	Field7315            *Enum7288               `protobuf:"varint,5,opt,name=field7315,enum=benchmarks.google_message4.Enum7288" json:"field7315,omitempty"`
-	Field7316            []byte                  `protobuf:"bytes,6,opt,name=field7316" json:"field7316,omitempty"`
-	Field7317            *UnusedEmptyMessage     `protobuf:"bytes,7,opt,name=field7317" json:"field7317,omitempty"`
-	Field7318            *UnusedEmptyMessage     `protobuf:"bytes,9,opt,name=field7318" json:"field7318,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7311     *Message6133        `protobuf:"bytes,1,opt,name=field7311" json:"field7311,omitempty"`
+	Field7312     *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field7312" json:"field7312,omitempty"`
+	Field7313     *string             `protobuf:"bytes,3,opt,name=field7313" json:"field7313,omitempty"`
+	Field7314     *Message6643        `protobuf:"bytes,4,opt,name=field7314" json:"field7314,omitempty"`
+	Field7315     *Enum7288           `protobuf:"varint,5,opt,name=field7315,enum=benchmarks.google_message4.Enum7288" json:"field7315,omitempty"`
+	Field7316     []byte              `protobuf:"bytes,6,opt,name=field7316" json:"field7316,omitempty"`
+	Field7317     *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field7317" json:"field7317,omitempty"`
+	Field7318     *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field7318" json:"field7318,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7287) Reset() {
@@ -331,57 +326,56 @@
 }
 
 type Message3061 struct {
-	Field3286            *string                    `protobuf:"bytes,2,opt,name=field3286" json:"field3286,omitempty"`
-	Field3287            *int32                     `protobuf:"varint,77,opt,name=field3287" json:"field3287,omitempty"`
-	Field3288            *string                    `protobuf:"bytes,49,opt,name=field3288" json:"field3288,omitempty"`
-	Field3289            *Message3046               `protobuf:"bytes,3,req,name=field3289" json:"field3289,omitempty"`
-	Field3290            *Message3046               `protobuf:"bytes,58,opt,name=field3290" json:"field3290,omitempty"`
-	Message3062          *Message3061_Message3062   `protobuf:"group,4,opt,name=Message3062,json=message3062" json:"message3062,omitempty"`
-	Field3292            *Message3060               `protobuf:"bytes,104,opt,name=field3292" json:"field3292,omitempty"`
-	Field3293            *int64                     `protobuf:"varint,32,opt,name=field3293" json:"field3293,omitempty"`
-	Field3294            *int32                     `protobuf:"varint,41,opt,name=field3294" json:"field3294,omitempty"`
-	Message3063          *Message3061_Message3063   `protobuf:"group,13,opt,name=Message3063,json=message3063" json:"message3063,omitempty"`
-	Field3296            *Enum2834                  `protobuf:"varint,94,opt,name=field3296,enum=benchmarks.google_message4.Enum2834" json:"field3296,omitempty"`
-	Field3297            *bool                      `protobuf:"varint,25,opt,name=field3297" json:"field3297,omitempty"`
-	Field3298            *bool                      `protobuf:"varint,50,opt,name=field3298" json:"field3298,omitempty"`
-	Field3299            *string                    `protobuf:"bytes,89,opt,name=field3299" json:"field3299,omitempty"`
-	Field3300            *string                    `protobuf:"bytes,91,opt,name=field3300" json:"field3300,omitempty"`
-	Field3301            *string                    `protobuf:"bytes,105,opt,name=field3301" json:"field3301,omitempty"`
-	Field3302            *Message3050               `protobuf:"bytes,53,opt,name=field3302" json:"field3302,omitempty"`
-	Field3303            *uint64                    `protobuf:"fixed64,51,opt,name=field3303" json:"field3303,omitempty"`
-	Field3304            *uint64                    `protobuf:"fixed64,106,opt,name=field3304" json:"field3304,omitempty"`
-	Field3305            *int32                     `protobuf:"varint,60,opt,name=field3305" json:"field3305,omitempty"`
-	Field3306            *string                    `protobuf:"bytes,44,opt,name=field3306" json:"field3306,omitempty"`
-	Field3307            []byte                     `protobuf:"bytes,81,opt,name=field3307" json:"field3307,omitempty"`
-	Field3308            *string                    `protobuf:"bytes,70,opt,name=field3308" json:"field3308,omitempty"`
-	Field3309            []byte                     `protobuf:"bytes,45,opt,name=field3309" json:"field3309,omitempty"`
-	Field3310            *Enum2806                  `protobuf:"varint,71,opt,name=field3310,enum=benchmarks.google_message4.Enum2806" json:"field3310,omitempty"`
-	Field3311            *int32                     `protobuf:"varint,72,opt,name=field3311" json:"field3311,omitempty"`
-	Field3312            []byte                     `protobuf:"bytes,78,opt,name=field3312" json:"field3312,omitempty"`
-	Field3313            *int32                     `protobuf:"varint,20,opt,name=field3313" json:"field3313,omitempty"`
-	Message3064          []*Message3061_Message3064 `protobuf:"group,8,rep,name=Message3064,json=message3064" json:"message3064,omitempty"`
-	Field3315            *UnusedEmptyMessage        `protobuf:"bytes,39,opt,name=field3315" json:"field3315,omitempty"`
-	Field3316            *int32                     `protobuf:"varint,76,opt,name=field3316" json:"field3316,omitempty"`
-	Message3065          *Message3061_Message3065   `protobuf:"group,63,opt,name=Message3065,json=message3065" json:"message3065,omitempty"`
-	Field3318            *Enum2806                  `protobuf:"varint,54,opt,name=field3318,enum=benchmarks.google_message4.Enum2806" json:"field3318,omitempty"`
-	Field3319            *int32                     `protobuf:"varint,46,opt,name=field3319" json:"field3319,omitempty"`
-	Field3320            []string                   `protobuf:"bytes,24,rep,name=field3320" json:"field3320,omitempty"`
-	Field3321            *uint32                    `protobuf:"fixed32,38,opt,name=field3321" json:"field3321,omitempty"`
-	Field3322            []byte                     `protobuf:"bytes,99,opt,name=field3322" json:"field3322,omitempty"`
-	Field3323            *uint64                    `protobuf:"fixed64,1,opt,name=field3323" json:"field3323,omitempty"`
-	Field3324            *uint64                    `protobuf:"fixed64,97,opt,name=field3324" json:"field3324,omitempty"`
-	Field3325            []*Message3040             `protobuf:"bytes,16,rep,name=field3325" json:"field3325,omitempty"`
-	Field3326            []*Message3041             `protobuf:"bytes,61,rep,name=field3326" json:"field3326,omitempty"`
-	Message3066          *Message3061_Message3066   `protobuf:"group,21,opt,name=Message3066,json=message3066" json:"message3066,omitempty"`
-	Field3328            *UnusedEmptyMessage        `protobuf:"bytes,47,opt,name=field3328" json:"field3328,omitempty"`
-	Field3329            *UnusedEmptyMessage        `protobuf:"bytes,48,opt,name=field3329" json:"field3329,omitempty"`
-	Field3330            *uint64                    `protobuf:"fixed64,40,opt,name=field3330" json:"field3330,omitempty"`
-	Field3331            *UnusedEmptyMessage        `protobuf:"bytes,86,opt,name=field3331" json:"field3331,omitempty"`
-	Field3332            *UnusedEmptyMessage        `protobuf:"bytes,59,opt,name=field3332" json:"field3332,omitempty"`
-	Field3333            *int32                     `protobuf:"varint,17,opt,name=field3333" json:"field3333,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Field3286     *string                    `protobuf:"bytes,2,opt,name=field3286" json:"field3286,omitempty"`
+	Field3287     *int32                     `protobuf:"varint,77,opt,name=field3287" json:"field3287,omitempty"`
+	Field3288     *string                    `protobuf:"bytes,49,opt,name=field3288" json:"field3288,omitempty"`
+	Field3289     *Message3046               `protobuf:"bytes,3,req,name=field3289" json:"field3289,omitempty"`
+	Field3290     *Message3046               `protobuf:"bytes,58,opt,name=field3290" json:"field3290,omitempty"`
+	Message3062   *Message3061_Message3062   `protobuf:"group,4,opt,name=Message3062,json=message3062" json:"message3062,omitempty"`
+	Field3292     *Message3060               `protobuf:"bytes,104,opt,name=field3292" json:"field3292,omitempty"`
+	Field3293     *int64                     `protobuf:"varint,32,opt,name=field3293" json:"field3293,omitempty"`
+	Field3294     *int32                     `protobuf:"varint,41,opt,name=field3294" json:"field3294,omitempty"`
+	Message3063   *Message3061_Message3063   `protobuf:"group,13,opt,name=Message3063,json=message3063" json:"message3063,omitempty"`
+	Field3296     *Enum2834                  `protobuf:"varint,94,opt,name=field3296,enum=benchmarks.google_message4.Enum2834" json:"field3296,omitempty"`
+	Field3297     *bool                      `protobuf:"varint,25,opt,name=field3297" json:"field3297,omitempty"`
+	Field3298     *bool                      `protobuf:"varint,50,opt,name=field3298" json:"field3298,omitempty"`
+	Field3299     *string                    `protobuf:"bytes,89,opt,name=field3299" json:"field3299,omitempty"`
+	Field3300     *string                    `protobuf:"bytes,91,opt,name=field3300" json:"field3300,omitempty"`
+	Field3301     *string                    `protobuf:"bytes,105,opt,name=field3301" json:"field3301,omitempty"`
+	Field3302     *Message3050               `protobuf:"bytes,53,opt,name=field3302" json:"field3302,omitempty"`
+	Field3303     *uint64                    `protobuf:"fixed64,51,opt,name=field3303" json:"field3303,omitempty"`
+	Field3304     *uint64                    `protobuf:"fixed64,106,opt,name=field3304" json:"field3304,omitempty"`
+	Field3305     *int32                     `protobuf:"varint,60,opt,name=field3305" json:"field3305,omitempty"`
+	Field3306     *string                    `protobuf:"bytes,44,opt,name=field3306" json:"field3306,omitempty"`
+	Field3307     []byte                     `protobuf:"bytes,81,opt,name=field3307" json:"field3307,omitempty"`
+	Field3308     *string                    `protobuf:"bytes,70,opt,name=field3308" json:"field3308,omitempty"`
+	Field3309     []byte                     `protobuf:"bytes,45,opt,name=field3309" json:"field3309,omitempty"`
+	Field3310     *Enum2806                  `protobuf:"varint,71,opt,name=field3310,enum=benchmarks.google_message4.Enum2806" json:"field3310,omitempty"`
+	Field3311     *int32                     `protobuf:"varint,72,opt,name=field3311" json:"field3311,omitempty"`
+	Field3312     []byte                     `protobuf:"bytes,78,opt,name=field3312" json:"field3312,omitempty"`
+	Field3313     *int32                     `protobuf:"varint,20,opt,name=field3313" json:"field3313,omitempty"`
+	Message3064   []*Message3061_Message3064 `protobuf:"group,8,rep,name=Message3064,json=message3064" json:"message3064,omitempty"`
+	Field3315     *UnusedEmptyMessage        `protobuf:"bytes,39,opt,name=field3315" json:"field3315,omitempty"`
+	Field3316     *int32                     `protobuf:"varint,76,opt,name=field3316" json:"field3316,omitempty"`
+	Message3065   *Message3061_Message3065   `protobuf:"group,63,opt,name=Message3065,json=message3065" json:"message3065,omitempty"`
+	Field3318     *Enum2806                  `protobuf:"varint,54,opt,name=field3318,enum=benchmarks.google_message4.Enum2806" json:"field3318,omitempty"`
+	Field3319     *int32                     `protobuf:"varint,46,opt,name=field3319" json:"field3319,omitempty"`
+	Field3320     []string                   `protobuf:"bytes,24,rep,name=field3320" json:"field3320,omitempty"`
+	Field3321     *uint32                    `protobuf:"fixed32,38,opt,name=field3321" json:"field3321,omitempty"`
+	Field3322     []byte                     `protobuf:"bytes,99,opt,name=field3322" json:"field3322,omitempty"`
+	Field3323     *uint64                    `protobuf:"fixed64,1,opt,name=field3323" json:"field3323,omitempty"`
+	Field3324     *uint64                    `protobuf:"fixed64,97,opt,name=field3324" json:"field3324,omitempty"`
+	Field3325     []*Message3040             `protobuf:"bytes,16,rep,name=field3325" json:"field3325,omitempty"`
+	Field3326     []*Message3041             `protobuf:"bytes,61,rep,name=field3326" json:"field3326,omitempty"`
+	Message3066   *Message3061_Message3066   `protobuf:"group,21,opt,name=Message3066,json=message3066" json:"message3066,omitempty"`
+	Field3328     *UnusedEmptyMessage        `protobuf:"bytes,47,opt,name=field3328" json:"field3328,omitempty"`
+	Field3329     *UnusedEmptyMessage        `protobuf:"bytes,48,opt,name=field3329" json:"field3329,omitempty"`
+	Field3330     *uint64                    `protobuf:"fixed64,40,opt,name=field3330" json:"field3330,omitempty"`
+	Field3331     *UnusedEmptyMessage        `protobuf:"bytes,86,opt,name=field3331" json:"field3331,omitempty"`
+	Field3332     *UnusedEmptyMessage        `protobuf:"bytes,59,opt,name=field3332" json:"field3332,omitempty"`
+	Field3333     *int32                     `protobuf:"varint,17,opt,name=field3333" json:"field3333,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3061) Reset() {
@@ -744,9 +738,8 @@
 }
 
 type Message12949 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12949) Reset() {
@@ -773,59 +766,58 @@
 }
 
 type Message8572 struct {
-	Field8647            []byte                  `protobuf:"bytes,1,opt,name=field8647" json:"field8647,omitempty"`
-	Field8648            []byte                  `protobuf:"bytes,3,opt,name=field8648" json:"field8648,omitempty"`
-	Field8649            *Message3886            `protobuf:"bytes,4,opt,name=field8649" json:"field8649,omitempty"`
-	Field8650            *Message3919            `protobuf:"bytes,57,opt,name=field8650" json:"field8650,omitempty"`
-	Field8651            *bool                   `protobuf:"varint,5,opt,name=field8651" json:"field8651,omitempty"`
-	Field8652            *int32                  `protobuf:"varint,6,opt,name=field8652" json:"field8652,omitempty"`
-	Field8653            *int32                  `protobuf:"varint,49,opt,name=field8653" json:"field8653,omitempty"`
-	Field8654            *Message7905            `protobuf:"bytes,7,opt,name=field8654" json:"field8654,omitempty"`
-	Field8655            *int32                  `protobuf:"varint,10,opt,name=field8655" json:"field8655,omitempty"`
-	Field8656            *UnusedEmptyMessage     `protobuf:"bytes,11,opt,name=field8656" json:"field8656,omitempty"`
-	Field8657            *bool                   `protobuf:"varint,35,opt,name=field8657" json:"field8657,omitempty"`
-	Field8658            []byte                  `protobuf:"bytes,12,opt,name=field8658" json:"field8658,omitempty"`
-	Field8659            *string                 `protobuf:"bytes,14,opt,name=field8659" json:"field8659,omitempty"`
-	Field8660            *UnusedEmptyMessage     `protobuf:"bytes,13,opt,name=field8660" json:"field8660,omitempty"`
-	Field8661            []byte                  `protobuf:"bytes,15,opt,name=field8661" json:"field8661,omitempty"`
-	Field8662            *UnusedEmptyMessage     `protobuf:"bytes,17,opt,name=field8662" json:"field8662,omitempty"`
-	Field8663            *int32                  `protobuf:"varint,18,opt,name=field8663" json:"field8663,omitempty"`
-	Field8664            *int32                  `protobuf:"varint,19,opt,name=field8664" json:"field8664,omitempty"`
-	Field8665            *bool                   `protobuf:"varint,20,opt,name=field8665" json:"field8665,omitempty"`
-	Field8666            *Enum3476               `protobuf:"varint,31,opt,name=field8666,enum=benchmarks.google_message4.Enum3476" json:"field8666,omitempty"`
-	Field8667            *bool                   `protobuf:"varint,36,opt,name=field8667" json:"field8667,omitempty"`
-	Field8668            *UnusedEmptyMessage     `protobuf:"bytes,39,opt,name=field8668" json:"field8668,omitempty"`
-	Field8669            []byte                  `protobuf:"bytes,22,opt,name=field8669" json:"field8669,omitempty"`
-	Field8670            *int32                  `protobuf:"varint,24,opt,name=field8670" json:"field8670,omitempty"`
-	Field8671            *Message3052            `protobuf:"bytes,25,opt,name=field8671" json:"field8671,omitempty"`
-	Field8672            []byte                  `protobuf:"bytes,26,opt,name=field8672" json:"field8672,omitempty"`
-	Field8673            []byte                  `protobuf:"bytes,28,opt,name=field8673" json:"field8673,omitempty"`
-	Field8674            *int32                  `protobuf:"varint,29,opt,name=field8674" json:"field8674,omitempty"`
-	Field8675            []byte                  `protobuf:"bytes,30,opt,name=field8675" json:"field8675,omitempty"`
-	Field8676            []byte                  `protobuf:"bytes,32,opt,name=field8676" json:"field8676,omitempty"`
-	Field8677            *string                 `protobuf:"bytes,33,opt,name=field8677" json:"field8677,omitempty"`
-	Field8678            *int32                  `protobuf:"varint,34,opt,name=field8678" json:"field8678,omitempty"`
-	Field8679            *int32                  `protobuf:"varint,37,opt,name=field8679" json:"field8679,omitempty"`
-	Field8680            *float64                `protobuf:"fixed64,38,opt,name=field8680" json:"field8680,omitempty"`
-	Field8681            *float64                `protobuf:"fixed64,42,opt,name=field8681" json:"field8681,omitempty"`
-	Field8682            *Message3922            `protobuf:"bytes,40,opt,name=field8682" json:"field8682,omitempty"`
-	Field8683            *UnusedEmptyMessage     `protobuf:"bytes,43,opt,name=field8683" json:"field8683,omitempty"`
-	Field8684            *int64                  `protobuf:"varint,44,opt,name=field8684" json:"field8684,omitempty"`
-	Field8685            *Message7929            `protobuf:"bytes,45,opt,name=field8685" json:"field8685,omitempty"`
-	Field8686            *uint64                 `protobuf:"varint,46,opt,name=field8686" json:"field8686,omitempty"`
-	Field8687            *uint32                 `protobuf:"varint,48,opt,name=field8687" json:"field8687,omitempty"`
-	Field8688            *Message7843            `protobuf:"bytes,47,opt,name=field8688" json:"field8688,omitempty"`
-	Field8689            *Message7864            `protobuf:"bytes,50,opt,name=field8689" json:"field8689,omitempty"`
-	Field8690            *UnusedEmptyMessage     `protobuf:"bytes,52,opt,name=field8690" json:"field8690,omitempty"`
-	Field8691            *bool                   `protobuf:"varint,58,opt,name=field8691" json:"field8691,omitempty"`
-	Field8692            *bool                   `protobuf:"varint,54,opt,name=field8692" json:"field8692,omitempty"`
-	Field8693            *string                 `protobuf:"bytes,55,opt,name=field8693" json:"field8693,omitempty"`
-	Field8694            *UnusedEmptyMessage     `protobuf:"bytes,41,opt,name=field8694" json:"field8694,omitempty"`
-	Field8695            *UnusedEmptyMessage     `protobuf:"bytes,53,opt,name=field8695" json:"field8695,omitempty"`
-	Field8696            *Message8575            `protobuf:"bytes,61,opt,name=field8696" json:"field8696,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8647     []byte              `protobuf:"bytes,1,opt,name=field8647" json:"field8647,omitempty"`
+	Field8648     []byte              `protobuf:"bytes,3,opt,name=field8648" json:"field8648,omitempty"`
+	Field8649     *Message3886        `protobuf:"bytes,4,opt,name=field8649" json:"field8649,omitempty"`
+	Field8650     *Message3919        `protobuf:"bytes,57,opt,name=field8650" json:"field8650,omitempty"`
+	Field8651     *bool               `protobuf:"varint,5,opt,name=field8651" json:"field8651,omitempty"`
+	Field8652     *int32              `protobuf:"varint,6,opt,name=field8652" json:"field8652,omitempty"`
+	Field8653     *int32              `protobuf:"varint,49,opt,name=field8653" json:"field8653,omitempty"`
+	Field8654     *Message7905        `protobuf:"bytes,7,opt,name=field8654" json:"field8654,omitempty"`
+	Field8655     *int32              `protobuf:"varint,10,opt,name=field8655" json:"field8655,omitempty"`
+	Field8656     *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field8656" json:"field8656,omitempty"`
+	Field8657     *bool               `protobuf:"varint,35,opt,name=field8657" json:"field8657,omitempty"`
+	Field8658     []byte              `protobuf:"bytes,12,opt,name=field8658" json:"field8658,omitempty"`
+	Field8659     *string             `protobuf:"bytes,14,opt,name=field8659" json:"field8659,omitempty"`
+	Field8660     *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field8660" json:"field8660,omitempty"`
+	Field8661     []byte              `protobuf:"bytes,15,opt,name=field8661" json:"field8661,omitempty"`
+	Field8662     *UnusedEmptyMessage `protobuf:"bytes,17,opt,name=field8662" json:"field8662,omitempty"`
+	Field8663     *int32              `protobuf:"varint,18,opt,name=field8663" json:"field8663,omitempty"`
+	Field8664     *int32              `protobuf:"varint,19,opt,name=field8664" json:"field8664,omitempty"`
+	Field8665     *bool               `protobuf:"varint,20,opt,name=field8665" json:"field8665,omitempty"`
+	Field8666     *Enum3476           `protobuf:"varint,31,opt,name=field8666,enum=benchmarks.google_message4.Enum3476" json:"field8666,omitempty"`
+	Field8667     *bool               `protobuf:"varint,36,opt,name=field8667" json:"field8667,omitempty"`
+	Field8668     *UnusedEmptyMessage `protobuf:"bytes,39,opt,name=field8668" json:"field8668,omitempty"`
+	Field8669     []byte              `protobuf:"bytes,22,opt,name=field8669" json:"field8669,omitempty"`
+	Field8670     *int32              `protobuf:"varint,24,opt,name=field8670" json:"field8670,omitempty"`
+	Field8671     *Message3052        `protobuf:"bytes,25,opt,name=field8671" json:"field8671,omitempty"`
+	Field8672     []byte              `protobuf:"bytes,26,opt,name=field8672" json:"field8672,omitempty"`
+	Field8673     []byte              `protobuf:"bytes,28,opt,name=field8673" json:"field8673,omitempty"`
+	Field8674     *int32              `protobuf:"varint,29,opt,name=field8674" json:"field8674,omitempty"`
+	Field8675     []byte              `protobuf:"bytes,30,opt,name=field8675" json:"field8675,omitempty"`
+	Field8676     []byte              `protobuf:"bytes,32,opt,name=field8676" json:"field8676,omitempty"`
+	Field8677     *string             `protobuf:"bytes,33,opt,name=field8677" json:"field8677,omitempty"`
+	Field8678     *int32              `protobuf:"varint,34,opt,name=field8678" json:"field8678,omitempty"`
+	Field8679     *int32              `protobuf:"varint,37,opt,name=field8679" json:"field8679,omitempty"`
+	Field8680     *float64            `protobuf:"fixed64,38,opt,name=field8680" json:"field8680,omitempty"`
+	Field8681     *float64            `protobuf:"fixed64,42,opt,name=field8681" json:"field8681,omitempty"`
+	Field8682     *Message3922        `protobuf:"bytes,40,opt,name=field8682" json:"field8682,omitempty"`
+	Field8683     *UnusedEmptyMessage `protobuf:"bytes,43,opt,name=field8683" json:"field8683,omitempty"`
+	Field8684     *int64              `protobuf:"varint,44,opt,name=field8684" json:"field8684,omitempty"`
+	Field8685     *Message7929        `protobuf:"bytes,45,opt,name=field8685" json:"field8685,omitempty"`
+	Field8686     *uint64             `protobuf:"varint,46,opt,name=field8686" json:"field8686,omitempty"`
+	Field8687     *uint32             `protobuf:"varint,48,opt,name=field8687" json:"field8687,omitempty"`
+	Field8688     *Message7843        `protobuf:"bytes,47,opt,name=field8688" json:"field8688,omitempty"`
+	Field8689     *Message7864        `protobuf:"bytes,50,opt,name=field8689" json:"field8689,omitempty"`
+	Field8690     *UnusedEmptyMessage `protobuf:"bytes,52,opt,name=field8690" json:"field8690,omitempty"`
+	Field8691     *bool               `protobuf:"varint,58,opt,name=field8691" json:"field8691,omitempty"`
+	Field8692     *bool               `protobuf:"varint,54,opt,name=field8692" json:"field8692,omitempty"`
+	Field8693     *string             `protobuf:"bytes,55,opt,name=field8693" json:"field8693,omitempty"`
+	Field8694     *UnusedEmptyMessage `protobuf:"bytes,41,opt,name=field8694" json:"field8694,omitempty"`
+	Field8695     *UnusedEmptyMessage `protobuf:"bytes,53,opt,name=field8695" json:"field8695,omitempty"`
+	Field8696     *Message8575        `protobuf:"bytes,61,opt,name=field8696" json:"field8696,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8572) Reset() {
@@ -1202,14 +1194,13 @@
 }
 
 type Message8774 struct {
-	Field8810            *string                 `protobuf:"bytes,1,opt,name=field8810" json:"field8810,omitempty"`
-	Field8811            *string                 `protobuf:"bytes,2,opt,name=field8811" json:"field8811,omitempty"`
-	Field8812            *string                 `protobuf:"bytes,3,opt,name=field8812" json:"field8812,omitempty"`
-	Field8813            *string                 `protobuf:"bytes,4,opt,name=field8813" json:"field8813,omitempty"`
-	Field8814            *string                 `protobuf:"bytes,5,opt,name=field8814" json:"field8814,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field8810     *string `protobuf:"bytes,1,opt,name=field8810" json:"field8810,omitempty"`
+	Field8811     *string `protobuf:"bytes,2,opt,name=field8811" json:"field8811,omitempty"`
+	Field8812     *string `protobuf:"bytes,3,opt,name=field8812" json:"field8812,omitempty"`
+	Field8813     *string `protobuf:"bytes,4,opt,name=field8813" json:"field8813,omitempty"`
+	Field8814     *string `protobuf:"bytes,5,opt,name=field8814" json:"field8814,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8774) Reset() {
@@ -1271,20 +1262,19 @@
 }
 
 type Message12776 struct {
-	Field12786             *string                   `protobuf:"bytes,1,opt,name=field12786" json:"field12786,omitempty"`
-	Field12787             *uint64                   `protobuf:"fixed64,11,opt,name=field12787" json:"field12787,omitempty"`
-	Field12788             *int32                    `protobuf:"varint,6,opt,name=field12788" json:"field12788,omitempty"`
-	Field12789             *int32                    `protobuf:"varint,13,opt,name=field12789" json:"field12789,omitempty"`
-	Field12790             *int32                    `protobuf:"varint,14,opt,name=field12790" json:"field12790,omitempty"`
-	Field12791             *int32                    `protobuf:"varint,15,opt,name=field12791" json:"field12791,omitempty"`
-	Field12792             *int32                    `protobuf:"varint,16,opt,name=field12792" json:"field12792,omitempty"`
-	Field12793             *UnusedEmptyMessage       `protobuf:"bytes,8,opt,name=field12793" json:"field12793,omitempty"`
-	Field12794             *Message12774             `protobuf:"bytes,10,opt,name=field12794" json:"field12794,omitempty"`
-	Field12795             *UnusedEmptyMessage       `protobuf:"bytes,12,opt,name=field12795" json:"field12795,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field12786      *string             `protobuf:"bytes,1,opt,name=field12786" json:"field12786,omitempty"`
+	Field12787      *uint64             `protobuf:"fixed64,11,opt,name=field12787" json:"field12787,omitempty"`
+	Field12788      *int32              `protobuf:"varint,6,opt,name=field12788" json:"field12788,omitempty"`
+	Field12789      *int32              `protobuf:"varint,13,opt,name=field12789" json:"field12789,omitempty"`
+	Field12790      *int32              `protobuf:"varint,14,opt,name=field12790" json:"field12790,omitempty"`
+	Field12791      *int32              `protobuf:"varint,15,opt,name=field12791" json:"field12791,omitempty"`
+	Field12792      *int32              `protobuf:"varint,16,opt,name=field12792" json:"field12792,omitempty"`
+	Field12793      *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field12793" json:"field12793,omitempty"`
+	Field12794      *Message12774       `protobuf:"bytes,10,opt,name=field12794" json:"field12794,omitempty"`
+	Field12795      *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field12795" json:"field12795,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message12776) Reset() {
@@ -1395,13 +1385,12 @@
 }
 
 type Message12798 struct {
-	Field12805           *int32                  `protobuf:"varint,1,opt,name=field12805" json:"field12805,omitempty"`
-	Field12806           *int32                  `protobuf:"varint,2,opt,name=field12806" json:"field12806,omitempty"`
-	Field12807           *Message12774           `protobuf:"bytes,6,opt,name=field12807" json:"field12807,omitempty"`
-	Field12808           *bool                   `protobuf:"varint,7,opt,name=field12808" json:"field12808,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12805    *int32        `protobuf:"varint,1,opt,name=field12805" json:"field12805,omitempty"`
+	Field12806    *int32        `protobuf:"varint,2,opt,name=field12806" json:"field12806,omitempty"`
+	Field12807    *Message12774 `protobuf:"bytes,6,opt,name=field12807" json:"field12807,omitempty"`
+	Field12808    *bool         `protobuf:"varint,7,opt,name=field12808" json:"field12808,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12798) Reset() {
@@ -1456,12 +1445,11 @@
 }
 
 type Message12797 struct {
-	Field12802           *Message12796           `protobuf:"bytes,1,opt,name=field12802" json:"field12802,omitempty"`
-	Field12803           []*Message12796         `protobuf:"bytes,2,rep,name=field12803" json:"field12803,omitempty"`
-	Field12804           *string                 `protobuf:"bytes,3,opt,name=field12804" json:"field12804,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12802    *Message12796   `protobuf:"bytes,1,opt,name=field12802" json:"field12802,omitempty"`
+	Field12803    []*Message12796 `protobuf:"bytes,2,rep,name=field12803" json:"field12803,omitempty"`
+	Field12804    *string         `protobuf:"bytes,3,opt,name=field12804" json:"field12804,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12797) Reset() {
@@ -1509,16 +1497,15 @@
 }
 
 type Message12825 struct {
-	Field12862           []*Message12818         `protobuf:"bytes,1,rep,name=field12862" json:"field12862,omitempty"`
-	Field12863           *int32                  `protobuf:"varint,2,opt,name=field12863" json:"field12863,omitempty"`
-	Field12864           *Message12819           `protobuf:"bytes,3,opt,name=field12864" json:"field12864,omitempty"`
-	Field12865           *Message12820           `protobuf:"bytes,4,opt,name=field12865" json:"field12865,omitempty"`
-	Field12866           *int32                  `protobuf:"varint,5,opt,name=field12866" json:"field12866,omitempty"`
-	Field12867           []*Message12821         `protobuf:"bytes,6,rep,name=field12867" json:"field12867,omitempty"`
-	Field12868           []*UnusedEmptyMessage   `protobuf:"bytes,7,rep,name=field12868" json:"field12868,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12862    []*Message12818       `protobuf:"bytes,1,rep,name=field12862" json:"field12862,omitempty"`
+	Field12863    *int32                `protobuf:"varint,2,opt,name=field12863" json:"field12863,omitempty"`
+	Field12864    *Message12819         `protobuf:"bytes,3,opt,name=field12864" json:"field12864,omitempty"`
+	Field12865    *Message12820         `protobuf:"bytes,4,opt,name=field12865" json:"field12865,omitempty"`
+	Field12866    *int32                `protobuf:"varint,5,opt,name=field12866" json:"field12866,omitempty"`
+	Field12867    []*Message12821       `protobuf:"bytes,6,rep,name=field12867" json:"field12867,omitempty"`
+	Field12868    []*UnusedEmptyMessage `protobuf:"bytes,7,rep,name=field12868" json:"field12868,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12825) Reset() {
@@ -1594,9 +1581,8 @@
 }
 
 type Message8590 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8590) Reset() {
@@ -1623,9 +1609,8 @@
 }
 
 type Message8587 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8587) Reset() {
@@ -1652,11 +1637,10 @@
 }
 
 type Message1374 struct {
-	Field1375            *string                 `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
-	Field1376            *string                 `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field1375     *string `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
+	Field1376     *string `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message1374) Reset() {
@@ -1697,11 +1681,10 @@
 }
 
 type Message2462 struct {
-	Field2496            []byte                  `protobuf:"bytes,1,req,name=field2496" json:"field2496,omitempty"`
-	Field2497            *float64                `protobuf:"fixed64,2,req,name=field2497" json:"field2497,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field2496     []byte   `protobuf:"bytes,1,req,name=field2496" json:"field2496,omitempty"`
+	Field2497     *float64 `protobuf:"fixed64,2,req,name=field2497" json:"field2497,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2462) Reset() {
@@ -1742,16 +1725,15 @@
 }
 
 type Message12685 struct {
-	Field12692           []string                `protobuf:"bytes,1,rep,name=field12692" json:"field12692,omitempty"`
-	Field12693           []string                `protobuf:"bytes,2,rep,name=field12693" json:"field12693,omitempty"`
-	Field12694           *int64                  `protobuf:"varint,3,opt,name=field12694" json:"field12694,omitempty"`
-	Field12695           *uint32                 `protobuf:"varint,4,opt,name=field12695" json:"field12695,omitempty"`
-	Field12696           []string                `protobuf:"bytes,5,rep,name=field12696" json:"field12696,omitempty"`
-	Field12697           *string                 `protobuf:"bytes,6,opt,name=field12697" json:"field12697,omitempty"`
-	Field12698           *string                 `protobuf:"bytes,7,opt,name=field12698" json:"field12698,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12692    []string `protobuf:"bytes,1,rep,name=field12692" json:"field12692,omitempty"`
+	Field12693    []string `protobuf:"bytes,2,rep,name=field12693" json:"field12693,omitempty"`
+	Field12694    *int64   `protobuf:"varint,3,opt,name=field12694" json:"field12694,omitempty"`
+	Field12695    *uint32  `protobuf:"varint,4,opt,name=field12695" json:"field12695,omitempty"`
+	Field12696    []string `protobuf:"bytes,5,rep,name=field12696" json:"field12696,omitempty"`
+	Field12697    *string  `protobuf:"bytes,6,opt,name=field12697" json:"field12697,omitempty"`
+	Field12698    *string  `protobuf:"bytes,7,opt,name=field12698" json:"field12698,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12685) Reset() {
@@ -1827,16 +1809,15 @@
 }
 
 type Message10320 struct {
-	Field10347           *Enum10335              `protobuf:"varint,1,opt,name=field10347,enum=benchmarks.google_message4.Enum10335" json:"field10347,omitempty"`
-	Field10348           []*Message10319         `protobuf:"bytes,2,rep,name=field10348" json:"field10348,omitempty"`
-	Field10349           *int32                  `protobuf:"varint,3,opt,name=field10349" json:"field10349,omitempty"`
-	Field10350           *int32                  `protobuf:"varint,4,opt,name=field10350" json:"field10350,omitempty"`
-	Field10351           *int32                  `protobuf:"varint,5,opt,name=field10351" json:"field10351,omitempty"`
-	Field10352           *int32                  `protobuf:"varint,6,opt,name=field10352" json:"field10352,omitempty"`
-	Field10353           *Enum10337              `protobuf:"varint,7,opt,name=field10353,enum=benchmarks.google_message4.Enum10337" json:"field10353,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10347    *Enum10335      `protobuf:"varint,1,opt,name=field10347,enum=benchmarks.google_message4.Enum10335" json:"field10347,omitempty"`
+	Field10348    []*Message10319 `protobuf:"bytes,2,rep,name=field10348" json:"field10348,omitempty"`
+	Field10349    *int32          `protobuf:"varint,3,opt,name=field10349" json:"field10349,omitempty"`
+	Field10350    *int32          `protobuf:"varint,4,opt,name=field10350" json:"field10350,omitempty"`
+	Field10351    *int32          `protobuf:"varint,5,opt,name=field10351" json:"field10351,omitempty"`
+	Field10352    *int32          `protobuf:"varint,6,opt,name=field10352" json:"field10352,omitempty"`
+	Field10353    *Enum10337      `protobuf:"varint,7,opt,name=field10353,enum=benchmarks.google_message4.Enum10337" json:"field10353,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10320) Reset() {
@@ -1912,12 +1893,11 @@
 }
 
 type Message11947 struct {
-	Field11951           *uint32                 `protobuf:"varint,1,opt,name=field11951" json:"field11951,omitempty"`
-	Field11952           *bool                   `protobuf:"varint,2,opt,name=field11952" json:"field11952,omitempty"`
-	Field11953           *int32                  `protobuf:"varint,3,opt,name=field11953" json:"field11953,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field11951    *uint32 `protobuf:"varint,1,opt,name=field11951" json:"field11951,omitempty"`
+	Field11952    *bool   `protobuf:"varint,2,opt,name=field11952" json:"field11952,omitempty"`
+	Field11953    *int32  `protobuf:"varint,3,opt,name=field11953" json:"field11953,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11947) Reset() {
@@ -1965,11 +1945,10 @@
 }
 
 type Message11920 struct {
-	Field11945           *Enum11901              `protobuf:"varint,1,opt,name=field11945,enum=benchmarks.google_message4.Enum11901" json:"field11945,omitempty"`
-	Field11946           *UnusedEnum             `protobuf:"varint,2,opt,name=field11946,enum=benchmarks.google_message4.UnusedEnum" json:"field11946,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field11945    *Enum11901  `protobuf:"varint,1,opt,name=field11945,enum=benchmarks.google_message4.Enum11901" json:"field11945,omitempty"`
+	Field11946    *UnusedEnum `protobuf:"varint,2,opt,name=field11946,enum=benchmarks.google_message4.UnusedEnum" json:"field11946,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message11920) Reset() {
@@ -2010,27 +1989,26 @@
 }
 
 type Message6643 struct {
-	Field6683            *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field6683" json:"field6683,omitempty"`
-	Field6684            *UnusedEmptyMessage     `protobuf:"bytes,4,opt,name=field6684" json:"field6684,omitempty"`
-	Field6685            *float64                `protobuf:"fixed64,5,opt,name=field6685" json:"field6685,omitempty"`
-	Field6686            *float64                `protobuf:"fixed64,6,opt,name=field6686" json:"field6686,omitempty"`
-	Field6687            *int32                  `protobuf:"varint,1,opt,name=field6687" json:"field6687,omitempty"`
-	Field6688            *int32                  `protobuf:"varint,2,opt,name=field6688" json:"field6688,omitempty"`
-	Field6689            *float64                `protobuf:"fixed64,9,opt,name=field6689" json:"field6689,omitempty"`
-	Field6690            []byte                  `protobuf:"bytes,10,opt,name=field6690" json:"field6690,omitempty"`
-	Field6691            *int32                  `protobuf:"varint,11,opt,name=field6691" json:"field6691,omitempty"`
-	Field6692            *bool                   `protobuf:"varint,12,opt,name=field6692" json:"field6692,omitempty"`
-	Field6693            *bool                   `protobuf:"varint,13,opt,name=field6693" json:"field6693,omitempty"`
-	Field6694            *Message6578            `protobuf:"bytes,15,opt,name=field6694" json:"field6694,omitempty"`
-	Field6695            *UnusedEnum             `protobuf:"varint,16,opt,name=field6695,enum=benchmarks.google_message4.UnusedEnum" json:"field6695,omitempty"`
-	Field6696            *int64                  `protobuf:"varint,17,opt,name=field6696" json:"field6696,omitempty"`
-	Field6697            []*UnusedEmptyMessage   `protobuf:"bytes,22,rep,name=field6697" json:"field6697,omitempty"`
-	Field6698            *UnusedEmptyMessage     `protobuf:"bytes,19,opt,name=field6698" json:"field6698,omitempty"`
-	Field6699            *UnusedEmptyMessage     `protobuf:"bytes,20,opt,name=field6699" json:"field6699,omitempty"`
-	Field6700            *int32                  `protobuf:"varint,21,opt,name=field6700" json:"field6700,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6683     *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field6683" json:"field6683,omitempty"`
+	Field6684     *UnusedEmptyMessage   `protobuf:"bytes,4,opt,name=field6684" json:"field6684,omitempty"`
+	Field6685     *float64              `protobuf:"fixed64,5,opt,name=field6685" json:"field6685,omitempty"`
+	Field6686     *float64              `protobuf:"fixed64,6,opt,name=field6686" json:"field6686,omitempty"`
+	Field6687     *int32                `protobuf:"varint,1,opt,name=field6687" json:"field6687,omitempty"`
+	Field6688     *int32                `protobuf:"varint,2,opt,name=field6688" json:"field6688,omitempty"`
+	Field6689     *float64              `protobuf:"fixed64,9,opt,name=field6689" json:"field6689,omitempty"`
+	Field6690     []byte                `protobuf:"bytes,10,opt,name=field6690" json:"field6690,omitempty"`
+	Field6691     *int32                `protobuf:"varint,11,opt,name=field6691" json:"field6691,omitempty"`
+	Field6692     *bool                 `protobuf:"varint,12,opt,name=field6692" json:"field6692,omitempty"`
+	Field6693     *bool                 `protobuf:"varint,13,opt,name=field6693" json:"field6693,omitempty"`
+	Field6694     *Message6578          `protobuf:"bytes,15,opt,name=field6694" json:"field6694,omitempty"`
+	Field6695     *UnusedEnum           `protobuf:"varint,16,opt,name=field6695,enum=benchmarks.google_message4.UnusedEnum" json:"field6695,omitempty"`
+	Field6696     *int64                `protobuf:"varint,17,opt,name=field6696" json:"field6696,omitempty"`
+	Field6697     []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field6697" json:"field6697,omitempty"`
+	Field6698     *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field6698" json:"field6698,omitempty"`
+	Field6699     *UnusedEmptyMessage   `protobuf:"bytes,20,opt,name=field6699" json:"field6699,omitempty"`
+	Field6700     *int32                `protobuf:"varint,21,opt,name=field6700" json:"field6700,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6643) Reset() {
@@ -2183,29 +2161,28 @@
 }
 
 type Message6133 struct {
-	Field6173            *Message4016            `protobuf:"bytes,12,opt,name=field6173" json:"field6173,omitempty"`
-	Field6174            *float64                `protobuf:"fixed64,16,opt,name=field6174" json:"field6174,omitempty"`
-	Field6175            *string                 `protobuf:"bytes,1,req,name=field6175" json:"field6175,omitempty"`
-	Field6176            *string                 `protobuf:"bytes,2,req,name=field6176" json:"field6176,omitempty"`
-	Field6177            *string                 `protobuf:"bytes,3,req,name=field6177" json:"field6177,omitempty"`
-	Field6178            *string                 `protobuf:"bytes,4,opt,name=field6178" json:"field6178,omitempty"`
-	Field6179            *string                 `protobuf:"bytes,8,opt,name=field6179" json:"field6179,omitempty"`
-	Field6180            []*Message6109          `protobuf:"bytes,5,rep,name=field6180" json:"field6180,omitempty"`
-	Field6181            []*Message5908          `protobuf:"bytes,13,rep,name=field6181" json:"field6181,omitempty"`
-	Field6182            []*Message6107          `protobuf:"bytes,7,rep,name=field6182" json:"field6182,omitempty"`
-	Field6183            []*Message6126          `protobuf:"bytes,9,rep,name=field6183" json:"field6183,omitempty"`
-	Field6184            []*Message6129          `protobuf:"bytes,15,rep,name=field6184" json:"field6184,omitempty"`
-	Field6185            *int32                  `protobuf:"varint,10,opt,name=field6185" json:"field6185,omitempty"`
-	Field6186            *int32                  `protobuf:"varint,11,opt,name=field6186" json:"field6186,omitempty"`
-	Field6187            *Message4016            `protobuf:"bytes,17,opt,name=field6187" json:"field6187,omitempty"`
-	Field6188            *float64                `protobuf:"fixed64,14,opt,name=field6188" json:"field6188,omitempty"`
-	Field6189            *float64                `protobuf:"fixed64,18,opt,name=field6189" json:"field6189,omitempty"`
-	Field6190            *string                 `protobuf:"bytes,19,opt,name=field6190" json:"field6190,omitempty"`
-	Field6191            *string                 `protobuf:"bytes,20,opt,name=field6191" json:"field6191,omitempty"`
-	Field6192            []*Message5881          `protobuf:"bytes,21,rep,name=field6192" json:"field6192,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6173     *Message4016   `protobuf:"bytes,12,opt,name=field6173" json:"field6173,omitempty"`
+	Field6174     *float64       `protobuf:"fixed64,16,opt,name=field6174" json:"field6174,omitempty"`
+	Field6175     *string        `protobuf:"bytes,1,req,name=field6175" json:"field6175,omitempty"`
+	Field6176     *string        `protobuf:"bytes,2,req,name=field6176" json:"field6176,omitempty"`
+	Field6177     *string        `protobuf:"bytes,3,req,name=field6177" json:"field6177,omitempty"`
+	Field6178     *string        `protobuf:"bytes,4,opt,name=field6178" json:"field6178,omitempty"`
+	Field6179     *string        `protobuf:"bytes,8,opt,name=field6179" json:"field6179,omitempty"`
+	Field6180     []*Message6109 `protobuf:"bytes,5,rep,name=field6180" json:"field6180,omitempty"`
+	Field6181     []*Message5908 `protobuf:"bytes,13,rep,name=field6181" json:"field6181,omitempty"`
+	Field6182     []*Message6107 `protobuf:"bytes,7,rep,name=field6182" json:"field6182,omitempty"`
+	Field6183     []*Message6126 `protobuf:"bytes,9,rep,name=field6183" json:"field6183,omitempty"`
+	Field6184     []*Message6129 `protobuf:"bytes,15,rep,name=field6184" json:"field6184,omitempty"`
+	Field6185     *int32         `protobuf:"varint,10,opt,name=field6185" json:"field6185,omitempty"`
+	Field6186     *int32         `protobuf:"varint,11,opt,name=field6186" json:"field6186,omitempty"`
+	Field6187     *Message4016   `protobuf:"bytes,17,opt,name=field6187" json:"field6187,omitempty"`
+	Field6188     *float64       `protobuf:"fixed64,14,opt,name=field6188" json:"field6188,omitempty"`
+	Field6189     *float64       `protobuf:"fixed64,18,opt,name=field6189" json:"field6189,omitempty"`
+	Field6190     *string        `protobuf:"bytes,19,opt,name=field6190" json:"field6190,omitempty"`
+	Field6191     *string        `protobuf:"bytes,20,opt,name=field6191" json:"field6191,omitempty"`
+	Field6192     []*Message5881 `protobuf:"bytes,21,rep,name=field6192" json:"field6192,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6133) Reset() {
@@ -2372,22 +2349,21 @@
 }
 
 type Message6109 struct {
-	Field6140              *string                   `protobuf:"bytes,1,opt,name=field6140" json:"field6140,omitempty"`
-	Field6141              *Enum6111                 `protobuf:"varint,2,req,name=field6141,enum=benchmarks.google_message4.Enum6111" json:"field6141,omitempty"`
-	Field6142              *int32                    `protobuf:"varint,9,opt,name=field6142" json:"field6142,omitempty"`
-	Field6143              *string                   `protobuf:"bytes,3,opt,name=field6143" json:"field6143,omitempty"`
-	Field6144              []*Message6110            `protobuf:"bytes,4,rep,name=field6144" json:"field6144,omitempty"`
-	Field6145              []int32                   `protobuf:"varint,7,rep,name=field6145" json:"field6145,omitempty"`
-	Field6146              []int32                   `protobuf:"varint,8,rep,name=field6146" json:"field6146,omitempty"`
-	Field6147              *Message6133              `protobuf:"bytes,10,opt,name=field6147" json:"field6147,omitempty"`
-	Field6148              []int32                   `protobuf:"varint,11,rep,name=field6148" json:"field6148,omitempty"`
-	Field6149              *string                   `protobuf:"bytes,12,opt,name=field6149" json:"field6149,omitempty"`
-	Field6150              *string                   `protobuf:"bytes,13,opt,name=field6150" json:"field6150,omitempty"`
-	Field6151              *bool                     `protobuf:"varint,14,opt,name=field6151" json:"field6151,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Field6140       *string        `protobuf:"bytes,1,opt,name=field6140" json:"field6140,omitempty"`
+	Field6141       *Enum6111      `protobuf:"varint,2,req,name=field6141,enum=benchmarks.google_message4.Enum6111" json:"field6141,omitempty"`
+	Field6142       *int32         `protobuf:"varint,9,opt,name=field6142" json:"field6142,omitempty"`
+	Field6143       *string        `protobuf:"bytes,3,opt,name=field6143" json:"field6143,omitempty"`
+	Field6144       []*Message6110 `protobuf:"bytes,4,rep,name=field6144" json:"field6144,omitempty"`
+	Field6145       []int32        `protobuf:"varint,7,rep,name=field6145" json:"field6145,omitempty"`
+	Field6146       []int32        `protobuf:"varint,8,rep,name=field6146" json:"field6146,omitempty"`
+	Field6147       *Message6133   `protobuf:"bytes,10,opt,name=field6147" json:"field6147,omitempty"`
+	Field6148       []int32        `protobuf:"varint,11,rep,name=field6148" json:"field6148,omitempty"`
+	Field6149       *string        `protobuf:"bytes,12,opt,name=field6149" json:"field6149,omitempty"`
+	Field6150       *string        `protobuf:"bytes,13,opt,name=field6150" json:"field6150,omitempty"`
+	Field6151       *bool          `protobuf:"varint,14,opt,name=field6151" json:"field6151,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message6109) Reset() {
@@ -2507,11 +2483,10 @@
 }
 
 type Message3046 struct {
-	Field3222            *Enum2593               `protobuf:"varint,1,req,name=field3222,enum=benchmarks.google_message4.Enum2593" json:"field3222,omitempty"`
-	Field3223            *int32                  `protobuf:"varint,4,opt,name=field3223" json:"field3223,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3222     *Enum2593 `protobuf:"varint,1,req,name=field3222,enum=benchmarks.google_message4.Enum2593" json:"field3222,omitempty"`
+	Field3223     *int32    `protobuf:"varint,4,opt,name=field3223" json:"field3223,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3046) Reset() {
@@ -2552,12 +2527,11 @@
 }
 
 type Message3060 struct {
-	Field3283            *int64                  `protobuf:"varint,1,opt,name=field3283" json:"field3283,omitempty"`
-	Field3284            *int64                  `protobuf:"varint,2,opt,name=field3284" json:"field3284,omitempty"`
-	Field3285            *int64                  `protobuf:"varint,3,opt,name=field3285" json:"field3285,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3283     *int64 `protobuf:"varint,1,opt,name=field3283" json:"field3283,omitempty"`
+	Field3284     *int64 `protobuf:"varint,2,opt,name=field3284" json:"field3284,omitempty"`
+	Field3285     *int64 `protobuf:"varint,3,opt,name=field3285" json:"field3285,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3060) Reset() {
@@ -2605,11 +2579,10 @@
 }
 
 type Message3041 struct {
-	Field3214            *string                 `protobuf:"bytes,1,opt,name=field3214" json:"field3214,omitempty"`
-	Field3215            *int32                  `protobuf:"varint,2,opt,name=field3215" json:"field3215,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3214     *string `protobuf:"bytes,1,opt,name=field3214" json:"field3214,omitempty"`
+	Field3215     *int32  `protobuf:"varint,2,opt,name=field3215" json:"field3215,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3041) Reset() {
@@ -2650,14 +2623,13 @@
 }
 
 type Message3040 struct {
-	Field3209            *uint64                 `protobuf:"fixed64,1,req,name=field3209" json:"field3209,omitempty"`
-	Field3210            []uint64                `protobuf:"fixed64,4,rep,name=field3210" json:"field3210,omitempty"`
-	Field3211            *int32                  `protobuf:"varint,5,opt,name=field3211" json:"field3211,omitempty"`
-	Field3212            *uint64                 `protobuf:"fixed64,2,opt,name=field3212" json:"field3212,omitempty"`
-	Field3213            *string                 `protobuf:"bytes,3,req,name=field3213" json:"field3213,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3209     *uint64  `protobuf:"fixed64,1,req,name=field3209" json:"field3209,omitempty"`
+	Field3210     []uint64 `protobuf:"fixed64,4,rep,name=field3210" json:"field3210,omitempty"`
+	Field3211     *int32   `protobuf:"varint,5,opt,name=field3211" json:"field3211,omitempty"`
+	Field3212     *uint64  `protobuf:"fixed64,2,opt,name=field3212" json:"field3212,omitempty"`
+	Field3213     *string  `protobuf:"bytes,3,req,name=field3213" json:"field3213,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3040) Reset() {
@@ -2719,15 +2691,14 @@
 }
 
 type Message3050 struct {
-	Field3245            []byte                  `protobuf:"bytes,5,opt,name=field3245" json:"field3245,omitempty"`
-	Field3246            *int32                  `protobuf:"varint,2,opt,name=field3246" json:"field3246,omitempty"`
-	Field3247            []byte                  `protobuf:"bytes,6,opt,name=field3247" json:"field3247,omitempty"`
-	Field3248            *int32                  `protobuf:"varint,4,opt,name=field3248" json:"field3248,omitempty"`
-	Field3249            *uint32                 `protobuf:"fixed32,1,opt,name=field3249" json:"field3249,omitempty"`
-	Field3250            *uint32                 `protobuf:"fixed32,3,opt,name=field3250" json:"field3250,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3245     []byte  `protobuf:"bytes,5,opt,name=field3245" json:"field3245,omitempty"`
+	Field3246     *int32  `protobuf:"varint,2,opt,name=field3246" json:"field3246,omitempty"`
+	Field3247     []byte  `protobuf:"bytes,6,opt,name=field3247" json:"field3247,omitempty"`
+	Field3248     *int32  `protobuf:"varint,4,opt,name=field3248" json:"field3248,omitempty"`
+	Field3249     *uint32 `protobuf:"fixed32,1,opt,name=field3249" json:"field3249,omitempty"`
+	Field3250     *uint32 `protobuf:"fixed32,3,opt,name=field3250" json:"field3250,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3050) Reset() {
@@ -2796,16 +2767,15 @@
 }
 
 type Message7905 struct {
-	Field7911            *int32                  `protobuf:"varint,1,opt,name=field7911" json:"field7911,omitempty"`
-	Field7912            *bool                   `protobuf:"varint,2,opt,name=field7912" json:"field7912,omitempty"`
-	Field7913            []byte                  `protobuf:"bytes,3,opt,name=field7913" json:"field7913,omitempty"`
-	Field7914            *int32                  `protobuf:"varint,4,opt,name=field7914" json:"field7914,omitempty"`
-	Field7915            *int32                  `protobuf:"varint,5,opt,name=field7915" json:"field7915,omitempty"`
-	Field7916            []byte                  `protobuf:"bytes,6,opt,name=field7916" json:"field7916,omitempty"`
-	Field7917            *int32                  `protobuf:"varint,7,opt,name=field7917" json:"field7917,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7911     *int32 `protobuf:"varint,1,opt,name=field7911" json:"field7911,omitempty"`
+	Field7912     *bool  `protobuf:"varint,2,opt,name=field7912" json:"field7912,omitempty"`
+	Field7913     []byte `protobuf:"bytes,3,opt,name=field7913" json:"field7913,omitempty"`
+	Field7914     *int32 `protobuf:"varint,4,opt,name=field7914" json:"field7914,omitempty"`
+	Field7915     *int32 `protobuf:"varint,5,opt,name=field7915" json:"field7915,omitempty"`
+	Field7916     []byte `protobuf:"bytes,6,opt,name=field7916" json:"field7916,omitempty"`
+	Field7917     *int32 `protobuf:"varint,7,opt,name=field7917" json:"field7917,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7905) Reset() {
@@ -2881,10 +2851,9 @@
 }
 
 type Message3886 struct {
-	Message3887          []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Message3887   []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3886) Reset() {
@@ -2918,15 +2887,14 @@
 }
 
 type Message7864 struct {
-	Field7866            *string                 `protobuf:"bytes,1,opt,name=field7866" json:"field7866,omitempty"`
-	Field7867            *string                 `protobuf:"bytes,2,opt,name=field7867" json:"field7867,omitempty"`
-	Field7868            []*Message7865          `protobuf:"bytes,5,rep,name=field7868" json:"field7868,omitempty"`
-	Field7869            []*Message7865          `protobuf:"bytes,6,rep,name=field7869" json:"field7869,omitempty"`
-	Field7870            []*Message7865          `protobuf:"bytes,7,rep,name=field7870" json:"field7870,omitempty"`
-	Field7871            []*UnusedEmptyMessage   `protobuf:"bytes,8,rep,name=field7871" json:"field7871,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7866     *string               `protobuf:"bytes,1,opt,name=field7866" json:"field7866,omitempty"`
+	Field7867     *string               `protobuf:"bytes,2,opt,name=field7867" json:"field7867,omitempty"`
+	Field7868     []*Message7865        `protobuf:"bytes,5,rep,name=field7868" json:"field7868,omitempty"`
+	Field7869     []*Message7865        `protobuf:"bytes,6,rep,name=field7869" json:"field7869,omitempty"`
+	Field7870     []*Message7865        `protobuf:"bytes,7,rep,name=field7870" json:"field7870,omitempty"`
+	Field7871     []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field7871" json:"field7871,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7864) Reset() {
@@ -2995,10 +2963,9 @@
 }
 
 type Message3922 struct {
-	Field4012            *uint64                 `protobuf:"varint,1,opt,name=field4012" json:"field4012,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field4012     *uint64 `protobuf:"varint,1,opt,name=field4012" json:"field4012,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3922) Reset() {
@@ -3032,18 +2999,17 @@
 }
 
 type Message3052 struct {
-	Field3254            []string                `protobuf:"bytes,1,rep,name=field3254" json:"field3254,omitempty"`
-	Field3255            []string                `protobuf:"bytes,2,rep,name=field3255" json:"field3255,omitempty"`
-	Field3256            [][]byte                `protobuf:"bytes,3,rep,name=field3256" json:"field3256,omitempty"`
-	Field3257            []string                `protobuf:"bytes,4,rep,name=field3257" json:"field3257,omitempty"`
-	Field3258            *bool                   `protobuf:"varint,5,opt,name=field3258" json:"field3258,omitempty"`
-	Field3259            *int32                  `protobuf:"varint,6,opt,name=field3259" json:"field3259,omitempty"`
-	Field3260            *int32                  `protobuf:"varint,7,opt,name=field3260" json:"field3260,omitempty"`
-	Field3261            *string                 `protobuf:"bytes,8,opt,name=field3261" json:"field3261,omitempty"`
-	Field3262            *string                 `protobuf:"bytes,9,opt,name=field3262" json:"field3262,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3254     []string `protobuf:"bytes,1,rep,name=field3254" json:"field3254,omitempty"`
+	Field3255     []string `protobuf:"bytes,2,rep,name=field3255" json:"field3255,omitempty"`
+	Field3256     [][]byte `protobuf:"bytes,3,rep,name=field3256" json:"field3256,omitempty"`
+	Field3257     []string `protobuf:"bytes,4,rep,name=field3257" json:"field3257,omitempty"`
+	Field3258     *bool    `protobuf:"varint,5,opt,name=field3258" json:"field3258,omitempty"`
+	Field3259     *int32   `protobuf:"varint,6,opt,name=field3259" json:"field3259,omitempty"`
+	Field3260     *int32   `protobuf:"varint,7,opt,name=field3260" json:"field3260,omitempty"`
+	Field3261     *string  `protobuf:"bytes,8,opt,name=field3261" json:"field3261,omitempty"`
+	Field3262     *string  `protobuf:"bytes,9,opt,name=field3262" json:"field3262,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3052) Reset() {
@@ -3133,9 +3099,8 @@
 }
 
 type Message8575 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message8575) Reset() {
@@ -3162,25 +3127,24 @@
 }
 
 type Message7843 struct {
-	Field7844            *bool                   `protobuf:"varint,5,opt,name=field7844" json:"field7844,omitempty"`
-	Field7845            *int32                  `protobuf:"varint,1,opt,name=field7845" json:"field7845,omitempty"`
-	Field7846            *UnusedEmptyMessage     `protobuf:"bytes,22,opt,name=field7846" json:"field7846,omitempty"`
-	Field7847            []int32                 `protobuf:"varint,3,rep,name=field7847" json:"field7847,omitempty"`
-	Field7848            []string                `protobuf:"bytes,11,rep,name=field7848" json:"field7848,omitempty"`
-	Field7849            *UnusedEnum             `protobuf:"varint,15,opt,name=field7849,enum=benchmarks.google_message4.UnusedEnum" json:"field7849,omitempty"`
-	Field7850            *UnusedEmptyMessage     `protobuf:"bytes,6,opt,name=field7850" json:"field7850,omitempty"`
-	Field7851            *UnusedEmptyMessage     `protobuf:"bytes,14,opt,name=field7851" json:"field7851,omitempty"`
-	Field7852            *UnusedEmptyMessage     `protobuf:"bytes,10,opt,name=field7852" json:"field7852,omitempty"`
-	Field7853            *Message7511            `protobuf:"bytes,13,opt,name=field7853" json:"field7853,omitempty"`
-	Field7854            *UnusedEmptyMessage     `protobuf:"bytes,16,opt,name=field7854" json:"field7854,omitempty"`
-	Field7855            *UnusedEmptyMessage     `protobuf:"bytes,17,opt,name=field7855" json:"field7855,omitempty"`
-	Field7856            *UnusedEmptyMessage     `protobuf:"bytes,19,opt,name=field7856" json:"field7856,omitempty"`
-	Field7857            *UnusedEmptyMessage     `protobuf:"bytes,18,opt,name=field7857" json:"field7857,omitempty"`
-	Field7858            *UnusedEnum             `protobuf:"varint,20,opt,name=field7858,enum=benchmarks.google_message4.UnusedEnum" json:"field7858,omitempty"`
-	Field7859            *int32                  `protobuf:"varint,2,opt,name=field7859" json:"field7859,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7844     *bool               `protobuf:"varint,5,opt,name=field7844" json:"field7844,omitempty"`
+	Field7845     *int32              `protobuf:"varint,1,opt,name=field7845" json:"field7845,omitempty"`
+	Field7846     *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field7846" json:"field7846,omitempty"`
+	Field7847     []int32             `protobuf:"varint,3,rep,name=field7847" json:"field7847,omitempty"`
+	Field7848     []string            `protobuf:"bytes,11,rep,name=field7848" json:"field7848,omitempty"`
+	Field7849     *UnusedEnum         `protobuf:"varint,15,opt,name=field7849,enum=benchmarks.google_message4.UnusedEnum" json:"field7849,omitempty"`
+	Field7850     *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field7850" json:"field7850,omitempty"`
+	Field7851     *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field7851" json:"field7851,omitempty"`
+	Field7852     *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field7852" json:"field7852,omitempty"`
+	Field7853     *Message7511        `protobuf:"bytes,13,opt,name=field7853" json:"field7853,omitempty"`
+	Field7854     *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field7854" json:"field7854,omitempty"`
+	Field7855     *UnusedEmptyMessage `protobuf:"bytes,17,opt,name=field7855" json:"field7855,omitempty"`
+	Field7856     *UnusedEmptyMessage `protobuf:"bytes,19,opt,name=field7856" json:"field7856,omitempty"`
+	Field7857     *UnusedEmptyMessage `protobuf:"bytes,18,opt,name=field7857" json:"field7857,omitempty"`
+	Field7858     *UnusedEnum         `protobuf:"varint,20,opt,name=field7858,enum=benchmarks.google_message4.UnusedEnum" json:"field7858,omitempty"`
+	Field7859     *int32              `protobuf:"varint,2,opt,name=field7859" json:"field7859,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7843) Reset() {
@@ -3319,10 +3283,9 @@
 }
 
 type Message3919 struct {
-	Field4009            []*Message3920          `protobuf:"bytes,1,rep,name=field4009" json:"field4009,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field4009     []*Message3920 `protobuf:"bytes,1,rep,name=field4009" json:"field4009,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3919) Reset() {
@@ -3356,29 +3319,28 @@
 }
 
 type Message7929 struct {
-	Field7942            *int64                  `protobuf:"varint,1,opt,name=field7942" json:"field7942,omitempty"`
-	Field7943            *int64                  `protobuf:"varint,4,opt,name=field7943" json:"field7943,omitempty"`
-	Field7944            *int64                  `protobuf:"varint,5,opt,name=field7944" json:"field7944,omitempty"`
-	Field7945            *int64                  `protobuf:"varint,12,opt,name=field7945" json:"field7945,omitempty"`
-	Field7946            *int64                  `protobuf:"varint,13,opt,name=field7946" json:"field7946,omitempty"`
-	Field7947            *int64                  `protobuf:"varint,18,opt,name=field7947" json:"field7947,omitempty"`
-	Field7948            *int64                  `protobuf:"varint,6,opt,name=field7948" json:"field7948,omitempty"`
-	Field7949            *int64                  `protobuf:"varint,7,opt,name=field7949" json:"field7949,omitempty"`
-	Field7950            []*Message7919          `protobuf:"bytes,8,rep,name=field7950" json:"field7950,omitempty"`
-	Field7951            []*UnusedEmptyMessage   `protobuf:"bytes,20,rep,name=field7951" json:"field7951,omitempty"`
-	Field7952            []*Message7920          `protobuf:"bytes,14,rep,name=field7952" json:"field7952,omitempty"`
-	Field7953            []*Message7921          `protobuf:"bytes,15,rep,name=field7953" json:"field7953,omitempty"`
-	Field7954            []*Message7928          `protobuf:"bytes,17,rep,name=field7954" json:"field7954,omitempty"`
-	Field7955            *int64                  `protobuf:"varint,19,opt,name=field7955" json:"field7955,omitempty"`
-	Field7956            *bool                   `protobuf:"varint,2,opt,name=field7956" json:"field7956,omitempty"`
-	Field7957            *int64                  `protobuf:"varint,3,opt,name=field7957" json:"field7957,omitempty"`
-	Field7958            *int64                  `protobuf:"varint,9,opt,name=field7958" json:"field7958,omitempty"`
-	Field7959            []*UnusedEmptyMessage   `protobuf:"bytes,10,rep,name=field7959" json:"field7959,omitempty"`
-	Field7960            [][]byte                `protobuf:"bytes,11,rep,name=field7960" json:"field7960,omitempty"`
-	Field7961            *int64                  `protobuf:"varint,16,opt,name=field7961" json:"field7961,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7942     *int64                `protobuf:"varint,1,opt,name=field7942" json:"field7942,omitempty"`
+	Field7943     *int64                `protobuf:"varint,4,opt,name=field7943" json:"field7943,omitempty"`
+	Field7944     *int64                `protobuf:"varint,5,opt,name=field7944" json:"field7944,omitempty"`
+	Field7945     *int64                `protobuf:"varint,12,opt,name=field7945" json:"field7945,omitempty"`
+	Field7946     *int64                `protobuf:"varint,13,opt,name=field7946" json:"field7946,omitempty"`
+	Field7947     *int64                `protobuf:"varint,18,opt,name=field7947" json:"field7947,omitempty"`
+	Field7948     *int64                `protobuf:"varint,6,opt,name=field7948" json:"field7948,omitempty"`
+	Field7949     *int64                `protobuf:"varint,7,opt,name=field7949" json:"field7949,omitempty"`
+	Field7950     []*Message7919        `protobuf:"bytes,8,rep,name=field7950" json:"field7950,omitempty"`
+	Field7951     []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field7951" json:"field7951,omitempty"`
+	Field7952     []*Message7920        `protobuf:"bytes,14,rep,name=field7952" json:"field7952,omitempty"`
+	Field7953     []*Message7921        `protobuf:"bytes,15,rep,name=field7953" json:"field7953,omitempty"`
+	Field7954     []*Message7928        `protobuf:"bytes,17,rep,name=field7954" json:"field7954,omitempty"`
+	Field7955     *int64                `protobuf:"varint,19,opt,name=field7955" json:"field7955,omitempty"`
+	Field7956     *bool                 `protobuf:"varint,2,opt,name=field7956" json:"field7956,omitempty"`
+	Field7957     *int64                `protobuf:"varint,3,opt,name=field7957" json:"field7957,omitempty"`
+	Field7958     *int64                `protobuf:"varint,9,opt,name=field7958" json:"field7958,omitempty"`
+	Field7959     []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field7959" json:"field7959,omitempty"`
+	Field7960     [][]byte              `protobuf:"bytes,11,rep,name=field7960" json:"field7960,omitempty"`
+	Field7961     *int64                `protobuf:"varint,16,opt,name=field7961" json:"field7961,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7929) Reset() {
@@ -3545,12 +3507,11 @@
 }
 
 type Message3061_Message3062 struct {
-	Field3335            *int32                  `protobuf:"varint,5,req,name=field3335" json:"field3335,omitempty"`
-	Field3336            *int32                  `protobuf:"varint,6,opt,name=field3336" json:"field3336,omitempty"`
-	Field3337            *int32                  `protobuf:"varint,7,opt,name=field3337" json:"field3337,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3335     *int32 `protobuf:"varint,5,req,name=field3335" json:"field3335,omitempty"`
+	Field3336     *int32 `protobuf:"varint,6,opt,name=field3336" json:"field3336,omitempty"`
+	Field3337     *int32 `protobuf:"varint,7,opt,name=field3337" json:"field3337,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3061_Message3062) Reset() {
@@ -3598,13 +3559,12 @@
 }
 
 type Message3061_Message3063 struct {
-	Field3338            *int32                  `protobuf:"varint,14,req,name=field3338" json:"field3338,omitempty"`
-	Field3339            *Enum2851               `protobuf:"varint,18,opt,name=field3339,enum=benchmarks.google_message4.Enum2851" json:"field3339,omitempty"`
-	Field3340            *int64                  `protobuf:"varint,15,opt,name=field3340" json:"field3340,omitempty"`
-	Field3341            *int64                  `protobuf:"varint,23,opt,name=field3341" json:"field3341,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3338     *int32    `protobuf:"varint,14,req,name=field3338" json:"field3338,omitempty"`
+	Field3339     *Enum2851 `protobuf:"varint,18,opt,name=field3339,enum=benchmarks.google_message4.Enum2851" json:"field3339,omitempty"`
+	Field3340     *int64    `protobuf:"varint,15,opt,name=field3340" json:"field3340,omitempty"`
+	Field3341     *int64    `protobuf:"varint,23,opt,name=field3341" json:"field3341,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3061_Message3063) Reset() {
@@ -3659,28 +3619,27 @@
 }
 
 type Message3061_Message3064 struct {
-	Field3342            *Enum2602               `protobuf:"varint,9,req,name=field3342,enum=benchmarks.google_message4.Enum2602" json:"field3342,omitempty"`
-	Field3343            *int32                  `protobuf:"varint,92,opt,name=field3343" json:"field3343,omitempty"`
-	Field3344            *string                 `protobuf:"bytes,10,opt,name=field3344" json:"field3344,omitempty"`
-	Field3345            []byte                  `protobuf:"bytes,11,opt,name=field3345" json:"field3345,omitempty"`
-	Field3346            *int32                  `protobuf:"varint,12,opt,name=field3346" json:"field3346,omitempty"`
-	Field3347            *Message3060            `protobuf:"bytes,98,opt,name=field3347" json:"field3347,omitempty"`
-	Field3348            *UnusedEmptyMessage     `protobuf:"bytes,82,opt,name=field3348" json:"field3348,omitempty"`
-	Field3349            *Message3050            `protobuf:"bytes,80,opt,name=field3349" json:"field3349,omitempty"`
-	Field3350            *uint64                 `protobuf:"fixed64,52,opt,name=field3350" json:"field3350,omitempty"`
-	Field3351            *int32                  `protobuf:"varint,33,opt,name=field3351" json:"field3351,omitempty"`
-	Field3352            *string                 `protobuf:"bytes,42,opt,name=field3352" json:"field3352,omitempty"`
-	Field3353            *string                 `protobuf:"bytes,69,opt,name=field3353" json:"field3353,omitempty"`
-	Field3354            []byte                  `protobuf:"bytes,43,opt,name=field3354" json:"field3354,omitempty"`
-	Field3355            *Enum2806               `protobuf:"varint,73,opt,name=field3355,enum=benchmarks.google_message4.Enum2806" json:"field3355,omitempty"`
-	Field3356            *int32                  `protobuf:"varint,74,opt,name=field3356" json:"field3356,omitempty"`
-	Field3357            *int32                  `protobuf:"varint,90,opt,name=field3357" json:"field3357,omitempty"`
-	Field3358            []byte                  `protobuf:"bytes,79,opt,name=field3358" json:"field3358,omitempty"`
-	Field3359            *int32                  `protobuf:"varint,19,opt,name=field3359" json:"field3359,omitempty"`
-	Field3360            *Enum2834               `protobuf:"varint,95,opt,name=field3360,enum=benchmarks.google_message4.Enum2834" json:"field3360,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3342     *Enum2602           `protobuf:"varint,9,req,name=field3342,enum=benchmarks.google_message4.Enum2602" json:"field3342,omitempty"`
+	Field3343     *int32              `protobuf:"varint,92,opt,name=field3343" json:"field3343,omitempty"`
+	Field3344     *string             `protobuf:"bytes,10,opt,name=field3344" json:"field3344,omitempty"`
+	Field3345     []byte              `protobuf:"bytes,11,opt,name=field3345" json:"field3345,omitempty"`
+	Field3346     *int32              `protobuf:"varint,12,opt,name=field3346" json:"field3346,omitempty"`
+	Field3347     *Message3060        `protobuf:"bytes,98,opt,name=field3347" json:"field3347,omitempty"`
+	Field3348     *UnusedEmptyMessage `protobuf:"bytes,82,opt,name=field3348" json:"field3348,omitempty"`
+	Field3349     *Message3050        `protobuf:"bytes,80,opt,name=field3349" json:"field3349,omitempty"`
+	Field3350     *uint64             `protobuf:"fixed64,52,opt,name=field3350" json:"field3350,omitempty"`
+	Field3351     *int32              `protobuf:"varint,33,opt,name=field3351" json:"field3351,omitempty"`
+	Field3352     *string             `protobuf:"bytes,42,opt,name=field3352" json:"field3352,omitempty"`
+	Field3353     *string             `protobuf:"bytes,69,opt,name=field3353" json:"field3353,omitempty"`
+	Field3354     []byte              `protobuf:"bytes,43,opt,name=field3354" json:"field3354,omitempty"`
+	Field3355     *Enum2806           `protobuf:"varint,73,opt,name=field3355,enum=benchmarks.google_message4.Enum2806" json:"field3355,omitempty"`
+	Field3356     *int32              `protobuf:"varint,74,opt,name=field3356" json:"field3356,omitempty"`
+	Field3357     *int32              `protobuf:"varint,90,opt,name=field3357" json:"field3357,omitempty"`
+	Field3358     []byte              `protobuf:"bytes,79,opt,name=field3358" json:"field3358,omitempty"`
+	Field3359     *int32              `protobuf:"varint,19,opt,name=field3359" json:"field3359,omitempty"`
+	Field3360     *Enum2834           `protobuf:"varint,95,opt,name=field3360,enum=benchmarks.google_message4.Enum2834" json:"field3360,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3061_Message3064) Reset() {
@@ -3840,9 +3799,8 @@
 }
 
 type Message3061_Message3065 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3061_Message3065) Reset() {
@@ -3869,17 +3827,16 @@
 }
 
 type Message3061_Message3066 struct {
-	Field3366            *int32                  `protobuf:"varint,22,opt,name=field3366" json:"field3366,omitempty"`
-	Field3367            *int32                  `protobuf:"varint,55,opt,name=field3367" json:"field3367,omitempty"`
-	Field3368            *int32                  `protobuf:"varint,88,opt,name=field3368" json:"field3368,omitempty"`
-	Field3369            *int32                  `protobuf:"varint,56,opt,name=field3369" json:"field3369,omitempty"`
-	Field3370            *int32                  `protobuf:"varint,75,opt,name=field3370" json:"field3370,omitempty"`
-	Field3371            *int32                  `protobuf:"varint,57,opt,name=field3371" json:"field3371,omitempty"`
-	Field3372            *UnusedEmptyMessage     `protobuf:"bytes,85,opt,name=field3372" json:"field3372,omitempty"`
-	Field3373            *UnusedEmptyMessage     `protobuf:"bytes,96,opt,name=field3373" json:"field3373,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3366     *int32              `protobuf:"varint,22,opt,name=field3366" json:"field3366,omitempty"`
+	Field3367     *int32              `protobuf:"varint,55,opt,name=field3367" json:"field3367,omitempty"`
+	Field3368     *int32              `protobuf:"varint,88,opt,name=field3368" json:"field3368,omitempty"`
+	Field3369     *int32              `protobuf:"varint,56,opt,name=field3369" json:"field3369,omitempty"`
+	Field3370     *int32              `protobuf:"varint,75,opt,name=field3370" json:"field3370,omitempty"`
+	Field3371     *int32              `protobuf:"varint,57,opt,name=field3371" json:"field3371,omitempty"`
+	Field3372     *UnusedEmptyMessage `protobuf:"bytes,85,opt,name=field3372" json:"field3372,omitempty"`
+	Field3373     *UnusedEmptyMessage `protobuf:"bytes,96,opt,name=field3373" json:"field3373,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3061_Message3066) Reset() {
@@ -3962,13 +3919,12 @@
 }
 
 type Message3886_Message3887 struct {
-	Field3932            *string                 `protobuf:"bytes,2,req,name=field3932" json:"field3932,omitempty"`
-	Field3933            *string                 `protobuf:"bytes,9,opt,name=field3933" json:"field3933,omitempty"`
-	Field3934            *Message3850            `protobuf:"bytes,3,opt,name=field3934" json:"field3934,omitempty"`
-	Field3935            []byte                  `protobuf:"bytes,8,opt,name=field3935" json:"field3935,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3932     *string      `protobuf:"bytes,2,req,name=field3932" json:"field3932,omitempty"`
+	Field3933     *string      `protobuf:"bytes,9,opt,name=field3933" json:"field3933,omitempty"`
+	Field3934     *Message3850 `protobuf:"bytes,3,opt,name=field3934" json:"field3934,omitempty"`
+	Field3935     []byte       `protobuf:"bytes,8,opt,name=field3935" json:"field3935,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3886_Message3887) Reset() {
@@ -5281,6 +5237,452 @@
 	}
 	file_datasets_google_message4_benchmark_message4_2_proto_init()
 	file_datasets_google_message4_benchmark_message4_3_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2463); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12686); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11949); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11975); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7287); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3061); i {
+			case 48:
+				return &v.sizeCache
+			case 49:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12949); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8572); i {
+			case 50:
+				return &v.sizeCache
+			case 51:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8774); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12776); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			case 12:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12798); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12797); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12825); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8590); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8587); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message1374); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2462); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12685); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10320); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11947); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message11920); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6643); i {
+			case 18:
+				return &v.sizeCache
+			case 19:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6133); i {
+			case 20:
+				return &v.sizeCache
+			case 21:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6109); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			case 14:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3046); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3060); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3041); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3040); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3050); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7905); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3886); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7864); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3922); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3052); i {
+			case 9:
+				return &v.sizeCache
+			case 10:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message8575); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7843); i {
+			case 16:
+				return &v.sizeCache
+			case 17:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3919); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7929); i {
+			case 20:
+				return &v.sizeCache
+			case 21:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3061_Message3062); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3061_Message3063); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3061_Message3064); i {
+			case 19:
+				return &v.sizeCache
+			case 20:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3061_Message3065); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3061_Message3066); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_1_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3886_Message3887); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message4_benchmark_message4_1_proto_rawDesc,
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go
index 06fa93b..6070f9d 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go
@@ -18,15 +18,14 @@
 )
 
 type Message12774 struct {
-	Field12777           *uint32                 `protobuf:"varint,1,opt,name=field12777" json:"field12777,omitempty"`
-	Field12778           *uint32                 `protobuf:"varint,2,opt,name=field12778" json:"field12778,omitempty"`
-	Field12779           *uint32                 `protobuf:"varint,3,opt,name=field12779" json:"field12779,omitempty"`
-	Field12780           *uint32                 `protobuf:"varint,4,opt,name=field12780" json:"field12780,omitempty"`
-	Field12781           *uint32                 `protobuf:"varint,5,opt,name=field12781" json:"field12781,omitempty"`
-	Field12782           *bool                   `protobuf:"varint,6,opt,name=field12782" json:"field12782,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12777    *uint32 `protobuf:"varint,1,opt,name=field12777" json:"field12777,omitempty"`
+	Field12778    *uint32 `protobuf:"varint,2,opt,name=field12778" json:"field12778,omitempty"`
+	Field12779    *uint32 `protobuf:"varint,3,opt,name=field12779" json:"field12779,omitempty"`
+	Field12780    *uint32 `protobuf:"varint,4,opt,name=field12780" json:"field12780,omitempty"`
+	Field12781    *uint32 `protobuf:"varint,5,opt,name=field12781" json:"field12781,omitempty"`
+	Field12782    *bool   `protobuf:"varint,6,opt,name=field12782" json:"field12782,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12774) Reset() {
@@ -95,11 +94,10 @@
 }
 
 type Message12796 struct {
-	Field12800           []uint64                `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
-	Field12801           *uint64                 `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12800    []uint64 `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
+	Field12801    *uint64  `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12796) Reset() {
@@ -140,14 +138,13 @@
 }
 
 type Message12821 struct {
-	Field12848           *int32                  `protobuf:"varint,1,opt,name=field12848" json:"field12848,omitempty"`
-	Field12849           *int32                  `protobuf:"varint,2,opt,name=field12849" json:"field12849,omitempty"`
-	Field12850           *int32                  `protobuf:"varint,3,opt,name=field12850" json:"field12850,omitempty"`
-	Field12851           *int32                  `protobuf:"varint,4,opt,name=field12851" json:"field12851,omitempty"`
-	Field12852           *int32                  `protobuf:"varint,5,opt,name=field12852" json:"field12852,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12848    *int32 `protobuf:"varint,1,opt,name=field12848" json:"field12848,omitempty"`
+	Field12849    *int32 `protobuf:"varint,2,opt,name=field12849" json:"field12849,omitempty"`
+	Field12850    *int32 `protobuf:"varint,3,opt,name=field12850" json:"field12850,omitempty"`
+	Field12851    *int32 `protobuf:"varint,4,opt,name=field12851" json:"field12851,omitempty"`
+	Field12852    *int32 `protobuf:"varint,5,opt,name=field12852" json:"field12852,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12821) Reset() {
@@ -209,17 +206,16 @@
 }
 
 type Message12820 struct {
-	Field12840           *int32                  `protobuf:"varint,1,opt,name=field12840" json:"field12840,omitempty"`
-	Field12841           *int32                  `protobuf:"varint,2,opt,name=field12841" json:"field12841,omitempty"`
-	Field12842           *int32                  `protobuf:"varint,3,opt,name=field12842" json:"field12842,omitempty"`
-	Field12843           *int32                  `protobuf:"varint,8,opt,name=field12843" json:"field12843,omitempty"`
-	Field12844           *int32                  `protobuf:"varint,4,opt,name=field12844" json:"field12844,omitempty"`
-	Field12845           *int32                  `protobuf:"varint,5,opt,name=field12845" json:"field12845,omitempty"`
-	Field12846           *int32                  `protobuf:"varint,6,opt,name=field12846" json:"field12846,omitempty"`
-	Field12847           *int32                  `protobuf:"varint,7,opt,name=field12847" json:"field12847,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12840    *int32 `protobuf:"varint,1,opt,name=field12840" json:"field12840,omitempty"`
+	Field12841    *int32 `protobuf:"varint,2,opt,name=field12841" json:"field12841,omitempty"`
+	Field12842    *int32 `protobuf:"varint,3,opt,name=field12842" json:"field12842,omitempty"`
+	Field12843    *int32 `protobuf:"varint,8,opt,name=field12843" json:"field12843,omitempty"`
+	Field12844    *int32 `protobuf:"varint,4,opt,name=field12844" json:"field12844,omitempty"`
+	Field12845    *int32 `protobuf:"varint,5,opt,name=field12845" json:"field12845,omitempty"`
+	Field12846    *int32 `protobuf:"varint,6,opt,name=field12846" json:"field12846,omitempty"`
+	Field12847    *int32 `protobuf:"varint,7,opt,name=field12847" json:"field12847,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12820) Reset() {
@@ -302,15 +298,14 @@
 }
 
 type Message12819 struct {
-	Field12834           *float64                `protobuf:"fixed64,1,opt,name=field12834" json:"field12834,omitempty"`
-	Field12835           *float64                `protobuf:"fixed64,2,opt,name=field12835" json:"field12835,omitempty"`
-	Field12836           *float64                `protobuf:"fixed64,3,opt,name=field12836" json:"field12836,omitempty"`
-	Field12837           *float64                `protobuf:"fixed64,4,opt,name=field12837" json:"field12837,omitempty"`
-	Field12838           *float64                `protobuf:"fixed64,5,opt,name=field12838" json:"field12838,omitempty"`
-	Field12839           *float64                `protobuf:"fixed64,6,opt,name=field12839" json:"field12839,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12834    *float64 `protobuf:"fixed64,1,opt,name=field12834" json:"field12834,omitempty"`
+	Field12835    *float64 `protobuf:"fixed64,2,opt,name=field12835" json:"field12835,omitempty"`
+	Field12836    *float64 `protobuf:"fixed64,3,opt,name=field12836" json:"field12836,omitempty"`
+	Field12837    *float64 `protobuf:"fixed64,4,opt,name=field12837" json:"field12837,omitempty"`
+	Field12838    *float64 `protobuf:"fixed64,5,opt,name=field12838" json:"field12838,omitempty"`
+	Field12839    *float64 `protobuf:"fixed64,6,opt,name=field12839" json:"field12839,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12819) Reset() {
@@ -379,14 +374,13 @@
 }
 
 type Message12818 struct {
-	Field12829           *uint64                 `protobuf:"varint,1,opt,name=field12829" json:"field12829,omitempty"`
-	Field12830           *int32                  `protobuf:"varint,2,opt,name=field12830" json:"field12830,omitempty"`
-	Field12831           *int32                  `protobuf:"varint,3,opt,name=field12831" json:"field12831,omitempty"`
-	Field12832           *int32                  `protobuf:"varint,5,opt,name=field12832" json:"field12832,omitempty"`
-	Field12833           []*Message12817         `protobuf:"bytes,4,rep,name=field12833" json:"field12833,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12829    *uint64         `protobuf:"varint,1,opt,name=field12829" json:"field12829,omitempty"`
+	Field12830    *int32          `protobuf:"varint,2,opt,name=field12830" json:"field12830,omitempty"`
+	Field12831    *int32          `protobuf:"varint,3,opt,name=field12831" json:"field12831,omitempty"`
+	Field12832    *int32          `protobuf:"varint,5,opt,name=field12832" json:"field12832,omitempty"`
+	Field12833    []*Message12817 `protobuf:"bytes,4,rep,name=field12833" json:"field12833,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12818) Reset() {
@@ -448,16 +442,15 @@
 }
 
 type Message10319 struct {
-	Field10340           *Enum10325              `protobuf:"varint,1,opt,name=field10340,enum=benchmarks.google_message4.Enum10325" json:"field10340,omitempty"`
-	Field10341           *int32                  `protobuf:"varint,4,opt,name=field10341" json:"field10341,omitempty"`
-	Field10342           *int32                  `protobuf:"varint,5,opt,name=field10342" json:"field10342,omitempty"`
-	Field10343           []byte                  `protobuf:"bytes,3,opt,name=field10343" json:"field10343,omitempty"`
-	Field10344           *string                 `protobuf:"bytes,2,opt,name=field10344" json:"field10344,omitempty"`
-	Field10345           *string                 `protobuf:"bytes,6,opt,name=field10345" json:"field10345,omitempty"`
-	Field10346           *string                 `protobuf:"bytes,7,opt,name=field10346" json:"field10346,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field10340    *Enum10325 `protobuf:"varint,1,opt,name=field10340,enum=benchmarks.google_message4.Enum10325" json:"field10340,omitempty"`
+	Field10341    *int32     `protobuf:"varint,4,opt,name=field10341" json:"field10341,omitempty"`
+	Field10342    *int32     `protobuf:"varint,5,opt,name=field10342" json:"field10342,omitempty"`
+	Field10343    []byte     `protobuf:"bytes,3,opt,name=field10343" json:"field10343,omitempty"`
+	Field10344    *string    `protobuf:"bytes,2,opt,name=field10344" json:"field10344,omitempty"`
+	Field10345    *string    `protobuf:"bytes,6,opt,name=field10345" json:"field10345,omitempty"`
+	Field10346    *string    `protobuf:"bytes,7,opt,name=field10346" json:"field10346,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message10319) Reset() {
@@ -533,11 +526,10 @@
 }
 
 type Message6578 struct {
-	Field6632            *Enum6579               `protobuf:"varint,1,opt,name=field6632,enum=benchmarks.google_message4.Enum6579" json:"field6632,omitempty"`
-	Field6633            *Enum6588               `protobuf:"varint,2,opt,name=field6633,enum=benchmarks.google_message4.Enum6588" json:"field6633,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6632     *Enum6579 `protobuf:"varint,1,opt,name=field6632,enum=benchmarks.google_message4.Enum6579" json:"field6632,omitempty"`
+	Field6633     *Enum6588 `protobuf:"varint,2,opt,name=field6633,enum=benchmarks.google_message4.Enum6588" json:"field6633,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6578) Reset() {
@@ -578,28 +570,27 @@
 }
 
 type Message6126 struct {
-	Field6152            *string                 `protobuf:"bytes,1,req,name=field6152" json:"field6152,omitempty"`
-	Field6153            []*Message6127          `protobuf:"bytes,9,rep,name=field6153" json:"field6153,omitempty"`
-	Field6154            *int32                  `protobuf:"varint,14,opt,name=field6154" json:"field6154,omitempty"`
-	Field6155            []byte                  `protobuf:"bytes,10,opt,name=field6155" json:"field6155,omitempty"`
-	Field6156            *Message6024            `protobuf:"bytes,12,opt,name=field6156" json:"field6156,omitempty"`
-	Field6157            *int32                  `protobuf:"varint,4,opt,name=field6157" json:"field6157,omitempty"`
-	Field6158            *string                 `protobuf:"bytes,5,opt,name=field6158" json:"field6158,omitempty"`
-	Field6159            *int32                  `protobuf:"varint,6,opt,name=field6159" json:"field6159,omitempty"`
-	Field6160            []int32                 `protobuf:"varint,2,rep,name=field6160" json:"field6160,omitempty"`
-	Field6161            []int32                 `protobuf:"varint,3,rep,name=field6161" json:"field6161,omitempty"`
-	Field6162            []*Message6052          `protobuf:"bytes,7,rep,name=field6162" json:"field6162,omitempty"`
-	Field6163            []*UnusedEmptyMessage   `protobuf:"bytes,11,rep,name=field6163" json:"field6163,omitempty"`
-	Field6164            *Enum6065               `protobuf:"varint,15,opt,name=field6164,enum=benchmarks.google_message4.Enum6065" json:"field6164,omitempty"`
-	Field6165            []*Message6127          `protobuf:"bytes,8,rep,name=field6165" json:"field6165,omitempty"`
-	Field6166            *bool                   `protobuf:"varint,13,opt,name=field6166" json:"field6166,omitempty"`
-	Field6167            *bool                   `protobuf:"varint,16,opt,name=field6167" json:"field6167,omitempty"`
-	Field6168            *bool                   `protobuf:"varint,18,opt,name=field6168" json:"field6168,omitempty"`
-	Field6169            []*Message6054          `protobuf:"bytes,17,rep,name=field6169" json:"field6169,omitempty"`
-	Field6170            *int32                  `protobuf:"varint,19,opt,name=field6170" json:"field6170,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6152     *string               `protobuf:"bytes,1,req,name=field6152" json:"field6152,omitempty"`
+	Field6153     []*Message6127        `protobuf:"bytes,9,rep,name=field6153" json:"field6153,omitempty"`
+	Field6154     *int32                `protobuf:"varint,14,opt,name=field6154" json:"field6154,omitempty"`
+	Field6155     []byte                `protobuf:"bytes,10,opt,name=field6155" json:"field6155,omitempty"`
+	Field6156     *Message6024          `protobuf:"bytes,12,opt,name=field6156" json:"field6156,omitempty"`
+	Field6157     *int32                `protobuf:"varint,4,opt,name=field6157" json:"field6157,omitempty"`
+	Field6158     *string               `protobuf:"bytes,5,opt,name=field6158" json:"field6158,omitempty"`
+	Field6159     *int32                `protobuf:"varint,6,opt,name=field6159" json:"field6159,omitempty"`
+	Field6160     []int32               `protobuf:"varint,2,rep,name=field6160" json:"field6160,omitempty"`
+	Field6161     []int32               `protobuf:"varint,3,rep,name=field6161" json:"field6161,omitempty"`
+	Field6162     []*Message6052        `protobuf:"bytes,7,rep,name=field6162" json:"field6162,omitempty"`
+	Field6163     []*UnusedEmptyMessage `protobuf:"bytes,11,rep,name=field6163" json:"field6163,omitempty"`
+	Field6164     *Enum6065             `protobuf:"varint,15,opt,name=field6164,enum=benchmarks.google_message4.Enum6065" json:"field6164,omitempty"`
+	Field6165     []*Message6127        `protobuf:"bytes,8,rep,name=field6165" json:"field6165,omitempty"`
+	Field6166     *bool                 `protobuf:"varint,13,opt,name=field6166" json:"field6166,omitempty"`
+	Field6167     *bool                 `protobuf:"varint,16,opt,name=field6167" json:"field6167,omitempty"`
+	Field6168     *bool                 `protobuf:"varint,18,opt,name=field6168" json:"field6168,omitempty"`
+	Field6169     []*Message6054        `protobuf:"bytes,17,rep,name=field6169" json:"field6169,omitempty"`
+	Field6170     *int32                `protobuf:"varint,19,opt,name=field6170" json:"field6170,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6126) Reset() {
@@ -759,15 +750,14 @@
 }
 
 type Message5881 struct {
-	Field5897            *float64                `protobuf:"fixed64,1,req,name=field5897" json:"field5897,omitempty"`
-	Field5898            *string                 `protobuf:"bytes,5,opt,name=field5898" json:"field5898,omitempty"`
-	Field5899            *Message5861            `protobuf:"bytes,2,opt,name=field5899" json:"field5899,omitempty"`
-	Field5900            *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field5900" json:"field5900,omitempty"`
-	Field5901            *Message5867            `protobuf:"bytes,4,opt,name=field5901" json:"field5901,omitempty"`
-	Field5902            *Message5880            `protobuf:"bytes,6,opt,name=field5902" json:"field5902,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field5897     *float64            `protobuf:"fixed64,1,req,name=field5897" json:"field5897,omitempty"`
+	Field5898     *string             `protobuf:"bytes,5,opt,name=field5898" json:"field5898,omitempty"`
+	Field5899     *Message5861        `protobuf:"bytes,2,opt,name=field5899" json:"field5899,omitempty"`
+	Field5900     *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field5900" json:"field5900,omitempty"`
+	Field5901     *Message5867        `protobuf:"bytes,4,opt,name=field5901" json:"field5901,omitempty"`
+	Field5902     *Message5880        `protobuf:"bytes,6,opt,name=field5902" json:"field5902,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message5881) Reset() {
@@ -836,9 +826,8 @@
 }
 
 type Message6110 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6110) Reset() {
@@ -865,15 +854,14 @@
 }
 
 type Message6107 struct {
-	Field6134            *Message4016            `protobuf:"bytes,1,opt,name=field6134" json:"field6134,omitempty"`
-	Field6135            *int32                  `protobuf:"varint,2,opt,name=field6135" json:"field6135,omitempty"`
-	Field6136            *string                 `protobuf:"bytes,3,opt,name=field6136" json:"field6136,omitempty"`
-	Field6137            []int32                 `protobuf:"varint,4,rep,name=field6137" json:"field6137,omitempty"`
-	Field6138            *int32                  `protobuf:"varint,5,opt,name=field6138" json:"field6138,omitempty"`
-	Field6139            []*Message6108          `protobuf:"bytes,6,rep,name=field6139" json:"field6139,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6134     *Message4016   `protobuf:"bytes,1,opt,name=field6134" json:"field6134,omitempty"`
+	Field6135     *int32         `protobuf:"varint,2,opt,name=field6135" json:"field6135,omitempty"`
+	Field6136     *string        `protobuf:"bytes,3,opt,name=field6136" json:"field6136,omitempty"`
+	Field6137     []int32        `protobuf:"varint,4,rep,name=field6137" json:"field6137,omitempty"`
+	Field6138     *int32         `protobuf:"varint,5,opt,name=field6138" json:"field6138,omitempty"`
+	Field6139     []*Message6108 `protobuf:"bytes,6,rep,name=field6139" json:"field6139,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6107) Reset() {
@@ -942,11 +930,10 @@
 }
 
 type Message6129 struct {
-	Field6171            *Enum6130               `protobuf:"varint,1,req,name=field6171,enum=benchmarks.google_message4.Enum6130" json:"field6171,omitempty"`
-	Field6172            *string                 `protobuf:"bytes,2,req,name=field6172" json:"field6172,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6171     *Enum6130 `protobuf:"varint,1,req,name=field6171,enum=benchmarks.google_message4.Enum6130" json:"field6171,omitempty"`
+	Field6172     *string   `protobuf:"bytes,2,req,name=field6172" json:"field6172,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6129) Reset() {
@@ -987,59 +974,58 @@
 }
 
 type Message5908 struct {
-	Field5971            *string                 `protobuf:"bytes,1,opt,name=field5971" json:"field5971,omitempty"`
-	Field5972            *int32                  `protobuf:"varint,2,opt,name=field5972" json:"field5972,omitempty"`
-	Field5973            *int32                  `protobuf:"varint,3,opt,name=field5973" json:"field5973,omitempty"`
-	Field5974            *Enum5909               `protobuf:"varint,45,opt,name=field5974,enum=benchmarks.google_message4.Enum5909" json:"field5974,omitempty"`
-	Field5975            *Enum5912               `protobuf:"varint,4,opt,name=field5975,enum=benchmarks.google_message4.Enum5912" json:"field5975,omitempty"`
-	Field5976            *uint32                 `protobuf:"fixed32,50,opt,name=field5976" json:"field5976,omitempty"`
-	Field5977            *uint32                 `protobuf:"fixed32,5,opt,name=field5977" json:"field5977,omitempty"`
-	Field5978            *uint32                 `protobuf:"fixed32,6,opt,name=field5978" json:"field5978,omitempty"`
-	Field5979            *string                 `protobuf:"bytes,7,opt,name=field5979" json:"field5979,omitempty"`
-	Field5980            *Enum5915               `protobuf:"varint,8,opt,name=field5980,enum=benchmarks.google_message4.Enum5915" json:"field5980,omitempty"`
-	Field5981            *Message5903            `protobuf:"bytes,9,opt,name=field5981" json:"field5981,omitempty"`
-	Field5982            *Message5903            `protobuf:"bytes,10,opt,name=field5982" json:"field5982,omitempty"`
-	Field5983            *Enum5920               `protobuf:"varint,11,opt,name=field5983,enum=benchmarks.google_message4.Enum5920" json:"field5983,omitempty"`
-	Field5984            *Enum5923               `protobuf:"varint,40,opt,name=field5984,enum=benchmarks.google_message4.Enum5923" json:"field5984,omitempty"`
-	Field5985            *Message5903            `protobuf:"bytes,41,opt,name=field5985" json:"field5985,omitempty"`
-	Field5986            *Message5903            `protobuf:"bytes,42,opt,name=field5986" json:"field5986,omitempty"`
-	Field5987            *Enum5928               `protobuf:"varint,47,opt,name=field5987,enum=benchmarks.google_message4.Enum5928" json:"field5987,omitempty"`
-	Field5988            *bool                   `protobuf:"varint,48,opt,name=field5988" json:"field5988,omitempty"`
-	Field5989            []uint32                `protobuf:"fixed32,49,rep,name=field5989" json:"field5989,omitempty"`
-	Field5990            *string                 `protobuf:"bytes,12,opt,name=field5990" json:"field5990,omitempty"`
-	Field5991            *Message5903            `protobuf:"bytes,13,opt,name=field5991" json:"field5991,omitempty"`
-	Field5992            *Message5903            `protobuf:"bytes,14,opt,name=field5992" json:"field5992,omitempty"`
-	Field5993            *Message5903            `protobuf:"bytes,15,opt,name=field5993" json:"field5993,omitempty"`
-	Field5994            *Message5903            `protobuf:"bytes,16,opt,name=field5994" json:"field5994,omitempty"`
-	Field5995            *Message5903            `protobuf:"bytes,32,opt,name=field5995" json:"field5995,omitempty"`
-	Field5996            *Message5903            `protobuf:"bytes,33,opt,name=field5996" json:"field5996,omitempty"`
-	Field5997            *Message5903            `protobuf:"bytes,34,opt,name=field5997" json:"field5997,omitempty"`
-	Field5998            *Message5903            `protobuf:"bytes,35,opt,name=field5998" json:"field5998,omitempty"`
-	Field5999            *Enum5931               `protobuf:"varint,17,opt,name=field5999,enum=benchmarks.google_message4.Enum5931" json:"field5999,omitempty"`
-	Field6000            *Enum5935               `protobuf:"varint,18,opt,name=field6000,enum=benchmarks.google_message4.Enum5935" json:"field6000,omitempty"`
-	Field6001            *Enum5939               `protobuf:"varint,36,opt,name=field6001,enum=benchmarks.google_message4.Enum5939" json:"field6001,omitempty"`
-	Field6002            *Enum5939               `protobuf:"varint,37,opt,name=field6002,enum=benchmarks.google_message4.Enum5939" json:"field6002,omitempty"`
-	Field6003            []int32                 `protobuf:"varint,19,rep,name=field6003" json:"field6003,omitempty"`
-	Field6004            *uint32                 `protobuf:"varint,20,opt,name=field6004" json:"field6004,omitempty"`
-	Field6005            *uint32                 `protobuf:"varint,21,opt,name=field6005" json:"field6005,omitempty"`
-	Field6006            *uint32                 `protobuf:"varint,22,opt,name=field6006" json:"field6006,omitempty"`
-	Field6007            *uint32                 `protobuf:"varint,23,opt,name=field6007" json:"field6007,omitempty"`
-	Field6008            *Enum5946               `protobuf:"varint,24,opt,name=field6008,enum=benchmarks.google_message4.Enum5946" json:"field6008,omitempty"`
-	Field6009            *Enum5946               `protobuf:"varint,25,opt,name=field6009,enum=benchmarks.google_message4.Enum5946" json:"field6009,omitempty"`
-	Field6010            *Enum5946               `protobuf:"varint,26,opt,name=field6010,enum=benchmarks.google_message4.Enum5946" json:"field6010,omitempty"`
-	Field6011            *Enum5946               `protobuf:"varint,27,opt,name=field6011,enum=benchmarks.google_message4.Enum5946" json:"field6011,omitempty"`
-	Field6012            *uint32                 `protobuf:"fixed32,28,opt,name=field6012" json:"field6012,omitempty"`
-	Field6013            *uint32                 `protobuf:"fixed32,29,opt,name=field6013" json:"field6013,omitempty"`
-	Field6014            *uint32                 `protobuf:"fixed32,30,opt,name=field6014" json:"field6014,omitempty"`
-	Field6015            *uint32                 `protobuf:"fixed32,31,opt,name=field6015" json:"field6015,omitempty"`
-	Field6016            *int32                  `protobuf:"varint,38,opt,name=field6016" json:"field6016,omitempty"`
-	Field6017            *float32                `protobuf:"fixed32,39,opt,name=field6017" json:"field6017,omitempty"`
-	Field6018            *Enum5957               `protobuf:"varint,43,opt,name=field6018,enum=benchmarks.google_message4.Enum5957" json:"field6018,omitempty"`
-	Field6019            *Message5907            `protobuf:"bytes,44,opt,name=field6019" json:"field6019,omitempty"`
-	Field6020            *Enum5962               `protobuf:"varint,46,opt,name=field6020,enum=benchmarks.google_message4.Enum5962" json:"field6020,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field5971     *string      `protobuf:"bytes,1,opt,name=field5971" json:"field5971,omitempty"`
+	Field5972     *int32       `protobuf:"varint,2,opt,name=field5972" json:"field5972,omitempty"`
+	Field5973     *int32       `protobuf:"varint,3,opt,name=field5973" json:"field5973,omitempty"`
+	Field5974     *Enum5909    `protobuf:"varint,45,opt,name=field5974,enum=benchmarks.google_message4.Enum5909" json:"field5974,omitempty"`
+	Field5975     *Enum5912    `protobuf:"varint,4,opt,name=field5975,enum=benchmarks.google_message4.Enum5912" json:"field5975,omitempty"`
+	Field5976     *uint32      `protobuf:"fixed32,50,opt,name=field5976" json:"field5976,omitempty"`
+	Field5977     *uint32      `protobuf:"fixed32,5,opt,name=field5977" json:"field5977,omitempty"`
+	Field5978     *uint32      `protobuf:"fixed32,6,opt,name=field5978" json:"field5978,omitempty"`
+	Field5979     *string      `protobuf:"bytes,7,opt,name=field5979" json:"field5979,omitempty"`
+	Field5980     *Enum5915    `protobuf:"varint,8,opt,name=field5980,enum=benchmarks.google_message4.Enum5915" json:"field5980,omitempty"`
+	Field5981     *Message5903 `protobuf:"bytes,9,opt,name=field5981" json:"field5981,omitempty"`
+	Field5982     *Message5903 `protobuf:"bytes,10,opt,name=field5982" json:"field5982,omitempty"`
+	Field5983     *Enum5920    `protobuf:"varint,11,opt,name=field5983,enum=benchmarks.google_message4.Enum5920" json:"field5983,omitempty"`
+	Field5984     *Enum5923    `protobuf:"varint,40,opt,name=field5984,enum=benchmarks.google_message4.Enum5923" json:"field5984,omitempty"`
+	Field5985     *Message5903 `protobuf:"bytes,41,opt,name=field5985" json:"field5985,omitempty"`
+	Field5986     *Message5903 `protobuf:"bytes,42,opt,name=field5986" json:"field5986,omitempty"`
+	Field5987     *Enum5928    `protobuf:"varint,47,opt,name=field5987,enum=benchmarks.google_message4.Enum5928" json:"field5987,omitempty"`
+	Field5988     *bool        `protobuf:"varint,48,opt,name=field5988" json:"field5988,omitempty"`
+	Field5989     []uint32     `protobuf:"fixed32,49,rep,name=field5989" json:"field5989,omitempty"`
+	Field5990     *string      `protobuf:"bytes,12,opt,name=field5990" json:"field5990,omitempty"`
+	Field5991     *Message5903 `protobuf:"bytes,13,opt,name=field5991" json:"field5991,omitempty"`
+	Field5992     *Message5903 `protobuf:"bytes,14,opt,name=field5992" json:"field5992,omitempty"`
+	Field5993     *Message5903 `protobuf:"bytes,15,opt,name=field5993" json:"field5993,omitempty"`
+	Field5994     *Message5903 `protobuf:"bytes,16,opt,name=field5994" json:"field5994,omitempty"`
+	Field5995     *Message5903 `protobuf:"bytes,32,opt,name=field5995" json:"field5995,omitempty"`
+	Field5996     *Message5903 `protobuf:"bytes,33,opt,name=field5996" json:"field5996,omitempty"`
+	Field5997     *Message5903 `protobuf:"bytes,34,opt,name=field5997" json:"field5997,omitempty"`
+	Field5998     *Message5903 `protobuf:"bytes,35,opt,name=field5998" json:"field5998,omitempty"`
+	Field5999     *Enum5931    `protobuf:"varint,17,opt,name=field5999,enum=benchmarks.google_message4.Enum5931" json:"field5999,omitempty"`
+	Field6000     *Enum5935    `protobuf:"varint,18,opt,name=field6000,enum=benchmarks.google_message4.Enum5935" json:"field6000,omitempty"`
+	Field6001     *Enum5939    `protobuf:"varint,36,opt,name=field6001,enum=benchmarks.google_message4.Enum5939" json:"field6001,omitempty"`
+	Field6002     *Enum5939    `protobuf:"varint,37,opt,name=field6002,enum=benchmarks.google_message4.Enum5939" json:"field6002,omitempty"`
+	Field6003     []int32      `protobuf:"varint,19,rep,name=field6003" json:"field6003,omitempty"`
+	Field6004     *uint32      `protobuf:"varint,20,opt,name=field6004" json:"field6004,omitempty"`
+	Field6005     *uint32      `protobuf:"varint,21,opt,name=field6005" json:"field6005,omitempty"`
+	Field6006     *uint32      `protobuf:"varint,22,opt,name=field6006" json:"field6006,omitempty"`
+	Field6007     *uint32      `protobuf:"varint,23,opt,name=field6007" json:"field6007,omitempty"`
+	Field6008     *Enum5946    `protobuf:"varint,24,opt,name=field6008,enum=benchmarks.google_message4.Enum5946" json:"field6008,omitempty"`
+	Field6009     *Enum5946    `protobuf:"varint,25,opt,name=field6009,enum=benchmarks.google_message4.Enum5946" json:"field6009,omitempty"`
+	Field6010     *Enum5946    `protobuf:"varint,26,opt,name=field6010,enum=benchmarks.google_message4.Enum5946" json:"field6010,omitempty"`
+	Field6011     *Enum5946    `protobuf:"varint,27,opt,name=field6011,enum=benchmarks.google_message4.Enum5946" json:"field6011,omitempty"`
+	Field6012     *uint32      `protobuf:"fixed32,28,opt,name=field6012" json:"field6012,omitempty"`
+	Field6013     *uint32      `protobuf:"fixed32,29,opt,name=field6013" json:"field6013,omitempty"`
+	Field6014     *uint32      `protobuf:"fixed32,30,opt,name=field6014" json:"field6014,omitempty"`
+	Field6015     *uint32      `protobuf:"fixed32,31,opt,name=field6015" json:"field6015,omitempty"`
+	Field6016     *int32       `protobuf:"varint,38,opt,name=field6016" json:"field6016,omitempty"`
+	Field6017     *float32     `protobuf:"fixed32,39,opt,name=field6017" json:"field6017,omitempty"`
+	Field6018     *Enum5957    `protobuf:"varint,43,opt,name=field6018,enum=benchmarks.google_message4.Enum5957" json:"field6018,omitempty"`
+	Field6019     *Message5907 `protobuf:"bytes,44,opt,name=field6019" json:"field6019,omitempty"`
+	Field6020     *Enum5962    `protobuf:"varint,46,opt,name=field6020,enum=benchmarks.google_message4.Enum5962" json:"field6020,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message5908) Reset() {
@@ -1416,15 +1402,14 @@
 }
 
 type Message3850 struct {
-	Field3924            *Enum3851               `protobuf:"varint,2,opt,name=field3924,enum=benchmarks.google_message4.Enum3851" json:"field3924,omitempty"`
-	Field3925            *bool                   `protobuf:"varint,12,opt,name=field3925" json:"field3925,omitempty"`
-	Field3926            *int32                  `protobuf:"varint,4,opt,name=field3926" json:"field3926,omitempty"`
-	Field3927            *bool                   `protobuf:"varint,10,opt,name=field3927" json:"field3927,omitempty"`
-	Field3928            *bool                   `protobuf:"varint,13,opt,name=field3928" json:"field3928,omitempty"`
-	Field3929            *bool                   `protobuf:"varint,14,opt,name=field3929" json:"field3929,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field3924     *Enum3851 `protobuf:"varint,2,opt,name=field3924,enum=benchmarks.google_message4.Enum3851" json:"field3924,omitempty"`
+	Field3925     *bool     `protobuf:"varint,12,opt,name=field3925" json:"field3925,omitempty"`
+	Field3926     *int32    `protobuf:"varint,4,opt,name=field3926" json:"field3926,omitempty"`
+	Field3927     *bool     `protobuf:"varint,10,opt,name=field3927" json:"field3927,omitempty"`
+	Field3928     *bool     `protobuf:"varint,13,opt,name=field3928" json:"field3928,omitempty"`
+	Field3929     *bool     `protobuf:"varint,14,opt,name=field3929" json:"field3929,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3850) Reset() {
@@ -1493,9 +1478,8 @@
 }
 
 type Message7865 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7865) Reset() {
@@ -1522,16 +1506,15 @@
 }
 
 type Message7511 struct {
-	Field7523            *bool                   `protobuf:"varint,1,opt,name=field7523" json:"field7523,omitempty"`
-	Field7524            *Enum7512               `protobuf:"varint,2,opt,name=field7524,enum=benchmarks.google_message4.Enum7512" json:"field7524,omitempty"`
-	Field7525            *int32                  `protobuf:"varint,3,opt,name=field7525" json:"field7525,omitempty"`
-	Field7526            *int32                  `protobuf:"varint,4,opt,name=field7526" json:"field7526,omitempty"`
-	Field7527            *bool                   `protobuf:"varint,5,opt,name=field7527" json:"field7527,omitempty"`
-	Field7528            *int32                  `protobuf:"varint,6,opt,name=field7528" json:"field7528,omitempty"`
-	Field7529            *int32                  `protobuf:"varint,7,opt,name=field7529" json:"field7529,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7523     *bool     `protobuf:"varint,1,opt,name=field7523" json:"field7523,omitempty"`
+	Field7524     *Enum7512 `protobuf:"varint,2,opt,name=field7524,enum=benchmarks.google_message4.Enum7512" json:"field7524,omitempty"`
+	Field7525     *int32    `protobuf:"varint,3,opt,name=field7525" json:"field7525,omitempty"`
+	Field7526     *int32    `protobuf:"varint,4,opt,name=field7526" json:"field7526,omitempty"`
+	Field7527     *bool     `protobuf:"varint,5,opt,name=field7527" json:"field7527,omitempty"`
+	Field7528     *int32    `protobuf:"varint,6,opt,name=field7528" json:"field7528,omitempty"`
+	Field7529     *int32    `protobuf:"varint,7,opt,name=field7529" json:"field7529,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7511) Reset() {
@@ -1607,9 +1590,8 @@
 }
 
 type Message3920 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3920) Reset() {
@@ -1636,11 +1618,10 @@
 }
 
 type Message7928 struct {
-	Field7940            *string                 `protobuf:"bytes,1,opt,name=field7940" json:"field7940,omitempty"`
-	Field7941            *int64                  `protobuf:"varint,2,opt,name=field7941" json:"field7941,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7940     *string `protobuf:"bytes,1,opt,name=field7940" json:"field7940,omitempty"`
+	Field7941     *int64  `protobuf:"varint,2,opt,name=field7941" json:"field7941,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7928) Reset() {
@@ -1681,13 +1662,12 @@
 }
 
 type Message7921 struct {
-	Field7936            *int32                  `protobuf:"varint,1,opt,name=field7936" json:"field7936,omitempty"`
-	Field7937            *int64                  `protobuf:"varint,2,opt,name=field7937" json:"field7937,omitempty"`
-	Field7938            *float32                `protobuf:"fixed32,3,opt,name=field7938" json:"field7938,omitempty"`
-	Field7939            *Enum7922               `protobuf:"varint,4,opt,name=field7939,enum=benchmarks.google_message4.Enum7922" json:"field7939,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7936     *int32    `protobuf:"varint,1,opt,name=field7936" json:"field7936,omitempty"`
+	Field7937     *int64    `protobuf:"varint,2,opt,name=field7937" json:"field7937,omitempty"`
+	Field7938     *float32  `protobuf:"fixed32,3,opt,name=field7938" json:"field7938,omitempty"`
+	Field7939     *Enum7922 `protobuf:"varint,4,opt,name=field7939,enum=benchmarks.google_message4.Enum7922" json:"field7939,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7921) Reset() {
@@ -1742,11 +1722,10 @@
 }
 
 type Message7920 struct {
-	Field7934            *int64                  `protobuf:"varint,1,opt,name=field7934" json:"field7934,omitempty"`
-	Field7935            *int64                  `protobuf:"varint,2,opt,name=field7935" json:"field7935,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7934     *int64 `protobuf:"varint,1,opt,name=field7934" json:"field7934,omitempty"`
+	Field7935     *int64 `protobuf:"varint,2,opt,name=field7935" json:"field7935,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7920) Reset() {
@@ -1787,12 +1766,11 @@
 }
 
 type Message7919 struct {
-	Field7931            *uint64                 `protobuf:"fixed64,1,opt,name=field7931" json:"field7931,omitempty"`
-	Field7932            *int64                  `protobuf:"varint,2,opt,name=field7932" json:"field7932,omitempty"`
-	Field7933            []byte                  `protobuf:"bytes,3,opt,name=field7933" json:"field7933,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field7931     *uint64 `protobuf:"fixed64,1,opt,name=field7931" json:"field7931,omitempty"`
+	Field7932     *int64  `protobuf:"varint,2,opt,name=field7932" json:"field7932,omitempty"`
+	Field7933     []byte  `protobuf:"bytes,3,opt,name=field7933" json:"field7933,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message7919) Reset() {
@@ -1840,12 +1818,11 @@
 }
 
 type Message12817 struct {
-	Field12826           *int32                  `protobuf:"varint,1,opt,name=field12826" json:"field12826,omitempty"`
-	Field12827           *int32                  `protobuf:"varint,2,opt,name=field12827" json:"field12827,omitempty"`
-	Field12828           *int32                  `protobuf:"varint,3,opt,name=field12828" json:"field12828,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field12826    *int32 `protobuf:"varint,1,opt,name=field12826" json:"field12826,omitempty"`
+	Field12827    *int32 `protobuf:"varint,2,opt,name=field12827" json:"field12827,omitempty"`
+	Field12828    *int32 `protobuf:"varint,3,opt,name=field12828" json:"field12828,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message12817) Reset() {
@@ -1893,11 +1870,10 @@
 }
 
 type Message6054 struct {
-	Field6089            *string                 `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
-	Field6090            *string                 `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6089     *string `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
+	Field6090     *string `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6054) Reset() {
@@ -1938,9 +1914,8 @@
 }
 
 type Message6127 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6127) Reset() {
@@ -1967,11 +1942,10 @@
 }
 
 type Message6052 struct {
-	Field6084            *string                 `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
-	Field6085            []byte                  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6084     *string `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
+	Field6085     []byte  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6052) Reset() {
@@ -2012,12 +1986,11 @@
 }
 
 type Message6024 struct {
-	Field6048            *Enum6025               `protobuf:"varint,1,opt,name=field6048,enum=benchmarks.google_message4.Enum6025" json:"field6048,omitempty"`
-	Field6049            *string                 `protobuf:"bytes,2,opt,name=field6049" json:"field6049,omitempty"`
-	Field6050            *UnusedEmptyMessage     `protobuf:"bytes,3,opt,name=field6050" json:"field6050,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field6048     *Enum6025           `protobuf:"varint,1,opt,name=field6048,enum=benchmarks.google_message4.Enum6025" json:"field6048,omitempty"`
+	Field6049     *string             `protobuf:"bytes,2,opt,name=field6049" json:"field6049,omitempty"`
+	Field6050     *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field6050" json:"field6050,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6024) Reset() {
@@ -2065,13 +2038,12 @@
 }
 
 type Message5861 struct {
-	Field5882            *Enum5862               `protobuf:"varint,1,req,name=field5882,enum=benchmarks.google_message4.Enum5862" json:"field5882,omitempty"`
-	Field5883            *string                 `protobuf:"bytes,2,req,name=field5883" json:"field5883,omitempty"`
-	Field5884            *bool                   `protobuf:"varint,3,opt,name=field5884" json:"field5884,omitempty"`
-	Field5885            *string                 `protobuf:"bytes,4,opt,name=field5885" json:"field5885,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field5882     *Enum5862 `protobuf:"varint,1,req,name=field5882,enum=benchmarks.google_message4.Enum5862" json:"field5882,omitempty"`
+	Field5883     *string   `protobuf:"bytes,2,req,name=field5883" json:"field5883,omitempty"`
+	Field5884     *bool     `protobuf:"varint,3,opt,name=field5884" json:"field5884,omitempty"`
+	Field5885     *string   `protobuf:"bytes,4,opt,name=field5885" json:"field5885,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message5861) Reset() {
@@ -2126,10 +2098,9 @@
 }
 
 type Message5880 struct {
-	Field5896            *string                 `protobuf:"bytes,1,opt,name=field5896" json:"field5896,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field5896     *string `protobuf:"bytes,1,opt,name=field5896" json:"field5896,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message5880) Reset() {
@@ -2163,15 +2134,14 @@
 }
 
 type Message5867 struct {
-	Field5890            *Enum5868               `protobuf:"varint,1,opt,name=field5890,enum=benchmarks.google_message4.Enum5868" json:"field5890,omitempty"`
-	Field5891            *string                 `protobuf:"bytes,2,opt,name=field5891" json:"field5891,omitempty"`
-	Field5892            *Enum5873               `protobuf:"varint,3,opt,name=field5892,enum=benchmarks.google_message4.Enum5873" json:"field5892,omitempty"`
-	Field5893            *int32                  `protobuf:"varint,4,opt,name=field5893" json:"field5893,omitempty"`
-	Field5894            *UnusedEnum             `protobuf:"varint,5,opt,name=field5894,enum=benchmarks.google_message4.UnusedEnum" json:"field5894,omitempty"`
-	Field5895            *bool                   `protobuf:"varint,6,opt,name=field5895" json:"field5895,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field5890     *Enum5868   `protobuf:"varint,1,opt,name=field5890,enum=benchmarks.google_message4.Enum5868" json:"field5890,omitempty"`
+	Field5891     *string     `protobuf:"bytes,2,opt,name=field5891" json:"field5891,omitempty"`
+	Field5892     *Enum5873   `protobuf:"varint,3,opt,name=field5892,enum=benchmarks.google_message4.Enum5873" json:"field5892,omitempty"`
+	Field5893     *int32      `protobuf:"varint,4,opt,name=field5893" json:"field5893,omitempty"`
+	Field5894     *UnusedEnum `protobuf:"varint,5,opt,name=field5894,enum=benchmarks.google_message4.UnusedEnum" json:"field5894,omitempty"`
+	Field5895     *bool       `protobuf:"varint,6,opt,name=field5895" json:"field5895,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message5867) Reset() {
@@ -2240,13 +2210,12 @@
 }
 
 type Message4016 struct {
-	Field4017            *int32                  `protobuf:"varint,1,req,name=field4017" json:"field4017,omitempty"`
-	Field4018            *int32                  `protobuf:"varint,2,req,name=field4018" json:"field4018,omitempty"`
-	Field4019            *int32                  `protobuf:"varint,3,req,name=field4019" json:"field4019,omitempty"`
-	Field4020            *int32                  `protobuf:"varint,4,req,name=field4020" json:"field4020,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field4017     *int32 `protobuf:"varint,1,req,name=field4017" json:"field4017,omitempty"`
+	Field4018     *int32 `protobuf:"varint,2,req,name=field4018" json:"field4018,omitempty"`
+	Field4019     *int32 `protobuf:"varint,3,req,name=field4019" json:"field4019,omitempty"`
+	Field4020     *int32 `protobuf:"varint,4,req,name=field4020" json:"field4020,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message4016) Reset() {
@@ -2301,9 +2270,8 @@
 }
 
 type Message6108 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message6108) Reset() {
@@ -2330,13 +2298,12 @@
 }
 
 type Message5907 struct {
-	Field5967            *Message5903            `protobuf:"bytes,1,opt,name=field5967" json:"field5967,omitempty"`
-	Field5968            *Message5903            `protobuf:"bytes,2,opt,name=field5968" json:"field5968,omitempty"`
-	Field5969            *Message5903            `protobuf:"bytes,3,opt,name=field5969" json:"field5969,omitempty"`
-	Field5970            *Message5903            `protobuf:"bytes,4,opt,name=field5970" json:"field5970,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field5967     *Message5903 `protobuf:"bytes,1,opt,name=field5967" json:"field5967,omitempty"`
+	Field5968     *Message5903 `protobuf:"bytes,2,opt,name=field5968" json:"field5968,omitempty"`
+	Field5969     *Message5903 `protobuf:"bytes,3,opt,name=field5969" json:"field5969,omitempty"`
+	Field5970     *Message5903 `protobuf:"bytes,4,opt,name=field5970" json:"field5970,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message5907) Reset() {
@@ -2391,9 +2358,8 @@
 }
 
 type UnusedEmptyMessage struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *UnusedEmptyMessage) Reset() {
@@ -2420,11 +2386,10 @@
 }
 
 type Message5903 struct {
-	Field5965            *int32                  `protobuf:"varint,1,req,name=field5965" json:"field5965,omitempty"`
-	Field5966            *Enum5904               `protobuf:"varint,2,opt,name=field5966,enum=benchmarks.google_message4.Enum5904" json:"field5966,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Field5965     *int32    `protobuf:"varint,1,req,name=field5965" json:"field5965,omitempty"`
+	Field5966     *Enum5904 `protobuf:"varint,2,opt,name=field5966,enum=benchmarks.google_message4.Enum5904" json:"field5966,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message5903) Reset() {
@@ -3164,6 +3129,358 @@
 		return
 	}
 	file_datasets_google_message4_benchmark_message4_3_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12774); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12796); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12821); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12820); i {
+			case 8:
+				return &v.sizeCache
+			case 9:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12819); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12818); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message10319); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6578); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6126); i {
+			case 19:
+				return &v.sizeCache
+			case 20:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message5881); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6110); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6107); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6129); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message5908); i {
+			case 50:
+				return &v.sizeCache
+			case 51:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3850); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7865); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7511); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3920); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7928); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7921); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7920); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message7919); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message12817); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6054); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6127); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6052); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6024); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message5861); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message5880); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message5867); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message4016); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message6108); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message5907); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UnusedEmptyMessage); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_datasets_google_message4_benchmark_message4_2_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message5903); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_datasets_google_message4_benchmark_message4_2_proto_rawDesc,
diff --git a/internal/testprotos/conformance/conformance.pb.go b/internal/testprotos/conformance/conformance.pb.go
index ec9ddc6..29b39cd 100644
--- a/internal/testprotos/conformance/conformance.pb.go
+++ b/internal/testprotos/conformance/conformance.pb.go
@@ -131,10 +131,9 @@
 // This will be known by message_type == "conformance.FailureSet", a conformance
 // test should return a serialized FailureSet in protobuf_payload.
 type FailureSet struct {
-	Failure              []string                `protobuf:"bytes,1,rep,name=failure,proto3" json:"failure,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Failure       []string `protobuf:"bytes,1,rep,name=failure,proto3" json:"failure,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FailureSet) Reset() {
@@ -199,10 +198,9 @@
 	// for more information.
 	TestCategory TestCategory `protobuf:"varint,5,opt,name=test_category,json=testCategory,proto3,enum=conformance.TestCategory" json:"test_category,omitempty"`
 	// Specify details for how to encode jspb.
-	JspbEncodingOptions  *JspbEncodingConfig     `protobuf:"bytes,6,opt,name=jspb_encoding_options,json=jspbEncodingOptions,proto3" json:"jspb_encoding_options,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	JspbEncodingOptions *JspbEncodingConfig `protobuf:"bytes,6,opt,name=jspb_encoding_options,json=jspbEncodingOptions,proto3" json:"jspb_encoding_options,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
 }
 
 func (x *ConformanceRequest) Reset() {
@@ -352,10 +350,9 @@
 	// If the input was successfully parsed and the requested output was
 	// TEXT_FORMAT, serialize to TEXT_FORMAT and set it in this field.
 	//	*ConformanceResponse_TextPayload
-	Result               isConformanceResponse_Result `protobuf_oneof:"result"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields      `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache          `json:"-"`
+	Result        isConformanceResponse_Result `protobuf_oneof:"result"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ConformanceResponse) Reset() {
@@ -499,10 +496,9 @@
 // Encoding options for jspb format.
 type JspbEncodingConfig struct {
 	// Encode the value field of Any as jspb array if ture, otherwise binary.
-	UseJspbArrayAnyFormat bool                    `protobuf:"varint,1,opt,name=use_jspb_array_any_format,json=useJspbArrayAnyFormat,proto3" json:"use_jspb_array_any_format,omitempty"`
-	XXX_NoUnkeyedLiteral  struct{}                `json:"-"`
-	XXX_unrecognized      protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache         protoimpl.SizeCache     `json:"-"`
+	UseJspbArrayAnyFormat bool `protobuf:"varint,1,opt,name=use_jspb_array_any_format,json=useJspbArrayAnyFormat,proto3" json:"use_jspb_array_any_format,omitempty"`
+	sizeCache             protoimpl.SizeCache
+	unknownFields         protoimpl.UnknownFields
 }
 
 func (x *JspbEncodingConfig) Reset() {
@@ -659,6 +655,48 @@
 	if File_conformance_conformance_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_conformance_conformance_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FailureSet); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_conformance_conformance_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ConformanceRequest); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_conformance_conformance_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ConformanceResponse); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_conformance_conformance_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*JspbEncodingConfig); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_conformance_conformance_proto_msgTypes[1].OneofWrappers = []interface{}{
 		(*ConformanceRequest_ProtobufPayload)(nil),
 		(*ConformanceRequest_JsonPayload)(nil),
diff --git a/internal/testprotos/conformance/test_messages_proto2.pb.go b/internal/testprotos/conformance/test_messages_proto2.pb.go
index 928e5b2..28b8058 100644
--- a/internal/testprotos/conformance/test_messages_proto2.pb.go
+++ b/internal/testprotos/conformance/test_messages_proto2.pb.go
@@ -214,28 +214,27 @@
 	Data       *TestAllTypesProto2_Data        `protobuf:"group,201,opt,name=Data,json=data" json:"data,omitempty"`
 	// Test field-name-to-JSON-name convention.
 	// (protobuf says names can be any valid C/C++ identifier.)
-	Fieldname1             *int32                    `protobuf:"varint,401,opt,name=fieldname1" json:"fieldname1,omitempty"`
-	FieldName2             *int32                    `protobuf:"varint,402,opt,name=field_name2,json=fieldName2" json:"field_name2,omitempty"`
-	XFieldName3            *int32                    `protobuf:"varint,403,opt,name=_field_name3,json=FieldName3" json:"_field_name3,omitempty"`
-	Field_Name4_           *int32                    `protobuf:"varint,404,opt,name=field__name4_,json=fieldName4" json:"field__name4_,omitempty"`
-	Field0Name5            *int32                    `protobuf:"varint,405,opt,name=field0name5" json:"field0name5,omitempty"`
-	Field_0Name6           *int32                    `protobuf:"varint,406,opt,name=field_0_name6,json=field0Name6" json:"field_0_name6,omitempty"`
-	FieldName7             *int32                    `protobuf:"varint,407,opt,name=fieldName7" json:"fieldName7,omitempty"`
-	FieldName8             *int32                    `protobuf:"varint,408,opt,name=FieldName8" json:"FieldName8,omitempty"`
-	Field_Name9            *int32                    `protobuf:"varint,409,opt,name=field_Name9,json=fieldName9" json:"field_Name9,omitempty"`
-	Field_Name10           *int32                    `protobuf:"varint,410,opt,name=Field_Name10,json=FieldName10" json:"Field_Name10,omitempty"`
-	FIELD_NAME11           *int32                    `protobuf:"varint,411,opt,name=FIELD_NAME11,json=FIELDNAME11" json:"FIELD_NAME11,omitempty"`
-	FIELDName12            *int32                    `protobuf:"varint,412,opt,name=FIELD_name12,json=FIELDName12" json:"FIELD_name12,omitempty"`
-	XFieldName13           *int32                    `protobuf:"varint,413,opt,name=__field_name13,json=FieldName13" json:"__field_name13,omitempty"`
-	X_FieldName14          *int32                    `protobuf:"varint,414,opt,name=__Field_name14,json=FieldName14" json:"__Field_name14,omitempty"`
-	Field_Name15           *int32                    `protobuf:"varint,415,opt,name=field__name15,json=fieldName15" json:"field__name15,omitempty"`
-	Field__Name16          *int32                    `protobuf:"varint,416,opt,name=field__Name16,json=fieldName16" json:"field__Name16,omitempty"`
-	FieldName17__          *int32                    `protobuf:"varint,417,opt,name=field_name17__,json=fieldName17" json:"field_name17__,omitempty"`
-	FieldName18__          *int32                    `protobuf:"varint,418,opt,name=Field_name18__,json=FieldName18" json:"Field_name18__,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	Fieldname1      *int32 `protobuf:"varint,401,opt,name=fieldname1" json:"fieldname1,omitempty"`
+	FieldName2      *int32 `protobuf:"varint,402,opt,name=field_name2,json=fieldName2" json:"field_name2,omitempty"`
+	XFieldName3     *int32 `protobuf:"varint,403,opt,name=_field_name3,json=FieldName3" json:"_field_name3,omitempty"`
+	Field_Name4_    *int32 `protobuf:"varint,404,opt,name=field__name4_,json=fieldName4" json:"field__name4_,omitempty"`
+	Field0Name5     *int32 `protobuf:"varint,405,opt,name=field0name5" json:"field0name5,omitempty"`
+	Field_0Name6    *int32 `protobuf:"varint,406,opt,name=field_0_name6,json=field0Name6" json:"field_0_name6,omitempty"`
+	FieldName7      *int32 `protobuf:"varint,407,opt,name=fieldName7" json:"fieldName7,omitempty"`
+	FieldName8      *int32 `protobuf:"varint,408,opt,name=FieldName8" json:"FieldName8,omitempty"`
+	Field_Name9     *int32 `protobuf:"varint,409,opt,name=field_Name9,json=fieldName9" json:"field_Name9,omitempty"`
+	Field_Name10    *int32 `protobuf:"varint,410,opt,name=Field_Name10,json=FieldName10" json:"Field_Name10,omitempty"`
+	FIELD_NAME11    *int32 `protobuf:"varint,411,opt,name=FIELD_NAME11,json=FIELDNAME11" json:"FIELD_NAME11,omitempty"`
+	FIELDName12     *int32 `protobuf:"varint,412,opt,name=FIELD_name12,json=FIELDName12" json:"FIELD_name12,omitempty"`
+	XFieldName13    *int32 `protobuf:"varint,413,opt,name=__field_name13,json=FieldName13" json:"__field_name13,omitempty"`
+	X_FieldName14   *int32 `protobuf:"varint,414,opt,name=__Field_name14,json=FieldName14" json:"__Field_name14,omitempty"`
+	Field_Name15    *int32 `protobuf:"varint,415,opt,name=field__name15,json=fieldName15" json:"field__name15,omitempty"`
+	Field__Name16   *int32 `protobuf:"varint,416,opt,name=field__Name16,json=fieldName16" json:"field__Name16,omitempty"`
+	FieldName17__   *int32 `protobuf:"varint,417,opt,name=field_name17__,json=fieldName17" json:"field_name17__,omitempty"`
+	FieldName18__   *int32 `protobuf:"varint,418,opt,name=Field_name18__,json=FieldName18" json:"Field_name18__,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *TestAllTypesProto2) Reset() {
@@ -966,10 +965,9 @@
 func (*TestAllTypesProto2_OneofEnum) isTestAllTypesProto2_OneofField() {}
 
 type ForeignMessageProto2 struct {
-	C                    *int32                  `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	C             *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ForeignMessageProto2) Reset() {
@@ -1003,11 +1001,10 @@
 }
 
 type TestAllTypesProto2_NestedMessage struct {
-	A                    *int32                  `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	Corecursive          *TestAllTypesProto2     `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32              `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	Corecursive   *TestAllTypesProto2 `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypesProto2_NestedMessage) Reset() {
@@ -1049,11 +1046,10 @@
 
 // groups
 type TestAllTypesProto2_Data struct {
-	GroupInt32           *int32                  `protobuf:"varint,202,opt,name=group_int32,json=groupInt32" json:"group_int32,omitempty"`
-	GroupUint32          *uint32                 `protobuf:"varint,203,opt,name=group_uint32,json=groupUint32" json:"group_uint32,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	GroupInt32    *int32  `protobuf:"varint,202,opt,name=group_int32,json=groupInt32" json:"group_int32,omitempty"`
+	GroupUint32   *uint32 `protobuf:"varint,203,opt,name=group_uint32,json=groupUint32" json:"group_uint32,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypesProto2_Data) Reset() {
@@ -1095,10 +1091,9 @@
 
 // message_set test case.
 type TestAllTypesProto2_MessageSetCorrect struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `protobuf_messageset:"1" json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields `protobuf_messageset:"1"`
 }
 
 func (x *TestAllTypesProto2_MessageSetCorrect) Reset() {
@@ -1134,10 +1129,9 @@
 }
 
 type TestAllTypesProto2_MessageSetCorrectExtension1 struct {
-	Str                  *string                 `protobuf:"bytes,25,opt,name=str" json:"str,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Str           *string `protobuf:"bytes,25,opt,name=str" json:"str,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypesProto2_MessageSetCorrectExtension1) Reset() {
@@ -1171,10 +1165,9 @@
 }
 
 type TestAllTypesProto2_MessageSetCorrectExtension2 struct {
-	I                    *int32                  `protobuf:"varint,9,opt,name=i" json:"i,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	I             *int32 `protobuf:"varint,9,opt,name=i" json:"i,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypesProto2_MessageSetCorrectExtension2) Reset() {
@@ -1887,6 +1880,82 @@
 	if File_google_protobuf_test_messages_proto2_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_test_messages_proto2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypesProto2); i {
+			case 82:
+				return &v.sizeCache
+			case 83:
+				return &v.unknownFields
+			case 84:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_test_messages_proto2_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ForeignMessageProto2); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_test_messages_proto2_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypesProto2_NestedMessage); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_test_messages_proto2_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypesProto2_Data); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_test_messages_proto2_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypesProto2_MessageSetCorrect); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_test_messages_proto2_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypesProto2_MessageSetCorrectExtension1); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_test_messages_proto2_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypesProto2_MessageSetCorrectExtension2); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_google_protobuf_test_messages_proto2_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*TestAllTypesProto2_OneofUint32)(nil),
 		(*TestAllTypesProto2_OneofNestedMessage)(nil),
diff --git a/internal/testprotos/conformance/test_messages_proto3.pb.go b/internal/testprotos/conformance/test_messages_proto3.pb.go
index 29f92bc..9f8bb92 100644
--- a/internal/testprotos/conformance/test_messages_proto3.pb.go
+++ b/internal/testprotos/conformance/test_messages_proto3.pb.go
@@ -284,27 +284,26 @@
 	RepeatedListValue     []*structpb.ListValue     `protobuf:"bytes,317,rep,name=repeated_list_value,json=repeatedListValue,proto3" json:"repeated_list_value,omitempty"`
 	// Test field-name-to-JSON-name convention.
 	// (protobuf says names can be any valid C/C++ identifier.)
-	Fieldname1           int32                   `protobuf:"varint,401,opt,name=fieldname1,proto3" json:"fieldname1,omitempty"`
-	FieldName2           int32                   `protobuf:"varint,402,opt,name=field_name2,json=fieldName2,proto3" json:"field_name2,omitempty"`
-	XFieldName3          int32                   `protobuf:"varint,403,opt,name=_field_name3,json=FieldName3,proto3" json:"_field_name3,omitempty"`
-	Field_Name4_         int32                   `protobuf:"varint,404,opt,name=field__name4_,json=fieldName4,proto3" json:"field__name4_,omitempty"`
-	Field0Name5          int32                   `protobuf:"varint,405,opt,name=field0name5,proto3" json:"field0name5,omitempty"`
-	Field_0Name6         int32                   `protobuf:"varint,406,opt,name=field_0_name6,json=field0Name6,proto3" json:"field_0_name6,omitempty"`
-	FieldName7           int32                   `protobuf:"varint,407,opt,name=fieldName7,proto3" json:"fieldName7,omitempty"`
-	FieldName8           int32                   `protobuf:"varint,408,opt,name=FieldName8,proto3" json:"FieldName8,omitempty"`
-	Field_Name9          int32                   `protobuf:"varint,409,opt,name=field_Name9,json=fieldName9,proto3" json:"field_Name9,omitempty"`
-	Field_Name10         int32                   `protobuf:"varint,410,opt,name=Field_Name10,json=FieldName10,proto3" json:"Field_Name10,omitempty"`
-	FIELD_NAME11         int32                   `protobuf:"varint,411,opt,name=FIELD_NAME11,json=FIELDNAME11,proto3" json:"FIELD_NAME11,omitempty"`
-	FIELDName12          int32                   `protobuf:"varint,412,opt,name=FIELD_name12,json=FIELDName12,proto3" json:"FIELD_name12,omitempty"`
-	XFieldName13         int32                   `protobuf:"varint,413,opt,name=__field_name13,json=FieldName13,proto3" json:"__field_name13,omitempty"`
-	X_FieldName14        int32                   `protobuf:"varint,414,opt,name=__Field_name14,json=FieldName14,proto3" json:"__Field_name14,omitempty"`
-	Field_Name15         int32                   `protobuf:"varint,415,opt,name=field__name15,json=fieldName15,proto3" json:"field__name15,omitempty"`
-	Field__Name16        int32                   `protobuf:"varint,416,opt,name=field__Name16,json=fieldName16,proto3" json:"field__Name16,omitempty"`
-	FieldName17__        int32                   `protobuf:"varint,417,opt,name=field_name17__,json=fieldName17,proto3" json:"field_name17__,omitempty"`
-	FieldName18__        int32                   `protobuf:"varint,418,opt,name=Field_name18__,json=FieldName18,proto3" json:"Field_name18__,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Fieldname1    int32 `protobuf:"varint,401,opt,name=fieldname1,proto3" json:"fieldname1,omitempty"`
+	FieldName2    int32 `protobuf:"varint,402,opt,name=field_name2,json=fieldName2,proto3" json:"field_name2,omitempty"`
+	XFieldName3   int32 `protobuf:"varint,403,opt,name=_field_name3,json=FieldName3,proto3" json:"_field_name3,omitempty"`
+	Field_Name4_  int32 `protobuf:"varint,404,opt,name=field__name4_,json=fieldName4,proto3" json:"field__name4_,omitempty"`
+	Field0Name5   int32 `protobuf:"varint,405,opt,name=field0name5,proto3" json:"field0name5,omitempty"`
+	Field_0Name6  int32 `protobuf:"varint,406,opt,name=field_0_name6,json=field0Name6,proto3" json:"field_0_name6,omitempty"`
+	FieldName7    int32 `protobuf:"varint,407,opt,name=fieldName7,proto3" json:"fieldName7,omitempty"`
+	FieldName8    int32 `protobuf:"varint,408,opt,name=FieldName8,proto3" json:"FieldName8,omitempty"`
+	Field_Name9   int32 `protobuf:"varint,409,opt,name=field_Name9,json=fieldName9,proto3" json:"field_Name9,omitempty"`
+	Field_Name10  int32 `protobuf:"varint,410,opt,name=Field_Name10,json=FieldName10,proto3" json:"Field_Name10,omitempty"`
+	FIELD_NAME11  int32 `protobuf:"varint,411,opt,name=FIELD_NAME11,json=FIELDNAME11,proto3" json:"FIELD_NAME11,omitempty"`
+	FIELDName12   int32 `protobuf:"varint,412,opt,name=FIELD_name12,json=FIELDName12,proto3" json:"FIELD_name12,omitempty"`
+	XFieldName13  int32 `protobuf:"varint,413,opt,name=__field_name13,json=FieldName13,proto3" json:"__field_name13,omitempty"`
+	X_FieldName14 int32 `protobuf:"varint,414,opt,name=__Field_name14,json=FieldName14,proto3" json:"__Field_name14,omitempty"`
+	Field_Name15  int32 `protobuf:"varint,415,opt,name=field__name15,json=fieldName15,proto3" json:"field__name15,omitempty"`
+	Field__Name16 int32 `protobuf:"varint,416,opt,name=field__Name16,json=fieldName16,proto3" json:"field__Name16,omitempty"`
+	FieldName17__ int32 `protobuf:"varint,417,opt,name=field_name17__,json=fieldName17,proto3" json:"field_name17__,omitempty"`
+	FieldName18__ int32 `protobuf:"varint,418,opt,name=Field_name18__,json=FieldName18,proto3" json:"Field_name18__,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypesProto3) Reset() {
@@ -1243,10 +1242,9 @@
 func (*TestAllTypesProto3_OneofEnum) isTestAllTypesProto3_OneofField() {}
 
 type ForeignMessage struct {
-	C                    int32                   `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	C             int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ForeignMessage) Reset() {
@@ -1280,11 +1278,10 @@
 }
 
 type TestAllTypesProto3_NestedMessage struct {
-	A                    int32                   `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
-	Corecursive          *TestAllTypesProto3     `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             int32               `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
+	Corecursive   *TestAllTypesProto3 `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypesProto3_NestedMessage) Reset() {
@@ -2133,6 +2130,38 @@
 	if File_google_protobuf_test_messages_proto3_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_test_messages_proto3_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypesProto3); i {
+			case 113:
+				return &v.sizeCache
+			case 114:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_test_messages_proto3_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ForeignMessage); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_test_messages_proto3_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypesProto3_NestedMessage); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_google_protobuf_test_messages_proto3_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*TestAllTypesProto3_OneofUint32)(nil),
 		(*TestAllTypesProto3_OneofNestedMessage)(nil),
diff --git a/internal/testprotos/irregular/test.pb.go b/internal/testprotos/irregular/test.pb.go
index c8ef2c4..5ea3cb0 100644
--- a/internal/testprotos/irregular/test.pb.go
+++ b/internal/testprotos/irregular/test.pb.go
@@ -24,10 +24,9 @@
 	MapMessage      map[string]*IrregularMessage `protobuf:"bytes,4,rep,name=map_message,json=mapMessage" json:"map_message,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Types that are valid to be assigned to Union:
 	//	*Message_OneofMessage
-	Union                isMessage_Union         `protobuf_oneof:"union"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Union         isMessage_Union `protobuf_oneof:"union"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message) Reset() {
@@ -191,6 +190,18 @@
 		return
 	}
 	file_irregular_irregular_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_irregular_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_irregular_test_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*Message_OneofMessage)(nil),
 	}
diff --git a/internal/testprotos/legacy/legacy.pb.go b/internal/testprotos/legacy/legacy.pb.go
index 86793a1..717cd58 100644
--- a/internal/testprotos/legacy/legacy.pb.go
+++ b/internal/testprotos/legacy/legacy.pb.go
@@ -30,21 +30,20 @@
 )
 
 type Legacy struct {
-	F1                   *proto2_v0_0.Message    `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
-	F2                   *proto3_v0_0.Message    `protobuf:"bytes,2,opt,name=f2,proto3" json:"f2,omitempty"`
-	F3                   *proto2_v0_01.Message   `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
-	F4                   *proto3_v0_01.Message   `protobuf:"bytes,4,opt,name=f4,proto3" json:"f4,omitempty"`
-	F5                   *proto2_v1_0.Message    `protobuf:"bytes,5,opt,name=f5,proto3" json:"f5,omitempty"`
-	F6                   *proto3_v1_0.Message    `protobuf:"bytes,6,opt,name=f6,proto3" json:"f6,omitempty"`
-	F7                   *proto2_v1_1.Message    `protobuf:"bytes,7,opt,name=f7,proto3" json:"f7,omitempty"`
-	F8                   *proto3_v1_1.Message    `protobuf:"bytes,8,opt,name=f8,proto3" json:"f8,omitempty"`
-	F9                   *proto2_v1_2.Message    `protobuf:"bytes,9,opt,name=f9,proto3" json:"f9,omitempty"`
-	F10                  *proto3_v1_2.Message    `protobuf:"bytes,10,opt,name=f10,proto3" json:"f10,omitempty"`
-	F11                  *proto2_v1_21.Message   `protobuf:"bytes,11,opt,name=f11,proto3" json:"f11,omitempty"`
-	F12                  *proto3_v1_21.Message   `protobuf:"bytes,12,opt,name=f12,proto3" json:"f12,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	F1            *proto2_v0_0.Message  `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
+	F2            *proto3_v0_0.Message  `protobuf:"bytes,2,opt,name=f2,proto3" json:"f2,omitempty"`
+	F3            *proto2_v0_01.Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
+	F4            *proto3_v0_01.Message `protobuf:"bytes,4,opt,name=f4,proto3" json:"f4,omitempty"`
+	F5            *proto2_v1_0.Message  `protobuf:"bytes,5,opt,name=f5,proto3" json:"f5,omitempty"`
+	F6            *proto3_v1_0.Message  `protobuf:"bytes,6,opt,name=f6,proto3" json:"f6,omitempty"`
+	F7            *proto2_v1_1.Message  `protobuf:"bytes,7,opt,name=f7,proto3" json:"f7,omitempty"`
+	F8            *proto3_v1_1.Message  `protobuf:"bytes,8,opt,name=f8,proto3" json:"f8,omitempty"`
+	F9            *proto2_v1_2.Message  `protobuf:"bytes,9,opt,name=f9,proto3" json:"f9,omitempty"`
+	F10           *proto3_v1_2.Message  `protobuf:"bytes,10,opt,name=f10,proto3" json:"f10,omitempty"`
+	F11           *proto2_v1_21.Message `protobuf:"bytes,11,opt,name=f11,proto3" json:"f11,omitempty"`
+	F12           *proto3_v1_21.Message `protobuf:"bytes,12,opt,name=f12,proto3" json:"f12,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Legacy) Reset() {
@@ -303,6 +302,18 @@
 	if File_legacy_legacy_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_legacy_legacy_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Legacy); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_legacy_legacy_proto_rawDesc,
diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go
index 9fa7865..e044c53 100644
--- a/internal/testprotos/test/test.pb.go
+++ b/internal/testprotos/test/test.pb.go
@@ -311,10 +311,9 @@
 	//	*TestAllTypes_OneofFloat
 	//	*TestAllTypes_OneofDouble
 	//	*TestAllTypes_OneofEnum
-	OneofField           isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
-	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache       `json:"-"`
+	OneofField    isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypes) Reset() {
@@ -1039,10 +1038,9 @@
 	DeprecatedInt32 *int32 `protobuf:"varint,1,opt,name=deprecated_int32,json=deprecatedInt32" json:"deprecated_int32,omitempty"` // Deprecated: Do not use.
 	// Types that are valid to be assigned to DeprecatedOneof:
 	//	*TestDeprecatedMessage_DeprecatedOneofField
-	DeprecatedOneof      isTestDeprecatedMessage_DeprecatedOneof `protobuf_oneof:"deprecated_oneof"`
-	XXX_NoUnkeyedLiteral struct{}                                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields                 `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache                     `json:"-"`
+	DeprecatedOneof isTestDeprecatedMessage_DeprecatedOneof `protobuf_oneof:"deprecated_oneof"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
 }
 
 func (x *TestDeprecatedMessage) Reset() {
@@ -1102,11 +1100,10 @@
 func (*TestDeprecatedMessage_DeprecatedOneofField) isTestDeprecatedMessage_DeprecatedOneof() {}
 
 type ForeignMessage struct {
-	C                    *int32                  `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
-	D                    *int32                  `protobuf:"varint,2,opt,name=d" json:"d,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	C             *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+	D             *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ForeignMessage) Reset() {
@@ -1147,9 +1144,8 @@
 }
 
 type TestReservedFields struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestReservedFields) Reset() {
@@ -1176,10 +1172,9 @@
 }
 
 type TestAllExtensions struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *TestAllExtensions) Reset() {
@@ -1215,10 +1210,9 @@
 }
 
 type OptionalGroupExtension struct {
-	A                    *int32                  `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *OptionalGroupExtension) Reset() {
@@ -1252,10 +1246,9 @@
 }
 
 type RepeatedGroupExtension struct {
-	A                    *int32                  `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *RepeatedGroupExtension) Reset() {
@@ -1289,9 +1282,8 @@
 }
 
 type TestNestedExtension struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestNestedExtension) Reset() {
@@ -1318,10 +1310,9 @@
 }
 
 type TestRequired struct {
-	RequiredField        *int32                  `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestRequired) Reset() {
@@ -1360,10 +1351,9 @@
 	MapMessage      map[int32]*TestRequired `protobuf:"bytes,3,rep,name=map_message,json=mapMessage" json:"map_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Types that are valid to be assigned to OneofField:
 	//	*TestRequiredForeign_OneofMessage
-	OneofField           isTestRequiredForeign_OneofField `protobuf_oneof:"oneof_field"`
-	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields          `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache              `json:"-"`
+	OneofField    isTestRequiredForeign_OneofField `protobuf_oneof:"oneof_field"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestRequiredForeign) Reset() {
@@ -1435,11 +1425,10 @@
 func (*TestRequiredForeign_OneofMessage) isTestRequiredForeign_OneofField() {}
 
 type TestRequiredGroupFields struct {
-	Optionalgroup        *TestRequiredGroupFields_OptionalGroup   `protobuf:"group,1,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	Repeatedgroup        []*TestRequiredGroupFields_RepeatedGroup `protobuf:"group,3,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                                 `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields                  `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache                      `json:"-"`
+	Optionalgroup *TestRequiredGroupFields_OptionalGroup   `protobuf:"group,1,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
+	Repeatedgroup []*TestRequiredGroupFields_RepeatedGroup `protobuf:"group,3,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestRequiredGroupFields) Reset() {
@@ -1480,10 +1469,9 @@
 }
 
 type TestWeak struct {
-	WeakMessage          *weak.WeakImportMessage `protobuf:"bytes,1,opt,name=weak_message,json=weakMessage" json:"weak_message,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	WeakMessage   *weak.WeakImportMessage `protobuf:"bytes,1,opt,name=weak_message,json=weakMessage" json:"weak_message,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestWeak) Reset() {
@@ -1518,9 +1506,8 @@
 
 // Test that RPC services work.
 type FooRequest struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FooRequest) Reset() {
@@ -1547,9 +1534,8 @@
 }
 
 type FooResponse struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FooResponse) Reset() {
@@ -1576,11 +1562,10 @@
 }
 
 type TestAllTypes_NestedMessage struct {
-	A                    *int32                  `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	Corecursive          *TestAllTypes           `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32        `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	Corecursive   *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypes_NestedMessage) Reset() {
@@ -1621,10 +1606,9 @@
 }
 
 type TestAllTypes_OptionalGroup struct {
-	A                    *int32                  `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypes_OptionalGroup) Reset() {
@@ -1658,10 +1642,9 @@
 }
 
 type TestAllTypes_RepeatedGroup struct {
-	A                    *int32                  `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypes_RepeatedGroup) Reset() {
@@ -1695,10 +1678,9 @@
 }
 
 type TestRequiredGroupFields_OptionalGroup struct {
-	A                    *int32                  `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestRequiredGroupFields_OptionalGroup) Reset() {
@@ -1732,10 +1714,9 @@
 }
 
 type TestRequiredGroupFields_RepeatedGroup struct {
-	A                    *int32                  `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestRequiredGroupFields_RepeatedGroup) Reset() {
@@ -3475,6 +3456,200 @@
 	}
 	file_test_test_import_proto_init()
 	file_test_test_public_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_test_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypes); i {
+			case 79:
+				return &v.sizeCache
+			case 80:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestDeprecatedMessage); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ForeignMessage); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestReservedFields); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllExtensions); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OptionalGroupExtension); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RepeatedGroupExtension); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestNestedExtension); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestRequired); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestRequiredForeign); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestRequiredGroupFields); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestWeak); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FooRequest); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FooResponse); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypes_NestedMessage); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypes_OptionalGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypes_RepeatedGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestRequiredGroupFields_OptionalGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_test_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestRequiredGroupFields_RepeatedGroup); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_test_test_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*TestAllTypes_OneofUint32)(nil),
 		(*TestAllTypes_OneofNestedMessage)(nil),
diff --git a/internal/testprotos/test/test_import.pb.go b/internal/testprotos/test/test_import.pb.go
index ea42b56..170ac51 100644
--- a/internal/testprotos/test/test_import.pb.go
+++ b/internal/testprotos/test/test_import.pb.go
@@ -66,9 +66,8 @@
 }
 
 type ImportMessage struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ImportMessage) Reset() {
@@ -140,6 +139,18 @@
 	if File_test_test_import_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_test_test_import_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ImportMessage); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_test_test_import_proto_rawDesc,
diff --git a/internal/testprotos/test/test_public.pb.go b/internal/testprotos/test/test_public.pb.go
index be20ac9..01037d5 100644
--- a/internal/testprotos/test/test_public.pb.go
+++ b/internal/testprotos/test/test_public.pb.go
@@ -18,9 +18,8 @@
 )
 
 type PublicImportMessage struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *PublicImportMessage) Reset() {
@@ -88,6 +87,18 @@
 	if File_test_test_public_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_test_test_public_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PublicImportMessage); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_test_test_public_proto_rawDesc,
diff --git a/internal/testprotos/test/weak/test_weak.pb.go b/internal/testprotos/test/weak/test_weak.pb.go
index f661776..23c4c6b 100644
--- a/internal/testprotos/test/weak/test_weak.pb.go
+++ b/internal/testprotos/test/weak/test_weak.pb.go
@@ -18,10 +18,9 @@
 )
 
 type WeakImportMessage struct {
-	A                    *int32                  `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *WeakImportMessage) Reset() {
@@ -98,6 +97,18 @@
 	if File_test_weak_test_weak_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_test_weak_test_weak_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WeakImportMessage); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_test_weak_test_weak_proto_rawDesc,
diff --git a/internal/testprotos/test3/test.pb.go b/internal/testprotos/test3/test.pb.go
index 67007b7..480baea 100644
--- a/internal/testprotos/test3/test.pb.go
+++ b/internal/testprotos/test3/test.pb.go
@@ -180,10 +180,9 @@
 	//	*TestAllTypes_OneofFloat
 	//	*TestAllTypes_OneofDouble
 	//	*TestAllTypes_OneofEnum
-	OneofField           isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
-	XXX_NoUnkeyedLiteral struct{}                  `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache       `json:"-"`
+	OneofField    isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypes) Reset() {
@@ -751,11 +750,10 @@
 func (*TestAllTypes_OneofEnum) isTestAllTypes_OneofField() {}
 
 type ForeignMessage struct {
-	C                    int32                   `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
-	D                    int32                   `protobuf:"varint,2,opt,name=d,proto3" json:"d,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	C             int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
+	D             int32 `protobuf:"varint,2,opt,name=d,proto3" json:"d,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ForeignMessage) Reset() {
@@ -796,11 +794,10 @@
 }
 
 type TestAllTypes_NestedMessage struct {
-	A                    int32                   `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
-	Corecursive          *TestAllTypes           `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	A             int32         `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
+	Corecursive   *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *TestAllTypes_NestedMessage) Reset() {
@@ -1322,6 +1319,38 @@
 		return
 	}
 	file_test3_test_import_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_test3_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypes); i {
+			case 60:
+				return &v.sizeCache
+			case 61:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test3_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ForeignMessage); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test3_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestAllTypes_NestedMessage); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_test3_test_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*TestAllTypes_OneofUint32)(nil),
 		(*TestAllTypes_OneofNestedMessage)(nil),
diff --git a/internal/testprotos/test3/test_import.pb.go b/internal/testprotos/test3/test_import.pb.go
index 3be0663..9347d75 100644
--- a/internal/testprotos/test3/test_import.pb.go
+++ b/internal/testprotos/test3/test_import.pb.go
@@ -56,9 +56,8 @@
 }
 
 type ImportMessage struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ImportMessage) Reset() {
@@ -130,6 +129,18 @@
 	if File_test3_test_import_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_test3_test_import_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ImportMessage); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_test3_test_import_proto_rawDesc,
diff --git a/reflect/protoregistry/testprotos/test.pb.go b/reflect/protoregistry/testprotos/test.pb.go
index ef91bf9..d79e2d6 100644
--- a/reflect/protoregistry/testprotos/test.pb.go
+++ b/reflect/protoregistry/testprotos/test.pb.go
@@ -160,10 +160,9 @@
 }
 
 type Message1 struct {
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields ``
 }
 
 func (x *Message1) Reset() {
@@ -199,9 +198,8 @@
 }
 
 type Message2 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message2) Reset() {
@@ -228,9 +226,8 @@
 }
 
 type Message3 struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message3) Reset() {
@@ -257,10 +254,9 @@
 }
 
 type Message4 struct {
-	BoolField            *bool                   `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	BoolField     *bool `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Message4) Reset() {
@@ -454,6 +450,50 @@
 	if File_test_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message1); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			case 2:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message2); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message3); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Message4); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_test_proto_rawDesc,
diff --git a/runtime/protoimpl/impl.go b/runtime/protoimpl/impl.go
index 24b58a8..e4e6c11 100644
--- a/runtime/protoimpl/impl.go
+++ b/runtime/protoimpl/impl.go
@@ -33,6 +33,9 @@
 	// TODO: Encode a date instead of the minor version?
 )
 
+// UnsafeEnabled specifies whether package unsafe can be used.
+const UnsafeEnabled = impl.UnsafeEnabled
+
 type (
 	// EnforceVersion is used by code generated by protoc-gen-go
 	// to statically enforce minimum and maximum versions of this package.
diff --git a/types/descriptorpb/descriptor.pb.go b/types/descriptorpb/descriptor.pb.go
index 1d003f8..decbb17 100644
--- a/types/descriptorpb/descriptor.pb.go
+++ b/types/descriptorpb/descriptor.pb.go
@@ -405,10 +405,9 @@
 // The protocol compiler can output a FileDescriptorSet containing the .proto
 // files it parses.
 type FileDescriptorSet struct {
-	File                 []*FileDescriptorProto  `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	File          []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FileDescriptorSet) Reset() {
@@ -465,10 +464,9 @@
 	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info,json=sourceCodeInfo" json:"source_code_info,omitempty"`
 	// The syntax of the proto file.
 	// The supported values are "proto2" and "proto3".
-	Syntax               *string                 `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Syntax        *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FileDescriptorProto) Reset() {
@@ -591,10 +589,9 @@
 	ReservedRange  []*DescriptorProto_ReservedRange  `protobuf:"bytes,9,rep,name=reserved_range,json=reservedRange" json:"reserved_range,omitempty"`
 	// Reserved field names, which may not be used by fields in the same message.
 	// A given name may only be reserved once.
-	ReservedName         []string                `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	ReservedName  []string `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *DescriptorProto) Reset() {
@@ -692,11 +689,10 @@
 
 type ExtensionRangeOptions struct {
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *ExtensionRangeOptions) Reset() {
@@ -768,11 +764,10 @@
 	// user has set a "json_name" option on this field, that option's value
 	// will be used. Otherwise, it's deduced from the field's name by converting
 	// it to camelCase.
-	JsonName             *string                 `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"`
-	Options              *FieldOptions           `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	JsonName      *string       `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"`
+	Options       *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FieldDescriptorProto) Reset() {
@@ -870,11 +865,10 @@
 
 // Describes a oneof.
 type OneofDescriptorProto struct {
-	Name                 *string                 `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Options              *OneofOptions           `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Name          *string       `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Options       *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *OneofDescriptorProto) Reset() {
@@ -925,10 +919,9 @@
 	ReservedRange []*EnumDescriptorProto_EnumReservedRange `protobuf:"bytes,4,rep,name=reserved_range,json=reservedRange" json:"reserved_range,omitempty"`
 	// Reserved enum value names, which may not be reused. A given name may only
 	// be reserved once.
-	ReservedName         []string                `protobuf:"bytes,5,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	ReservedName  []string `protobuf:"bytes,5,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *EnumDescriptorProto) Reset() {
@@ -991,12 +984,11 @@
 
 // Describes a value within an enum.
 type EnumValueDescriptorProto struct {
-	Name                 *string                 `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number               *int32                  `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
-	Options              *EnumValueOptions       `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Name          *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number        *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
+	Options       *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *EnumValueDescriptorProto) Reset() {
@@ -1045,12 +1037,11 @@
 
 // Describes a service.
 type ServiceDescriptorProto struct {
-	Name                 *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Method               []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
-	Options              *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields  `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache      `json:"-"`
+	Name          *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Method        []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
+	Options       *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ServiceDescriptorProto) Reset() {
@@ -1108,10 +1099,9 @@
 	// Identifies if client streams multiple client messages
 	ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,json=clientStreaming,def=0" json:"client_streaming,omitempty"`
 	// Identifies if server streams multiple server messages
-	ServerStreaming      *bool                   `protobuf:"varint,6,opt,name=server_streaming,json=serverStreaming,def=0" json:"server_streaming,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	ServerStreaming *bool `protobuf:"varint,6,opt,name=server_streaming,json=serverStreaming,def=0" json:"server_streaming,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
 }
 
 func (x *MethodDescriptorProto) Reset() {
@@ -1266,11 +1256,10 @@
 	RubyPackage *string `protobuf:"bytes,45,opt,name=ruby_package,json=rubyPackage" json:"ruby_package,omitempty"`
 	// The parser stores options it doesn't recognize here.
 	// See the documentation for the "Options" section above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *FileOptions) Reset() {
@@ -1515,11 +1504,10 @@
 	// parser.
 	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry,json=mapEntry" json:"map_entry,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *MessageOptions) Reset() {
@@ -1654,11 +1642,10 @@
 	// For Google-internal migration only. Do not use.
 	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *FieldOptions) Reset() {
@@ -1750,11 +1737,10 @@
 
 type OneofOptions struct {
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *OneofOptions) Reset() {
@@ -1806,11 +1792,10 @@
 	// is a formalization for deprecating enums.
 	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *EnumOptions) Reset() {
@@ -1875,11 +1860,10 @@
 	// this is a formalization for deprecating enum values.
 	Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *EnumValueOptions) Reset() {
@@ -1937,11 +1921,10 @@
 	// this is a formalization for deprecating services.
 	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *ServiceOptions) Reset() {
@@ -2000,11 +1983,10 @@
 	Deprecated       *bool                           `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
 	IdempotencyLevel *MethodOptions_IdempotencyLevel `protobuf:"varint,34,opt,name=idempotency_level,json=idempotencyLevel,enum=google.protobuf.MethodOptions_IdempotencyLevel,def=0" json:"idempotency_level,omitempty"`
 	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption    []*UninterpretedOption    `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                  `json:"-"`
-	XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
-	XXX_unrecognized       protoimpl.UnknownFields   `json:"-"`
-	XXX_sizecache          protoimpl.SizeCache       `json:"-"`
+	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
+	extensionFields     protoimpl.ExtensionFields ``
 }
 
 func (x *MethodOptions) Reset() {
@@ -2073,15 +2055,14 @@
 	Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
 	// The value of the uninterpreted option, in whatever type the tokenizer
 	// identified it as during parsing. Exactly one of these should be set.
-	IdentifierValue      *string                 `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"`
-	PositiveIntValue     *uint64                 `protobuf:"varint,4,opt,name=positive_int_value,json=positiveIntValue" json:"positive_int_value,omitempty"`
-	NegativeIntValue     *int64                  `protobuf:"varint,5,opt,name=negative_int_value,json=negativeIntValue" json:"negative_int_value,omitempty"`
-	DoubleValue          *float64                `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"`
-	StringValue          []byte                  `protobuf:"bytes,7,opt,name=string_value,json=stringValue" json:"string_value,omitempty"`
-	AggregateValue       *string                 `protobuf:"bytes,8,opt,name=aggregate_value,json=aggregateValue" json:"aggregate_value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"`
+	PositiveIntValue *uint64  `protobuf:"varint,4,opt,name=positive_int_value,json=positiveIntValue" json:"positive_int_value,omitempty"`
+	NegativeIntValue *int64   `protobuf:"varint,5,opt,name=negative_int_value,json=negativeIntValue" json:"negative_int_value,omitempty"`
+	DoubleValue      *float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"`
+	StringValue      []byte   `protobuf:"bytes,7,opt,name=string_value,json=stringValue" json:"string_value,omitempty"`
+	AggregateValue   *string  `protobuf:"bytes,8,opt,name=aggregate_value,json=aggregateValue" json:"aggregate_value,omitempty"`
+	sizeCache        protoimpl.SizeCache
+	unknownFields    protoimpl.UnknownFields
 }
 
 func (x *UninterpretedOption) Reset() {
@@ -2202,10 +2183,9 @@
 	// - Code which tries to interpret locations should probably be designed to
 	//   ignore those that it doesn't understand, as more types of locations could
 	//   be recorded in the future.
-	Location             []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields    `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache        `json:"-"`
+	Location      []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *SourceCodeInfo) Reset() {
@@ -2244,10 +2224,9 @@
 type GeneratedCodeInfo struct {
 	// An Annotation connects some span of text in generated code to an element
 	// of its generating .proto file.
-	Annotation           []*GeneratedCodeInfo_Annotation `protobuf:"bytes,1,rep,name=annotation" json:"annotation,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields         `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache             `json:"-"`
+	Annotation    []*GeneratedCodeInfo_Annotation `protobuf:"bytes,1,rep,name=annotation" json:"annotation,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GeneratedCodeInfo) Reset() {
@@ -2281,12 +2260,11 @@
 }
 
 type DescriptorProto_ExtensionRange struct {
-	Start                *int32                  `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End                  *int32                  `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	Options              *ExtensionRangeOptions  `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Start         *int32                 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End           *int32                 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	Options       *ExtensionRangeOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *DescriptorProto_ExtensionRange) Reset() {
@@ -2337,11 +2315,10 @@
 // fields or extension ranges in the same message. Reserved ranges may
 // not overlap.
 type DescriptorProto_ReservedRange struct {
-	Start                *int32                  `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End                  *int32                  `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Start         *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End           *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *DescriptorProto_ReservedRange) Reset() {
@@ -2388,11 +2365,10 @@
 // is inclusive such that it can appropriately represent the entire int32
 // domain.
 type EnumDescriptorProto_EnumReservedRange struct {
-	Start                *int32                  `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End                  *int32                  `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Start         *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End           *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *EnumDescriptorProto_EnumReservedRange) Reset() {
@@ -2438,11 +2414,10 @@
 // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
 // "foo.(bar.baz).qux".
 type UninterpretedOption_NamePart struct {
-	NamePart             *string                 `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"`
-	IsExtension          *bool                   `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	NamePart      *string `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"`
+	IsExtension   *bool   `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *UninterpretedOption_NamePart) Reset() {
@@ -2560,12 +2535,11 @@
 	//   optional int32 grault = 6;
 	//
 	//   // ignored detached comments.
-	LeadingComments         *string                 `protobuf:"bytes,3,opt,name=leading_comments,json=leadingComments" json:"leading_comments,omitempty"`
-	TrailingComments        *string                 `protobuf:"bytes,4,opt,name=trailing_comments,json=trailingComments" json:"trailing_comments,omitempty"`
-	LeadingDetachedComments []string                `protobuf:"bytes,6,rep,name=leading_detached_comments,json=leadingDetachedComments" json:"leading_detached_comments,omitempty"`
-	XXX_NoUnkeyedLiteral    struct{}                `json:"-"`
-	XXX_unrecognized        protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache           protoimpl.SizeCache     `json:"-"`
+	LeadingComments         *string  `protobuf:"bytes,3,opt,name=leading_comments,json=leadingComments" json:"leading_comments,omitempty"`
+	TrailingComments        *string  `protobuf:"bytes,4,opt,name=trailing_comments,json=trailingComments" json:"trailing_comments,omitempty"`
+	LeadingDetachedComments []string `protobuf:"bytes,6,rep,name=leading_detached_comments,json=leadingDetachedComments" json:"leading_detached_comments,omitempty"`
+	sizeCache               protoimpl.SizeCache
+	unknownFields           protoimpl.UnknownFields
 }
 
 func (x *SourceCodeInfo_Location) Reset() {
@@ -2638,10 +2612,9 @@
 	// Identifies the ending offset in bytes in the generated code that
 	// relates to the identified offset. The end offset should be one past
 	// the last relevant byte (so the length of the text = end - begin).
-	End                  *int32                  `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	End           *int32 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *GeneratedCodeInfo_Annotation) Reset() {
@@ -3278,6 +3251,296 @@
 	if File_google_protobuf_descriptor_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_descriptor_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FileDescriptorSet); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FileDescriptorProto); i {
+			case 12:
+				return &v.sizeCache
+			case 13:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DescriptorProto); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtensionRangeOptions); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			case 3:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldDescriptorProto); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OneofDescriptorProto); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnumDescriptorProto); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnumValueDescriptorProto); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceDescriptorProto); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MethodDescriptorProto); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FileOptions); i {
+			case 21:
+				return &v.sizeCache
+			case 22:
+				return &v.unknownFields
+			case 23:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MessageOptions); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			case 7:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldOptions); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			case 9:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OneofOptions); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			case 3:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnumOptions); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			case 5:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnumValueOptions); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			case 4:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceOptions); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			case 4:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MethodOptions); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			case 5:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UninterpretedOption); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SourceCodeInfo); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GeneratedCodeInfo); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DescriptorProto_ExtensionRange); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DescriptorProto_ReservedRange); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnumDescriptorProto_EnumReservedRange); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UninterpretedOption_NamePart); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SourceCodeInfo_Location); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_descriptor_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GeneratedCodeInfo_Annotation); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_descriptor_proto_rawDesc,
diff --git a/types/known/anypb/any.pb.go b/types/known/anypb/any.pb.go
index 368fd75..71e687d 100644
--- a/types/known/anypb/any.pb.go
+++ b/types/known/anypb/any.pb.go
@@ -128,10 +128,9 @@
 	//
 	TypeUrl string `protobuf:"bytes,1,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"`
 	// Must be a valid serialized protocol buffer of the above specified type.
-	Value                []byte                  `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Any) Reset() {
@@ -222,6 +221,18 @@
 	if File_google_protobuf_any_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_any_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Any); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_any_proto_rawDesc,
diff --git a/types/known/apipb/api.pb.go b/types/known/apipb/api.pb.go
index af46a90..b0d4128 100644
--- a/types/known/apipb/api.pb.go
+++ b/types/known/apipb/api.pb.go
@@ -64,10 +64,9 @@
 	// Included interfaces. See [Mixin][].
 	Mixins []*Mixin `protobuf:"bytes,6,rep,name=mixins,proto3" json:"mixins,omitempty"`
 	// The source syntax of the service.
-	Syntax               typepb.Syntax           `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Syntax        typepb.Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Api) Reset() {
@@ -157,10 +156,9 @@
 	// Any metadata attached to the method.
 	Options []*typepb.Option `protobuf:"bytes,6,rep,name=options,proto3" json:"options,omitempty"`
 	// The source syntax of this method.
-	Syntax               typepb.Syntax           `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Syntax        typepb.Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Method) Reset() {
@@ -318,10 +316,9 @@
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// If non-empty specifies a path under which inherited HTTP paths
 	// are rooted.
-	Root                 string                  `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Root          string `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Mixin) Reset() {
@@ -465,6 +462,38 @@
 	if File_google_protobuf_api_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_api_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Api); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_api_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Method); i {
+			case 7:
+				return &v.sizeCache
+			case 8:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_api_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Mixin); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_api_proto_rawDesc,
diff --git a/types/known/durationpb/duration.pb.go b/types/known/durationpb/duration.pb.go
index 788e57b..3d7dac7 100644
--- a/types/known/durationpb/duration.pb.go
+++ b/types/known/durationpb/duration.pb.go
@@ -88,10 +88,9 @@
 	// of one second or more, a non-zero value for the `nanos` field must be
 	// of the same sign as the `seconds` field. Must be from -999,999,999
 	// to +999,999,999 inclusive.
-	Nanos                int32                   `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Nanos         int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Duration) Reset() {
@@ -183,6 +182,18 @@
 	if File_google_protobuf_duration_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_duration_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Duration); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_duration_proto_rawDesc,
diff --git a/types/known/emptypb/empty.pb.go b/types/known/emptypb/empty.pb.go
index 72952b4..6b3935d 100644
--- a/types/known/emptypb/empty.pb.go
+++ b/types/known/emptypb/empty.pb.go
@@ -27,9 +27,8 @@
 //
 // The JSON representation for `Empty` is empty JSON object `{}`.
 type Empty struct {
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Empty) Reset() {
@@ -103,6 +102,18 @@
 	if File_google_protobuf_empty_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_empty_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Empty); i {
+			case 0:
+				return &v.sizeCache
+			case 1:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_empty_proto_rawDesc,
diff --git a/types/known/fieldmaskpb/field_mask.pb.go b/types/known/fieldmaskpb/field_mask.pb.go
index b131163..1b72928 100644
--- a/types/known/fieldmaskpb/field_mask.pb.go
+++ b/types/known/fieldmaskpb/field_mask.pb.go
@@ -218,10 +218,9 @@
 // `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
 type FieldMask struct {
 	// The set of field mask paths.
-	Paths                []string                `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Paths         []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FieldMask) Reset() {
@@ -303,6 +302,18 @@
 	if File_google_protobuf_field_mask_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_field_mask_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FieldMask); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_field_mask_proto_rawDesc,
diff --git a/types/known/sourcecontextpb/source_context.pb.go b/types/known/sourcecontextpb/source_context.pb.go
index 533b37c..016fafd 100644
--- a/types/known/sourcecontextpb/source_context.pb.go
+++ b/types/known/sourcecontextpb/source_context.pb.go
@@ -22,10 +22,9 @@
 type SourceContext struct {
 	// The path-qualified name of the .proto file that contained the associated
 	// protobuf element.  For example: `"google/protobuf/source_context.proto"`.
-	FileName             string                  `protobuf:"bytes,1,opt,name=file_name,json=fileName,proto3" json:"file_name,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	FileName      string `protobuf:"bytes,1,opt,name=file_name,json=fileName,proto3" json:"file_name,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *SourceContext) Reset() {
@@ -108,6 +107,18 @@
 	if File_google_protobuf_source_context_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_source_context_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SourceContext); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_source_context_proto_rawDesc,
diff --git a/types/known/structpb/struct.pb.go b/types/known/structpb/struct.pb.go
index 74f87c6..9b3efff 100644
--- a/types/known/structpb/struct.pb.go
+++ b/types/known/structpb/struct.pb.go
@@ -72,10 +72,9 @@
 // The JSON representation for `Struct` is JSON object.
 type Struct struct {
 	// Unordered map of dynamically typed values.
-	Fields               map[string]*Value       `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Fields        map[string]*Value `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Struct) Reset() {
@@ -132,10 +131,9 @@
 	//	*Value_StructValue
 	// Represents a repeated `Value`.
 	//	*Value_ListValue
-	Kind                 isValue_Kind            `protobuf_oneof:"kind"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Kind          isValue_Kind `protobuf_oneof:"kind"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Value) Reset() {
@@ -257,10 +255,9 @@
 // The JSON representation for `ListValue` is JSON array.
 type ListValue struct {
 	// Repeated field of dynamically typed values.
-	Values               []*Value                `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Values        []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *ListValue) Reset() {
@@ -387,6 +384,38 @@
 	if File_google_protobuf_struct_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_struct_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Struct); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_struct_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Value); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_struct_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ListValue); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	file_google_protobuf_struct_proto_msgTypes[1].OneofWrappers = []interface{}{
 		(*Value_NullValue)(nil),
 		(*Value_NumberValue)(nil),
diff --git a/types/known/timestamppb/timestamp.pb.go b/types/known/timestamppb/timestamp.pb.go
index aee1cf1..2639d5c 100644
--- a/types/known/timestamppb/timestamp.pb.go
+++ b/types/known/timestamppb/timestamp.pb.go
@@ -108,10 +108,9 @@
 	// second values with fractions must still have non-negative nanos values
 	// that count forward in time. Must be from 0 to 999,999,999
 	// inclusive.
-	Nanos                int32                   `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Nanos         int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Timestamp) Reset() {
@@ -203,6 +202,18 @@
 	if File_google_protobuf_timestamp_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_timestamp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Timestamp); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_timestamp_proto_rawDesc,
diff --git a/types/known/typepb/type.pb.go b/types/known/typepb/type.pb.go
index d4f4a5a..bc350d3 100644
--- a/types/known/typepb/type.pb.go
+++ b/types/known/typepb/type.pb.go
@@ -238,10 +238,9 @@
 	// The source context.
 	SourceContext *sourcecontextpb.SourceContext `protobuf:"bytes,5,opt,name=source_context,json=sourceContext,proto3" json:"source_context,omitempty"`
 	// The source syntax.
-	Syntax               Syntax                  `protobuf:"varint,6,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Syntax        Syntax `protobuf:"varint,6,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Type) Reset() {
@@ -332,10 +331,9 @@
 	// The field JSON name.
 	JsonName string `protobuf:"bytes,10,opt,name=json_name,json=jsonName,proto3" json:"json_name,omitempty"`
 	// The string value of the default value of this field. Proto2 syntax only.
-	DefaultValue         string                  `protobuf:"bytes,11,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	DefaultValue  string `protobuf:"bytes,11,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Field) Reset() {
@@ -442,10 +440,9 @@
 	// The source context.
 	SourceContext *sourcecontextpb.SourceContext `protobuf:"bytes,4,opt,name=source_context,json=sourceContext,proto3" json:"source_context,omitempty"`
 	// The source syntax.
-	Syntax               Syntax                  `protobuf:"varint,5,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Syntax        Syntax `protobuf:"varint,5,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Enum) Reset() {
@@ -513,10 +510,9 @@
 	// Enum value number.
 	Number int32 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"`
 	// Protocol buffer options.
-	Options              []*Option               `protobuf:"bytes,3,rep,name=options,proto3" json:"options,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Options       []*Option `protobuf:"bytes,3,rep,name=options,proto3" json:"options,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *EnumValue) Reset() {
@@ -575,10 +571,9 @@
 	// the corresponding wrapper type defined in google/protobuf/wrappers.proto
 	// should be used. If the value is an enum, it should be stored as an int32
 	// value using the google.protobuf.Int32Value type.
-	Value                *anypb.Any              `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         *anypb.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Option) Reset() {
@@ -790,6 +785,58 @@
 	if File_google_protobuf_type_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_type_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Type); i {
+			case 6:
+				return &v.sizeCache
+			case 7:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_type_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Field); i {
+			case 10:
+				return &v.sizeCache
+			case 11:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_type_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Enum); i {
+			case 5:
+				return &v.sizeCache
+			case 6:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_type_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnumValue); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_type_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Option); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_type_proto_rawDesc,
diff --git a/types/known/wrapperspb/wrappers.pb.go b/types/known/wrapperspb/wrappers.pb.go
index a12b986..2df1119 100644
--- a/types/known/wrapperspb/wrappers.pb.go
+++ b/types/known/wrapperspb/wrappers.pb.go
@@ -22,10 +22,9 @@
 // The JSON representation for `DoubleValue` is JSON number.
 type DoubleValue struct {
 	// The double value.
-	Value                float64                 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *DoubleValue) Reset() {
@@ -65,10 +64,9 @@
 // The JSON representation for `FloatValue` is JSON number.
 type FloatValue struct {
 	// The float value.
-	Value                float32                 `protobuf:"fixed32,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         float32 `protobuf:"fixed32,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *FloatValue) Reset() {
@@ -108,10 +106,9 @@
 // The JSON representation for `Int64Value` is JSON string.
 type Int64Value struct {
 	// The int64 value.
-	Value                int64                   `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         int64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Int64Value) Reset() {
@@ -151,10 +148,9 @@
 // The JSON representation for `UInt64Value` is JSON string.
 type UInt64Value struct {
 	// The uint64 value.
-	Value                uint64                  `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *UInt64Value) Reset() {
@@ -194,10 +190,9 @@
 // The JSON representation for `Int32Value` is JSON number.
 type Int32Value struct {
 	// The int32 value.
-	Value                int32                   `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         int32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Int32Value) Reset() {
@@ -237,10 +232,9 @@
 // The JSON representation for `UInt32Value` is JSON number.
 type UInt32Value struct {
 	// The uint32 value.
-	Value                uint32                  `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         uint32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *UInt32Value) Reset() {
@@ -280,10 +274,9 @@
 // The JSON representation for `BoolValue` is JSON `true` and `false`.
 type BoolValue struct {
 	// The bool value.
-	Value                bool                    `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         bool `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *BoolValue) Reset() {
@@ -323,10 +316,9 @@
 // The JSON representation for `StringValue` is JSON string.
 type StringValue struct {
 	// The string value.
-	Value                string                  `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *StringValue) Reset() {
@@ -366,10 +358,9 @@
 // The JSON representation for `BytesValue` is JSON string.
 type BytesValue struct {
 	// The bytes value.
-	Value                []byte                  `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Value         []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *BytesValue) Reset() {
@@ -479,6 +470,98 @@
 	if File_google_protobuf_wrappers_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_wrappers_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DoubleValue); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_wrappers_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FloatValue); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_wrappers_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Int64Value); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_wrappers_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UInt64Value); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_wrappers_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Int32Value); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_wrappers_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UInt32Value); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_wrappers_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BoolValue); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_wrappers_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StringValue); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_wrappers_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BytesValue); i {
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_wrappers_proto_rawDesc,
diff --git a/types/pluginpb/plugin.pb.go b/types/pluginpb/plugin.pb.go
index 2f994f6..6a1f738 100644
--- a/types/pluginpb/plugin.pb.go
+++ b/types/pluginpb/plugin.pb.go
@@ -25,10 +25,9 @@
 	Patch *int32 `protobuf:"varint,3,opt,name=patch" json:"patch,omitempty"`
 	// A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
 	// be empty for mainline stable releases.
-	Suffix               *string                 `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Suffix        *string `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *Version) Reset() {
@@ -106,10 +105,9 @@
 	// fully qualified.
 	ProtoFile []*descriptorpb.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file,json=protoFile" json:"proto_file,omitempty"`
 	// The version number of protocol compiler.
-	CompilerVersion      *Version                `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	CompilerVersion *Version `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"`
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
 }
 
 func (x *CodeGeneratorRequest) Reset() {
@@ -173,11 +171,10 @@
 	// problem in protoc itself -- such as the input CodeGeneratorRequest being
 	// unparseable -- should be reported by writing a message to stderr and
 	// exiting with a non-zero status code.
-	Error                *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	File                 []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields       `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache           `json:"-"`
+	Error         *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	File          []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *CodeGeneratorResponse) Reset() {
@@ -270,10 +267,9 @@
 	// If |insertion_point| is present, |name| must also be present.
 	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point,json=insertionPoint" json:"insertion_point,omitempty"`
 	// The file contents.
-	Content              *string                 `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     protoimpl.UnknownFields `json:"-"`
-	XXX_sizecache        protoimpl.SizeCache     `json:"-"`
+	Content       *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
 func (x *CodeGeneratorResponse_File) Reset() {
@@ -408,6 +404,48 @@
 	if File_google_protobuf_compiler_plugin_proto != nil {
 		return
 	}
+	if !protoimpl.UnsafeEnabled {
+		file_google_protobuf_compiler_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Version); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_compiler_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CodeGeneratorRequest); i {
+			case 4:
+				return &v.sizeCache
+			case 5:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_compiler_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CodeGeneratorResponse); i {
+			case 2:
+				return &v.sizeCache
+			case 3:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_google_protobuf_compiler_plugin_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CodeGeneratorResponse_File); i {
+			case 3:
+				return &v.sizeCache
+			case 4:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			RawDescriptor: file_google_protobuf_compiler_plugin_proto_rawDesc,