cmd/protoc-gen-go: group generation of internal fields together

These were originally kept separate to assist Google-internal patches,
but it turns out that Google-internal patches do not use the
genMessageInternalFields function.

Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/cmd/protoc-gen-go/internal_gengo/main.go b/cmd/protoc-gen-go/internal_gengo/main.go
index 44bb413..67e476b 100644
--- a/cmd/protoc-gen-go/internal_gengo/main.go
+++ b/cmd/protoc-gen-go/internal_gengo/main.go
@@ -418,14 +418,48 @@
 
 func genMessageFields(g *protogen.GeneratedFile, f *fileInfo, message *protogen.Message) {
 	sf := f.allMessageFieldsByPtr[message]
+	genMessageInternalFields(g, message, sf)
+	for _, field := range message.Fields {
+		genMessageField(g, f, message, field, sf)
+	}
+}
+
+func genMessageInternalFields(g *protogen.GeneratedFile, message *protogen.Message, sf *structFields) {
 	if generateMessageStateFields {
 		g.P("state ", protoimplPackage.Ident("MessageState"))
 		sf.append("state")
 	}
-	for _, field := range message.Fields {
-		genMessageField(g, f, message, field, sf)
+	if generateNoUnkeyedLiteralFields {
+		g.P("XXX_NoUnkeyedLiteral", " struct{} `json:\"-\"`")
+		sf.append("XXX_NoUnkeyedLiteral")
 	}
-	genMessageInternalFields(g, message, sf)
+	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 loadMessageAPIFlags(message).WeakMapField {
+		g.P("XXX_weak", " ", protoimplPackage.Ident("WeakFields"), " `json:\"-\"`")
+		sf.append("XXX_weak")
+	}
+	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 {
+		if generateExportedExtensionFields {
+			g.P("XXX_InternalExtensions", " ", protoimplPackage.Ident("ExtensionFields"), " `json:\"-\"`")
+			sf.append("XXX_InternalExtensions")
+		} else {
+			g.P("extensionFields", " ", protoimplPackage.Ident("ExtensionFields"))
+			sf.append("extensionFields")
+		}
+	}
 }
 
 func genMessageField(g *protogen.GeneratedFile, f *fileInfo, message *protogen.Message, field *protogen.Field, sf *structFields) {
@@ -478,40 +512,6 @@
 	sf.append(field.GoName)
 }
 
-func genMessageInternalFields(g *protogen.GeneratedFile, message *protogen.Message, sf *structFields) {
-	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 loadMessageAPIFlags(message).WeakMapField {
-		g.P("XXX_weak", " ", protoimplPackage.Ident("WeakFields"), " `json:\"-\"`")
-		sf.append("XXX_weak")
-	}
-	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 {
-		if generateExportedExtensionFields {
-			g.P("XXX_InternalExtensions", " ", protoimplPackage.Ident("ExtensionFields"), " `json:\"-\"`")
-			sf.append("XXX_InternalExtensions")
-		} else {
-			g.P("extensionFields", " ", protoimplPackage.Ident("ExtensionFields"))
-			sf.append("extensionFields")
-		}
-	}
-}
-
 // genDefaultConsts generates consts and vars holding the default
 // values of fields.
 func genDefaultConsts(g *protogen.GeneratedFile, f *fileInfo, message *protogen.Message) {
diff --git a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
index 5069766..8fb13df 100644
--- a/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
+++ b/cmd/protoc-gen-go/testdata/annotations/annotations.pb.go
@@ -71,9 +71,9 @@
 
 type AnnotationsTestMessage struct {
 	state                protoimpl.MessageState
-	AnnotationsTestField *string `protobuf:"bytes,1,opt,name=AnnotationsTestField" json:"AnnotationsTestField,omitempty"`
 	sizeCache            protoimpl.SizeCache
 	unknownFields        protoimpl.UnknownFields
+	AnnotationsTestField *string `protobuf:"bytes,1,opt,name=AnnotationsTestField" json:"AnnotationsTestField,omitempty"`
 }
 
 func (x *AnnotationsTestMessage) Reset() {
@@ -168,9 +168,9 @@
 			switch v := v.(*AnnotationsTestMessage); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 cf71dbc..116cae9 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:590 end:609} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:626 end:673} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1904 end:1926} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:1982 end:2002} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2984 end:3007}
\ No newline at end of file
+annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:590 end:609} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:626 end:673} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1904 end:1926} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2070 end:2090} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2984 end:3007}
\ 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 56b07c3..28e9542 100644
--- a/cmd/protoc-gen-go/testdata/comments/comments.pb.go
+++ b/cmd/protoc-gen-go/testdata/comments/comments.pb.go
@@ -21,7 +21,9 @@
 
 // COMMENT: Message1
 type Message1 struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// COMMENT: Field1A
 	Field1A *string `protobuf:"bytes,1,opt,name=Field1A" json:"Field1A,omitempty"`
 	// COMMENT: Oneof1A
@@ -29,9 +31,7 @@
 	// Types that are valid to be assigned to Oneof1A:
 	// COMMENT: Oneof1AField1
 	//	*Message1_Oneof1AField1
-	Oneof1A       isMessage1_Oneof1A `protobuf_oneof:"Oneof1a"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Oneof1A isMessage1_Oneof1A `protobuf_oneof:"Oneof1a"`
 }
 
 func (x *Message1) Reset() {
@@ -323,9 +323,9 @@
 			switch v := v.(*Message1); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
index 386c91d..dbcd569 100644
--- a/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
+++ b/cmd/protoc-gen-go/testdata/comments/deprecated.pb.go
@@ -61,9 +61,9 @@
 // Deprecated: Do not use.
 type DeprecatedMessage struct {
 	state           protoimpl.MessageState
-	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
+	DeprecatedField string `protobuf:"bytes,1,opt,name=deprecated_field,json=deprecatedField,proto3" json:"deprecated_field,omitempty"` // Deprecated: Do not use.
 }
 
 func (x *DeprecatedMessage) Reset() {
@@ -158,9 +158,9 @@
 			switch v := v.(*DeprecatedMessage); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 0c9da4b..0b092ea 100644
--- a/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/base/base.pb.go
@@ -20,10 +20,10 @@
 
 type BaseMessage struct {
 	state           protoimpl.MessageState
-	Field           *string `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+	Field           *string `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
 }
 
 func (x *BaseMessage) Reset() {
@@ -168,11 +168,11 @@
 			switch v := v.(*BaseMessage); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
-			case 4:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
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 0ea60bb..fe4160e 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
@@ -74,9 +74,9 @@
 
 type Message struct {
 	state         protoimpl.MessageState
-	Data          []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Data          []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
 }
 
 func (x *Message) Reset() {
@@ -115,9 +115,9 @@
 
 type ExtensionGroup struct {
 	state          protoimpl.MessageState
-	ExtensionGroup *string `protobuf:"bytes,120,opt,name=extension_group,json=extensionGroup" json:"extension_group,omitempty"`
 	sizeCache      protoimpl.SizeCache
 	unknownFields  protoimpl.UnknownFields
+	ExtensionGroup *string `protobuf:"bytes,120,opt,name=extension_group,json=extensionGroup" json:"extension_group,omitempty"`
 }
 
 func (x *ExtensionGroup) Reset() {
@@ -190,9 +190,9 @@
 
 type RepeatedGroup struct {
 	state          protoimpl.MessageState
-	RepeatedXGroup []string `protobuf:"bytes,319,rep,name=repeated_x_group,json=repeatedXGroup" json:"repeated_x_group,omitempty"`
 	sizeCache      protoimpl.SizeCache
 	unknownFields  protoimpl.UnknownFields
+	RepeatedXGroup []string `protobuf:"bytes,319,rep,name=repeated_x_group,json=repeatedXGroup" json:"repeated_x_group,omitempty"`
 }
 
 func (x *RepeatedGroup) Reset() {
@@ -1280,9 +1280,9 @@
 			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1292,9 +1292,9 @@
 			switch v := v.(*ExtensionGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1316,9 +1316,9 @@
 			switch v := v.(*RepeatedGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 02ff328..7125ff9 100644
--- a/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go
@@ -19,9 +19,9 @@
 
 type ExtraMessage struct {
 	state         protoimpl.MessageState
-	Data          []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Data          []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
 }
 
 func (x *ExtraMessage) Reset() {
@@ -108,9 +108,9 @@
 			switch v := v.(*ExtraMessage); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
index a33f903..8373349 100644
--- a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
+++ b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
@@ -23,7 +23,9 @@
 // This exists to demonstrate the current behavior and catch unintended
 // changes in it.
 type Message struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Various CamelCase conversions.
 	FieldOne   *string `protobuf:"bytes,1,opt,name=field_one,json=fieldOne" json:"field_one,omitempty"`
 	FieldTwo   *string `protobuf:"bytes,2,opt,name=FieldTwo" json:"FieldTwo,omitempty"`
@@ -58,8 +60,6 @@
 	// Types that are valid to be assigned to OneofConflictC:
 	//	*Message_OneofMessageConflict_
 	OneofConflictC isMessage_OneofConflictC `protobuf_oneof:"oneof_conflict_c"`
-	sizeCache      protoimpl.SizeCache
-	unknownFields  protoimpl.UnknownFields
 }
 
 func (x *Message) Reset() {
@@ -397,9 +397,9 @@
 			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
-			case 18:
+			case 1:
 				return &v.sizeCache
-			case 19:
+			case 2:
 				return &v.unknownFields
 			default:
 				return 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 73465cb..ed9bb22 100644
--- a/cmd/protoc-gen-go/testdata/import_public/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
@@ -58,11 +58,11 @@
 
 type Public struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -181,9 +181,9 @@
 			switch v := v.(*Public); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 18bdb56..47684eb 100644
--- a/cmd/protoc-gen-go/testdata/import_public/b.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
@@ -20,10 +20,10 @@
 
 type Local struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Local) Reset() {
@@ -127,9 +127,9 @@
 			switch v := v.(*Local); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 8554ed8..bc4d3d1 100644
--- a/cmd/protoc-gen-go/testdata/import_public/c.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/c.pb.go
@@ -19,14 +19,14 @@
 )
 
 type UsingPublicImport struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Local is declared in b.proto, which is a public import of a.proto.
 	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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Sub2 *sub2.Sub2Message `protobuf:"bytes,2,opt,name=sub2" json:"sub2,omitempty"`
 }
 
 func (x *UsingPublicImport) Reset() {
@@ -133,9 +133,9 @@
 			switch v := v.(*UsingPublicImport); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 134ea5b..23b799e 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
@@ -179,7 +179,10 @@
 }
 
 type M struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// Field using a type in the same Go package, but a different source file.
 	M2 *M2      `protobuf:"bytes,1,opt,name=m2" json:"m2,omitempty"`
 	S  *string  `protobuf:"bytes,4,opt,name=s,def=default" json:"s,omitempty"`
@@ -188,10 +191,7 @@
 	// Types that are valid to be assigned to OneofField:
 	//	*M_OneofInt32
 	//	*M_OneofInt64
-	OneofField      isM_OneofField `protobuf_oneof:"oneof_field"`
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
+	OneofField isM_OneofField `protobuf_oneof:"oneof_field"`
 }
 
 const Default_M_S string = "default"
@@ -301,13 +301,13 @@
 func (*M_OneofInt64) isM_OneofField() {}
 
 type M_Submessage struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Types that are valid to be assigned to SubmessageOneofField:
 	//	*M_Submessage_SubmessageOneofInt32
 	//	*M_Submessage_SubmessageOneofInt64
 	SubmessageOneofField isM_Submessage_SubmessageOneofField `protobuf_oneof:"submessage_oneof_field"`
-	sizeCache            protoimpl.SizeCache
-	unknownFields        protoimpl.UnknownFields
 }
 
 func (x *M_Submessage) Reset() {
@@ -482,11 +482,11 @@
 			switch v := v.(*M); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
-			case 8:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -496,9 +496,9 @@
 			switch v := v.(*M_Submessage); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 9cc7f1a..f94d370 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
@@ -94,9 +94,9 @@
 
 type M1_1 struct {
 	state         protoimpl.MessageState
-	M1            *M1 `protobuf:"bytes,1,opt,name=m1,proto3" json:"m1,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	M1            *M1 `protobuf:"bytes,1,opt,name=m1,proto3" json:"m1,omitempty"`
 }
 
 func (x *M1_1) Reset() {
@@ -200,9 +200,9 @@
 			switch v := v.(*M1_1); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 2d8f33d..074977a 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
@@ -20,9 +20,9 @@
 
 type A1M1 struct {
 	state         protoimpl.MessageState
-	F             *test_a_1.M1 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	F             *test_a_1.M1 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
 }
 
 func (x *A1M1) Reset() {
@@ -111,9 +111,9 @@
 			switch v := v.(*A1M1); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 e449600..24503b6 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
@@ -20,9 +20,9 @@
 
 type A1M2 struct {
 	state         protoimpl.MessageState
-	F             *test_a_1.M2 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	F             *test_a_1.M2 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
 }
 
 func (x *A1M2) Reset() {
@@ -111,9 +111,9 @@
 			switch v := v.(*A1M2); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 028d093..3edf7ec 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
@@ -23,13 +23,13 @@
 
 type All struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -172,9 +172,9 @@
 			switch v := v.(*All); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 0d195ad..78765ae 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
@@ -18,12 +18,12 @@
 )
 
 type Foo struct {
-	state protoimpl.MessageState
-	// Types that are valid to be assigned to Bar:
-	//	*Foo_GetBar
-	Bar           isFoo_Bar `protobuf_oneof:"bar"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// Types that are valid to be assigned to Bar:
+	//	*Foo_GetBar
+	Bar isFoo_Bar `protobuf_oneof:"bar"`
 }
 
 func (x *Foo) Reset() {
@@ -122,9 +122,9 @@
 			switch v := v.(*Foo); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go b/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
index d59d3a1..cc63144 100644
--- a/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
+++ b/cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go
@@ -71,10 +71,10 @@
 
 type Message struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 const Default_Message_EnumField Enum = Enum_ZERO
@@ -171,9 +171,9 @@
 			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
index e76aa20..900e59c 100644
--- a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
@@ -339,10 +339,10 @@
 
 type EnumContainerMessage1 struct {
 	state             protoimpl.MessageState
-	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
+	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"`
 }
 
 const Default_EnumContainerMessage1_DefaultDuplicate1 EnumType2 = EnumType2_duplicate1
@@ -510,9 +510,9 @@
 			switch v := v.(*EnumContainerMessage1); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
index cae45b5..3b9b30e 100644
--- a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
@@ -75,6 +75,8 @@
 
 type FieldTestMessage struct {
 	state               protoimpl.MessageState
+	sizeCache           protoimpl.SizeCache
+	unknownFields       protoimpl.UnknownFields
 	OptionalBool        *bool                                `protobuf:"varint,1,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
 	OptionalEnum        *FieldTestMessage_Enum               `protobuf:"varint,2,opt,name=optional_enum,json=optionalEnum,enum=goproto.protoc.proto2.FieldTestMessage_Enum" json:"optional_enum,omitempty"`
 	OptionalInt32       *int32                               `protobuf:"varint,3,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
@@ -180,9 +182,7 @@
 	// Types that are valid to be assigned to OneofTwo:
 	//	*FieldTestMessage_OneofTwo_1
 	//	*FieldTestMessage_OneofTwo_2
-	OneofTwo      isFieldTestMessage_OneofTwo `protobuf_oneof:"oneof_two"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	OneofTwo isFieldTestMessage_OneofTwo `protobuf_oneof:"oneof_two"`
 }
 
 const Default_FieldTestMessage_DefaultBool bool = true
@@ -1104,9 +1104,9 @@
 
 type FieldTestMessage_OptionalGroup struct {
 	state         protoimpl.MessageState
-	OptionalGroup *string `protobuf:"bytes,19,opt,name=optional_group,json=optionalGroup" json:"optional_group,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	OptionalGroup *string `protobuf:"bytes,19,opt,name=optional_group,json=optionalGroup" json:"optional_group,omitempty"`
 }
 
 func (x *FieldTestMessage_OptionalGroup) Reset() {
@@ -1145,9 +1145,9 @@
 
 type FieldTestMessage_RequiredGroup struct {
 	state         protoimpl.MessageState
-	RequiredGroup *string `protobuf:"bytes,119,req,name=required_group,json=requiredGroup" json:"required_group,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	RequiredGroup *string `protobuf:"bytes,119,req,name=required_group,json=requiredGroup" json:"required_group,omitempty"`
 }
 
 func (x *FieldTestMessage_RequiredGroup) Reset() {
@@ -1186,9 +1186,9 @@
 
 type FieldTestMessage_RepeatedGroup struct {
 	state         protoimpl.MessageState
-	RepeatedGroup []string `protobuf:"bytes,219,rep,name=repeated_group,json=repeatedGroup" json:"repeated_group,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	RepeatedGroup []string `protobuf:"bytes,219,rep,name=repeated_group,json=repeatedGroup" json:"repeated_group,omitempty"`
 }
 
 func (x *FieldTestMessage_RepeatedGroup) Reset() {
@@ -1227,9 +1227,9 @@
 
 type FieldTestMessage_OneofGroup struct {
 	state           protoimpl.MessageState
-	OneofGroupField *string `protobuf:"bytes,619,opt,name=oneof_group_field,json=oneofGroupField" json:"oneof_group_field,omitempty"`
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
+	OneofGroupField *string `protobuf:"bytes,619,opt,name=oneof_group_field,json=oneofGroupField" json:"oneof_group_field,omitempty"`
 }
 
 func (x *FieldTestMessage_OneofGroup) Reset() {
@@ -1736,9 +1736,9 @@
 			switch v := v.(*FieldTestMessage); i {
 			case 0:
 				return &v.state
-			case 84:
+			case 1:
 				return &v.sizeCache
-			case 85:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1748,9 +1748,9 @@
 			switch v := v.(*FieldTestMessage_OptionalGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1760,9 +1760,9 @@
 			switch v := v.(*FieldTestMessage_RequiredGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1772,9 +1772,9 @@
 			switch v := v.(*FieldTestMessage_RepeatedGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1784,9 +1784,9 @@
 			switch v := v.(*FieldTestMessage_OneofGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return 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 a29063e..28f6959 100644
--- a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
@@ -19,10 +19,10 @@
 
 type Layer1 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Layer1) Reset() {
@@ -68,9 +68,9 @@
 
 type Layer1_Layer2 struct {
 	state         protoimpl.MessageState
-	L3            *Layer1_Layer2_Layer3 `protobuf:"bytes,1,opt,name=l3" json:"l3,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	L3            *Layer1_Layer2_Layer3 `protobuf:"bytes,1,opt,name=l3" json:"l3,omitempty"`
 }
 
 func (x *Layer1_Layer2) Reset() {
@@ -205,9 +205,9 @@
 			switch v := v.(*Layer1); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -217,9 +217,9 @@
 			switch v := v.(*Layer1_Layer2); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
index e62af12..4993b2f 100644
--- a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
@@ -19,10 +19,10 @@
 
 type Message struct {
 	state         protoimpl.MessageState
-	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
+	I32           *int32   `protobuf:"varint,1,opt,name=i32" json:"i32,omitempty"`
+	M             *Message `protobuf:"bytes,2,opt,name=m" json:"m,omitempty"`
 }
 
 func (x *Message) Reset() {
@@ -118,9 +118,9 @@
 			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
index b15334b..4433995 100644
--- a/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto3/fields.pb.go
@@ -61,6 +61,8 @@
 
 type FieldTestMessage struct {
 	state            protoimpl.MessageState
+	sizeCache        protoimpl.SizeCache
+	unknownFields    protoimpl.UnknownFields
 	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"`
@@ -98,8 +100,6 @@
 	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() {
@@ -624,9 +624,9 @@
 			switch v := v.(*FieldTestMessage); i {
 			case 0:
 				return &v.state
-			case 38:
+			case 1:
 				return &v.sizeCache
-			case 39:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/encoding/testprotos/pb2/test.pb.go b/encoding/testprotos/pb2/test.pb.go
index 4e0d6a5..93b3fa7 100644
--- a/encoding/testprotos/pb2/test.pb.go
+++ b/encoding/testprotos/pb2/test.pb.go
@@ -143,6 +143,8 @@
 // Scalars contains optional scalar fields.
 type Scalars struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -158,8 +160,6 @@
 	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() {
@@ -297,12 +297,12 @@
 // Message contains enum fields.
 type Enums struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -363,6 +363,8 @@
 // Message contains repeated fields.
 type Repeats struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -372,8 +374,6 @@
 	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() {
@@ -469,10 +469,10 @@
 // Message type used as submessage.
 type Nested struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Nested) Reset() {
@@ -519,12 +519,12 @@
 // Message contains message and group fields.
 type Nests struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -585,14 +585,14 @@
 // Message contains required fields.
 type Requireds struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -667,10 +667,10 @@
 // Message contains both required and optional fields.
 type PartialRequired struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *PartialRequired) Reset() {
@@ -716,9 +716,9 @@
 
 type NestedWithRequired struct {
 	state         protoimpl.MessageState
-	ReqString     *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	ReqString     *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
 }
 
 func (x *NestedWithRequired) Reset() {
@@ -756,15 +756,15 @@
 }
 
 type IndirectRequired struct {
-	state       protoimpl.MessageState
-	OptNested   *NestedWithRequired            `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	RptNested   []*NestedWithRequired          `protobuf:"bytes,2,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
-	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"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	OptNested     *NestedWithRequired            `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
+	RptNested     []*NestedWithRequired          `protobuf:"bytes,2,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
+	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"`
 }
 
 func (x *IndirectRequired) Reset() {
@@ -841,12 +841,12 @@
 
 type Extensions struct {
 	state           protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Extensions) Reset() {
@@ -984,9 +984,9 @@
 
 type MessageSetExtension struct {
 	state         protoimpl.MessageState
-	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 }
 
 func (x *MessageSetExtension) Reset() {
@@ -1068,9 +1068,9 @@
 
 type FakeMessageSetExtension struct {
 	state         protoimpl.MessageState
-	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 }
 
 func (x *FakeMessageSetExtension) Reset() {
@@ -1110,6 +1110,8 @@
 // Message contains well-known type fields.
 type KnownTypes struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1128,8 +1130,6 @@
 	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() {
@@ -1287,11 +1287,11 @@
 
 type Nests_OptGroup struct {
 	state          protoimpl.MessageState
+	sizeCache      protoimpl.SizeCache
+	unknownFields  protoimpl.UnknownFields
 	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() {
@@ -1344,9 +1344,9 @@
 
 type Nests_RptGroup struct {
 	state         protoimpl.MessageState
-	RptString     []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	RptString     []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
 }
 
 func (x *Nests_RptGroup) Reset() {
@@ -1385,9 +1385,9 @@
 
 type Nests_OptGroup_OptNestedGroup struct {
 	state         protoimpl.MessageState
-	OptFixed32    *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	OptFixed32    *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
 }
 
 func (x *Nests_OptGroup_OptNestedGroup) Reset() {
@@ -2149,9 +2149,9 @@
 			switch v := v.(*Scalars); i {
 			case 0:
 				return &v.state
-			case 16:
+			case 1:
 				return &v.sizeCache
-			case 17:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2161,9 +2161,9 @@
 			switch v := v.(*Enums); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2173,9 +2173,9 @@
 			switch v := v.(*Repeats); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2185,9 +2185,9 @@
 			switch v := v.(*Nested); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2197,9 +2197,9 @@
 			switch v := v.(*Nests); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2209,9 +2209,9 @@
 			switch v := v.(*Requireds); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2221,9 +2221,9 @@
 			switch v := v.(*PartialRequired); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2233,9 +2233,9 @@
 			switch v := v.(*NestedWithRequired); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2245,9 +2245,9 @@
 			switch v := v.(*IndirectRequired); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2257,11 +2257,11 @@
 			switch v := v.(*Extensions); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
-			case 6:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -2297,9 +2297,9 @@
 			switch v := v.(*MessageSetExtension); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2323,9 +2323,9 @@
 			switch v := v.(*FakeMessageSetExtension); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2335,9 +2335,9 @@
 			switch v := v.(*KnownTypes); i {
 			case 0:
 				return &v.state
-			case 19:
+			case 1:
 				return &v.sizeCache
-			case 20:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2347,9 +2347,9 @@
 			switch v := v.(*Nests_OptGroup); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2359,9 +2359,9 @@
 			switch v := v.(*Nests_RptGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2371,9 +2371,9 @@
 			switch v := v.(*Nests_OptGroup_OptNestedGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/encoding/testprotos/pb3/test.pb.go b/encoding/testprotos/pb3/test.pb.go
index e110a79..1b0958f 100644
--- a/encoding/testprotos/pb3/test.pb.go
+++ b/encoding/testprotos/pb3/test.pb.go
@@ -121,6 +121,8 @@
 // Scalars contains scalar field types.
 type Scalars struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -136,8 +138,6 @@
 	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() {
@@ -275,10 +275,10 @@
 // Message contains enum fields.
 type Enums struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Enums) Reset() {
@@ -325,9 +325,9 @@
 // Message contains nested message field.
 type Nests struct {
 	state         protoimpl.MessageState
-	SNested       *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	SNested       *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
 }
 
 func (x *Nests) Reset() {
@@ -367,10 +367,10 @@
 // Message type used as submessage.
 type Nested struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Nested) Reset() {
@@ -416,14 +416,14 @@
 
 // Message contains oneof field.
 type Oneofs struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Types that are valid to be assigned to Union:
 	//	*Oneofs_OneofEnum
 	//	*Oneofs_OneofString
 	//	*Oneofs_OneofNested
-	Union         isOneofs_Union `protobuf_oneof:"union"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Union isOneofs_Union `protobuf_oneof:"union"`
 }
 
 func (x *Oneofs) Reset() {
@@ -506,13 +506,13 @@
 // Message contains map fields.
 type Maps struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -580,9 +580,9 @@
 // Message for testing json_name option.
 type JSONNames struct {
 	state         protoimpl.MessageState
-	SString       string `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	SString       string `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"`
 }
 
 func (x *JSONNames) Reset() {
@@ -793,9 +793,9 @@
 			switch v := v.(*Scalars); i {
 			case 0:
 				return &v.state
-			case 16:
+			case 1:
 				return &v.sizeCache
-			case 17:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -805,9 +805,9 @@
 			switch v := v.(*Enums); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -817,9 +817,9 @@
 			switch v := v.(*Nests); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -829,9 +829,9 @@
 			switch v := v.(*Nested); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -841,9 +841,9 @@
 			switch v := v.(*Oneofs); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -853,9 +853,9 @@
 			switch v := v.(*Maps); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -865,9 +865,9 @@
 			switch v := v.(*JSONNames); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/benchmarks/benchmarks.pb.go b/internal/testprotos/benchmarks/benchmarks.pb.go
index 9c08d4d..7e4200c 100644
--- a/internal/testprotos/benchmarks/benchmarks.pb.go
+++ b/internal/testprotos/benchmarks/benchmarks.pb.go
@@ -18,7 +18,9 @@
 )
 
 type BenchmarkDataset struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Name of the benchmark dataset.  This should be unique across all datasets.
 	// Should only contain word characters: [a-zA-Z0-9_]
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
@@ -43,9 +45,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Payload [][]byte `protobuf:"bytes,3,rep,name=payload,proto3" json:"payload,omitempty"`
 }
 
 func (x *BenchmarkDataset) Reset() {
@@ -150,9 +150,9 @@
 			switch v := v.(*BenchmarkDataset); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 4f1975c..41d2a0c 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
@@ -19,6 +19,8 @@
 
 type GoogleMessage1 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -60,8 +62,6 @@
 	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
 }
 
 const Default_GoogleMessage1_Field80 bool = false
@@ -405,6 +405,8 @@
 
 type GoogleMessage1SubMessage struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -425,8 +427,6 @@
 	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
 }
 
 const Default_GoogleMessage1SubMessage_Field1 int32 = 0
@@ -778,9 +778,9 @@
 			switch v := v.(*GoogleMessage1); i {
 			case 0:
 				return &v.state
-			case 42:
+			case 1:
 				return &v.sizeCache
-			case 43:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -790,9 +790,9 @@
 			switch v := v.(*GoogleMessage1SubMessage); i {
 			case 0:
 				return &v.state
-			case 21:
+			case 1:
 				return &v.sizeCache
-			case 22:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 eb173a9..95aaa1d 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
@@ -19,6 +19,8 @@
 
 type GoogleMessage1 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -60,8 +62,6 @@
 	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() {
@@ -380,6 +380,8 @@
 
 type GoogleMessage1SubMessage struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -400,8 +402,6 @@
 	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() {
@@ -733,9 +733,9 @@
 			switch v := v.(*GoogleMessage1); i {
 			case 0:
 				return &v.state
-			case 42:
+			case 1:
 				return &v.sizeCache
-			case 43:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -745,9 +745,9 @@
 			switch v := v.(*GoogleMessage1SubMessage); i {
 			case 0:
 				return &v.state
-			case 21:
+			case 1:
 				return &v.sizeCache
-			case 22:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 3d127a4..9d0e509 100644
--- a/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
@@ -19,6 +19,8 @@
 
 type GoogleMessage2 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -49,8 +51,6 @@
 	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
 }
 
 const Default_GoogleMessage2_Field75 bool = false
@@ -308,6 +308,8 @@
 
 type GoogleMessage2GroupedMessage struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -319,8 +321,6 @@
 	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
 }
 
 const Default_GoogleMessage2GroupedMessage_Field3 float32 = 0
@@ -433,6 +433,8 @@
 
 type GoogleMessage2_Group1 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -449,8 +451,6 @@
 	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
 }
 
 const Default_GoogleMessage2_Group1_Field20 int32 = 0
@@ -758,9 +758,9 @@
 			switch v := v.(*GoogleMessage2); i {
 			case 0:
 				return &v.state
-			case 31:
+			case 1:
 				return &v.sizeCache
-			case 32:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -770,9 +770,9 @@
 			switch v := v.(*GoogleMessage2GroupedMessage); i {
 			case 0:
 				return &v.state
-			case 12:
+			case 1:
 				return &v.sizeCache
-			case 13:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -782,9 +782,9 @@
 			switch v := v.(*GoogleMessage2_Group1); i {
 			case 0:
 				return &v.state
-			case 17:
+			case 1:
 				return &v.sizeCache
-			case 18:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 bdc5d89..2c706ca 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
@@ -20,6 +20,8 @@
 
 type GoogleMessage3 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -35,8 +37,6 @@
 	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() {
@@ -173,12 +173,12 @@
 
 type Message1327 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -238,6 +238,8 @@
 
 type Message3672 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -248,8 +250,6 @@
 	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() {
@@ -351,6 +351,8 @@
 
 type Message3804 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -358,8 +360,6 @@
 	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() {
@@ -440,9 +440,9 @@
 
 type Message6849 struct {
 	state         protoimpl.MessageState
-	Field6910     []*Message6850 `protobuf:"bytes,1,rep,name=field6910" json:"field6910,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field6910     []*Message6850 `protobuf:"bytes,1,rep,name=field6910" json:"field6910,omitempty"`
 }
 
 func (x *Message6849) Reset() {
@@ -481,9 +481,9 @@
 
 type Message6866 struct {
 	state         protoimpl.MessageState
-	Field6973     []*Message6863 `protobuf:"bytes,1,rep,name=field6973" json:"field6973,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field6973     []*Message6863 `protobuf:"bytes,1,rep,name=field6973" json:"field6973,omitempty"`
 }
 
 func (x *Message6866) Reset() {
@@ -522,9 +522,9 @@
 
 type Message6870 struct {
 	state         protoimpl.MessageState
-	Field6991     []*Message6871 `protobuf:"bytes,1,rep,name=field6991" json:"field6991,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field6991     []*Message6871 `protobuf:"bytes,1,rep,name=field6991" json:"field6991,omitempty"`
 }
 
 func (x *Message6870) Reset() {
@@ -563,6 +563,8 @@
 
 type Message7651 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -608,8 +610,6 @@
 	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() {
@@ -956,14 +956,14 @@
 
 type Message7864 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1037,6 +1037,8 @@
 
 type Message7929 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1057,8 +1059,6 @@
 	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() {
@@ -1230,6 +1230,8 @@
 
 type Message8508 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1247,8 +1249,6 @@
 	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() {
@@ -1399,10 +1399,10 @@
 
 type Message9122 struct {
 	state         protoimpl.MessageState
-	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
+	Field9132     *float32 `protobuf:"fixed32,1,opt,name=field9132" json:"field9132,omitempty"`
+	Field9133     *float32 `protobuf:"fixed32,2,opt,name=field9133" json:"field9133,omitempty"`
 }
 
 func (x *Message9122) Reset() {
@@ -1448,9 +1448,9 @@
 
 type Message10177 struct {
 	state         protoimpl.MessageState
-	Field10270    []*Message10155 `protobuf:"bytes,1,rep,name=field10270" json:"field10270,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field10270    []*Message10155 `protobuf:"bytes,1,rep,name=field10270" json:"field10270,omitempty"`
 }
 
 func (x *Message10177) Reset() {
@@ -1489,11 +1489,11 @@
 
 type Message10278 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1546,9 +1546,9 @@
 
 type Message10323 struct {
 	state         protoimpl.MessageState
-	Field10360    []*Message10320 `protobuf:"bytes,1,rep,name=field10360" json:"field10360,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field10360    []*Message10320 `protobuf:"bytes,1,rep,name=field10360" json:"field10360,omitempty"`
 }
 
 func (x *Message10323) Reset() {
@@ -1587,10 +1587,10 @@
 
 type Message10324 struct {
 	state         protoimpl.MessageState
-	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
+	Field10362    []*Message10322 `protobuf:"bytes,1,rep,name=field10362" json:"field10362,omitempty"`
+	Field10363    *Message10321   `protobuf:"bytes,2,opt,name=field10363" json:"field10363,omitempty"`
 }
 
 func (x *Message10324) Reset() {
@@ -1636,9 +1636,9 @@
 
 type Message11990 struct {
 	state         protoimpl.MessageState
-	Field12030    []*Message11988 `protobuf:"bytes,1,rep,name=field12030" json:"field12030,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field12030    []*Message11988 `protobuf:"bytes,1,rep,name=field12030" json:"field12030,omitempty"`
 }
 
 func (x *Message11990) Reset() {
@@ -1677,11 +1677,11 @@
 
 type Message12691 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1734,6 +1734,8 @@
 
 type Message12870 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1754,8 +1756,6 @@
 	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() {
@@ -1927,10 +1927,10 @@
 
 type Message13154 struct {
 	state         protoimpl.MessageState
-	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
+	Field13164    *float32 `protobuf:"fixed32,1,req,name=field13164" json:"field13164,omitempty"`
+	Field13165    *float32 `protobuf:"fixed32,2,req,name=field13165" json:"field13165,omitempty"`
 }
 
 func (x *Message13154) Reset() {
@@ -1976,6 +1976,9 @@
 
 type Message16507 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -2008,9 +2011,6 @@
 	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() {
@@ -2275,9 +2275,9 @@
 
 type Message16564 struct {
 	state         protoimpl.MessageState
-	Field16568    []*Message16552 `protobuf:"bytes,1,rep,name=field16568" json:"field16568,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field16568    []*Message16552 `protobuf:"bytes,1,rep,name=field16568" json:"field16568,omitempty"`
 }
 
 func (x *Message16564) Reset() {
@@ -2316,10 +2316,10 @@
 
 type Message16661 struct {
 	state         protoimpl.MessageState
-	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
+	Field16671    []*Message16660 `protobuf:"bytes,1,rep,name=field16671" json:"field16671,omitempty"`
+	Field16672    []uint64        `protobuf:"varint,2,rep,name=field16672" json:"field16672,omitempty"`
 }
 
 func (x *Message16661) Reset() {
@@ -2365,12 +2365,12 @@
 
 type Message16746 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2430,10 +2430,10 @@
 
 type Message17786 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message17786) Reset() {
@@ -2479,9 +2479,9 @@
 
 type Message22857 struct {
 	state         protoimpl.MessageState
-	Field22874    []*Message22853 `protobuf:"bytes,1,rep,name=field22874" json:"field22874,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field22874    []*Message22853 `protobuf:"bytes,1,rep,name=field22874" json:"field22874,omitempty"`
 }
 
 func (x *Message22857) Reset() {
@@ -2520,10 +2520,10 @@
 
 type Message24404 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message24404) Reset() {
@@ -2569,10 +2569,10 @@
 
 type Message27300 struct {
 	state         protoimpl.MessageState
-	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
+	Field27302    []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field27302" json:"field27302,omitempty"`
+	Field27303    *string               `protobuf:"bytes,2,opt,name=field27303" json:"field27303,omitempty"`
 }
 
 func (x *Message27300) Reset() {
@@ -2618,6 +2618,8 @@
 
 type Message27453 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2641,8 +2643,6 @@
 	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() {
@@ -2835,10 +2835,10 @@
 
 type Message3672_Message3673 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message3672_Message3673) Reset() {
@@ -2884,10 +2884,10 @@
 
 type Message3672_Message3674 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message3672_Message3674) Reset() {
@@ -2933,6 +2933,8 @@
 
 type Message17786_Message17787 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2959,8 +2961,6 @@
 	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() {
@@ -3174,6 +3174,8 @@
 
 type Message24404_Message24405 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3205,8 +3207,6 @@
 	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() {
@@ -6175,9 +6175,9 @@
 			switch v := v.(*GoogleMessage3); i {
 			case 0:
 				return &v.state
-			case 16:
+			case 1:
 				return &v.sizeCache
-			case 17:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6187,9 +6187,9 @@
 			switch v := v.(*Message1327); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6199,9 +6199,9 @@
 			switch v := v.(*Message3672); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6211,9 +6211,9 @@
 			switch v := v.(*Message3804); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6223,9 +6223,9 @@
 			switch v := v.(*Message6849); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6235,9 +6235,9 @@
 			switch v := v.(*Message6866); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6247,9 +6247,9 @@
 			switch v := v.(*Message6870); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6259,9 +6259,9 @@
 			switch v := v.(*Message7651); i {
 			case 0:
 				return &v.state
-			case 46:
+			case 1:
 				return &v.sizeCache
-			case 47:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6271,9 +6271,9 @@
 			switch v := v.(*Message7864); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6283,9 +6283,9 @@
 			switch v := v.(*Message7929); i {
 			case 0:
 				return &v.state
-			case 21:
+			case 1:
 				return &v.sizeCache
-			case 22:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6295,9 +6295,9 @@
 			switch v := v.(*Message8508); i {
 			case 0:
 				return &v.state
-			case 18:
+			case 1:
 				return &v.sizeCache
-			case 19:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6307,9 +6307,9 @@
 			switch v := v.(*Message9122); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6319,9 +6319,9 @@
 			switch v := v.(*Message10177); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6331,9 +6331,9 @@
 			switch v := v.(*Message10278); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6343,9 +6343,9 @@
 			switch v := v.(*Message10323); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6355,9 +6355,9 @@
 			switch v := v.(*Message10324); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6367,9 +6367,9 @@
 			switch v := v.(*Message11990); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6379,9 +6379,9 @@
 			switch v := v.(*Message12691); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6391,9 +6391,9 @@
 			switch v := v.(*Message12870); i {
 			case 0:
 				return &v.state
-			case 21:
+			case 1:
 				return &v.sizeCache
-			case 22:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6403,9 +6403,9 @@
 			switch v := v.(*Message13154); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6415,11 +6415,11 @@
 			switch v := v.(*Message16507); i {
 			case 0:
 				return &v.state
-			case 33:
+			case 1:
 				return &v.sizeCache
-			case 34:
+			case 2:
 				return &v.unknownFields
-			case 35:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -6429,9 +6429,9 @@
 			switch v := v.(*Message16564); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6441,9 +6441,9 @@
 			switch v := v.(*Message16661); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6453,9 +6453,9 @@
 			switch v := v.(*Message16746); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6465,9 +6465,9 @@
 			switch v := v.(*Message17786); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6477,9 +6477,9 @@
 			switch v := v.(*Message22857); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6489,9 +6489,9 @@
 			switch v := v.(*Message24404); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6501,9 +6501,9 @@
 			switch v := v.(*Message27300); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6513,9 +6513,9 @@
 			switch v := v.(*Message27453); i {
 			case 0:
 				return &v.state
-			case 24:
+			case 1:
 				return &v.sizeCache
-			case 25:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6525,9 +6525,9 @@
 			switch v := v.(*Message3672_Message3673); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6537,9 +6537,9 @@
 			switch v := v.(*Message3672_Message3674); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6549,9 +6549,9 @@
 			switch v := v.(*Message17786_Message17787); i {
 			case 0:
 				return &v.state
-			case 27:
+			case 1:
 				return &v.sizeCache
-			case 28:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6561,9 +6561,9 @@
 			switch v := v.(*Message24404_Message24405); i {
 			case 0:
 				return &v.state
-			case 32:
+			case 1:
 				return &v.sizeCache
-			case 33:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 391604c..33b4c9f 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
@@ -20,9 +20,9 @@
 
 type Message34390 struct {
 	state         protoimpl.MessageState
-	Field34452    []*Message34387 `protobuf:"bytes,1,rep,name=field34452" json:"field34452,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field34452    []*Message34387 `protobuf:"bytes,1,rep,name=field34452" json:"field34452,omitempty"`
 }
 
 func (x *Message34390) Reset() {
@@ -61,10 +61,10 @@
 
 type Message34624 struct {
 	state         protoimpl.MessageState
-	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
+	Field34683    *Message34621 `protobuf:"bytes,1,opt,name=field34683" json:"field34683,omitempty"`
+	Field34684    *Message34621 `protobuf:"bytes,2,opt,name=field34684" json:"field34684,omitempty"`
 }
 
 func (x *Message34624) Reset() {
@@ -110,6 +110,8 @@
 
 type Message34791 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -124,8 +126,6 @@
 	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() {
@@ -255,14 +255,14 @@
 
 type Message35483 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -336,6 +336,8 @@
 
 type Message35807 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -344,8 +346,6 @@
 	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() {
@@ -433,10 +433,10 @@
 
 type Message37487 struct {
 	state         protoimpl.MessageState
-	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
+	Field37501    []byte `protobuf:"bytes,2,opt,name=field37501" json:"field37501,omitempty"`
+	Field37502    *bool  `protobuf:"varint,3,opt,name=field37502" json:"field37502,omitempty"`
 }
 
 func (x *Message37487) Reset() {
@@ -482,13 +482,13 @@
 
 type Message13062 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -555,9 +555,9 @@
 
 type Message952 struct {
 	state         protoimpl.MessageState
-	Field963      []*Message949 `protobuf:"bytes,1,rep,name=field963" json:"field963,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field963      []*Message949 `protobuf:"bytes,1,rep,name=field963" json:"field963,omitempty"`
 }
 
 func (x *Message952) Reset() {
@@ -596,6 +596,8 @@
 
 type Message36876 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -659,8 +661,6 @@
 	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() {
@@ -1199,6 +1199,8 @@
 
 type Message6863 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1232,8 +1234,6 @@
 	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() {
@@ -1529,10 +1529,10 @@
 
 type Message7547 struct {
 	state         protoimpl.MessageState
-	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
+	Field7549     []byte `protobuf:"bytes,1,req,name=field7549" json:"field7549,omitempty"`
+	Field7550     *int32 `protobuf:"varint,2,req,name=field7550" json:"field7550,omitempty"`
 }
 
 func (x *Message7547) Reset() {
@@ -1578,6 +1578,8 @@
 
 type Message7648 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1590,8 +1592,6 @@
 	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() {
@@ -1740,10 +1740,10 @@
 
 type Message7928 struct {
 	state         protoimpl.MessageState
-	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
+	Field7940     *string `protobuf:"bytes,1,opt,name=field7940" json:"field7940,omitempty"`
+	Field7941     *int64  `protobuf:"varint,2,opt,name=field7941" json:"field7941,omitempty"`
 }
 
 func (x *Message7928) Reset() {
@@ -1789,11 +1789,11 @@
 
 type Message7919 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1846,10 +1846,10 @@
 
 type Message7920 struct {
 	state         protoimpl.MessageState
-	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
+	Field7934     *int64 `protobuf:"varint,1,opt,name=field7934" json:"field7934,omitempty"`
+	Field7935     *int64 `protobuf:"varint,2,opt,name=field7935" json:"field7935,omitempty"`
 }
 
 func (x *Message7920) Reset() {
@@ -1895,12 +1895,12 @@
 
 type Message7921 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1960,13 +1960,13 @@
 
 type Message8511 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2033,14 +2033,14 @@
 
 type Message8512 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2114,12 +2114,12 @@
 
 type Message8513 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2179,13 +2179,13 @@
 
 type Message8514 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2252,11 +2252,11 @@
 
 type Message8515 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2309,6 +2309,8 @@
 
 type Message10320 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2316,8 +2318,6 @@
 	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() {
@@ -2398,11 +2398,11 @@
 
 type Message10321 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2455,11 +2455,11 @@
 
 type Message10322 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2512,12 +2512,12 @@
 
 type Message11988 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2577,12 +2577,12 @@
 
 type Message12668 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2642,6 +2642,8 @@
 
 type Message12825 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2649,8 +2651,6 @@
 	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() {
@@ -2731,11 +2731,11 @@
 
 type Message16478 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2788,11 +2788,11 @@
 
 type Message16552 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2845,11 +2845,11 @@
 
 type Message16660 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2902,6 +2902,9 @@
 
 type Message16727 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -2926,9 +2929,6 @@
 	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() {
@@ -3137,10 +3137,10 @@
 
 type Message16725 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message16725) Reset() {
@@ -3186,6 +3186,8 @@
 
 type Message17726 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3208,8 +3210,6 @@
 	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() {
@@ -3395,10 +3395,10 @@
 
 type Message17782 struct {
 	state         protoimpl.MessageState
-	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
+	Field18153    *string `protobuf:"bytes,1,opt,name=field18153" json:"field18153,omitempty"`
+	Field18154    *string `protobuf:"bytes,2,opt,name=field18154" json:"field18154,omitempty"`
 }
 
 func (x *Message17782) Reset() {
@@ -3444,14 +3444,14 @@
 
 type Message17783 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3525,6 +3525,9 @@
 
 type Message16945 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -3604,9 +3607,6 @@
 	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() {
@@ -4896,10 +4896,10 @@
 
 type Message34791_Message34792 struct {
 	state         protoimpl.MessageState
-	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
+	Field34808    *string `protobuf:"bytes,3,req,name=field34808" json:"field34808,omitempty"`
+	Field34809    *string `protobuf:"bytes,4,opt,name=field34809" json:"field34809,omitempty"`
 }
 
 func (x *Message34791_Message34792) Reset() {
@@ -4945,13 +4945,13 @@
 
 type Message36876_Message36877 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -5051,10 +5051,10 @@
 
 type Message36876_Message36879 struct {
 	state         protoimpl.MessageState
-	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
+	Field37050    *string `protobuf:"bytes,56,req,name=field37050" json:"field37050,omitempty"`
+	Field37051    *int32  `protobuf:"varint,69,opt,name=field37051" json:"field37051,omitempty"`
 }
 
 func (x *Message36876_Message36879) Reset() {
@@ -5364,14 +5364,14 @@
 
 type Message36876_Message36888 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -5445,6 +5445,8 @@
 
 type Message36876_Message36889 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -5470,8 +5472,6 @@
 	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() {
@@ -5711,12 +5711,12 @@
 
 type Message36876_Message36911 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -5776,10 +5776,10 @@
 
 type Message36876_Message36912 struct {
 	state         protoimpl.MessageState
-	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
+	Field37125    *Message3901 `protobuf:"bytes,153,opt,name=field37125" json:"field37125,omitempty"`
+	Field37126    *Message3901 `protobuf:"bytes,162,opt,name=field37126" json:"field37126,omitempty"`
 }
 
 func (x *Message36876_Message36912) Reset() {
@@ -5825,14 +5825,14 @@
 
 type Message17783_Message17784 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -5906,14 +5906,14 @@
 
 type Message17783_Message17785 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -8114,9 +8114,9 @@
 			switch v := v.(*Message34390); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8126,9 +8126,9 @@
 			switch v := v.(*Message34624); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8138,9 +8138,9 @@
 			switch v := v.(*Message34791); i {
 			case 0:
 				return &v.state
-			case 15:
+			case 1:
 				return &v.sizeCache
-			case 16:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8150,9 +8150,9 @@
 			switch v := v.(*Message35483); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8162,9 +8162,9 @@
 			switch v := v.(*Message35807); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8174,9 +8174,9 @@
 			switch v := v.(*Message37487); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8186,9 +8186,9 @@
 			switch v := v.(*Message13062); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8198,9 +8198,9 @@
 			switch v := v.(*Message952); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8210,9 +8210,9 @@
 			switch v := v.(*Message36876); i {
 			case 0:
 				return &v.state
-			case 64:
+			case 1:
 				return &v.sizeCache
-			case 65:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8246,9 +8246,9 @@
 			switch v := v.(*Message6863); i {
 			case 0:
 				return &v.state
-			case 34:
+			case 1:
 				return &v.sizeCache
-			case 35:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8270,9 +8270,9 @@
 			switch v := v.(*Message7547); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8282,9 +8282,9 @@
 			switch v := v.(*Message7648); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8306,9 +8306,9 @@
 			switch v := v.(*Message7928); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8318,9 +8318,9 @@
 			switch v := v.(*Message7919); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8330,9 +8330,9 @@
 			switch v := v.(*Message7920); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8342,9 +8342,9 @@
 			switch v := v.(*Message7921); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8354,9 +8354,9 @@
 			switch v := v.(*Message8511); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8366,9 +8366,9 @@
 			switch v := v.(*Message8512); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8378,9 +8378,9 @@
 			switch v := v.(*Message8513); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8390,9 +8390,9 @@
 			switch v := v.(*Message8514); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8402,9 +8402,9 @@
 			switch v := v.(*Message8515); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8414,9 +8414,9 @@
 			switch v := v.(*Message10320); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8426,9 +8426,9 @@
 			switch v := v.(*Message10321); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8438,9 +8438,9 @@
 			switch v := v.(*Message10322); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8450,9 +8450,9 @@
 			switch v := v.(*Message11988); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8462,9 +8462,9 @@
 			switch v := v.(*Message12668); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8474,9 +8474,9 @@
 			switch v := v.(*Message12825); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8486,9 +8486,9 @@
 			switch v := v.(*Message16478); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8498,9 +8498,9 @@
 			switch v := v.(*Message16552); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8510,9 +8510,9 @@
 			switch v := v.(*Message16660); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8522,11 +8522,11 @@
 			switch v := v.(*Message16727); i {
 			case 0:
 				return &v.state
-			case 25:
+			case 1:
 				return &v.sizeCache
-			case 26:
+			case 2:
 				return &v.unknownFields
-			case 27:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -8536,9 +8536,9 @@
 			switch v := v.(*Message16725); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8548,9 +8548,9 @@
 			switch v := v.(*Message17726); i {
 			case 0:
 				return &v.state
-			case 23:
+			case 1:
 				return &v.sizeCache
-			case 24:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8560,9 +8560,9 @@
 			switch v := v.(*Message17782); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8572,9 +8572,9 @@
 			switch v := v.(*Message17783); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8584,11 +8584,11 @@
 			switch v := v.(*Message16945); i {
 			case 0:
 				return &v.state
-			case 80:
+			case 1:
 				return &v.sizeCache
-			case 81:
+			case 2:
 				return &v.unknownFields
-			case 82:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -8598,9 +8598,9 @@
 			switch v := v.(*Message34791_Message34792); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8610,9 +8610,9 @@
 			switch v := v.(*Message36876_Message36877); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8634,9 +8634,9 @@
 			switch v := v.(*Message36876_Message36879); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8742,9 +8742,9 @@
 			switch v := v.(*Message36876_Message36888); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8754,9 +8754,9 @@
 			switch v := v.(*Message36876_Message36889); i {
 			case 0:
 				return &v.state
-			case 26:
+			case 1:
 				return &v.sizeCache
-			case 27:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8778,9 +8778,9 @@
 			switch v := v.(*Message36876_Message36911); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8790,9 +8790,9 @@
 			switch v := v.(*Message36876_Message36912); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8802,9 +8802,9 @@
 			switch v := v.(*Message17783_Message17784); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -8814,9 +8814,9 @@
 			switch v := v.(*Message17783_Message17785); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 7164135..bf902b4 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
@@ -20,13 +20,13 @@
 
 type Message22853 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -93,6 +93,8 @@
 
 type Message24345 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -118,8 +120,6 @@
 	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() {
@@ -326,10 +326,10 @@
 
 type Message24403 struct {
 	state         protoimpl.MessageState
-	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
+	Field24681    *Message24401 `protobuf:"bytes,1,opt,name=field24681" json:"field24681,omitempty"`
+	Field24682    *Message24402 `protobuf:"bytes,2,opt,name=field24682" json:"field24682,omitempty"`
 }
 
 func (x *Message24403) Reset() {
@@ -375,6 +375,8 @@
 
 type Message24391 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -400,8 +402,6 @@
 	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() {
@@ -641,13 +641,13 @@
 
 type Message27357 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -714,12 +714,12 @@
 
 type Message27360 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -779,13 +779,13 @@
 
 type Message34387 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -852,6 +852,8 @@
 
 type Message34621 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -870,8 +872,6 @@
 	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() {
@@ -1029,6 +1029,8 @@
 
 type Message35476 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1043,8 +1045,6 @@
 	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() {
@@ -1174,6 +1174,8 @@
 
 type Message949 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1181,8 +1183,6 @@
 	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() {
@@ -1263,10 +1263,10 @@
 
 type Message36869 struct {
 	state         protoimpl.MessageState
-	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
+	Field36970    *int32 `protobuf:"varint,1,opt,name=field36970" json:"field36970,omitempty"`
+	Field36971    *int32 `protobuf:"varint,2,opt,name=field36971" json:"field36971,omitempty"`
 }
 
 func (x *Message36869) Reset() {
@@ -1312,13 +1312,13 @@
 
 type Message33968 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1385,6 +1385,8 @@
 
 type Message6644 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1401,8 +1403,6 @@
 	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() {
@@ -1546,9 +1546,9 @@
 
 type Message18831 struct {
 	state         protoimpl.MessageState
-	Message18832  []*Message18831_Message18832 `protobuf:"group,1,rep,name=Message18832,json=message18832" json:"message18832,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Message18832  []*Message18831_Message18832 `protobuf:"group,1,rep,name=Message18832,json=message18832" json:"message18832,omitempty"`
 }
 
 func (x *Message18831) Reset() {
@@ -1587,10 +1587,10 @@
 
 type Message13090 struct {
 	state         protoimpl.MessageState
-	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
+	Field13141    *Message13083 `protobuf:"bytes,1,opt,name=field13141" json:"field13141,omitempty"`
+	Field13142    *Message13088 `protobuf:"bytes,2,opt,name=field13142" json:"field13142,omitempty"`
 }
 
 func (x *Message13090) Reset() {
@@ -1636,13 +1636,13 @@
 
 type Message11874 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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() {
@@ -1713,9 +1713,9 @@
 
 type Message4144 struct {
 	state         protoimpl.MessageState
-	Message4145   []*Message4144_Message4145 `protobuf:"group,1,rep,name=Message4145,json=message4145" json:"message4145,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Message4145   []*Message4144_Message4145 `protobuf:"group,1,rep,name=Message4145,json=message4145" json:"message4145,omitempty"`
 }
 
 func (x *Message4144) Reset() {
@@ -1754,6 +1754,8 @@
 
 type Message35573 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1765,8 +1767,6 @@
 	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() {
@@ -1875,6 +1875,8 @@
 
 type Message36858 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1887,8 +1889,6 @@
 	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() {
@@ -2004,6 +2004,8 @@
 
 type Message13174 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2025,8 +2027,6 @@
 	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() {
@@ -2205,6 +2205,9 @@
 
 type Message18283 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -2309,9 +2312,6 @@
 	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() {
@@ -3083,11 +3083,11 @@
 
 type Message13169 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3140,9 +3140,9 @@
 
 type Message19255 struct {
 	state         protoimpl.MessageState
-	Field19257    *string `protobuf:"bytes,1,opt,name=field19257" json:"field19257,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field19257    *string `protobuf:"bytes,1,opt,name=field19257" json:"field19257,omitempty"`
 }
 
 func (x *Message19255) Reset() {
@@ -3181,11 +3181,11 @@
 
 type Message35542 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3238,6 +3238,8 @@
 
 type Message3901 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3250,8 +3252,6 @@
 	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() {
@@ -3400,6 +3400,8 @@
 
 type Message18831_Message18832 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3407,8 +3409,6 @@
 	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() {
@@ -3489,13 +3489,13 @@
 
 type Message18831_Message18832_Message18833 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3562,14 +3562,14 @@
 
 type Message4144_Message4145 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3676,6 +3676,8 @@
 
 type Message35573_Message35575 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3714,8 +3716,6 @@
 	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() {
@@ -4013,6 +4013,8 @@
 
 type Message35573_Message35575_Message35576 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -4038,8 +4040,6 @@
 	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() {
@@ -4246,10 +4246,10 @@
 
 type Message36858_Message36859 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message36858_Message36859) Reset() {
@@ -5699,9 +5699,9 @@
 			switch v := v.(*Message22853); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5711,9 +5711,9 @@
 			switch v := v.(*Message24345); i {
 			case 0:
 				return &v.state
-			case 26:
+			case 1:
 				return &v.sizeCache
-			case 27:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5723,9 +5723,9 @@
 			switch v := v.(*Message24403); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5735,9 +5735,9 @@
 			switch v := v.(*Message24391); i {
 			case 0:
 				return &v.state
-			case 26:
+			case 1:
 				return &v.sizeCache
-			case 27:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5759,9 +5759,9 @@
 			switch v := v.(*Message27357); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5771,9 +5771,9 @@
 			switch v := v.(*Message27360); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5783,9 +5783,9 @@
 			switch v := v.(*Message34387); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5795,9 +5795,9 @@
 			switch v := v.(*Message34621); i {
 			case 0:
 				return &v.state
-			case 19:
+			case 1:
 				return &v.sizeCache
-			case 20:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5807,9 +5807,9 @@
 			switch v := v.(*Message35476); i {
 			case 0:
 				return &v.state
-			case 15:
+			case 1:
 				return &v.sizeCache
-			case 16:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5819,9 +5819,9 @@
 			switch v := v.(*Message949); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5831,9 +5831,9 @@
 			switch v := v.(*Message36869); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5843,9 +5843,9 @@
 			switch v := v.(*Message33968); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5855,9 +5855,9 @@
 			switch v := v.(*Message6644); i {
 			case 0:
 				return &v.state
-			case 17:
+			case 1:
 				return &v.sizeCache
-			case 18:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5867,9 +5867,9 @@
 			switch v := v.(*Message18831); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5879,9 +5879,9 @@
 			switch v := v.(*Message13090); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5891,11 +5891,11 @@
 			switch v := v.(*Message11874); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
-			case 7:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5905,9 +5905,9 @@
 			switch v := v.(*Message4144); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5917,9 +5917,9 @@
 			switch v := v.(*Message35573); i {
 			case 0:
 				return &v.state
-			case 12:
+			case 1:
 				return &v.sizeCache
-			case 13:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5929,9 +5929,9 @@
 			switch v := v.(*Message36858); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5941,9 +5941,9 @@
 			switch v := v.(*Message13174); i {
 			case 0:
 				return &v.state
-			case 22:
+			case 1:
 				return &v.sizeCache
-			case 23:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5953,11 +5953,11 @@
 			switch v := v.(*Message18283); i {
 			case 0:
 				return &v.state
-			case 105:
+			case 1:
 				return &v.sizeCache
-			case 106:
+			case 2:
 				return &v.unknownFields
-			case 107:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5967,9 +5967,9 @@
 			switch v := v.(*Message13169); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5979,9 +5979,9 @@
 			switch v := v.(*Message19255); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5991,9 +5991,9 @@
 			switch v := v.(*Message35542); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6003,9 +6003,9 @@
 			switch v := v.(*Message3901); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6027,9 +6027,9 @@
 			switch v := v.(*Message18831_Message18832); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6039,9 +6039,9 @@
 			switch v := v.(*Message18831_Message18832_Message18833); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6051,9 +6051,9 @@
 			switch v := v.(*Message4144_Message4145); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6075,9 +6075,9 @@
 			switch v := v.(*Message35573_Message35575); i {
 			case 0:
 				return &v.state
-			case 39:
+			case 1:
 				return &v.sizeCache
-			case 40:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6087,9 +6087,9 @@
 			switch v := v.(*Message35573_Message35575_Message35576); i {
 			case 0:
 				return &v.state
-			case 26:
+			case 1:
 				return &v.sizeCache
-			case 27:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6099,9 +6099,9 @@
 			switch v := v.(*Message36858_Message36859); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 5ce4ba5..ebbf37e 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
@@ -19,6 +19,8 @@
 
 type Message35546 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -31,8 +33,6 @@
 	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() {
@@ -148,6 +148,8 @@
 
 type Message2356 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -179,8 +181,6 @@
 	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() {
@@ -429,6 +429,8 @@
 
 type Message7029 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -471,8 +473,6 @@
 	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() {
@@ -798,9 +798,9 @@
 
 type Message35538 struct {
 	state         protoimpl.MessageState
-	Field35539    *int64 `protobuf:"varint,1,req,name=field35539" json:"field35539,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field35539    *int64 `protobuf:"varint,1,req,name=field35539" json:"field35539,omitempty"`
 }
 
 func (x *Message35538) Reset() {
@@ -839,6 +839,8 @@
 
 type Message18921 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -851,8 +853,6 @@
 	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() {
@@ -968,9 +968,9 @@
 
 type Message35540 struct {
 	state         protoimpl.MessageState
-	Field35541    *bool `protobuf:"varint,1,opt,name=field35541" json:"field35541,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field35541    *bool `protobuf:"varint,1,opt,name=field35541" json:"field35541,omitempty"`
 }
 
 func (x *Message35540) Reset() {
@@ -1009,9 +1009,9 @@
 
 type Message3886 struct {
 	state         protoimpl.MessageState
-	Message3887   []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Message3887   []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
 }
 
 func (x *Message3886) Reset() {
@@ -1050,6 +1050,8 @@
 
 type Message6743 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1058,8 +1060,6 @@
 	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() {
@@ -1147,6 +1147,8 @@
 
 type Message6773 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1157,8 +1159,6 @@
 	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() {
@@ -1260,6 +1260,8 @@
 
 type Message8224 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1287,8 +1289,6 @@
 	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() {
@@ -1509,6 +1509,8 @@
 
 type Message8392 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1518,8 +1520,6 @@
 	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() {
@@ -1614,6 +1614,8 @@
 
 type Message8130 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1638,8 +1640,6 @@
 	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() {
@@ -1839,6 +1839,8 @@
 
 type Message8478 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1847,8 +1849,6 @@
 	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() {
@@ -1936,6 +1936,8 @@
 
 type Message8479 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1945,8 +1947,6 @@
 	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() {
@@ -2041,6 +2041,8 @@
 
 type Message10319 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2048,8 +2050,6 @@
 	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() {
@@ -2130,12 +2130,12 @@
 
 type Message4016 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2195,12 +2195,12 @@
 
 type Message12669 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2260,14 +2260,14 @@
 
 type Message12819 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2341,6 +2341,8 @@
 
 type Message12820 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2349,8 +2351,6 @@
 	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() {
@@ -2438,13 +2438,13 @@
 
 type Message12821 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2511,13 +2511,13 @@
 
 type Message12818 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2584,14 +2584,14 @@
 
 type Message16479 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2665,13 +2665,13 @@
 
 type Message16722 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2738,6 +2738,8 @@
 
 type Message16724 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2751,8 +2753,6 @@
 	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() {
@@ -2908,6 +2908,8 @@
 
 type Message24356 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2923,8 +2925,6 @@
 	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() {
@@ -3061,6 +3061,8 @@
 
 type Message24376 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3075,8 +3077,6 @@
 	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() {
@@ -3206,6 +3206,8 @@
 
 type Message24366 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3221,8 +3223,6 @@
 	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() {
@@ -3359,10 +3359,10 @@
 
 type Message35546_Message35547 struct {
 	state         protoimpl.MessageState
-	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
+	Field35569    *int32 `protobuf:"varint,5,req,name=field35569" json:"field35569,omitempty"`
+	Field35570    *int32 `protobuf:"varint,6,req,name=field35570" json:"field35570,omitempty"`
 }
 
 func (x *Message35546_Message35547) Reset() {
@@ -3408,10 +3408,10 @@
 
 type Message35546_Message35548 struct {
 	state         protoimpl.MessageState
-	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
+	Field35571    *int64 `protobuf:"varint,11,req,name=field35571" json:"field35571,omitempty"`
+	Field35572    *int64 `protobuf:"varint,12,req,name=field35572" json:"field35572,omitempty"`
 }
 
 func (x *Message35546_Message35548) Reset() {
@@ -3457,6 +3457,8 @@
 
 type Message2356_Message2357 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3469,8 +3471,6 @@
 	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() {
@@ -3619,6 +3619,8 @@
 
 type Message2356_Message2359 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3627,8 +3629,6 @@
 	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() {
@@ -3716,11 +3716,11 @@
 
 type Message7029_Message7030 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3773,14 +3773,14 @@
 
 type Message7029_Message7031 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3854,6 +3854,8 @@
 
 type Message18921_Message18922 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3877,8 +3879,6 @@
 	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() {
@@ -4071,12 +4071,12 @@
 
 type Message3886_Message3887 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -5349,9 +5349,9 @@
 			switch v := v.(*Message35546); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5361,9 +5361,9 @@
 			switch v := v.(*Message2356); i {
 			case 0:
 				return &v.state
-			case 32:
+			case 1:
 				return &v.sizeCache
-			case 33:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5373,9 +5373,9 @@
 			switch v := v.(*Message7029); i {
 			case 0:
 				return &v.state
-			case 43:
+			case 1:
 				return &v.sizeCache
-			case 44:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5385,9 +5385,9 @@
 			switch v := v.(*Message35538); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5397,9 +5397,9 @@
 			switch v := v.(*Message18921); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5409,9 +5409,9 @@
 			switch v := v.(*Message35540); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5421,9 +5421,9 @@
 			switch v := v.(*Message3886); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5433,9 +5433,9 @@
 			switch v := v.(*Message6743); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5445,9 +5445,9 @@
 			switch v := v.(*Message6773); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5457,9 +5457,9 @@
 			switch v := v.(*Message8224); i {
 			case 0:
 				return &v.state
-			case 28:
+			case 1:
 				return &v.sizeCache
-			case 29:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5469,9 +5469,9 @@
 			switch v := v.(*Message8392); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5481,9 +5481,9 @@
 			switch v := v.(*Message8130); i {
 			case 0:
 				return &v.state
-			case 25:
+			case 1:
 				return &v.sizeCache
-			case 26:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5493,9 +5493,9 @@
 			switch v := v.(*Message8478); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5505,9 +5505,9 @@
 			switch v := v.(*Message8479); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5517,9 +5517,9 @@
 			switch v := v.(*Message10319); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5529,9 +5529,9 @@
 			switch v := v.(*Message4016); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5541,9 +5541,9 @@
 			switch v := v.(*Message12669); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5553,9 +5553,9 @@
 			switch v := v.(*Message12819); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5565,9 +5565,9 @@
 			switch v := v.(*Message12820); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5577,9 +5577,9 @@
 			switch v := v.(*Message12821); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5589,9 +5589,9 @@
 			switch v := v.(*Message12818); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5601,9 +5601,9 @@
 			switch v := v.(*Message16479); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5613,9 +5613,9 @@
 			switch v := v.(*Message16722); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5625,9 +5625,9 @@
 			switch v := v.(*Message16724); i {
 			case 0:
 				return &v.state
-			case 14:
+			case 1:
 				return &v.sizeCache
-			case 15:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5649,9 +5649,9 @@
 			switch v := v.(*Message24356); i {
 			case 0:
 				return &v.state
-			case 16:
+			case 1:
 				return &v.sizeCache
-			case 17:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5661,9 +5661,9 @@
 			switch v := v.(*Message24376); i {
 			case 0:
 				return &v.state
-			case 15:
+			case 1:
 				return &v.sizeCache
-			case 16:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5673,9 +5673,9 @@
 			switch v := v.(*Message24366); i {
 			case 0:
 				return &v.state
-			case 16:
+			case 1:
 				return &v.sizeCache
-			case 17:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5685,9 +5685,9 @@
 			switch v := v.(*Message35546_Message35547); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5697,9 +5697,9 @@
 			switch v := v.(*Message35546_Message35548); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5709,9 +5709,9 @@
 			switch v := v.(*Message2356_Message2357); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5733,9 +5733,9 @@
 			switch v := v.(*Message2356_Message2359); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5745,9 +5745,9 @@
 			switch v := v.(*Message7029_Message7030); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5757,9 +5757,9 @@
 			switch v := v.(*Message7029_Message7031); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5769,9 +5769,9 @@
 			switch v := v.(*Message18921_Message18922); i {
 			case 0:
 				return &v.state
-			case 24:
+			case 1:
 				return &v.sizeCache
-			case 25:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5781,9 +5781,9 @@
 			switch v := v.(*Message3886_Message3887); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 c27f805..43755fc 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
@@ -53,9 +53,9 @@
 
 type Message24401 struct {
 	state         protoimpl.MessageState
-	Field24679    *Message24400 `protobuf:"bytes,1,opt,name=field24679" json:"field24679,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field24679    *Message24400 `protobuf:"bytes,1,opt,name=field24679" json:"field24679,omitempty"`
 }
 
 func (x *Message24401) Reset() {
@@ -94,9 +94,9 @@
 
 type Message24402 struct {
 	state         protoimpl.MessageState
-	Field24680    *Message24400 `protobuf:"bytes,1,opt,name=field24680" json:"field24680,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field24680    *Message24400 `protobuf:"bytes,1,opt,name=field24680" json:"field24680,omitempty"`
 }
 
 func (x *Message24402) Reset() {
@@ -135,6 +135,8 @@
 
 type Message24379 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -153,8 +155,6 @@
 	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() {
@@ -312,10 +312,10 @@
 
 type Message27358 struct {
 	state         protoimpl.MessageState
-	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
+	Field27415    *int32 `protobuf:"varint,1,opt,name=field27415" json:"field27415,omitempty"`
+	Field27416    *int32 `protobuf:"varint,2,opt,name=field27416" json:"field27416,omitempty"`
 }
 
 func (x *Message27358) Reset() {
@@ -361,6 +361,8 @@
 
 type Message34381 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -371,8 +373,6 @@
 	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() {
@@ -474,6 +474,8 @@
 
 type Message34619 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -481,8 +483,6 @@
 	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() {
@@ -563,6 +563,9 @@
 
 type Message730 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -596,9 +599,6 @@
 	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() {
@@ -873,12 +873,12 @@
 
 type Message33958 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -938,13 +938,13 @@
 
 type Message6637 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1011,6 +1011,8 @@
 
 type Message6643 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1029,8 +1031,6 @@
 	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() {
@@ -1188,6 +1188,8 @@
 
 type Message6126 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1207,8 +1209,6 @@
 	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() {
@@ -1373,6 +1373,8 @@
 
 type Message13083 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1383,8 +1385,6 @@
 	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() {
@@ -1486,11 +1486,11 @@
 
 type Message13088 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1543,6 +1543,8 @@
 
 type Message10391 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1552,8 +1554,6 @@
 	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() {
@@ -1648,6 +1648,9 @@
 
 type Message11873 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -1660,9 +1663,6 @@
 	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() {
@@ -1788,12 +1788,12 @@
 
 type Message35506 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1853,9 +1853,9 @@
 
 type Message13151 struct {
 	state         protoimpl.MessageState
-	Field13158    []*Message13145 `protobuf:"bytes,1,rep,name=field13158" json:"field13158,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field13158    []*Message13145 `protobuf:"bytes,1,rep,name=field13158" json:"field13158,omitempty"`
 }
 
 func (x *Message13151) Reset() {
@@ -1894,9 +1894,9 @@
 
 type Message18253 struct {
 	state         protoimpl.MessageState
-	Message18254  []*Message18253_Message18254 `protobuf:"group,1,rep,name=Message18254,json=message18254" json:"message18254,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Message18254  []*Message18253_Message18254 `protobuf:"group,1,rep,name=Message18254,json=message18254" json:"message18254,omitempty"`
 }
 
 func (x *Message18253) Reset() {
@@ -1935,9 +1935,9 @@
 
 type Message16685 struct {
 	state         protoimpl.MessageState
-	Field16694    []*Message16686 `protobuf:"bytes,2,rep,name=field16694" json:"field16694,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field16694    []*Message16686 `protobuf:"bytes,2,rep,name=field16694" json:"field16694,omitempty"`
 }
 
 func (x *Message16685) Reset() {
@@ -1976,6 +1976,8 @@
 
 type Message16816 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1986,8 +1988,6 @@
 	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() {
@@ -2089,6 +2089,8 @@
 
 type Message13168 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2100,8 +2102,6 @@
 	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() {
@@ -2210,6 +2210,8 @@
 
 type Message13167 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2223,8 +2225,6 @@
 	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() {
@@ -2347,10 +2347,10 @@
 
 type Message1374 struct {
 	state         protoimpl.MessageState
-	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
+	Field1375     *string `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
+	Field1376     *string `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
 }
 
 func (x *Message1374) Reset() {
@@ -2462,6 +2462,8 @@
 
 type Message18856 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2493,8 +2495,6 @@
 	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() {
@@ -2743,14 +2743,14 @@
 
 type Message3850 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2824,12 +2824,12 @@
 
 type Message6721 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2889,9 +2889,9 @@
 
 type Message6742 struct {
 	state         protoimpl.MessageState
-	Field6758     *bool `protobuf:"varint,1,opt,name=field6758" json:"field6758,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field6758     *bool `protobuf:"varint,1,opt,name=field6758" json:"field6758,omitempty"`
 }
 
 func (x *Message6742) Reset() {
@@ -2930,10 +2930,10 @@
 
 type Message6726 struct {
 	state         protoimpl.MessageState
-	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
+	Field6752     *int64         `protobuf:"varint,1,opt,name=field6752" json:"field6752,omitempty"`
+	Field6753     []*Message6727 `protobuf:"bytes,2,rep,name=field6753" json:"field6753,omitempty"`
 }
 
 func (x *Message6726) Reset() {
@@ -2979,11 +2979,11 @@
 
 type Message6733 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3036,10 +3036,10 @@
 
 type Message6723 struct {
 	state         protoimpl.MessageState
-	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
+	Field6748     *int64         `protobuf:"varint,1,opt,name=field6748" json:"field6748,omitempty"`
+	Field6749     []*Message6724 `protobuf:"bytes,2,rep,name=field6749" json:"field6749,omitempty"`
 }
 
 func (x *Message6723) Reset() {
@@ -3085,10 +3085,10 @@
 
 type Message6725 struct {
 	state         protoimpl.MessageState
-	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
+	Field6750     *int32 `protobuf:"varint,1,opt,name=field6750" json:"field6750,omitempty"`
+	Field6751     *int32 `protobuf:"varint,2,opt,name=field6751" json:"field6751,omitempty"`
 }
 
 func (x *Message6725) Reset() {
@@ -3134,9 +3134,9 @@
 
 type Message6734 struct {
 	state         protoimpl.MessageState
-	Field6757     []*Message6735 `protobuf:"bytes,1,rep,name=field6757" json:"field6757,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field6757     []*Message6735 `protobuf:"bytes,1,rep,name=field6757" json:"field6757,omitempty"`
 }
 
 func (x *Message6734) Reset() {
@@ -3175,11 +3175,11 @@
 
 type Message8184 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3232,11 +3232,11 @@
 
 type Message8477 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3289,12 +3289,12 @@
 
 type Message8454 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3354,11 +3354,11 @@
 
 type Message8476 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3411,12 +3411,12 @@
 
 type Message8455 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3476,10 +3476,10 @@
 
 type Message8475 struct {
 	state         protoimpl.MessageState
-	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
+	Field8481     *string `protobuf:"bytes,1,opt,name=field8481" json:"field8481,omitempty"`
+	Field8482     *int64  `protobuf:"varint,2,opt,name=field8482" json:"field8482,omitempty"`
 }
 
 func (x *Message8475) Reset() {
@@ -3558,11 +3558,11 @@
 
 type Message12817 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3615,6 +3615,8 @@
 
 type Message16480 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3624,8 +3626,6 @@
 	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() {
@@ -3720,6 +3720,8 @@
 
 type Message24317 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3749,8 +3751,6 @@
 	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() {
@@ -3985,14 +3985,14 @@
 
 type Message33958_Message33959 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -4066,12 +4066,12 @@
 
 type Message13083_Message13084 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -4230,10 +4230,10 @@
 
 type Message13088_Message13089 struct {
 	state         protoimpl.MessageState
-	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
+	Field13139    *string  `protobuf:"bytes,2,req,name=field13139" json:"field13139,omitempty"`
+	Field13140    *float32 `protobuf:"fixed32,3,opt,name=field13140" json:"field13140,omitempty"`
 }
 
 func (x *Message13088_Message13089) Reset() {
@@ -4279,10 +4279,10 @@
 
 type Message18253_Message18254 struct {
 	state         protoimpl.MessageState
-	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
+	Field18362    *uint64  `protobuf:"fixed64,2,req,name=field18362" json:"field18362,omitempty"`
+	Field18363    *float64 `protobuf:"fixed64,3,req,name=field18363" json:"field18363,omitempty"`
 }
 
 func (x *Message18253_Message18254) Reset() {
@@ -5713,9 +5713,9 @@
 			switch v := v.(*Message24401); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5725,9 +5725,9 @@
 			switch v := v.(*Message24402); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5737,9 +5737,9 @@
 			switch v := v.(*Message24379); i {
 			case 0:
 				return &v.state
-			case 19:
+			case 1:
 				return &v.sizeCache
-			case 20:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5749,9 +5749,9 @@
 			switch v := v.(*Message27358); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5761,9 +5761,9 @@
 			switch v := v.(*Message34381); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5773,9 +5773,9 @@
 			switch v := v.(*Message34619); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5785,11 +5785,11 @@
 			switch v := v.(*Message730); i {
 			case 0:
 				return &v.state
-			case 34:
+			case 1:
 				return &v.sizeCache
-			case 35:
+			case 2:
 				return &v.unknownFields
-			case 36:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5799,9 +5799,9 @@
 			switch v := v.(*Message33958); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5811,9 +5811,9 @@
 			switch v := v.(*Message6637); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5823,9 +5823,9 @@
 			switch v := v.(*Message6643); i {
 			case 0:
 				return &v.state
-			case 19:
+			case 1:
 				return &v.sizeCache
-			case 20:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5835,9 +5835,9 @@
 			switch v := v.(*Message6126); i {
 			case 0:
 				return &v.state
-			case 20:
+			case 1:
 				return &v.sizeCache
-			case 21:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5847,9 +5847,9 @@
 			switch v := v.(*Message13083); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5859,9 +5859,9 @@
 			switch v := v.(*Message13088); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5871,9 +5871,9 @@
 			switch v := v.(*Message10391); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5883,11 +5883,11 @@
 			switch v := v.(*Message11873); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
-			case 15:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5897,9 +5897,9 @@
 			switch v := v.(*Message35506); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5909,9 +5909,9 @@
 			switch v := v.(*Message13151); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5921,9 +5921,9 @@
 			switch v := v.(*Message18253); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5933,9 +5933,9 @@
 			switch v := v.(*Message16685); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5945,9 +5945,9 @@
 			switch v := v.(*Message16816); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5957,9 +5957,9 @@
 			switch v := v.(*Message13168); i {
 			case 0:
 				return &v.state
-			case 12:
+			case 1:
 				return &v.sizeCache
-			case 13:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5969,9 +5969,9 @@
 			switch v := v.(*Message13167); i {
 			case 0:
 				return &v.state
-			case 14:
+			case 1:
 				return &v.sizeCache
-			case 15:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5981,9 +5981,9 @@
 			switch v := v.(*Message1374); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6017,9 +6017,9 @@
 			switch v := v.(*Message18856); i {
 			case 0:
 				return &v.state
-			case 32:
+			case 1:
 				return &v.sizeCache
-			case 33:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6029,9 +6029,9 @@
 			switch v := v.(*Message3850); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6041,9 +6041,9 @@
 			switch v := v.(*Message6721); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6053,9 +6053,9 @@
 			switch v := v.(*Message6742); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6065,9 +6065,9 @@
 			switch v := v.(*Message6726); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6077,9 +6077,9 @@
 			switch v := v.(*Message6733); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6089,9 +6089,9 @@
 			switch v := v.(*Message6723); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6101,9 +6101,9 @@
 			switch v := v.(*Message6725); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6113,9 +6113,9 @@
 			switch v := v.(*Message6734); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6125,9 +6125,9 @@
 			switch v := v.(*Message8184); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6137,9 +6137,9 @@
 			switch v := v.(*Message8477); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6149,9 +6149,9 @@
 			switch v := v.(*Message8454); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6161,9 +6161,9 @@
 			switch v := v.(*Message8476); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6173,9 +6173,9 @@
 			switch v := v.(*Message8455); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6185,9 +6185,9 @@
 			switch v := v.(*Message8475); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6209,9 +6209,9 @@
 			switch v := v.(*Message12817); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6221,9 +6221,9 @@
 			switch v := v.(*Message16480); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6233,9 +6233,9 @@
 			switch v := v.(*Message24317); i {
 			case 0:
 				return &v.state
-			case 30:
+			case 1:
 				return &v.sizeCache
-			case 31:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6245,9 +6245,9 @@
 			switch v := v.(*Message33958_Message33959); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6257,9 +6257,9 @@
 			switch v := v.(*Message13083_Message13084); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6305,9 +6305,9 @@
 			switch v := v.(*Message13088_Message13089); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -6317,9 +6317,9 @@
 			switch v := v.(*Message18253_Message18254); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 01edb05..e8b65f6 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
@@ -86,13 +86,13 @@
 
 type Message24400 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -225,12 +225,12 @@
 
 type Message719 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -290,6 +290,9 @@
 
 type Message728 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -299,9 +302,6 @@
 	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() {
@@ -407,6 +407,8 @@
 
 type Message704 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -414,8 +416,6 @@
 	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() {
@@ -496,6 +496,9 @@
 
 type Message697 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -532,9 +535,6 @@
 	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() {
@@ -871,10 +871,10 @@
 
 type Message6578 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message6578) Reset() {
@@ -920,11 +920,11 @@
 
 type Message6024 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -977,10 +977,10 @@
 
 type Message6052 struct {
 	state         protoimpl.MessageState
-	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
+	Field6084     *string `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
+	Field6085     []byte  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
 }
 
 func (x *Message6052) Reset() {
@@ -1026,10 +1026,10 @@
 
 type Message6054 struct {
 	state         protoimpl.MessageState
-	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
+	Field6089     *string `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
+	Field6090     *string `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
 }
 
 func (x *Message6054) Reset() {
@@ -1075,11 +1075,11 @@
 
 type Message10573 struct {
 	state           protoimpl.MessageState
-	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
+	Field10580      []*Message10576 `protobuf:"bytes,1,rep,name=field10580" json:"field10580,omitempty"`
+	Field10581      *string         `protobuf:"bytes,2,opt,name=field10581" json:"field10581,omitempty"`
 }
 
 func (x *Message10573) Reset() {
@@ -1134,10 +1134,10 @@
 
 type Message10824 struct {
 	state         protoimpl.MessageState
-	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
+	Field10825    *string `protobuf:"bytes,1,req,name=field10825" json:"field10825,omitempty"`
+	Field10826    *int32  `protobuf:"varint,2,opt,name=field10826" json:"field10826,omitempty"`
 }
 
 func (x *Message10824) Reset() {
@@ -1183,14 +1183,14 @@
 
 type Message10582 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1264,6 +1264,9 @@
 
 type Message10155 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -1334,9 +1337,6 @@
 	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() {
@@ -1868,13 +1868,13 @@
 
 type Message11866 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1941,6 +1941,8 @@
 
 type Message10469 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1950,8 +1952,6 @@
 	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() {
@@ -2046,10 +2046,10 @@
 
 type Message10818 struct {
 	state         protoimpl.MessageState
-	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
+	Field10819    *Message10800 `protobuf:"bytes,1,opt,name=field10819" json:"field10819,omitempty"`
+	Field10820    *Message10801 `protobuf:"bytes,2,opt,name=field10820" json:"field10820,omitempty"`
 }
 
 func (x *Message10818) Reset() {
@@ -2095,6 +2095,8 @@
 
 type Message10773 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2118,8 +2120,6 @@
 	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() {
@@ -2312,12 +2312,12 @@
 
 type Message13145 struct {
 	state           protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message13145) Reset() {
@@ -2412,10 +2412,10 @@
 
 type Message12796 struct {
 	state         protoimpl.MessageState
-	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
+	Field12800    []uint64 `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
+	Field12801    *uint64  `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
 }
 
 func (x *Message12796) Reset() {
@@ -2593,10 +2593,10 @@
 
 type Message8183 struct {
 	state         protoimpl.MessageState
-	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
+	Field8226     *string `protobuf:"bytes,1,opt,name=field8226" json:"field8226,omitempty"`
+	Field8227     *string `protobuf:"bytes,2,opt,name=field8227" json:"field8227,omitempty"`
 }
 
 func (x *Message8183) Reset() {
@@ -2642,6 +2642,9 @@
 
 type Message8301 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -2653,9 +2656,6 @@
 	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() {
@@ -2806,6 +2806,9 @@
 
 type Message8302 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -2827,9 +2830,6 @@
 	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() {
@@ -3050,6 +3050,8 @@
 
 type Message8449 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3057,8 +3059,6 @@
 	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() {
@@ -3139,11 +3139,11 @@
 
 type Message13358 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3196,12 +3196,12 @@
 
 type Message13912 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3261,11 +3261,11 @@
 
 type Message24316 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3318,14 +3318,14 @@
 
 type Message24312 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3399,6 +3399,8 @@
 
 type Message24313 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3409,8 +3411,6 @@
 	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() {
@@ -3512,11 +3512,11 @@
 
 type Message24315 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3569,12 +3569,12 @@
 
 type Message716 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3634,11 +3634,11 @@
 
 type Message718 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3691,13 +3691,13 @@
 
 type Message703 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3764,6 +3764,8 @@
 
 type Message715 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3777,8 +3779,6 @@
 	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() {
@@ -3901,10 +3901,10 @@
 
 type Message700 struct {
 	state         protoimpl.MessageState
-	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
+	Field789      []string `protobuf:"bytes,1,rep,name=field789" json:"field789,omitempty"`
+	Field790      []string `protobuf:"bytes,2,rep,name=field790" json:"field790,omitempty"`
 }
 
 func (x *Message700) Reset() {
@@ -3950,10 +3950,10 @@
 
 type Message699 struct {
 	state         protoimpl.MessageState
-	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
+	Field787      *string  `protobuf:"bytes,1,req,name=field787" json:"field787,omitempty"`
+	Field788      []string `protobuf:"bytes,2,rep,name=field788" json:"field788,omitempty"`
 }
 
 func (x *Message699) Reset() {
@@ -3999,6 +3999,8 @@
 
 type Message698 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -4007,8 +4009,6 @@
 	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() {
@@ -4096,12 +4096,12 @@
 
 type Message10155_Message10156 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -5233,9 +5233,9 @@
 			switch v := v.(*Message24400); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5269,9 +5269,9 @@
 			switch v := v.(*Message719); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5281,11 +5281,11 @@
 			switch v := v.(*Message728); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
-			case 12:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5295,9 +5295,9 @@
 			switch v := v.(*Message704); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5307,11 +5307,11 @@
 			switch v := v.(*Message697); i {
 			case 0:
 				return &v.state
-			case 37:
+			case 1:
 				return &v.sizeCache
-			case 38:
+			case 2:
 				return &v.unknownFields
-			case 39:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5335,9 +5335,9 @@
 			switch v := v.(*Message6578); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5347,9 +5347,9 @@
 			switch v := v.(*Message6024); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5359,9 +5359,9 @@
 			switch v := v.(*Message6052); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5371,9 +5371,9 @@
 			switch v := v.(*Message6054); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5383,11 +5383,11 @@
 			switch v := v.(*Message10573); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
-			case 5:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5397,9 +5397,9 @@
 			switch v := v.(*Message10824); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5409,9 +5409,9 @@
 			switch v := v.(*Message10582); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5421,11 +5421,11 @@
 			switch v := v.(*Message10155); i {
 			case 0:
 				return &v.state
-			case 71:
+			case 1:
 				return &v.sizeCache
-			case 72:
+			case 2:
 				return &v.unknownFields
-			case 73:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5435,9 +5435,9 @@
 			switch v := v.(*Message11866); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5447,9 +5447,9 @@
 			switch v := v.(*Message10469); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5459,9 +5459,9 @@
 			switch v := v.(*Message10818); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5471,9 +5471,9 @@
 			switch v := v.(*Message10773); i {
 			case 0:
 				return &v.state
-			case 24:
+			case 1:
 				return &v.sizeCache
-			case 25:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5483,11 +5483,11 @@
 			switch v := v.(*Message13145); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
-			case 6:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5509,9 +5509,9 @@
 			switch v := v.(*Message12796); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5569,9 +5569,9 @@
 			switch v := v.(*Message8183); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5581,11 +5581,11 @@
 			switch v := v.(*Message8301); i {
 			case 0:
 				return &v.state
-			case 12:
+			case 1:
 				return &v.sizeCache
-			case 13:
+			case 2:
 				return &v.unknownFields
-			case 14:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5607,11 +5607,11 @@
 			switch v := v.(*Message8302); i {
 			case 0:
 				return &v.state
-			case 22:
+			case 1:
 				return &v.sizeCache
-			case 23:
+			case 2:
 				return &v.unknownFields
-			case 24:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5633,9 +5633,9 @@
 			switch v := v.(*Message8449); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5645,9 +5645,9 @@
 			switch v := v.(*Message13358); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5657,9 +5657,9 @@
 			switch v := v.(*Message13912); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5669,9 +5669,9 @@
 			switch v := v.(*Message24316); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5681,9 +5681,9 @@
 			switch v := v.(*Message24312); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5693,9 +5693,9 @@
 			switch v := v.(*Message24313); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5705,9 +5705,9 @@
 			switch v := v.(*Message24315); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5717,9 +5717,9 @@
 			switch v := v.(*Message716); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5729,9 +5729,9 @@
 			switch v := v.(*Message718); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5741,9 +5741,9 @@
 			switch v := v.(*Message703); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5753,9 +5753,9 @@
 			switch v := v.(*Message715); i {
 			case 0:
 				return &v.state
-			case 14:
+			case 1:
 				return &v.sizeCache
-			case 15:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5765,9 +5765,9 @@
 			switch v := v.(*Message700); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5777,9 +5777,9 @@
 			switch v := v.(*Message699); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5789,9 +5789,9 @@
 			switch v := v.(*Message698); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5801,9 +5801,9 @@
 			switch v := v.(*Message10155_Message10156); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 4f8884f..2e96a3f 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
@@ -53,10 +53,10 @@
 
 type Message10154 struct {
 	state         protoimpl.MessageState
-	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
+	Field10192    []byte `protobuf:"bytes,1,opt,name=field10192" json:"field10192,omitempty"`
+	Field10193    *int32 `protobuf:"varint,2,opt,name=field10193" json:"field10193,omitempty"`
 }
 
 func (x *Message10154) Reset() {
@@ -102,6 +102,8 @@
 
 type Message8944 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -164,8 +166,6 @@
 	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() {
@@ -631,6 +631,9 @@
 
 type Message9182 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -657,9 +660,6 @@
 	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() {
@@ -886,10 +886,10 @@
 
 type Message9160 struct {
 	state         protoimpl.MessageState
-	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
+	Field9161     *int32 `protobuf:"varint,1,opt,name=field9161" json:"field9161,omitempty"`
+	Field9162     []byte `protobuf:"bytes,2,opt,name=field9162" json:"field9162,omitempty"`
 }
 
 func (x *Message9160) Reset() {
@@ -935,9 +935,9 @@
 
 type Message9242 struct {
 	state         protoimpl.MessageState
-	Field9327     []Enum9243 `protobuf:"varint,1,rep,name=field9327,enum=benchmarks.google_message3.Enum9243" json:"field9327,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field9327     []Enum9243 `protobuf:"varint,1,rep,name=field9327,enum=benchmarks.google_message3.Enum9243" json:"field9327,omitempty"`
 }
 
 func (x *Message9242) Reset() {
@@ -976,9 +976,9 @@
 
 type Message8890 struct {
 	state         protoimpl.MessageState
-	Field8916     []*Message8888 `protobuf:"bytes,1,rep,name=field8916" json:"field8916,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field8916     []*Message8888 `protobuf:"bytes,1,rep,name=field8916" json:"field8916,omitempty"`
 }
 
 func (x *Message8890) Reset() {
@@ -1017,9 +1017,9 @@
 
 type Message9123 struct {
 	state         protoimpl.MessageState
-	Field9135     *float32 `protobuf:"fixed32,1,opt,name=field9135" json:"field9135,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field9135     *float32 `protobuf:"fixed32,1,opt,name=field9135" json:"field9135,omitempty"`
 }
 
 func (x *Message9123) Reset() {
@@ -1058,12 +1058,12 @@
 
 type Message9628 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1123,6 +1123,8 @@
 
 type Message11014 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1188,8 +1190,6 @@
 	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() {
@@ -1676,11 +1676,11 @@
 
 type Message10801 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1733,9 +1733,9 @@
 
 type Message10749 struct {
 	state         protoimpl.MessageState
-	Field10754    []*Message10748 `protobuf:"bytes,1,rep,name=field10754" json:"field10754,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field10754    []*Message10748 `protobuf:"bytes,1,rep,name=field10754" json:"field10754,omitempty"`
 }
 
 func (x *Message10749) Reset() {
@@ -1774,11 +1774,11 @@
 
 type Message8298 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1831,10 +1831,10 @@
 
 type Message8300 struct {
 	state         protoimpl.MessageState
-	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
+	Field8326     *string      `protobuf:"bytes,1,opt,name=field8326" json:"field8326,omitempty"`
+	Field8327     *Message7966 `protobuf:"bytes,2,opt,name=field8327" json:"field8327,omitempty"`
 }
 
 func (x *Message8300) Reset() {
@@ -1880,13 +1880,13 @@
 
 type Message8291 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1953,14 +1953,14 @@
 
 type Message8296 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2034,10 +2034,10 @@
 
 type Message7965 struct {
 	state         protoimpl.MessageState
-	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
+	Field7967     *int32 `protobuf:"varint,1,opt,name=field7967" json:"field7967,omitempty"`
+	Field7968     *int32 `protobuf:"varint,2,opt,name=field7968" json:"field7968,omitempty"`
 }
 
 func (x *Message7965) Reset() {
@@ -2083,10 +2083,10 @@
 
 type Message8290 struct {
 	state         protoimpl.MessageState
-	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
+	Field8304     *string `protobuf:"bytes,1,opt,name=field8304" json:"field8304,omitempty"`
+	Field8305     *string `protobuf:"bytes,2,opt,name=field8305" json:"field8305,omitempty"`
 }
 
 func (x *Message8290) Reset() {
@@ -2132,10 +2132,10 @@
 
 type Message717 struct {
 	state         protoimpl.MessageState
-	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
+	Field876      []string `protobuf:"bytes,1,rep,name=field876" json:"field876,omitempty"`
+	Field877      *float64 `protobuf:"fixed64,2,opt,name=field877" json:"field877,omitempty"`
 }
 
 func (x *Message717) Reset() {
@@ -2181,10 +2181,10 @@
 
 type Message713 struct {
 	state         protoimpl.MessageState
-	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
+	Field852      *Message708 `protobuf:"bytes,1,req,name=field852" json:"field852,omitempty"`
+	Field853      []string    `protobuf:"bytes,2,rep,name=field853" json:"field853,omitempty"`
 }
 
 func (x *Message713) Reset() {
@@ -2230,6 +2230,8 @@
 
 type Message705 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2237,8 +2239,6 @@
 	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() {
@@ -2319,13 +2319,13 @@
 
 type Message709 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2392,10 +2392,10 @@
 
 type Message702 struct {
 	state         protoimpl.MessageState
-	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
+	Field793      *string `protobuf:"bytes,1,opt,name=field793" json:"field793,omitempty"`
+	Field794      *string `protobuf:"bytes,2,opt,name=field794" json:"field794,omitempty"`
 }
 
 func (x *Message702) Reset() {
@@ -2441,13 +2441,13 @@
 
 type Message714 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2514,13 +2514,13 @@
 
 type Message710 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2587,12 +2587,12 @@
 
 type Message706 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2652,13 +2652,13 @@
 
 type Message707 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2725,12 +2725,12 @@
 
 type Message711 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2790,6 +2790,8 @@
 
 type Message712 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2799,8 +2801,6 @@
 	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() {
@@ -2895,6 +2895,8 @@
 
 type Message8939 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2917,8 +2919,6 @@
 	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() {
@@ -3104,9 +3104,9 @@
 
 type Message9181 struct {
 	state         protoimpl.MessageState
-	Field9204     *string `protobuf:"bytes,1,opt,name=field9204" json:"field9204,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field9204     *string `protobuf:"bytes,1,opt,name=field9204" json:"field9204,omitempty"`
 }
 
 func (x *Message9181) Reset() {
@@ -3145,11 +3145,11 @@
 
 type Message9164 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3202,10 +3202,10 @@
 
 type Message9165 struct {
 	state         protoimpl.MessageState
-	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
+	Field9171     *float32 `protobuf:"fixed32,1,opt,name=field9171" json:"field9171,omitempty"`
+	Field9172     *float32 `protobuf:"fixed32,2,opt,name=field9172" json:"field9172,omitempty"`
 }
 
 func (x *Message9165) Reset() {
@@ -3251,10 +3251,10 @@
 
 type Message9166 struct {
 	state         protoimpl.MessageState
-	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
+	Field9173     *float32 `protobuf:"fixed32,1,opt,name=field9173" json:"field9173,omitempty"`
+	Field9174     *int32   `protobuf:"varint,2,opt,name=field9174" json:"field9174,omitempty"`
 }
 
 func (x *Message9166) Reset() {
@@ -3300,6 +3300,8 @@
 
 type Message9151 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3308,8 +3310,6 @@
 	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() {
@@ -3397,12 +3397,12 @@
 
 type Message8888 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3462,13 +3462,13 @@
 
 type Message9627 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3568,6 +3568,8 @@
 
 type Message11013 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3591,8 +3593,6 @@
 	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() {
@@ -3818,14 +3818,14 @@
 
 type Message8939_Message8941 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3899,14 +3899,14 @@
 
 type Message8939_Message8943 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -4935,9 +4935,9 @@
 			switch v := v.(*Message10154); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4947,9 +4947,9 @@
 			switch v := v.(*Message8944); i {
 			case 0:
 				return &v.state
-			case 63:
+			case 1:
 				return &v.sizeCache
-			case 64:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4959,11 +4959,11 @@
 			switch v := v.(*Message9182); i {
 			case 0:
 				return &v.state
-			case 27:
+			case 1:
 				return &v.sizeCache
-			case 28:
+			case 2:
 				return &v.unknownFields
-			case 29:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -4973,9 +4973,9 @@
 			switch v := v.(*Message9160); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4985,9 +4985,9 @@
 			switch v := v.(*Message9242); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4997,9 +4997,9 @@
 			switch v := v.(*Message8890); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5009,9 +5009,9 @@
 			switch v := v.(*Message9123); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5021,9 +5021,9 @@
 			switch v := v.(*Message9628); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5033,9 +5033,9 @@
 			switch v := v.(*Message11014); i {
 			case 0:
 				return &v.state
-			case 66:
+			case 1:
 				return &v.sizeCache
-			case 67:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5045,9 +5045,9 @@
 			switch v := v.(*Message10801); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5057,9 +5057,9 @@
 			switch v := v.(*Message10749); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5069,9 +5069,9 @@
 			switch v := v.(*Message8298); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5081,9 +5081,9 @@
 			switch v := v.(*Message8300); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5093,9 +5093,9 @@
 			switch v := v.(*Message8291); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5105,9 +5105,9 @@
 			switch v := v.(*Message8296); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5117,9 +5117,9 @@
 			switch v := v.(*Message7965); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5129,9 +5129,9 @@
 			switch v := v.(*Message8290); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5141,9 +5141,9 @@
 			switch v := v.(*Message717); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5153,9 +5153,9 @@
 			switch v := v.(*Message713); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5165,9 +5165,9 @@
 			switch v := v.(*Message705); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5177,9 +5177,9 @@
 			switch v := v.(*Message709); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5189,9 +5189,9 @@
 			switch v := v.(*Message702); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5201,9 +5201,9 @@
 			switch v := v.(*Message714); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5213,9 +5213,9 @@
 			switch v := v.(*Message710); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5225,9 +5225,9 @@
 			switch v := v.(*Message706); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5237,9 +5237,9 @@
 			switch v := v.(*Message707); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5249,9 +5249,9 @@
 			switch v := v.(*Message711); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5261,9 +5261,9 @@
 			switch v := v.(*Message712); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5273,9 +5273,9 @@
 			switch v := v.(*Message8939); i {
 			case 0:
 				return &v.state
-			case 23:
+			case 1:
 				return &v.sizeCache
-			case 24:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5285,9 +5285,9 @@
 			switch v := v.(*Message9181); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5297,9 +5297,9 @@
 			switch v := v.(*Message9164); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5309,9 +5309,9 @@
 			switch v := v.(*Message9165); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5321,9 +5321,9 @@
 			switch v := v.(*Message9166); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5333,9 +5333,9 @@
 			switch v := v.(*Message9151); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5345,9 +5345,9 @@
 			switch v := v.(*Message8888); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5357,9 +5357,9 @@
 			switch v := v.(*Message9627); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5381,9 +5381,9 @@
 			switch v := v.(*Message11013); i {
 			case 0:
 				return &v.state
-			case 24:
+			case 1:
 				return &v.sizeCache
-			case 25:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5405,9 +5405,9 @@
 			switch v := v.(*Message8939_Message8941); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5417,9 +5417,9 @@
 			switch v := v.(*Message8939_Message8943); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 ed50f1b..f09b643 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
@@ -52,12 +52,12 @@
 
 type Message10800 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -150,12 +150,12 @@
 
 type Message10748 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -215,10 +215,10 @@
 
 type Message7966 struct {
 	state         protoimpl.MessageState
-	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
+	Field7969     *string `protobuf:"bytes,1,opt,name=field7969" json:"field7969,omitempty"`
+	Field7970     *bool   `protobuf:"varint,2,opt,name=field7970" json:"field7970,omitempty"`
 }
 
 func (x *Message7966) Reset() {
@@ -264,14 +264,14 @@
 
 type Message708 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -378,10 +378,10 @@
 
 type Message11011 struct {
 	state         protoimpl.MessageState
-	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
+	Field11752    []byte `protobuf:"bytes,1,req,name=field11752" json:"field11752,omitempty"`
+	Field11753    []byte `protobuf:"bytes,2,req,name=field11753" json:"field11753,omitempty"`
 }
 
 func (x *Message11011) Reset() {
@@ -460,9 +460,9 @@
 
 type Message741 struct {
 	state         protoimpl.MessageState
-	Field936      []string `protobuf:"bytes,1,rep,name=field936" json:"field936,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field936      []string `protobuf:"bytes,1,rep,name=field936" json:"field936,omitempty"`
 }
 
 func (x *Message741) Reset() {
@@ -622,9 +622,9 @@
 			switch v := v.(*Message10800); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -646,9 +646,9 @@
 			switch v := v.(*Message10748); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -658,9 +658,9 @@
 			switch v := v.(*Message7966); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -670,9 +670,9 @@
 			switch v := v.(*Message708); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -694,9 +694,9 @@
 			switch v := v.(*Message11011); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -718,9 +718,9 @@
 			switch v := v.(*Message741); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 b6e3611..596e5f0 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
@@ -20,6 +20,8 @@
 
 type GoogleMessage4 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -36,8 +38,6 @@
 	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() {
@@ -181,6 +181,8 @@
 
 type Message37489 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -202,8 +204,6 @@
 	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() {
@@ -382,10 +382,10 @@
 
 type Message7319 struct {
 	state         protoimpl.MessageState
-	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
+	Field7321     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7321" json:"field7321,omitempty"`
+	Field7322     *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field7322" json:"field7322,omitempty"`
 }
 
 func (x *Message7319) Reset() {
@@ -431,6 +431,8 @@
 
 type Message12717 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -440,8 +442,6 @@
 	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() {
@@ -536,12 +536,12 @@
 
 type Message37331 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -601,11 +601,11 @@
 
 type Message8815 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -658,14 +658,14 @@
 
 type Message7330 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -739,10 +739,10 @@
 
 type Message12960 struct {
 	state         protoimpl.MessageState
-	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
+	Field12962    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12962" json:"field12962,omitempty"`
+	Field12963    *Message12948       `protobuf:"bytes,2,opt,name=field12963" json:"field12963,omitempty"`
 }
 
 func (x *Message12960) Reset() {
@@ -788,6 +788,8 @@
 
 type Message176 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -847,8 +849,6 @@
 	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() {
@@ -1293,11 +1293,11 @@
 
 type Message8817 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1350,11 +1350,11 @@
 
 type Message8835 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1407,11 +1407,11 @@
 
 type Message37333 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1464,10 +1464,10 @@
 
 type Message13000 struct {
 	state         protoimpl.MessageState
-	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
+	Field13015    *int64          `protobuf:"varint,1,opt,name=field13015" json:"field13015,omitempty"`
+	Field13016    []*Message12979 `protobuf:"bytes,2,rep,name=field13016" json:"field13016,omitempty"`
 }
 
 func (x *Message13000) Reset() {
@@ -1513,12 +1513,12 @@
 
 type Message37335 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1578,11 +1578,11 @@
 
 type Message8848 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1635,10 +1635,10 @@
 
 type Message13035 struct {
 	state         protoimpl.MessageState
-	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
+	Field13058    *int64  `protobuf:"varint,1,opt,name=field13058" json:"field13058,omitempty"`
+	Field13059    []int64 `protobuf:"varint,2,rep,name=field13059" json:"field13059,omitempty"`
 }
 
 func (x *Message13035) Reset() {
@@ -1684,10 +1684,10 @@
 
 type Message8856 struct {
 	state         protoimpl.MessageState
-	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
+	Field8858     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8858" json:"field8858,omitempty"`
+	Field8859     *string             `protobuf:"bytes,2,opt,name=field8859" json:"field8859,omitempty"`
 }
 
 func (x *Message8856) Reset() {
@@ -1733,14 +1733,14 @@
 
 type Message12908 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1814,11 +1814,11 @@
 
 type Message12910 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1871,6 +1871,8 @@
 
 type Message37327 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1882,8 +1884,6 @@
 	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() {
@@ -1992,13 +1992,13 @@
 
 type Message37329 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2065,13 +2065,13 @@
 
 type Message2517 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2138,12 +2138,12 @@
 
 type Message12748 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2203,9 +2203,9 @@
 
 type Message12687 struct {
 	state         protoimpl.MessageState
-	Field12701    []*Message12686 `protobuf:"bytes,1,rep,name=field12701" json:"field12701,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field12701    []*Message12686 `protobuf:"bytes,1,rep,name=field12701" json:"field12701,omitempty"`
 }
 
 func (x *Message12687) Reset() {
@@ -2244,11 +2244,11 @@
 
 type Message11948 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2301,9 +2301,9 @@
 
 type Message11976 struct {
 	state         protoimpl.MessageState
-	Field12002    []*Message11975 `protobuf:"bytes,1,rep,name=field12002" json:"field12002,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field12002    []*Message11975 `protobuf:"bytes,1,rep,name=field12002" json:"field12002,omitempty"`
 }
 
 func (x *Message11976) Reset() {
@@ -2342,10 +2342,10 @@
 
 type Message7320 struct {
 	state         protoimpl.MessageState
-	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
+	Field7323     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7323" json:"field7323,omitempty"`
+	Field7324     *Message7287        `protobuf:"bytes,8,opt,name=field7324" json:"field7324,omitempty"`
 }
 
 func (x *Message7320) Reset() {
@@ -2391,12 +2391,12 @@
 
 type Message3069 struct {
 	state           protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message3069) Reset() {
@@ -2458,9 +2458,9 @@
 
 type Message12948 struct {
 	state         protoimpl.MessageState
-	Field12958    []*Message12949 `protobuf:"bytes,1,rep,name=field12958" json:"field12958,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field12958    []*Message12949 `protobuf:"bytes,1,rep,name=field12958" json:"field12958,omitempty"`
 }
 
 func (x *Message12948) Reset() {
@@ -2499,6 +2499,8 @@
 
 type Message8768 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2506,8 +2508,6 @@
 	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() {
@@ -2588,6 +2588,8 @@
 
 type Message12979 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2595,8 +2597,6 @@
 	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() {
@@ -2677,6 +2677,8 @@
 
 type Message37173 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2702,8 +2704,6 @@
 	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() {
@@ -2910,6 +2910,8 @@
 
 type Message12799 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2918,8 +2920,6 @@
 	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() {
@@ -3007,6 +3007,8 @@
 
 type Message12870 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3027,8 +3029,6 @@
 	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() {
@@ -3200,6 +3200,8 @@
 
 type Message3804 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3207,8 +3209,6 @@
 	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() {
@@ -3289,11 +3289,11 @@
 
 type Message12903 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3346,10 +3346,10 @@
 
 type Message37326 struct {
 	state         protoimpl.MessageState
-	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
+	Field37345    *string `protobuf:"bytes,1,req,name=field37345" json:"field37345,omitempty"`
+	Field37346    *string `protobuf:"bytes,2,opt,name=field37346" json:"field37346,omitempty"`
 }
 
 func (x *Message37326) Reset() {
@@ -3395,6 +3395,8 @@
 
 type Message2356 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3426,8 +3428,6 @@
 	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() {
@@ -3719,11 +3719,11 @@
 
 type Message971 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3809,10 +3809,10 @@
 
 type Message3069_Message3070 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message3069_Message3070) Reset() {
@@ -3858,6 +3858,8 @@
 
 type Message2356_Message2357 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3870,8 +3872,6 @@
 	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() {
@@ -5348,9 +5348,9 @@
 			switch v := v.(*GoogleMessage4); i {
 			case 0:
 				return &v.state
-			case 17:
+			case 1:
 				return &v.sizeCache
-			case 18:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5360,9 +5360,9 @@
 			switch v := v.(*Message37489); i {
 			case 0:
 				return &v.state
-			case 22:
+			case 1:
 				return &v.sizeCache
-			case 23:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5372,9 +5372,9 @@
 			switch v := v.(*Message7319); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5384,9 +5384,9 @@
 			switch v := v.(*Message12717); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5396,9 +5396,9 @@
 			switch v := v.(*Message37331); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5408,9 +5408,9 @@
 			switch v := v.(*Message8815); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5420,9 +5420,9 @@
 			switch v := v.(*Message7330); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5432,9 +5432,9 @@
 			switch v := v.(*Message12960); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5444,9 +5444,9 @@
 			switch v := v.(*Message176); i {
 			case 0:
 				return &v.state
-			case 60:
+			case 1:
 				return &v.sizeCache
-			case 61:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5456,9 +5456,9 @@
 			switch v := v.(*Message8817); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5468,9 +5468,9 @@
 			switch v := v.(*Message8835); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5480,9 +5480,9 @@
 			switch v := v.(*Message37333); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5492,9 +5492,9 @@
 			switch v := v.(*Message13000); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5504,9 +5504,9 @@
 			switch v := v.(*Message37335); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5516,9 +5516,9 @@
 			switch v := v.(*Message8848); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5528,9 +5528,9 @@
 			switch v := v.(*Message13035); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5540,9 +5540,9 @@
 			switch v := v.(*Message8856); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5552,9 +5552,9 @@
 			switch v := v.(*Message12908); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5564,9 +5564,9 @@
 			switch v := v.(*Message12910); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5576,9 +5576,9 @@
 			switch v := v.(*Message37327); i {
 			case 0:
 				return &v.state
-			case 12:
+			case 1:
 				return &v.sizeCache
-			case 13:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5588,9 +5588,9 @@
 			switch v := v.(*Message37329); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5600,9 +5600,9 @@
 			switch v := v.(*Message2517); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5612,9 +5612,9 @@
 			switch v := v.(*Message12748); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5624,9 +5624,9 @@
 			switch v := v.(*Message12687); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5636,9 +5636,9 @@
 			switch v := v.(*Message11948); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5648,9 +5648,9 @@
 			switch v := v.(*Message11976); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5660,9 +5660,9 @@
 			switch v := v.(*Message7320); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5672,11 +5672,11 @@
 			switch v := v.(*Message3069); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
-			case 6:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5686,9 +5686,9 @@
 			switch v := v.(*Message12948); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5698,9 +5698,9 @@
 			switch v := v.(*Message8768); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5710,9 +5710,9 @@
 			switch v := v.(*Message12979); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5722,9 +5722,9 @@
 			switch v := v.(*Message37173); i {
 			case 0:
 				return &v.state
-			case 26:
+			case 1:
 				return &v.sizeCache
-			case 27:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5734,9 +5734,9 @@
 			switch v := v.(*Message12799); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5746,9 +5746,9 @@
 			switch v := v.(*Message12870); i {
 			case 0:
 				return &v.state
-			case 21:
+			case 1:
 				return &v.sizeCache
-			case 22:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5758,9 +5758,9 @@
 			switch v := v.(*Message3804); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5770,9 +5770,9 @@
 			switch v := v.(*Message12903); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5782,9 +5782,9 @@
 			switch v := v.(*Message37326); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5794,9 +5794,9 @@
 			switch v := v.(*Message2356); i {
 			case 0:
 				return &v.state
-			case 32:
+			case 1:
 				return &v.sizeCache
-			case 33:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5820,9 +5820,9 @@
 			switch v := v.(*Message971); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5844,9 +5844,9 @@
 			switch v := v.(*Message3069_Message3070); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5856,9 +5856,9 @@
 			switch v := v.(*Message2356_Message2357); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 c9f97b3..f0f068b 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
@@ -20,9 +20,9 @@
 
 type Message2463 struct {
 	state         protoimpl.MessageState
-	Field2498     []*Message2462 `protobuf:"bytes,1,rep,name=field2498" json:"field2498,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field2498     []*Message2462 `protobuf:"bytes,1,rep,name=field2498" json:"field2498,omitempty"`
 }
 
 func (x *Message2463) Reset() {
@@ -61,10 +61,10 @@
 
 type Message12686 struct {
 	state         protoimpl.MessageState
-	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
+	Field12699    *string       `protobuf:"bytes,1,opt,name=field12699" json:"field12699,omitempty"`
+	Field12700    *Message12685 `protobuf:"bytes,2,opt,name=field12700" json:"field12700,omitempty"`
 }
 
 func (x *Message12686) Reset() {
@@ -143,6 +143,8 @@
 
 type Message11975 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -153,8 +155,6 @@
 	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() {
@@ -256,6 +256,8 @@
 
 type Message7287 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -264,8 +266,6 @@
 	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() {
@@ -353,6 +353,8 @@
 
 type Message3061 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -401,8 +403,6 @@
 	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() {
@@ -803,6 +803,8 @@
 
 type Message8572 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -853,8 +855,6 @@
 	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() {
@@ -1236,13 +1236,13 @@
 
 type Message8774 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1309,6 +1309,9 @@
 
 type Message12776 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -1319,9 +1322,6 @@
 	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() {
@@ -1437,12 +1437,12 @@
 
 type Message12798 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1502,11 +1502,11 @@
 
 type Message12797 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1559,6 +1559,8 @@
 
 type Message12825 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1566,8 +1568,6 @@
 	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() {
@@ -1714,10 +1714,10 @@
 
 type Message1374 struct {
 	state         protoimpl.MessageState
-	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
+	Field1375     *string `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
+	Field1376     *string `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
 }
 
 func (x *Message1374) Reset() {
@@ -1763,10 +1763,10 @@
 
 type Message2462 struct {
 	state         protoimpl.MessageState
-	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
+	Field2496     []byte   `protobuf:"bytes,1,req,name=field2496" json:"field2496,omitempty"`
+	Field2497     *float64 `protobuf:"fixed64,2,req,name=field2497" json:"field2497,omitempty"`
 }
 
 func (x *Message2462) Reset() {
@@ -1812,6 +1812,8 @@
 
 type Message12685 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1819,8 +1821,6 @@
 	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() {
@@ -1901,6 +1901,8 @@
 
 type Message10320 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1908,8 +1910,6 @@
 	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() {
@@ -1990,11 +1990,11 @@
 
 type Message11947 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2047,10 +2047,10 @@
 
 type Message11920 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message11920) Reset() {
@@ -2096,6 +2096,8 @@
 
 type Message6643 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2114,8 +2116,6 @@
 	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() {
@@ -2273,6 +2273,8 @@
 
 type Message6133 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2293,8 +2295,6 @@
 	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() {
@@ -2466,6 +2466,9 @@
 
 type Message6109 struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	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"`
@@ -2478,9 +2481,6 @@
 	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() {
@@ -2605,10 +2605,10 @@
 
 type Message3046 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message3046) Reset() {
@@ -2654,11 +2654,11 @@
 
 type Message3060 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2711,10 +2711,10 @@
 
 type Message3041 struct {
 	state         protoimpl.MessageState
-	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
+	Field3214     *string `protobuf:"bytes,1,opt,name=field3214" json:"field3214,omitempty"`
+	Field3215     *int32  `protobuf:"varint,2,opt,name=field3215" json:"field3215,omitempty"`
 }
 
 func (x *Message3041) Reset() {
@@ -2760,13 +2760,13 @@
 
 type Message3040 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2833,14 +2833,14 @@
 
 type Message3050 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2914,6 +2914,8 @@
 
 type Message7905 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -2921,8 +2923,6 @@
 	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() {
@@ -3003,9 +3003,9 @@
 
 type Message3886 struct {
 	state         protoimpl.MessageState
-	Message3887   []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Message3887   []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
 }
 
 func (x *Message3886) Reset() {
@@ -3044,14 +3044,14 @@
 
 type Message7864 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3125,9 +3125,9 @@
 
 type Message3922 struct {
 	state         protoimpl.MessageState
-	Field4012     *uint64 `protobuf:"varint,1,opt,name=field4012" json:"field4012,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field4012     *uint64 `protobuf:"varint,1,opt,name=field4012" json:"field4012,omitempty"`
 }
 
 func (x *Message3922) Reset() {
@@ -3166,6 +3166,8 @@
 
 type Message3052 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3175,8 +3177,6 @@
 	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() {
@@ -3304,6 +3304,8 @@
 
 type Message7843 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3320,8 +3322,6 @@
 	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() {
@@ -3465,9 +3465,9 @@
 
 type Message3919 struct {
 	state         protoimpl.MessageState
-	Field4009     []*Message3920 `protobuf:"bytes,1,rep,name=field4009" json:"field4009,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field4009     []*Message3920 `protobuf:"bytes,1,rep,name=field4009" json:"field4009,omitempty"`
 }
 
 func (x *Message3919) Reset() {
@@ -3506,6 +3506,8 @@
 
 type Message7929 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3526,8 +3528,6 @@
 	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() {
@@ -3699,11 +3699,11 @@
 
 type Message3061_Message3062 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3756,12 +3756,12 @@
 
 type Message3061_Message3063 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -3821,6 +3821,8 @@
 
 type Message3061_Message3064 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -3840,8 +3842,6 @@
 	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() {
@@ -4039,6 +4039,8 @@
 
 type Message3061_Message3066 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -4047,8 +4049,6 @@
 	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() {
@@ -4136,12 +4136,12 @@
 
 type Message3886_Message3887 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -5463,9 +5463,9 @@
 			switch v := v.(*Message2463); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5475,9 +5475,9 @@
 			switch v := v.(*Message12686); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5499,9 +5499,9 @@
 			switch v := v.(*Message11975); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5511,9 +5511,9 @@
 			switch v := v.(*Message7287); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5523,9 +5523,9 @@
 			switch v := v.(*Message3061); i {
 			case 0:
 				return &v.state
-			case 49:
+			case 1:
 				return &v.sizeCache
-			case 50:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5547,9 +5547,9 @@
 			switch v := v.(*Message8572); i {
 			case 0:
 				return &v.state
-			case 51:
+			case 1:
 				return &v.sizeCache
-			case 52:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5559,9 +5559,9 @@
 			switch v := v.(*Message8774); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5571,11 +5571,11 @@
 			switch v := v.(*Message12776); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
-			case 13:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5585,9 +5585,9 @@
 			switch v := v.(*Message12798); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5597,9 +5597,9 @@
 			switch v := v.(*Message12797); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5609,9 +5609,9 @@
 			switch v := v.(*Message12825); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5645,9 +5645,9 @@
 			switch v := v.(*Message1374); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5657,9 +5657,9 @@
 			switch v := v.(*Message2462); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5669,9 +5669,9 @@
 			switch v := v.(*Message12685); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5681,9 +5681,9 @@
 			switch v := v.(*Message10320); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5693,9 +5693,9 @@
 			switch v := v.(*Message11947); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5705,9 +5705,9 @@
 			switch v := v.(*Message11920); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5717,9 +5717,9 @@
 			switch v := v.(*Message6643); i {
 			case 0:
 				return &v.state
-			case 19:
+			case 1:
 				return &v.sizeCache
-			case 20:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5729,9 +5729,9 @@
 			switch v := v.(*Message6133); i {
 			case 0:
 				return &v.state
-			case 21:
+			case 1:
 				return &v.sizeCache
-			case 22:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5741,11 +5741,11 @@
 			switch v := v.(*Message6109); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
-			case 15:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -5755,9 +5755,9 @@
 			switch v := v.(*Message3046); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5767,9 +5767,9 @@
 			switch v := v.(*Message3060); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5779,9 +5779,9 @@
 			switch v := v.(*Message3041); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5791,9 +5791,9 @@
 			switch v := v.(*Message3040); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5803,9 +5803,9 @@
 			switch v := v.(*Message3050); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5815,9 +5815,9 @@
 			switch v := v.(*Message7905); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5827,9 +5827,9 @@
 			switch v := v.(*Message3886); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5839,9 +5839,9 @@
 			switch v := v.(*Message7864); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5851,9 +5851,9 @@
 			switch v := v.(*Message3922); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5863,9 +5863,9 @@
 			switch v := v.(*Message3052); i {
 			case 0:
 				return &v.state
-			case 10:
+			case 1:
 				return &v.sizeCache
-			case 11:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5887,9 +5887,9 @@
 			switch v := v.(*Message7843); i {
 			case 0:
 				return &v.state
-			case 17:
+			case 1:
 				return &v.sizeCache
-			case 18:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5899,9 +5899,9 @@
 			switch v := v.(*Message3919); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5911,9 +5911,9 @@
 			switch v := v.(*Message7929); i {
 			case 0:
 				return &v.state
-			case 21:
+			case 1:
 				return &v.sizeCache
-			case 22:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5923,9 +5923,9 @@
 			switch v := v.(*Message3061_Message3062); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5935,9 +5935,9 @@
 			switch v := v.(*Message3061_Message3063); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5947,9 +5947,9 @@
 			switch v := v.(*Message3061_Message3064); i {
 			case 0:
 				return &v.state
-			case 20:
+			case 1:
 				return &v.sizeCache
-			case 21:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5971,9 +5971,9 @@
 			switch v := v.(*Message3061_Message3066); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -5983,9 +5983,9 @@
 			switch v := v.(*Message3886_Message3887); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
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 0060d2e..d36c612 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
@@ -19,14 +19,14 @@
 
 type Message12774 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -100,10 +100,10 @@
 
 type Message12796 struct {
 	state         protoimpl.MessageState
-	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
+	Field12800    []uint64 `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
+	Field12801    *uint64  `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
 }
 
 func (x *Message12796) Reset() {
@@ -149,13 +149,13 @@
 
 type Message12821 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -222,6 +222,8 @@
 
 type Message12820 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -230,8 +232,6 @@
 	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() {
@@ -319,14 +319,14 @@
 
 type Message12819 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -400,13 +400,13 @@
 
 type Message12818 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -473,6 +473,8 @@
 
 type Message10319 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -480,8 +482,6 @@
 	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() {
@@ -562,10 +562,10 @@
 
 type Message6578 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message6578) Reset() {
@@ -611,6 +611,8 @@
 
 type Message6126 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -630,8 +632,6 @@
 	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() {
@@ -796,14 +796,14 @@
 
 type Message5881 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -910,14 +910,14 @@
 
 type Message6107 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -991,10 +991,10 @@
 
 type Message6129 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message6129) Reset() {
@@ -1040,6 +1040,8 @@
 
 type Message5908 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1090,8 +1092,6 @@
 	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() {
@@ -1473,14 +1473,14 @@
 
 type Message3850 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1587,6 +1587,8 @@
 
 type Message7511 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -1594,8 +1596,6 @@
 	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() {
@@ -1709,10 +1709,10 @@
 
 type Message7928 struct {
 	state         protoimpl.MessageState
-	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
+	Field7940     *string `protobuf:"bytes,1,opt,name=field7940" json:"field7940,omitempty"`
+	Field7941     *int64  `protobuf:"varint,2,opt,name=field7941" json:"field7941,omitempty"`
 }
 
 func (x *Message7928) Reset() {
@@ -1758,12 +1758,12 @@
 
 type Message7921 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1823,10 +1823,10 @@
 
 type Message7920 struct {
 	state         protoimpl.MessageState
-	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
+	Field7934     *int64 `protobuf:"varint,1,opt,name=field7934" json:"field7934,omitempty"`
+	Field7935     *int64 `protobuf:"varint,2,opt,name=field7935" json:"field7935,omitempty"`
 }
 
 func (x *Message7920) Reset() {
@@ -1872,11 +1872,11 @@
 
 type Message7919 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1929,11 +1929,11 @@
 
 type Message12817 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1986,10 +1986,10 @@
 
 type Message6054 struct {
 	state         protoimpl.MessageState
-	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
+	Field6089     *string `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
+	Field6090     *string `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
 }
 
 func (x *Message6054) Reset() {
@@ -2068,10 +2068,10 @@
 
 type Message6052 struct {
 	state         protoimpl.MessageState
-	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
+	Field6084     *string `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
+	Field6085     []byte  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
 }
 
 func (x *Message6052) Reset() {
@@ -2117,11 +2117,11 @@
 
 type Message6024 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2174,12 +2174,12 @@
 
 type Message5861 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2239,9 +2239,9 @@
 
 type Message5880 struct {
 	state         protoimpl.MessageState
-	Field5896     *string `protobuf:"bytes,1,opt,name=field5896" json:"field5896,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Field5896     *string `protobuf:"bytes,1,opt,name=field5896" json:"field5896,omitempty"`
 }
 
 func (x *Message5880) Reset() {
@@ -2280,14 +2280,14 @@
 
 type Message5867 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2361,12 +2361,12 @@
 
 type Message4016 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2459,12 +2459,12 @@
 
 type Message5907 struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2557,10 +2557,10 @@
 
 type Message5903 struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *Message5903) Reset() {
@@ -3309,9 +3309,9 @@
 			switch v := v.(*Message12774); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3321,9 +3321,9 @@
 			switch v := v.(*Message12796); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3333,9 +3333,9 @@
 			switch v := v.(*Message12821); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3345,9 +3345,9 @@
 			switch v := v.(*Message12820); i {
 			case 0:
 				return &v.state
-			case 9:
+			case 1:
 				return &v.sizeCache
-			case 10:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3357,9 +3357,9 @@
 			switch v := v.(*Message12819); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3369,9 +3369,9 @@
 			switch v := v.(*Message12818); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3381,9 +3381,9 @@
 			switch v := v.(*Message10319); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3393,9 +3393,9 @@
 			switch v := v.(*Message6578); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3405,9 +3405,9 @@
 			switch v := v.(*Message6126); i {
 			case 0:
 				return &v.state
-			case 20:
+			case 1:
 				return &v.sizeCache
-			case 21:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3417,9 +3417,9 @@
 			switch v := v.(*Message5881); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3441,9 +3441,9 @@
 			switch v := v.(*Message6107); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3453,9 +3453,9 @@
 			switch v := v.(*Message6129); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3465,9 +3465,9 @@
 			switch v := v.(*Message5908); i {
 			case 0:
 				return &v.state
-			case 51:
+			case 1:
 				return &v.sizeCache
-			case 52:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3477,9 +3477,9 @@
 			switch v := v.(*Message3850); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3501,9 +3501,9 @@
 			switch v := v.(*Message7511); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3525,9 +3525,9 @@
 			switch v := v.(*Message7928); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3537,9 +3537,9 @@
 			switch v := v.(*Message7921); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3549,9 +3549,9 @@
 			switch v := v.(*Message7920); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3561,9 +3561,9 @@
 			switch v := v.(*Message7919); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3573,9 +3573,9 @@
 			switch v := v.(*Message12817); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3585,9 +3585,9 @@
 			switch v := v.(*Message6054); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3609,9 +3609,9 @@
 			switch v := v.(*Message6052); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3621,9 +3621,9 @@
 			switch v := v.(*Message6024); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3633,9 +3633,9 @@
 			switch v := v.(*Message5861); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3645,9 +3645,9 @@
 			switch v := v.(*Message5880); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3657,9 +3657,9 @@
 			switch v := v.(*Message5867); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3669,9 +3669,9 @@
 			switch v := v.(*Message4016); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3693,9 +3693,9 @@
 			switch v := v.(*Message5907); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3717,9 +3717,9 @@
 			switch v := v.(*Message5903); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/conformance/conformance.pb.go b/internal/testprotos/conformance/conformance.pb.go
index f94368c..964459f 100644
--- a/internal/testprotos/conformance/conformance.pb.go
+++ b/internal/testprotos/conformance/conformance.pb.go
@@ -140,9 +140,9 @@
 // test should return a serialized FailureSet in protobuf_payload.
 type FailureSet struct {
 	state         protoimpl.MessageState
-	Failure       []string `protobuf:"bytes,1,rep,name=failure,proto3" json:"failure,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Failure       []string `protobuf:"bytes,1,rep,name=failure,proto3" json:"failure,omitempty"`
 }
 
 func (x *FailureSet) Reset() {
@@ -185,7 +185,9 @@
 //   2. parse the protobuf or JSON payload in "payload" (which may fail)
 //   3. if the parse succeeded, serialize the message in the requested format.
 type ConformanceRequest struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The payload (whether protobuf of JSON) is always for a
 	// protobuf_test_messages.proto3.TestAllTypes proto (as defined in
 	// src/google/protobuf/proto3_test_messages.proto).
@@ -213,8 +215,6 @@
 	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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
 }
 
 func (x *ConformanceRequest) Reset() {
@@ -337,7 +337,9 @@
 
 // Represents a single test case's output.
 type ConformanceResponse struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Types that are valid to be assigned to Result:
 	// This string should be set to indicate parsing failed.  The string can
 	// provide more information about the parse error if it is available.
@@ -369,9 +371,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Result isConformanceResponse_Result `protobuf_oneof:"result"`
 }
 
 func (x *ConformanceResponse) Reset() {
@@ -518,11 +518,11 @@
 
 // Encoding options for jspb format.
 type JspbEncodingConfig struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// 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"`
-	sizeCache             protoimpl.SizeCache
-	unknownFields         protoimpl.UnknownFields
 }
 
 func (x *JspbEncodingConfig) Reset() {
@@ -688,9 +688,9 @@
 			switch v := v.(*FailureSet); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -700,9 +700,9 @@
 			switch v := v.(*ConformanceRequest); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -712,9 +712,9 @@
 			switch v := v.(*ConformanceResponse); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -724,9 +724,9 @@
 			switch v := v.(*JspbEncodingConfig); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/conformance/test_messages_proto2.pb.go b/internal/testprotos/conformance/test_messages_proto2.pb.go
index a93e75d..9882564 100644
--- a/internal/testprotos/conformance/test_messages_proto2.pb.go
+++ b/internal/testprotos/conformance/test_messages_proto2.pb.go
@@ -144,7 +144,10 @@
 // could trigger bugs that occur in any message type in this file.  We verify
 // this stays true in a unit test.
 type TestAllTypesProto2 struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// Singular
 	OptionalInt32          *int32                            `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
 	OptionalInt64          *int64                            `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
@@ -224,27 +227,24 @@
 	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"`
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	extensionFields protoimpl.ExtensionFields
+	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"`
 }
 
 func (x *TestAllTypesProto2) Reset() {
@@ -980,9 +980,9 @@
 
 type ForeignMessageProto2 struct {
 	state         protoimpl.MessageState
-	C             *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	C             *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
 }
 
 func (x *ForeignMessageProto2) Reset() {
@@ -1021,10 +1021,10 @@
 
 type TestAllTypesProto2_NestedMessage struct {
 	state         protoimpl.MessageState
-	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
+	A             *int32              `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	Corecursive   *TestAllTypesProto2 `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
 }
 
 func (x *TestAllTypesProto2_NestedMessage) Reset() {
@@ -1071,10 +1071,10 @@
 // groups
 type TestAllTypesProto2_Data struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *TestAllTypesProto2_Data) Reset() {
@@ -1164,9 +1164,9 @@
 
 type TestAllTypesProto2_MessageSetCorrectExtension1 struct {
 	state         protoimpl.MessageState
-	Str           *string `protobuf:"bytes,25,opt,name=str" json:"str,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Str           *string `protobuf:"bytes,25,opt,name=str" json:"str,omitempty"`
 }
 
 func (x *TestAllTypesProto2_MessageSetCorrectExtension1) Reset() {
@@ -1205,9 +1205,9 @@
 
 type TestAllTypesProto2_MessageSetCorrectExtension2 struct {
 	state         protoimpl.MessageState
-	I             *int32 `protobuf:"varint,9,opt,name=i" json:"i,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	I             *int32 `protobuf:"varint,9,opt,name=i" json:"i,omitempty"`
 }
 
 func (x *TestAllTypesProto2_MessageSetCorrectExtension2) Reset() {
@@ -1929,11 +1929,11 @@
 			switch v := v.(*TestAllTypesProto2); i {
 			case 0:
 				return &v.state
-			case 83:
+			case 1:
 				return &v.sizeCache
-			case 84:
+			case 2:
 				return &v.unknownFields
-			case 85:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -1943,9 +1943,9 @@
 			switch v := v.(*ForeignMessageProto2); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1955,9 +1955,9 @@
 			switch v := v.(*TestAllTypesProto2_NestedMessage); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1967,9 +1967,9 @@
 			switch v := v.(*TestAllTypesProto2_Data); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1993,9 +1993,9 @@
 			switch v := v.(*TestAllTypesProto2_MessageSetCorrectExtension1); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2005,9 +2005,9 @@
 			switch v := v.(*TestAllTypesProto2_MessageSetCorrectExtension2); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/conformance/test_messages_proto3.pb.go b/internal/testprotos/conformance/test_messages_proto3.pb.go
index abecb3a..432aacc 100644
--- a/internal/testprotos/conformance/test_messages_proto3.pb.go
+++ b/internal/testprotos/conformance/test_messages_proto3.pb.go
@@ -185,7 +185,9 @@
 // could trigger bugs that occur in any message type in this file.  We verify
 // this stays true in a unit test.
 type TestAllTypesProto3 struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Singular
 	OptionalInt32          int32                             `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`
 	OptionalInt64          int64                             `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64,proto3" json:"optional_int64,omitempty"`
@@ -315,8 +317,6 @@
 	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() {
@@ -1260,9 +1260,9 @@
 
 type ForeignMessage struct {
 	state         protoimpl.MessageState
-	C             int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	C             int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
 }
 
 func (x *ForeignMessage) Reset() {
@@ -1301,10 +1301,10 @@
 
 type TestAllTypesProto3_NestedMessage struct {
 	state         protoimpl.MessageState
-	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
+	A             int32               `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
+	Corecursive   *TestAllTypesProto3 `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
 }
 
 func (x *TestAllTypesProto3_NestedMessage) Reset() {
@@ -2162,9 +2162,9 @@
 			switch v := v.(*TestAllTypesProto3); i {
 			case 0:
 				return &v.state
-			case 114:
+			case 1:
 				return &v.sizeCache
-			case 115:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2174,9 +2174,9 @@
 			switch v := v.(*ForeignMessage); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -2186,9 +2186,9 @@
 			switch v := v.(*TestAllTypesProto3_NestedMessage); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/irregular/test.pb.go b/internal/testprotos/irregular/test.pb.go
index f25f971..25bd9f7 100644
--- a/internal/testprotos/irregular/test.pb.go
+++ b/internal/testprotos/irregular/test.pb.go
@@ -19,15 +19,15 @@
 
 type Message struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
 	OptionalMessage *IrregularMessage            `protobuf:"bytes,1,opt,name=optional_message,json=optionalMessage" json:"optional_message,omitempty"`
 	RepeatedMessage []*IrregularMessage          `protobuf:"bytes,2,rep,name=repeated_message,json=repeatedMessage" json:"repeated_message,omitempty"`
 	RequiredMessage *IrregularMessage            `protobuf:"bytes,3,req,name=required_message,json=requiredMessage" json:"required_message,omitempty"`
 	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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Union isMessage_Union `protobuf_oneof:"union"`
 }
 
 func (x *Message) Reset() {
@@ -200,9 +200,9 @@
 			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/legacy/legacy.pb.go b/internal/testprotos/legacy/legacy.pb.go
index 6530b7b..134c344 100644
--- a/internal/testprotos/legacy/legacy.pb.go
+++ b/internal/testprotos/legacy/legacy.pb.go
@@ -31,6 +31,8 @@
 
 type Legacy struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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"`
@@ -43,8 +45,6 @@
 	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() {
@@ -312,9 +312,9 @@
 			switch v := v.(*Legacy); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/messageset/msetextpb/msetextpb.pb.go b/internal/testprotos/messageset/msetextpb/msetextpb.pb.go
index 0e1d643..716517f 100644
--- a/internal/testprotos/messageset/msetextpb/msetextpb.pb.go
+++ b/internal/testprotos/messageset/msetextpb/msetextpb.pb.go
@@ -21,10 +21,10 @@
 
 type Ext1 struct {
 	state         protoimpl.MessageState
-	Ext1Field1    *int32 `protobuf:"varint,1,opt,name=ext1_field1,json=ext1Field1" json:"ext1_field1,omitempty"`
-	Ext1Field2    *int32 `protobuf:"varint,2,opt,name=ext1_field2,json=ext1Field2" json:"ext1_field2,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Ext1Field1    *int32 `protobuf:"varint,1,opt,name=ext1_field1,json=ext1Field1" json:"ext1_field1,omitempty"`
+	Ext1Field2    *int32 `protobuf:"varint,2,opt,name=ext1_field2,json=ext1Field2" json:"ext1_field2,omitempty"`
 }
 
 func (x *Ext1) Reset() {
@@ -70,9 +70,9 @@
 
 type Ext2 struct {
 	state         protoimpl.MessageState
-	Ext2Field1    *int32 `protobuf:"varint,1,opt,name=ext2_field1,json=ext2Field1" json:"ext2_field1,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Ext2Field1    *int32 `protobuf:"varint,1,opt,name=ext2_field1,json=ext2Field1" json:"ext2_field1,omitempty"`
 }
 
 func (x *Ext2) Reset() {
@@ -213,9 +213,9 @@
 			switch v := v.(*Ext1); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -225,9 +225,9 @@
 			switch v := v.(*Ext2); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go
index a9fddef..139c71e 100644
--- a/internal/testprotos/test/test.pb.go
+++ b/internal/testprotos/test/test.pb.go
@@ -239,6 +239,8 @@
 
 type TestAllTypes struct {
 	state                  protoimpl.MessageState
+	sizeCache              protoimpl.SizeCache
+	unknownFields          protoimpl.UnknownFields
 	OptionalInt32          *int32                                 `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
 	OptionalInt64          *int64                                 `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
 	OptionalUint32         *uint32                                `protobuf:"varint,3,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
@@ -328,9 +330,7 @@
 	//	*TestAllTypes_OneofFloat
 	//	*TestAllTypes_OneofDouble
 	//	*TestAllTypes_OneofEnum
-	OneofField    isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
 }
 
 const Default_TestAllTypes_DefaultInt32 int32 = 81
@@ -1057,12 +1057,12 @@
 // Deprecated: Do not use.
 type TestDeprecatedMessage struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
 	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"`
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
 }
 
 func (x *TestDeprecatedMessage) Reset() {
@@ -1127,10 +1127,10 @@
 
 type ForeignMessage struct {
 	state         protoimpl.MessageState
-	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
+	C             *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+	D             *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"`
 }
 
 func (x *ForeignMessage) Reset() {
@@ -1252,9 +1252,9 @@
 
 type OptionalGroupExtension struct {
 	state         protoimpl.MessageState
-	A             *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	A             *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *OptionalGroupExtension) Reset() {
@@ -1293,9 +1293,9 @@
 
 type RepeatedGroupExtension struct {
 	state         protoimpl.MessageState
-	A             *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	A             *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *RepeatedGroupExtension) Reset() {
@@ -1367,9 +1367,9 @@
 
 type TestRequired struct {
 	state         protoimpl.MessageState
-	RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"`
 }
 
 func (x *TestRequired) Reset() {
@@ -1408,14 +1408,14 @@
 
 type TestRequiredForeign struct {
 	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
 	OptionalMessage *TestRequired           `protobuf:"bytes,1,opt,name=optional_message,json=optionalMessage" json:"optional_message,omitempty"`
 	RepeatedMessage []*TestRequired         `protobuf:"bytes,2,rep,name=repeated_message,json=repeatedMessage" json:"repeated_message,omitempty"`
 	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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	OneofField isTestRequiredForeign_OneofField `protobuf_oneof:"oneof_field"`
 }
 
 func (x *TestRequiredForeign) Reset() {
@@ -1492,10 +1492,10 @@
 
 type TestRequiredGroupFields struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *TestRequiredGroupFields) Reset() {
@@ -1541,11 +1541,11 @@
 
 type TestWeak struct {
 	state                 protoimpl.MessageState
-	XXX_weak_WeakMessage1 struct{} `protobuf:"bytes,1,opt,name=weak_message1,json=weakMessage1,weak=goproto.proto.test.weak.WeakImportMessage1" json:"weak_message1,omitempty"`
-	XXX_weak_WeakMessage2 struct{} `protobuf:"bytes,2,opt,name=weak_message2,json=weakMessage2,weak=goproto.proto.test.weak.WeakImportMessage2" json:"weak_message2,omitempty"`
 	sizeCache             protoimpl.SizeCache
 	XXX_weak              protoimpl.WeakFields `json:"-"`
 	unknownFields         protoimpl.UnknownFields
+	XXX_weak_WeakMessage1 struct{} `protobuf:"bytes,1,opt,name=weak_message1,json=weakMessage1,weak=goproto.proto.test.weak.WeakImportMessage1" json:"weak_message1,omitempty"`
+	XXX_weak_WeakMessage2 struct{} `protobuf:"bytes,2,opt,name=weak_message2,json=weakMessage2,weak=goproto.proto.test.weak.WeakImportMessage2" json:"weak_message2,omitempty"`
 }
 
 func (x *TestWeak) Reset() {
@@ -1623,6 +1623,8 @@
 
 type TestPackedTypes struct {
 	state          protoimpl.MessageState
+	sizeCache      protoimpl.SizeCache
+	unknownFields  protoimpl.UnknownFields
 	PackedInt32    []int32       `protobuf:"varint,90,rep,packed,name=packed_int32,json=packedInt32" json:"packed_int32,omitempty"`
 	PackedInt64    []int64       `protobuf:"varint,91,rep,packed,name=packed_int64,json=packedInt64" json:"packed_int64,omitempty"`
 	PackedUint32   []uint32      `protobuf:"varint,92,rep,packed,name=packed_uint32,json=packedUint32" json:"packed_uint32,omitempty"`
@@ -1637,8 +1639,6 @@
 	PackedDouble   []float64     `protobuf:"fixed64,101,rep,packed,name=packed_double,json=packedDouble" json:"packed_double,omitempty"`
 	PackedBool     []bool        `protobuf:"varint,102,rep,packed,name=packed_bool,json=packedBool" json:"packed_bool,omitempty"`
 	PackedEnum     []ForeignEnum `protobuf:"varint,103,rep,packed,name=packed_enum,json=packedEnum,enum=goproto.proto.test.ForeignEnum" json:"packed_enum,omitempty"`
-	sizeCache      protoimpl.SizeCache
-	unknownFields  protoimpl.UnknownFields
 }
 
 func (x *TestPackedTypes) Reset() {
@@ -1768,6 +1768,8 @@
 
 type TestUnpackedTypes struct {
 	state            protoimpl.MessageState
+	sizeCache        protoimpl.SizeCache
+	unknownFields    protoimpl.UnknownFields
 	UnpackedInt32    []int32       `protobuf:"varint,90,rep,name=unpacked_int32,json=unpackedInt32" json:"unpacked_int32,omitempty"`
 	UnpackedInt64    []int64       `protobuf:"varint,91,rep,name=unpacked_int64,json=unpackedInt64" json:"unpacked_int64,omitempty"`
 	UnpackedUint32   []uint32      `protobuf:"varint,92,rep,name=unpacked_uint32,json=unpackedUint32" json:"unpacked_uint32,omitempty"`
@@ -1782,8 +1784,6 @@
 	UnpackedDouble   []float64     `protobuf:"fixed64,101,rep,name=unpacked_double,json=unpackedDouble" json:"unpacked_double,omitempty"`
 	UnpackedBool     []bool        `protobuf:"varint,102,rep,name=unpacked_bool,json=unpackedBool" json:"unpacked_bool,omitempty"`
 	UnpackedEnum     []ForeignEnum `protobuf:"varint,103,rep,name=unpacked_enum,json=unpackedEnum,enum=goproto.proto.test.ForeignEnum" json:"unpacked_enum,omitempty"`
-	sizeCache        protoimpl.SizeCache
-	unknownFields    protoimpl.UnknownFields
 }
 
 func (x *TestUnpackedTypes) Reset() {
@@ -2066,10 +2066,10 @@
 
 type TestAllTypes_NestedMessage struct {
 	state         protoimpl.MessageState
-	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
+	A             *int32        `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	Corecursive   *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
 }
 
 func (x *TestAllTypes_NestedMessage) Reset() {
@@ -2115,9 +2115,9 @@
 
 type TestAllTypes_OptionalGroup struct {
 	state         protoimpl.MessageState
-	A             *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	A             *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *TestAllTypes_OptionalGroup) Reset() {
@@ -2156,9 +2156,9 @@
 
 type TestAllTypes_RepeatedGroup struct {
 	state         protoimpl.MessageState
-	A             *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	A             *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *TestAllTypes_RepeatedGroup) Reset() {
@@ -2197,9 +2197,9 @@
 
 type TestRequiredGroupFields_OptionalGroup struct {
 	state         protoimpl.MessageState
-	A             *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	A             *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
 }
 
 func (x *TestRequiredGroupFields_OptionalGroup) Reset() {
@@ -2238,9 +2238,9 @@
 
 type TestRequiredGroupFields_RepeatedGroup struct {
 	state         protoimpl.MessageState
-	A             *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	A             *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
 }
 
 func (x *TestRequiredGroupFields_RepeatedGroup) Reset() {
@@ -4615,9 +4615,9 @@
 			switch v := v.(*TestAllTypes); i {
 			case 0:
 				return &v.state
-			case 80:
+			case 1:
 				return &v.sizeCache
-			case 81:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4627,9 +4627,9 @@
 			switch v := v.(*TestDeprecatedMessage); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4639,9 +4639,9 @@
 			switch v := v.(*ForeignMessage); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4677,9 +4677,9 @@
 			switch v := v.(*OptionalGroupExtension); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4689,9 +4689,9 @@
 			switch v := v.(*RepeatedGroupExtension); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4713,9 +4713,9 @@
 			switch v := v.(*TestRequired); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4725,9 +4725,9 @@
 			switch v := v.(*TestRequiredForeign); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4737,9 +4737,9 @@
 			switch v := v.(*TestRequiredGroupFields); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4749,9 +4749,9 @@
 			switch v := v.(*TestWeak); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 3:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4761,9 +4761,9 @@
 			switch v := v.(*TestPackedTypes); i {
 			case 0:
 				return &v.state
-			case 15:
+			case 1:
 				return &v.sizeCache
-			case 16:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4773,9 +4773,9 @@
 			switch v := v.(*TestUnpackedTypes); i {
 			case 0:
 				return &v.state
-			case 15:
+			case 1:
 				return &v.sizeCache
-			case 16:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4837,9 +4837,9 @@
 			switch v := v.(*TestAllTypes_NestedMessage); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4849,9 +4849,9 @@
 			switch v := v.(*TestAllTypes_OptionalGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4861,9 +4861,9 @@
 			switch v := v.(*TestAllTypes_RepeatedGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4873,9 +4873,9 @@
 			switch v := v.(*TestRequiredGroupFields_OptionalGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -4885,9 +4885,9 @@
 			switch v := v.(*TestRequiredGroupFields_RepeatedGroup); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/test/weak1/test_weak.pb.go b/internal/testprotos/test/weak1/test_weak.pb.go
index 89b94c3..5a29b98 100644
--- a/internal/testprotos/test/weak1/test_weak.pb.go
+++ b/internal/testprotos/test/weak1/test_weak.pb.go
@@ -19,9 +19,9 @@
 
 type WeakImportMessage1 struct {
 	state         protoimpl.MessageState
-	A             *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	A             *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *WeakImportMessage1) Reset() {
@@ -107,9 +107,9 @@
 			switch v := v.(*WeakImportMessage1); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/test/weak2/test_weak.pb.go b/internal/testprotos/test/weak2/test_weak.pb.go
index 4b68a3a..b24dba8 100644
--- a/internal/testprotos/test/weak2/test_weak.pb.go
+++ b/internal/testprotos/test/weak2/test_weak.pb.go
@@ -19,9 +19,9 @@
 
 type WeakImportMessage2 struct {
 	state         protoimpl.MessageState
-	A             *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	A             *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *WeakImportMessage2) Reset() {
@@ -107,9 +107,9 @@
 			switch v := v.(*WeakImportMessage2); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/internal/testprotos/test3/test.pb.go b/internal/testprotos/test3/test.pb.go
index cdcdd35..c87fa9e 100644
--- a/internal/testprotos/test3/test.pb.go
+++ b/internal/testprotos/test3/test.pb.go
@@ -120,6 +120,8 @@
 
 type TestAllTypes struct {
 	state                  protoimpl.MessageState
+	sizeCache              protoimpl.SizeCache
+	unknownFields          protoimpl.UnknownFields
 	OptionalInt32          int32                                  `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`
 	OptionalInt64          int64                                  `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64,proto3" json:"optional_int64,omitempty"`
 	OptionalUint32         uint32                                 `protobuf:"varint,3,opt,name=optional_uint32,json=optionalUint32,proto3" json:"optional_uint32,omitempty"`
@@ -189,9 +191,7 @@
 	//	*TestAllTypes_OneofFloat
 	//	*TestAllTypes_OneofDouble
 	//	*TestAllTypes_OneofEnum
-	OneofField    isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
 }
 
 func (x *TestAllTypes) Reset() {
@@ -764,10 +764,10 @@
 
 type ForeignMessage struct {
 	state         protoimpl.MessageState
-	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
+	C             int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
+	D             int32 `protobuf:"varint,2,opt,name=d,proto3" json:"d,omitempty"`
 }
 
 func (x *ForeignMessage) Reset() {
@@ -813,10 +813,10 @@
 
 type TestAllTypes_NestedMessage struct {
 	state         protoimpl.MessageState
-	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
+	A             int32         `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
+	Corecursive   *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
 }
 
 func (x *TestAllTypes_NestedMessage) Reset() {
@@ -1347,9 +1347,9 @@
 			switch v := v.(*TestAllTypes); i {
 			case 0:
 				return &v.state
-			case 61:
+			case 1:
 				return &v.sizeCache
-			case 62:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1359,9 +1359,9 @@
 			switch v := v.(*ForeignMessage); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -1371,9 +1371,9 @@
 			switch v := v.(*TestAllTypes_NestedMessage); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/reflect/protoregistry/testprotos/test.pb.go b/reflect/protoregistry/testprotos/test.pb.go
index 0e4c563..b4f1431 100644
--- a/reflect/protoregistry/testprotos/test.pb.go
+++ b/reflect/protoregistry/testprotos/test.pb.go
@@ -283,9 +283,9 @@
 
 type Message4 struct {
 	state         protoimpl.MessageState
-	BoolField     *bool `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	BoolField     *bool `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"`
 }
 
 func (x *Message4) Reset() {
@@ -526,9 +526,9 @@
 			switch v := v.(*Message4); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/descriptorpb/descriptor.pb.go b/types/descriptorpb/descriptor.pb.go
index 418ca0f..3443d94 100644
--- a/types/descriptorpb/descriptor.pb.go
+++ b/types/descriptorpb/descriptor.pb.go
@@ -431,9 +431,9 @@
 // files it parses.
 type FileDescriptorSet struct {
 	state         protoimpl.MessageState
-	File          []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	File          []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
 }
 
 func (x *FileDescriptorSet) Reset() {
@@ -472,9 +472,11 @@
 
 // Describes a complete .proto file.
 type FileDescriptorProto struct {
-	state   protoimpl.MessageState
-	Name    *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Package *string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+	Name          *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Package       *string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"`
 	// Names of files imported by this file.
 	Dependency []string `protobuf:"bytes,3,rep,name=dependency" json:"dependency,omitempty"`
 	// Indexes of the public imported files in the dependency list above.
@@ -495,9 +497,7 @@
 	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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Syntax *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
 }
 
 func (x *FileDescriptorProto) Reset() {
@@ -614,6 +614,8 @@
 // Describes a message type.
 type DescriptorProto struct {
 	state          protoimpl.MessageState
+	sizeCache      protoimpl.SizeCache
+	unknownFields  protoimpl.UnknownFields
 	Name           *string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	Field          []*FieldDescriptorProto           `protobuf:"bytes,2,rep,name=field" json:"field,omitempty"`
 	Extension      []*FieldDescriptorProto           `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
@@ -625,9 +627,7 @@
 	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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	ReservedName []string `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
 }
 
 func (x *DescriptorProto) Reset() {
@@ -728,12 +728,12 @@
 }
 
 type ExtensionRangeOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// 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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 func (x *ExtensionRangeOptions) Reset() {
@@ -781,10 +781,12 @@
 
 // Describes a field within a message.
 type FieldDescriptorProto struct {
-	state  protoimpl.MessageState
-	Name   *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number *int32                      `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
-	Label  *FieldDescriptorProto_Label `protobuf:"varint,4,opt,name=label,enum=google.protobuf.FieldDescriptorProto_Label" json:"label,omitempty"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+	Name          *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number        *int32                      `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
+	Label         *FieldDescriptorProto_Label `protobuf:"varint,4,opt,name=label,enum=google.protobuf.FieldDescriptorProto_Label" json:"label,omitempty"`
 	// If type_name is set, this need not be set.  If both this and type_name
 	// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
 	Type *FieldDescriptorProto_Type `protobuf:"varint,5,opt,name=type,enum=google.protobuf.FieldDescriptorProto_Type" json:"type,omitempty"`
@@ -810,10 +812,8 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	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"`
 }
 
 func (x *FieldDescriptorProto) Reset() {
@@ -916,10 +916,10 @@
 // Describes a oneof.
 type OneofDescriptorProto struct {
 	state         protoimpl.MessageState
-	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
+	Name          *string       `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Options       *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
 }
 
 func (x *OneofDescriptorProto) Reset() {
@@ -965,19 +965,19 @@
 
 // Describes an enum type.
 type EnumDescriptorProto struct {
-	state   protoimpl.MessageState
-	Name    *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Value   []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
-	Options *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+	Name          *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Value         []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
+	Options       *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
 	// Range of reserved numeric values. Reserved numeric values may not be used
 	// by enum values in the same enum declaration. Reserved ranges may not
 	// overlap.
 	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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	ReservedName []string `protobuf:"bytes,5,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
 }
 
 func (x *EnumDescriptorProto) Reset() {
@@ -1045,11 +1045,11 @@
 // Describes a value within an enum.
 type EnumValueDescriptorProto struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1103,11 +1103,11 @@
 // Describes a service.
 type ServiceDescriptorProto struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -1160,8 +1160,10 @@
 
 // Describes a method of a service.
 type MethodDescriptorProto struct {
-	state protoimpl.MessageState
-	Name  *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+	Name          *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	// Input and output type names.  These are resolved in the same way as
 	// FieldDescriptorProto.type_name, but must refer to a message type.
 	InputType  *string        `protobuf:"bytes,2,opt,name=input_type,json=inputType" json:"input_type,omitempty"`
@@ -1171,8 +1173,6 @@
 	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"`
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
 }
 
 const Default_MethodDescriptorProto_ClientStreaming bool = false
@@ -1248,7 +1248,10 @@
 }
 
 type FileOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// Sets the Java package where classes generated from this .proto will be
 	// placed.  By default, the proto package is used, but this is often
 	// inappropriate because proto packages do not normally start with backwards
@@ -1333,9 +1336,6 @@
 	// 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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 const Default_FileOptions_JavaMultipleFiles bool = false
@@ -1533,7 +1533,10 @@
 }
 
 type MessageOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// Set true to use the old proto1 MessageSet wire format for extensions.
 	// This is provided for backwards-compatibility with the MessageSet wire
 	// format.  You should not use this for any other reason:  It's less
@@ -1586,9 +1589,6 @@
 	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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 const Default_MessageOptions_MessageSetWireFormat bool = false
@@ -1667,7 +1667,10 @@
 }
 
 type FieldOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// The ctype option instructs the C++ code generator to use a different
 	// representation of the field than it normally would.  See the specific
 	// options below.  This option is not yet implemented in the open source
@@ -1729,9 +1732,6 @@
 	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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 const Default_FieldOptions_Ctype FieldOptions_CType = FieldOptions_STRING
@@ -1826,12 +1826,12 @@
 }
 
 type OneofOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// 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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 func (x *OneofOptions) Reset() {
@@ -1878,7 +1878,10 @@
 }
 
 type EnumOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// Set this option to true to allow mapping different tag names to the same
 	// value.
 	AllowAlias *bool `protobuf:"varint,2,opt,name=allow_alias,json=allowAlias" json:"allow_alias,omitempty"`
@@ -1889,9 +1892,6 @@
 	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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 const Default_EnumOptions_Deprecated bool = false
@@ -1954,7 +1954,10 @@
 }
 
 type EnumValueOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// Is this enum value deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the enum value, or it will be completely ignored; in the very least,
@@ -1962,9 +1965,6 @@
 	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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 const Default_EnumValueOptions_Deprecated bool = false
@@ -2020,7 +2020,10 @@
 }
 
 type ServiceOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// Is this service deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the service, or it will be completely ignored; in the very least,
@@ -2028,9 +2031,6 @@
 	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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 const Default_ServiceOptions_Deprecated bool = false
@@ -2086,7 +2086,10 @@
 }
 
 type MethodOptions struct {
-	state protoimpl.MessageState
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
 	// Is this method deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the method, or it will be completely ignored; in the very least,
@@ -2095,9 +2098,6 @@
 	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"`
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
-	extensionFields     protoimpl.ExtensionFields
 }
 
 const Default_MethodOptions_Deprecated bool = false
@@ -2167,8 +2167,10 @@
 // or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
 // in them.
 type UninterpretedOption struct {
-	state protoimpl.MessageState
-	Name  []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+	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"`
@@ -2177,8 +2179,6 @@
 	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() {
@@ -2260,7 +2260,9 @@
 // Encapsulates information about the original source file from which a
 // FileDescriptorProto was generated.
 type SourceCodeInfo struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// A Location identifies a piece of source code in a .proto file which
 	// corresponds to a particular definition.  This information is intended
 	// to be useful to IDEs, code indexers, documentation generators, and similar
@@ -2304,9 +2306,7 @@
 	// - 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Location []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
 }
 
 func (x *SourceCodeInfo) Reset() {
@@ -2347,12 +2347,12 @@
 // file. A GeneratedCodeInfo message is associated with only one generated
 // source file, but may contain references to different source .proto files.
 type GeneratedCodeInfo struct {
-	state protoimpl.MessageState
-	// 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"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// 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"`
 }
 
 func (x *GeneratedCodeInfo) Reset() {
@@ -2391,11 +2391,11 @@
 
 type DescriptorProto_ExtensionRange struct {
 	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	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() {
@@ -2451,10 +2451,10 @@
 // not overlap.
 type DescriptorProto_ReservedRange struct {
 	state         protoimpl.MessageState
-	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
+	Start         *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End           *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
 }
 
 func (x *DescriptorProto_ReservedRange) Reset() {
@@ -2506,10 +2506,10 @@
 // domain.
 type EnumDescriptorProto_EnumReservedRange struct {
 	state         protoimpl.MessageState
-	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
+	Start         *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End           *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
 }
 
 func (x *EnumDescriptorProto_EnumReservedRange) Reset() {
@@ -2560,10 +2560,10 @@
 // "foo.(bar.baz).qux".
 type UninterpretedOption_NamePart struct {
 	state         protoimpl.MessageState
-	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
+	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"`
 }
 
 func (x *UninterpretedOption_NamePart) Reset() {
@@ -2608,7 +2608,9 @@
 }
 
 type SourceCodeInfo_Location struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Identifies which part of the FileDescriptorProto was defined at this
 	// location.
 	//
@@ -2689,8 +2691,6 @@
 	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() {
@@ -2756,7 +2756,9 @@
 }
 
 type GeneratedCodeInfo_Annotation struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Identifies the element in the original source .proto file. This field
 	// is formatted the same as SourceCodeInfo.Location.path.
 	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`
@@ -2768,9 +2770,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	End *int32 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
 }
 
 func (x *GeneratedCodeInfo_Annotation) Reset() {
@@ -3416,9 +3416,9 @@
 			switch v := v.(*FileDescriptorSet); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3428,9 +3428,9 @@
 			switch v := v.(*FileDescriptorProto); i {
 			case 0:
 				return &v.state
-			case 13:
+			case 1:
 				return &v.sizeCache
-			case 14:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3440,9 +3440,9 @@
 			switch v := v.(*DescriptorProto); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3452,11 +3452,11 @@
 			switch v := v.(*ExtensionRangeOptions); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
-			case 4:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3466,9 +3466,9 @@
 			switch v := v.(*FieldDescriptorProto); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3478,9 +3478,9 @@
 			switch v := v.(*OneofDescriptorProto); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3490,9 +3490,9 @@
 			switch v := v.(*EnumDescriptorProto); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3502,9 +3502,9 @@
 			switch v := v.(*EnumValueDescriptorProto); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3514,9 +3514,9 @@
 			switch v := v.(*ServiceDescriptorProto); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3526,9 +3526,9 @@
 			switch v := v.(*MethodDescriptorProto); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3538,11 +3538,11 @@
 			switch v := v.(*FileOptions); i {
 			case 0:
 				return &v.state
-			case 22:
+			case 1:
 				return &v.sizeCache
-			case 23:
+			case 2:
 				return &v.unknownFields
-			case 24:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3552,11 +3552,11 @@
 			switch v := v.(*MessageOptions); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
-			case 8:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3566,11 +3566,11 @@
 			switch v := v.(*FieldOptions); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
-			case 10:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3580,11 +3580,11 @@
 			switch v := v.(*OneofOptions); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
-			case 4:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3594,11 +3594,11 @@
 			switch v := v.(*EnumOptions); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
-			case 6:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3608,11 +3608,11 @@
 			switch v := v.(*EnumValueOptions); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
-			case 5:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3622,11 +3622,11 @@
 			switch v := v.(*ServiceOptions); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
-			case 5:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3636,11 +3636,11 @@
 			switch v := v.(*MethodOptions); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
-			case 6:
+			case 3:
 				return &v.extensionFields
 			default:
 				return nil
@@ -3650,9 +3650,9 @@
 			switch v := v.(*UninterpretedOption); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3662,9 +3662,9 @@
 			switch v := v.(*SourceCodeInfo); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3674,9 +3674,9 @@
 			switch v := v.(*GeneratedCodeInfo); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3686,9 +3686,9 @@
 			switch v := v.(*DescriptorProto_ExtensionRange); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3698,9 +3698,9 @@
 			switch v := v.(*DescriptorProto_ReservedRange); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3710,9 +3710,9 @@
 			switch v := v.(*EnumDescriptorProto_EnumReservedRange); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3722,9 +3722,9 @@
 			switch v := v.(*UninterpretedOption_NamePart); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3734,9 +3734,9 @@
 			switch v := v.(*SourceCodeInfo_Location); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -3746,9 +3746,9 @@
 			switch v := v.(*GeneratedCodeInfo_Annotation); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/anypb/any.pb.go b/types/known/anypb/any.pb.go
index 99915bd..30a135d 100644
--- a/types/known/anypb/any.pb.go
+++ b/types/known/anypb/any.pb.go
@@ -98,7 +98,9 @@
 //     }
 //
 type Any struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// A URL/resource name that uniquely identifies the type of the serialized
 	// protocol buffer message. This string must contain at least
 	// one "/" character. The last segment of the URL's path must represent
@@ -129,9 +131,7 @@
 	//
 	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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *Any) Reset() {
@@ -229,9 +229,9 @@
 			switch v := v.(*Any); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/apipb/api.pb.go b/types/known/apipb/api.pb.go
index 54398fd..b980413 100644
--- a/types/known/apipb/api.pb.go
+++ b/types/known/apipb/api.pb.go
@@ -29,7 +29,9 @@
 // this message itself. See https://cloud.google.com/apis/design/glossary for
 // detailed terminology.
 type Api struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The fully qualified name of this interface, including package name
 	// followed by the interface's simple name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
@@ -65,9 +67,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Syntax typepb.Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
 }
 
 func (x *Api) Reset() {
@@ -148,7 +148,9 @@
 
 // Method represents a method of an API interface.
 type Method struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The simple name of this method.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A URL of the input message type.
@@ -162,9 +164,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Syntax typepb.Syntax `protobuf:"varint,7,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
 }
 
 func (x *Method) Reset() {
@@ -322,14 +322,14 @@
 //       ...
 //     }
 type Mixin struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The fully qualified name of the interface which is included.
 	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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Root string `protobuf:"bytes,2,opt,name=root,proto3" json:"root,omitempty"`
 }
 
 func (x *Mixin) Reset() {
@@ -482,9 +482,9 @@
 			switch v := v.(*Api); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -494,9 +494,9 @@
 			switch v := v.(*Method); i {
 			case 0:
 				return &v.state
-			case 8:
+			case 1:
 				return &v.sizeCache
-			case 9:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -506,9 +506,9 @@
 			switch v := v.(*Mixin); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/durationpb/duration.pb.go b/types/known/durationpb/duration.pb.go
index df68129..d445bfb 100644
--- a/types/known/durationpb/duration.pb.go
+++ b/types/known/durationpb/duration.pb.go
@@ -78,7 +78,9 @@
 //
 //
 type Duration struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Signed seconds of the span of time. Must be from -315,576,000,000
 	// to +315,576,000,000 inclusive. Note: these bounds are computed from:
 	// 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
@@ -89,9 +91,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Nanos int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"`
 }
 
 func (x *Duration) Reset() {
@@ -190,9 +190,9 @@
 			switch v := v.(*Duration); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/fieldmaskpb/field_mask.pb.go b/types/known/fieldmaskpb/field_mask.pb.go
index 22619d2..0c58668 100644
--- a/types/known/fieldmaskpb/field_mask.pb.go
+++ b/types/known/fieldmaskpb/field_mask.pb.go
@@ -217,11 +217,11 @@
 // request should verify the included field paths, and return an
 // `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
 type FieldMask struct {
-	state protoimpl.MessageState
-	// The set of field mask paths.
-	Paths         []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The set of field mask paths.
+	Paths []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
 }
 
 func (x *FieldMask) Reset() {
@@ -312,9 +312,9 @@
 			switch v := v.(*FieldMask); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/sourcecontextpb/source_context.pb.go b/types/known/sourcecontextpb/source_context.pb.go
index e721a85..4b09d82 100644
--- a/types/known/sourcecontextpb/source_context.pb.go
+++ b/types/known/sourcecontextpb/source_context.pb.go
@@ -20,12 +20,12 @@
 // `SourceContext` represents information about the source of a
 // protobuf element, like the file in which it is defined.
 type SourceContext struct {
-	state protoimpl.MessageState
-	// 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"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// 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"`
 }
 
 func (x *SourceContext) Reset() {
@@ -117,9 +117,9 @@
 			switch v := v.(*SourceContext); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/structpb/struct.pb.go b/types/known/structpb/struct.pb.go
index 4ebd8db..9df5028 100644
--- a/types/known/structpb/struct.pb.go
+++ b/types/known/structpb/struct.pb.go
@@ -73,11 +73,11 @@
 //
 // The JSON representation for `Struct` is JSON object.
 type Struct struct {
-	state protoimpl.MessageState
-	// 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"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// 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"`
 }
 
 func (x *Struct) Reset() {
@@ -121,7 +121,9 @@
 //
 // The JSON representation for `Value` is JSON value.
 type Value struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The kind of value.
 	//
 	// Types that are valid to be assigned to Kind:
@@ -137,9 +139,7 @@
 	//	*Value_StructValue
 	// Represents a repeated `Value`.
 	//	*Value_ListValue
-	Kind          isValue_Kind `protobuf_oneof:"kind"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Kind isValue_Kind `protobuf_oneof:"kind"`
 }
 
 func (x *Value) Reset() {
@@ -262,11 +262,11 @@
 //
 // The JSON representation for `ListValue` is JSON array.
 type ListValue struct {
-	state protoimpl.MessageState
-	// Repeated field of dynamically typed values.
-	Values        []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// Repeated field of dynamically typed values.
+	Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
 }
 
 func (x *ListValue) Reset() {
@@ -400,9 +400,9 @@
 			switch v := v.(*Struct); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -412,9 +412,9 @@
 			switch v := v.(*Value); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -424,9 +424,9 @@
 			switch v := v.(*ListValue); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/timestamppb/timestamp.pb.go b/types/known/timestamppb/timestamp.pb.go
index 5dd0a02..0a11617 100644
--- a/types/known/timestamppb/timestamp.pb.go
+++ b/types/known/timestamppb/timestamp.pb.go
@@ -100,7 +100,9 @@
 //
 //
 type Timestamp struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Represents seconds of UTC time since Unix epoch
 	// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
 	// 9999-12-31T23:59:59Z inclusive.
@@ -109,9 +111,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Nanos int32 `protobuf:"varint,2,opt,name=nanos,proto3" json:"nanos,omitempty"`
 }
 
 func (x *Timestamp) Reset() {
@@ -210,9 +210,9 @@
 			switch v := v.(*Timestamp); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/typepb/type.pb.go b/types/known/typepb/type.pb.go
index 37985d0..7f69953 100644
--- a/types/known/typepb/type.pb.go
+++ b/types/known/typepb/type.pb.go
@@ -239,7 +239,9 @@
 
 // A protocol buffer message type.
 type Type struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The fully qualified message name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The list of fields.
@@ -251,9 +253,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Syntax Syntax `protobuf:"varint,6,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
 }
 
 func (x *Type) Reset() {
@@ -327,7 +327,9 @@
 
 // A single field of a message type.
 type Field struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The field type.
 	Kind Field_Kind `protobuf:"varint,1,opt,name=kind,proto3,enum=google.protobuf.Field_Kind" json:"kind,omitempty"`
 	// The field cardinality.
@@ -349,9 +351,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	DefaultValue string `protobuf:"bytes,11,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
 }
 
 func (x *Field) Reset() {
@@ -453,7 +453,9 @@
 
 // Enum type definition.
 type Enum struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Enum type name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Enum value definitions.
@@ -463,9 +465,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Syntax Syntax `protobuf:"varint,5,opt,name=syntax,proto3,enum=google.protobuf.Syntax" json:"syntax,omitempty"`
 }
 
 func (x *Enum) Reset() {
@@ -532,15 +532,15 @@
 
 // Enum value definition.
 type EnumValue struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Enum value name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Options []*Option `protobuf:"bytes,3,rep,name=options,proto3" json:"options,omitempty"`
 }
 
 func (x *EnumValue) Reset() {
@@ -594,7 +594,9 @@
 // A protocol buffer option, which can be attached to a message, field,
 // enumeration, etc.
 type Option struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The option's name. For protobuf built-in options (options defined in
 	// descriptor.proto), this is the short name. For example, `"map_entry"`.
 	// For custom options, it should be the fully-qualified name. For example,
@@ -604,9 +606,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Value *anypb.Any `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *Option) Reset() {
@@ -827,9 +827,9 @@
 			switch v := v.(*Type); i {
 			case 0:
 				return &v.state
-			case 7:
+			case 1:
 				return &v.sizeCache
-			case 8:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -839,9 +839,9 @@
 			switch v := v.(*Field); i {
 			case 0:
 				return &v.state
-			case 11:
+			case 1:
 				return &v.sizeCache
-			case 12:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -851,9 +851,9 @@
 			switch v := v.(*Enum); i {
 			case 0:
 				return &v.state
-			case 6:
+			case 1:
 				return &v.sizeCache
-			case 7:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -863,9 +863,9 @@
 			switch v := v.(*EnumValue); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -875,9 +875,9 @@
 			switch v := v.(*Option); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/known/wrapperspb/wrappers.pb.go b/types/known/wrapperspb/wrappers.pb.go
index f98053a..6f27026 100644
--- a/types/known/wrapperspb/wrappers.pb.go
+++ b/types/known/wrapperspb/wrappers.pb.go
@@ -21,11 +21,11 @@
 //
 // The JSON representation for `DoubleValue` is JSON number.
 type DoubleValue struct {
-	state protoimpl.MessageState
-	// The double value.
-	Value         float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The double value.
+	Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *DoubleValue) Reset() {
@@ -66,11 +66,11 @@
 //
 // The JSON representation for `FloatValue` is JSON number.
 type FloatValue struct {
-	state protoimpl.MessageState
-	// The float value.
-	Value         float32 `protobuf:"fixed32,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The float value.
+	Value float32 `protobuf:"fixed32,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *FloatValue) Reset() {
@@ -111,11 +111,11 @@
 //
 // The JSON representation for `Int64Value` is JSON string.
 type Int64Value struct {
-	state protoimpl.MessageState
-	// The int64 value.
-	Value         int64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The int64 value.
+	Value int64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *Int64Value) Reset() {
@@ -156,11 +156,11 @@
 //
 // The JSON representation for `UInt64Value` is JSON string.
 type UInt64Value struct {
-	state protoimpl.MessageState
-	// The uint64 value.
-	Value         uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The uint64 value.
+	Value uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *UInt64Value) Reset() {
@@ -201,11 +201,11 @@
 //
 // The JSON representation for `Int32Value` is JSON number.
 type Int32Value struct {
-	state protoimpl.MessageState
-	// The int32 value.
-	Value         int32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The int32 value.
+	Value int32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *Int32Value) Reset() {
@@ -246,11 +246,11 @@
 //
 // The JSON representation for `UInt32Value` is JSON number.
 type UInt32Value struct {
-	state protoimpl.MessageState
-	// The uint32 value.
-	Value         uint32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The uint32 value.
+	Value uint32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *UInt32Value) Reset() {
@@ -291,11 +291,11 @@
 //
 // The JSON representation for `BoolValue` is JSON `true` and `false`.
 type BoolValue struct {
-	state protoimpl.MessageState
-	// The bool value.
-	Value         bool `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The bool value.
+	Value bool `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *BoolValue) Reset() {
@@ -336,11 +336,11 @@
 //
 // The JSON representation for `StringValue` is JSON string.
 type StringValue struct {
-	state protoimpl.MessageState
-	// The string value.
-	Value         string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The string value.
+	Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *StringValue) Reset() {
@@ -381,11 +381,11 @@
 //
 // The JSON representation for `BytesValue` is JSON string.
 type BytesValue struct {
-	state protoimpl.MessageState
-	// The bytes value.
-	Value         []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	// The bytes value.
+	Value []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *BytesValue) Reset() {
@@ -502,9 +502,9 @@
 			switch v := v.(*DoubleValue); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -514,9 +514,9 @@
 			switch v := v.(*FloatValue); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -526,9 +526,9 @@
 			switch v := v.(*Int64Value); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -538,9 +538,9 @@
 			switch v := v.(*UInt64Value); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -550,9 +550,9 @@
 			switch v := v.(*Int32Value); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -562,9 +562,9 @@
 			switch v := v.(*UInt32Value); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -574,9 +574,9 @@
 			switch v := v.(*BoolValue); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -586,9 +586,9 @@
 			switch v := v.(*StringValue); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -598,9 +598,9 @@
 			switch v := v.(*BytesValue); i {
 			case 0:
 				return &v.state
-			case 2:
+			case 1:
 				return &v.sizeCache
-			case 3:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
diff --git a/types/pluginpb/plugin.pb.go b/types/pluginpb/plugin.pb.go
index 3b5cf69..c769e8a 100644
--- a/types/pluginpb/plugin.pb.go
+++ b/types/pluginpb/plugin.pb.go
@@ -20,15 +20,15 @@
 
 // The version number of protocol compiler.
 type Version struct {
-	state protoimpl.MessageState
-	Major *int32 `protobuf:"varint,1,opt,name=major" json:"major,omitempty"`
-	Minor *int32 `protobuf:"varint,2,opt,name=minor" json:"minor,omitempty"`
-	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"`
+	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+	Major         *int32 `protobuf:"varint,1,opt,name=major" json:"major,omitempty"`
+	Minor         *int32 `protobuf:"varint,2,opt,name=minor" json:"minor,omitempty"`
+	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"`
 }
 
 func (x *Version) Reset() {
@@ -88,7 +88,9 @@
 
 // An encoded CodeGeneratorRequest is written to the plugin's stdin.
 type CodeGeneratorRequest struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The .proto files that were explicitly listed on the command-line.  The
 	// code generator should generate code only for these files.  Each file's
 	// descriptor will be included in proto_file, below.
@@ -112,8 +114,6 @@
 	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"`
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
 }
 
 func (x *CodeGeneratorRequest) Reset() {
@@ -173,7 +173,9 @@
 
 // The plugin writes an encoded CodeGeneratorResponse to stdout.
 type CodeGeneratorResponse struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// Error message.  If non-empty, code generation failed.  The plugin process
 	// should exit with status code zero even if it reports an error in this way.
 	//
@@ -182,10 +184,8 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Error *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	File  []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
 }
 
 func (x *CodeGeneratorResponse) Reset() {
@@ -231,7 +231,9 @@
 
 // Represents a single generated file.
 type CodeGeneratorResponse_File struct {
-	state protoimpl.MessageState
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 	// The file name, relative to the output directory.  The name must not
 	// contain "." or ".." components and must be relative, not be absolute (so,
 	// the file cannot lie outside the output directory).  "/" must be used as
@@ -283,9 +285,7 @@
 	// 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"`
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
+	Content *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
 }
 
 func (x *CodeGeneratorResponse_File) Reset() {
@@ -429,9 +429,9 @@
 			switch v := v.(*Version); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -441,9 +441,9 @@
 			switch v := v.(*CodeGeneratorRequest); i {
 			case 0:
 				return &v.state
-			case 5:
+			case 1:
 				return &v.sizeCache
-			case 6:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -453,9 +453,9 @@
 			switch v := v.(*CodeGeneratorResponse); i {
 			case 0:
 				return &v.state
-			case 3:
+			case 1:
 				return &v.sizeCache
-			case 4:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil
@@ -465,9 +465,9 @@
 			switch v := v.(*CodeGeneratorResponse_File); i {
 			case 0:
 				return &v.state
-			case 4:
+			case 1:
 				return &v.sizeCache
-			case 5:
+			case 2:
 				return &v.unknownFields
 			default:
 				return nil