diff --git a/Makefile b/Makefile
index a309619..bcbc328 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ all:
 
 regenerate:
 	(cd simple && protoc-min-version --version="3.0.0" --gogo_out=plugins=grpc:. --proto_path=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf/ grpc.proto)
-	(cd bench && protoc-gen-combo --version="3.0.0" --proto_path=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf/ --plugins=grpc bench.proto)
+	(cd bench && protoc-gen-combo --version="3.0.0" --proto_path=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf/ --gogo_out=plugins=grpc:. bench.proto)
 	(cd gofast && protoc --gofast_out=plugins=grpc:. gofast.proto)
 
 test:
diff --git a/bench/combos/both/bench.pb.go b/bench/combos/both/bench.pb.go
index 8b70de9..96dbb67 100644
--- a/bench/combos/both/bench.pb.go
+++ b/bench/combos/both/bench.pb.go
@@ -43,7 +43,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Request struct {
 	Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
@@ -612,11 +614,12 @@ func valueToGoStringBench(v interface{}, typ string) string {
 	pv := reflect.Indirect(rv).Interface()
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
 }
-func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
+func extensionToGoStringBench(m github_com_gogo_protobuf_proto.Message) string {
+	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
 	if e == nil {
 		return "nil"
 	}
-	s := "map[int32]proto.Extension{"
+	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
 	keys := make([]int, 0, len(e))
 	for k := range e {
 		keys = append(keys, int(k))
@@ -626,7 +629,7 @@ func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extensi
 	for _, k := range keys {
 		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
 	}
-	s += strings.Join(ss, ",") + "}"
+	s += strings.Join(ss, ",") + "})"
 	return s
 }
 
@@ -636,7 +639,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for Bencher service
 
@@ -846,6 +849,7 @@ var _Bencher_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorBench,
 }
 
 func (m *Request) Marshal() (data []byte, err error) {
@@ -2372,35 +2376,38 @@ var (
 	ErrIntOverflowBench   = fmt.Errorf("proto: integer overflow")
 )
 
+func init() { proto.RegisterFile("combos/both/bench.proto", fileDescriptorBench) }
+
 var fileDescriptorBench = []byte{
-	// 451 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0xbb, 0x76, 0x6d, 0x37, 0x1b, 0xa7, 0x2d, 0x7b, 0x80, 0x51, 0x91, 0x2c, 0x64, 0xb5,
-	0x12, 0x1c, 0x1a, 0xff, 0x6f, 0xd3, 0x6b, 0x0e, 0xdc, 0xe0, 0xe0, 0x3c, 0x41, 0xdd, 0x3a, 0x8e,
-	0xa5, 0xb8, 0x86, 0xd4, 0xbe, 0xf3, 0x10, 0xbc, 0x03, 0x3c, 0x0a, 0x47, 0x1e, 0xa1, 0x94, 0x17,
-	0xe0, 0x98, 0x03, 0x07, 0x86, 0xf5, 0x7a, 0x8d, 0x85, 0x2c, 0x05, 0x89, 0xc3, 0x48, 0x9e, 0xdf,
-	0x37, 0xf6, 0x8c, 0xbf, 0xd9, 0xa5, 0xcf, 0x6e, 0xca, 0x22, 0x29, 0xef, 0x9d, 0xa4, 0xac, 0x56,
-	0x4e, 0x92, 0xde, 0xdd, 0xac, 0xa6, 0xef, 0x36, 0x65, 0x55, 0x32, 0x8d, 0x27, 0x27, 0xe7, 0x59,
-	0x5e, 0xad, 0xea, 0x64, 0x8a, 0x65, 0x4e, 0x56, 0x66, 0xa5, 0xc3, 0xd5, 0xa4, 0x5e, 0xf2, 0x8c,
-	0x27, 0xfc, 0xa9, 0x79, 0xcb, 0x7e, 0x4e, 0x8d, 0x38, 0x7d, 0x5f, 0xa7, 0xf7, 0x15, 0x3b, 0xa6,
-	0xea, 0xdb, 0xba, 0x00, 0xf2, 0x82, 0xbc, 0x54, 0x63, 0xf5, 0xae, 0x2e, 0xec, 0x05, 0xd5, 0x16,
-	0xc5, 0xf5, 0x7a, 0xcd, 0x9e, 0x52, 0xfd, 0x75, 0x9e, 0xae, 0x6f, 0x03, 0x50, 0x51, 0xd5, 0x62,
-	0x7d, 0xc9, 0x33, 0x06, 0xd4, 0xe0, 0xdc, 0xf3, 0x60, 0x8c, 0x82, 0x1e, 0x1b, 0xcb, 0x26, 0xed,
-	0x94, 0x10, 0x0e, 0x51, 0x19, 0xb5, 0x4a, 0x68, 0xff, 0x54, 0xa8, 0xfe, 0x26, 0xbd, 0xcd, 0xeb,
-	0x42, 0x7e, 0xd6, 0xe3, 0x4d, 0x89, 0xf8, 0xac, 0x27, 0xb9, 0x0f, 0x0a, 0x72, 0x45, 0x70, 0x7f,
-	0x70, 0x8c, 0x96, 0x87, 0xb0, 0xcf, 0x87, 0x6f, 0x78, 0x28, 0x79, 0x04, 0x1a, 0xf2, 0x89, 0xe0,
-	0x91, 0xe4, 0x17, 0xa0, 0x23, 0xdf, 0x17, 0xfc, 0x42, 0xf2, 0x4b, 0x30, 0x90, 0x3f, 0x11, 0xfc,
-	0x52, 0xf2, 0x19, 0x1c, 0x20, 0x67, 0x82, 0xcf, 0x24, 0xbf, 0x82, 0x11, 0x72, 0x43, 0xf0, 0xab,
-	0xee, 0xe7, 0x5d, 0xa0, 0x28, 0x1c, 0xb5, 0x3f, 0xef, 0xee, 0x62, 0x98, 0x0f, 0x26, 0x2a, 0xc7,
-	0xad, 0xe2, 0x77, 0x4a, 0x00, 0x13, 0x54, 0x0e, 0x5a, 0x25, 0x18, 0x36, 0xb9, 0x53, 0x22, 0x38,
-	0x42, 0xc5, 0x6c, 0x95, 0xc8, 0xfe, 0xa4, 0x50, 0x75, 0x9e, 0x67, 0xff, 0xec, 0xfd, 0x59, 0xcf,
-	0xfb, 0xb1, 0x3f, 0x99, 0x36, 0x87, 0xaf, 0x59, 0xa5, 0x5c, 0xc5, 0xe9, 0x1f, 0xab, 0x50, 0xb1,
-	0xcc, 0x14, 0x65, 0xfc, 0x1c, 0xfd, 0xb5, 0x98, 0x5d, 0x17, 0x70, 0xd6, 0x5b, 0xc0, 0x40, 0xf3,
-	0xd9, 0xff, 0x75, 0xca, 0xff, 0x48, 0xa8, 0x31, 0xff, 0xdd, 0x26, 0xdd, 0xb0, 0x57, 0x74, 0x84,
-	0xa6, 0x2d, 0xaa, 0x4d, 0x7a, 0x5d, 0xb0, 0x43, 0xd1, 0x5d, 0x5c, 0x9c, 0x13, 0x2a, 0x72, 0xac,
-	0x70, 0x09, 0x73, 0xa8, 0xd9, 0x8c, 0x35, 0x50, 0xdd, 0x9f, 0x1d, 0x5f, 0x38, 0xa7, 0x63, 0xee,
-	0xce, 0x40, 0x7d, 0xcf, 0x41, 0x97, 0xcc, 0x4f, 0x1f, 0xbe, 0x59, 0xe4, 0x07, 0xc6, 0x16, 0xe3,
-	0xf3, 0xa3, 0x45, 0xbe, 0x60, 0x7c, 0xc5, 0x78, 0xc0, 0xd8, 0x3e, 0x5a, 0x7b, 0x1f, 0xbe, 0x5b,
-	0x7b, 0x89, 0xce, 0xaf, 0x77, 0xf0, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x74, 0xaf, 0x48, 0x28, 0x2f,
+	// 467 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0x31, 0x6e, 0xdb, 0x30,
+	0x14, 0x86, 0xf3, 0xac, 0x58, 0x8a, 0x69, 0x3b, 0x49, 0x39, 0xb4, 0x0f, 0x29, 0x40, 0x10, 0x46,
+	0x02, 0xb0, 0x43, 0x2c, 0x59, 0xb6, 0x13, 0x67, 0xd5, 0xd0, 0xad, 0x1d, 0xec, 0x13, 0x44, 0x8e,
+	0x2c, 0x0b, 0xb0, 0xc2, 0xd6, 0x91, 0xf6, 0x1e, 0xa2, 0x77, 0x68, 0x8f, 0xd2, 0xb1, 0x47, 0x88,
+	0xd5, 0x0b, 0x74, 0xcc, 0xd0, 0xa1, 0x28, 0x45, 0xd1, 0x35, 0x0a, 0x01, 0x2e, 0x90, 0x4d, 0xef,
+	0xfb, 0x29, 0xbe, 0xc7, 0xff, 0x27, 0xc9, 0xab, 0xb9, 0x4c, 0x43, 0xf9, 0xe0, 0x86, 0x32, 0x5b,
+	0xba, 0x61, 0x74, 0x3f, 0x5f, 0xf6, 0x3f, 0xac, 0x65, 0x26, 0x69, 0x53, 0x15, 0x67, 0x97, 0x71,
+	0x92, 0x2d, 0xf3, 0xb0, 0x3f, 0x97, 0xa9, 0x1b, 0xcb, 0x58, 0xba, 0x4a, 0x0d, 0xf3, 0x85, 0xaa,
+	0x54, 0xa1, 0xbe, 0xca, 0xbf, 0x7a, 0xaf, 0x89, 0x33, 0x8d, 0x3e, 0xe6, 0xd1, 0x43, 0x46, 0x4f,
+	0x89, 0xf5, 0x3e, 0x4f, 0x11, 0x38, 0x08, 0x6b, 0x6a, 0xdd, 0xe7, 0x69, 0x6f, 0x46, 0x9a, 0xb3,
+	0xf4, 0x76, 0xb5, 0xa2, 0x2f, 0x89, 0xfd, 0x36, 0x89, 0x56, 0x77, 0x43, 0xb4, 0x38, 0x88, 0xe6,
+	0xd4, 0x5e, 0xa8, 0x8a, 0x22, 0x71, 0x14, 0x1f, 0x0c, 0xb0, 0xcd, 0x41, 0xd8, 0x53, 0x67, 0x51,
+	0x96, 0x5b, 0x65, 0x84, 0xc7, 0x1c, 0x44, 0xab, 0x52, 0x46, 0xbd, 0x5f, 0x0d, 0x62, 0xbf, 0x8b,
+	0xee, 0x92, 0x3c, 0x35, 0xdb, 0x0e, 0x54, 0x53, 0xd0, 0xdb, 0x0e, 0x0c, 0xf7, 0xb1, 0xc1, 0x41,
+	0x34, 0x34, 0xf7, 0x6b, 0xc7, 0xa8, 0xf8, 0x08, 0x0f, 0xd5, 0xf0, 0x25, 0x1f, 0x19, 0x3e, 0xc6,
+	0x26, 0x07, 0xd1, 0xd5, 0x7c, 0x6c, 0xf8, 0x15, 0xda, 0x1c, 0xc4, 0xa1, 0xe6, 0x57, 0x86, 0x5f,
+	0xa3, 0xc3, 0x41, 0xbc, 0xd0, 0xfc, 0xda, 0xf0, 0x09, 0x1e, 0x71, 0x10, 0x54, 0xf3, 0x89, 0xe1,
+	0x37, 0xd8, 0xe2, 0x20, 0x1c, 0xcd, 0x6f, 0xb6, 0x87, 0xf7, 0x90, 0x70, 0x10, 0x27, 0xd5, 0xe1,
+	0xbd, 0x7d, 0x0c, 0xf3, 0xb1, 0xc3, 0x41, 0x9c, 0x56, 0x8a, 0xbf, 0x55, 0x86, 0xd8, 0xe5, 0x20,
+	0x8e, 0x2a, 0x65, 0x58, 0x6f, 0xf2, 0x56, 0x19, 0xe3, 0x09, 0x07, 0xd1, 0xa9, 0x94, 0x71, 0xef,
+	0x4b, 0x83, 0x58, 0x41, 0x12, 0xff, 0xb7, 0xf7, 0x17, 0x3b, 0xde, 0xb7, 0xfd, 0x6e, 0xbf, 0xbc,
+	0x7c, 0x65, 0x94, 0x26, 0x8a, 0xf3, 0xbf, 0xa2, 0xb0, 0x44, 0xdb, 0xef, 0xe8, 0x65, 0xea, 0x1e,
+	0xfd, 0x13, 0xcc, 0xbe, 0x01, 0x5c, 0xec, 0x04, 0x50, 0xd3, 0x7c, 0xf2, 0xbc, 0x4e, 0xf9, 0x9f,
+	0x81, 0x38, 0xc1, 0x9f, 0x36, 0xd1, 0x9a, 0xbe, 0x21, 0xad, 0x20, 0x89, 0x67, 0xd9, 0x3a, 0xba,
+	0x4d, 0xe9, 0xb1, 0xee, 0xae, 0x1f, 0xce, 0x19, 0xd1, 0x75, 0x90, 0xc4, 0x1e, 0x50, 0x97, 0x74,
+	0xca, 0xb1, 0x6a, 0x56, 0xef, 0xce, 0xee, 0x01, 0xbd, 0x24, 0x6d, 0xe5, 0x4e, 0xcd, 0xfa, 0x1d,
+	0x07, 0x3d, 0x08, 0xce, 0x1f, 0x37, 0x0c, 0x7e, 0x6e, 0x18, 0x3c, 0x6d, 0x18, 0x7c, 0x2d, 0x18,
+	0x7c, 0x2b, 0x18, 0x7c, 0x2f, 0x18, 0x3c, 0x16, 0x0c, 0x9e, 0x0a, 0x76, 0xf0, 0xe9, 0x07, 0x3b,
+	0x08, 0x6d, 0xf5, 0xbc, 0x87, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x74, 0xaf, 0x48, 0x28, 0x2f,
 	0x04, 0x00, 0x00,
 }
diff --git a/bench/combos/marshaler/bench.pb.go b/bench/combos/marshaler/bench.pb.go
index 473194d..6a4d089 100644
--- a/bench/combos/marshaler/bench.pb.go
+++ b/bench/combos/marshaler/bench.pb.go
@@ -41,7 +41,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Request struct {
 	Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
@@ -610,11 +612,12 @@ func valueToGoStringBench(v interface{}, typ string) string {
 	pv := reflect.Indirect(rv).Interface()
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
 }
-func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
+func extensionToGoStringBench(m github_com_gogo_protobuf_proto.Message) string {
+	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
 	if e == nil {
 		return "nil"
 	}
-	s := "map[int32]proto.Extension{"
+	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
 	keys := make([]int, 0, len(e))
 	for k := range e {
 		keys = append(keys, int(k))
@@ -624,7 +627,7 @@ func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extensi
 	for _, k := range keys {
 		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
 	}
-	s += strings.Join(ss, ",") + "}"
+	s += strings.Join(ss, ",") + "})"
 	return s
 }
 
@@ -634,7 +637,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for Bencher service
 
@@ -844,6 +847,7 @@ var _Bencher_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorBench,
 }
 
 func (m *Request) Marshal() (data []byte, err error) {
@@ -1443,35 +1447,38 @@ func sozBench(x uint64) (n int) {
 	return sovBench(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
 
+func init() { proto.RegisterFile("combos/marshaler/bench.proto", fileDescriptorBench) }
+
 var fileDescriptorBench = []byte{
-	// 457 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0xbb, 0x71, 0x63, 0x37, 0x9b, 0xa4, 0x2d, 0x7b, 0x40, 0xa3, 0x82, 0x22, 0x14, 0xb5,
-	0x12, 0x1c, 0x1a, 0xff, 0x6f, 0xd3, 0x6b, 0x0e, 0xdc, 0xe0, 0xe0, 0x3c, 0x81, 0xdd, 0x6e, 0x1c,
-	0x4b, 0x76, 0x0d, 0x8e, 0x7d, 0xe7, 0x21, 0x78, 0x07, 0x78, 0x14, 0x8e, 0x3c, 0x42, 0x29, 0x2f,
-	0xc0, 0xb1, 0x07, 0x0e, 0x0c, 0xeb, 0xf5, 0x1a, 0x0b, 0x59, 0x2a, 0x12, 0x87, 0x95, 0x3d, 0xbf,
-	0x6f, 0xec, 0x99, 0xfd, 0x66, 0x97, 0x3e, 0xbf, 0xce, 0xb3, 0x28, 0xdf, 0x99, 0x59, 0x58, 0xec,
-	0xb6, 0x61, 0xca, 0x0b, 0x33, 0xe2, 0xb7, 0xd7, 0xdb, 0xc5, 0xbb, 0x22, 0x2f, 0x73, 0x36, 0x14,
-	0xc1, 0xc9, 0x79, 0x9c, 0x94, 0xdb, 0x2a, 0x5a, 0x60, 0xae, 0x19, 0xe7, 0x71, 0x6e, 0x0a, 0x35,
-	0xaa, 0x36, 0x22, 0x12, 0x81, 0x78, 0xab, 0xbf, 0x9a, 0x3f, 0xa3, 0x46, 0xc0, 0xdf, 0x57, 0x7c,
-	0x57, 0xb2, 0x63, 0xaa, 0xbd, 0xad, 0x32, 0x20, 0x2f, 0xc8, 0x4b, 0x2d, 0xd0, 0x6e, 0xab, 0x6c,
-	0xbe, 0xa6, 0xc3, 0x75, 0x16, 0xa6, 0x29, 0x7b, 0x4a, 0xf5, 0xd7, 0x09, 0x4f, 0x6f, 0x5c, 0xd0,
-	0x50, 0x1d, 0x06, 0xfa, 0x46, 0x44, 0x0c, 0xa8, 0x21, 0xb8, 0x6d, 0xc3, 0x18, 0x05, 0x3d, 0x30,
-	0x36, 0x75, 0xd8, 0x2a, 0x1e, 0x1c, 0xa2, 0x32, 0x6a, 0x14, 0x6f, 0xfe, 0x73, 0x40, 0xf5, 0x37,
-	0xfc, 0x26, 0xa9, 0x32, 0xf5, 0x5b, 0x5b, 0x14, 0x25, 0xf2, 0xb7, 0xb6, 0xe2, 0x0e, 0x0c, 0x90,
-	0x0f, 0x24, 0x77, 0x7a, 0xdb, 0x68, 0xb8, 0x07, 0xfb, 0xa2, 0xf9, 0x9a, 0x7b, 0x8a, 0xfb, 0x30,
-	0x44, 0x3e, 0x95, 0xdc, 0x57, 0xfc, 0x02, 0x74, 0xe4, 0xfb, 0x92, 0x5f, 0x28, 0x7e, 0x09, 0x06,
-	0xf2, 0x27, 0x92, 0x5f, 0x2a, 0xbe, 0x84, 0x03, 0xe4, 0x4c, 0xf2, 0xa5, 0xe2, 0x57, 0x30, 0x42,
-	0x6e, 0x48, 0x7e, 0xd5, 0x6e, 0xde, 0x02, 0x8a, 0xc2, 0x51, 0xb3, 0x79, 0xeb, 0x31, 0x86, 0x39,
-	0x30, 0x41, 0xe5, 0xb8, 0x51, 0x9c, 0x56, 0x71, 0x61, 0x8a, 0xca, 0x41, 0xa3, 0xb8, 0xfd, 0x26,
-	0xb7, 0x8a, 0x0f, 0x47, 0xa8, 0x4c, 0x1a, 0xc5, 0x9f, 0x7f, 0x1a, 0x50, 0x6d, 0x95, 0xc4, 0xff,
-	0xec, 0xfd, 0x59, 0xc7, 0xfb, 0xb1, 0x33, 0x5d, 0xd4, 0x87, 0xaf, 0x1e, 0xa5, 0x1a, 0xc5, 0xe9,
-	0x1f, 0xa3, 0xd0, 0x30, 0x6d, 0x22, 0xd3, 0xc4, 0x39, 0xfa, 0x6b, 0x30, 0x8f, 0x1d, 0xc0, 0x59,
-	0x67, 0x00, 0x3d, 0xc5, 0x97, 0xff, 0xd7, 0x29, 0xe7, 0x23, 0xa1, 0xc6, 0xea, 0x77, 0x19, 0x5e,
-	0xb0, 0x57, 0x74, 0x84, 0xa6, 0xad, 0xcb, 0x82, 0x87, 0x19, 0x3b, 0x94, 0xd5, 0xe5, 0xc5, 0x39,
-	0xa1, 0x32, 0xc6, 0x0c, 0x8b, 0x30, 0x93, 0x4e, 0xea, 0xb6, 0x7a, 0xb2, 0xbb, 0xbd, 0xe3, 0x07,
-	0xe7, 0x74, 0x2c, 0xdc, 0xe9, 0xc9, 0xef, 0x38, 0x68, 0x91, 0xd5, 0xe9, 0xdd, 0xb7, 0x19, 0xf9,
-	0x81, 0xeb, 0x01, 0xd7, 0xe7, 0xfb, 0x19, 0xf9, 0x82, 0xeb, 0xeb, 0xfd, 0x6c, 0xef, 0x0e, 0x9f,
-	0x0f, 0xf8, 0xfc, 0xf0, 0x7d, 0xb6, 0x17, 0xe9, 0xe2, 0x7a, 0xbb, 0xbf, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0x25, 0xc1, 0x67, 0xdf, 0x34, 0x04, 0x00, 0x00,
+	// 472 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0x41, 0x6e, 0xda, 0x40,
+	0x14, 0x86, 0x79, 0x38, 0xd8, 0x61, 0x80, 0x24, 0x9d, 0x45, 0xf5, 0x94, 0x56, 0xa3, 0x11, 0x4a,
+	0xa4, 0xe9, 0x22, 0xd8, 0x18, 0x48, 0xc8, 0xd6, 0x8b, 0xee, 0xda, 0x05, 0x9c, 0x00, 0x13, 0x63,
+	0x2c, 0xe1, 0xb8, 0x35, 0x78, 0xdf, 0x43, 0xf4, 0x0e, 0xed, 0x51, 0xba, 0xec, 0x11, 0x82, 0x7b,
+	0x81, 0x2e, 0xb3, 0xe8, 0xa2, 0xea, 0x78, 0x3c, 0xd4, 0xaa, 0x2c, 0xa5, 0x52, 0x76, 0x7e, 0xdf,
+	0x3f, 0x9e, 0xf7, 0xe6, 0xff, 0x67, 0xc8, 0xeb, 0x65, 0x12, 0xfb, 0xc9, 0xd6, 0x8e, 0x17, 0xe9,
+	0x76, 0xbd, 0xd8, 0x04, 0xa9, 0xed, 0x07, 0xf7, 0xcb, 0xf5, 0xe0, 0x43, 0x9a, 0xec, 0x12, 0xda,
+	0x92, 0xc5, 0xf9, 0x55, 0x18, 0xed, 0xd6, 0x99, 0x3f, 0x58, 0x26, 0xb1, 0x1d, 0x26, 0x61, 0x62,
+	0x4b, 0xd5, 0xcf, 0x56, 0xb2, 0x92, 0x85, 0xfc, 0x2a, 0xfe, 0xea, 0xbf, 0x22, 0xd6, 0x2c, 0xf8,
+	0x98, 0x05, 0xdb, 0x1d, 0x3d, 0x23, 0xc6, 0xfb, 0x2c, 0x46, 0xe0, 0x20, 0x8c, 0x99, 0x71, 0x9f,
+	0xc5, 0xfd, 0x39, 0x69, 0xcd, 0xe3, 0xc5, 0x66, 0x43, 0x5f, 0x12, 0xf3, 0x6d, 0x14, 0x6c, 0xee,
+	0x46, 0x68, 0x70, 0x10, 0xad, 0x99, 0xb9, 0x92, 0x15, 0x45, 0x62, 0x49, 0x3e, 0x1c, 0x62, 0x87,
+	0x83, 0x30, 0x67, 0xd6, 0xaa, 0x28, 0x0f, 0xca, 0x18, 0x4f, 0x38, 0x88, 0x76, 0xa9, 0x8c, 0xfb,
+	0xbf, 0x9a, 0xc4, 0x7c, 0x17, 0xdc, 0x45, 0x59, 0xac, 0xb7, 0x1d, 0xca, 0xa6, 0xa0, 0xb6, 0x1d,
+	0x6a, 0xee, 0x62, 0x93, 0x83, 0x68, 0x2a, 0xee, 0xd6, 0x8e, 0x51, 0xf2, 0x31, 0x1e, 0xc9, 0xe1,
+	0x0b, 0x3e, 0xd6, 0x7c, 0x82, 0x2d, 0x0e, 0xa2, 0xa7, 0xf8, 0x44, 0xf3, 0x6b, 0x34, 0x39, 0x88,
+	0x23, 0xc5, 0xaf, 0x35, 0xbf, 0x41, 0x8b, 0x83, 0x78, 0xa1, 0xf8, 0x8d, 0xe6, 0x53, 0x3c, 0xe6,
+	0x20, 0xa8, 0xe2, 0x53, 0xcd, 0x6f, 0xb1, 0xcd, 0x41, 0x58, 0x8a, 0xdf, 0x1e, 0x0e, 0xef, 0x20,
+	0xe1, 0x20, 0x4e, 0xcb, 0xc3, 0x3b, 0x4f, 0x31, 0xcc, 0xc5, 0x2e, 0x07, 0x71, 0x56, 0x2a, 0xee,
+	0x41, 0x19, 0x61, 0x8f, 0x83, 0x38, 0x2e, 0x95, 0x51, 0xbd, 0xc9, 0x07, 0x65, 0x82, 0xa7, 0x1c,
+	0x44, 0xb7, 0x54, 0x26, 0xfd, 0x2f, 0x4d, 0x62, 0x78, 0x51, 0xf8, 0xdf, 0xde, 0x5f, 0x56, 0xbc,
+	0xef, 0xb8, 0xbd, 0x41, 0x71, 0xf9, 0x8a, 0x28, 0x75, 0x14, 0x17, 0x7f, 0x45, 0x61, 0x88, 0x8e,
+	0xdb, 0x55, 0xcb, 0xe4, 0x3d, 0xfa, 0x27, 0x98, 0xa7, 0x06, 0x70, 0x59, 0x09, 0xa0, 0xa6, 0xf9,
+	0xf4, 0x79, 0x9d, 0x72, 0x3f, 0x03, 0xb1, 0xbc, 0x3f, 0x6d, 0x82, 0x94, 0xbe, 0x21, 0x6d, 0x2f,
+	0x0a, 0xe7, 0xbb, 0x34, 0x58, 0xc4, 0xf4, 0x44, 0x75, 0x57, 0x0f, 0xe7, 0x9c, 0xa8, 0xda, 0x8b,
+	0x42, 0x07, 0xa8, 0x4d, 0xba, 0xc5, 0x58, 0x35, 0xab, 0xab, 0xb3, 0x3b, 0x40, 0xaf, 0x48, 0x47,
+	0xba, 0x53, 0xb3, 0xbe, 0xe2, 0xa0, 0x03, 0xde, 0xc5, 0xc3, 0x9e, 0xc1, 0xcf, 0x3d, 0x83, 0xc7,
+	0x3d, 0x83, 0xaf, 0x39, 0x83, 0x6f, 0x39, 0x83, 0xef, 0x39, 0x6b, 0x3c, 0xe4, 0x0c, 0x1e, 0x73,
+	0xd6, 0xf8, 0xf4, 0x83, 0x35, 0x7c, 0x53, 0x3e, 0xef, 0xd1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x25, 0xc1, 0x67, 0xdf, 0x34, 0x04, 0x00, 0x00,
 }
diff --git a/bench/combos/neither/bench.pb.go b/bench/combos/neither/bench.pb.go
index e34df2b..2ff9749 100644
--- a/bench/combos/neither/bench.pb.go
+++ b/bench/combos/neither/bench.pb.go
@@ -41,7 +41,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Request struct {
 	Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
@@ -610,11 +612,12 @@ func valueToGoStringBench(v interface{}, typ string) string {
 	pv := reflect.Indirect(rv).Interface()
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
 }
-func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
+func extensionToGoStringBench(m github_com_gogo_protobuf_proto.Message) string {
+	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
 	if e == nil {
 		return "nil"
 	}
-	s := "map[int32]proto.Extension{"
+	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
 	keys := make([]int, 0, len(e))
 	for k := range e {
 		keys = append(keys, int(k))
@@ -624,7 +627,7 @@ func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extensi
 	for _, k := range keys {
 		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
 	}
-	s += strings.Join(ss, ",") + "}"
+	s += strings.Join(ss, ",") + "})"
 	return s
 }
 
@@ -634,7 +637,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for Bencher service
 
@@ -844,6 +847,7 @@ var _Bencher_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorBench,
 }
 
 func NewPopulatedRequest(r randyBench, easy bool) *Request {
@@ -1167,35 +1171,38 @@ func sozBench(x uint64) (n int) {
 	return sovBench(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
 
+func init() { proto.RegisterFile("combos/neither/bench.proto", fileDescriptorBench) }
+
 var fileDescriptorBench = []byte{
-	// 453 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0x80, 0xbb, 0x71, 0x63, 0x37, 0x9b, 0xa4, 0x2d, 0x7b, 0x40, 0xa3, 0x20, 0x59, 0xc8, 0x6a,
-	0x25, 0x38, 0x34, 0xfe, 0x6f, 0xd3, 0x6b, 0x0e, 0xdc, 0xe0, 0xe0, 0x3c, 0x41, 0xdd, 0x6e, 0x5c,
-	0x4b, 0x71, 0x0c, 0xae, 0x7d, 0xe7, 0x21, 0x78, 0x07, 0x78, 0x14, 0x8e, 0x3c, 0x42, 0x29, 0x2f,
-	0xc0, 0xb1, 0x07, 0x0e, 0x0c, 0xeb, 0xf5, 0x1a, 0x0b, 0x59, 0x0a, 0x52, 0x0f, 0x2b, 0x7b, 0xbe,
-	0x6f, 0xec, 0x1d, 0xcf, 0x78, 0xe9, 0xec, 0x3a, 0xcf, 0xe2, 0xfc, 0xce, 0xde, 0xf2, 0xb4, 0xbc,
-	0xe5, 0x85, 0x1d, 0xf3, 0xed, 0xf5, 0xed, 0xfc, 0x7d, 0x91, 0x97, 0x39, 0x1b, 0x8a, 0x60, 0x76,
-	0x96, 0xa0, 0xaa, 0xe2, 0x39, 0x66, 0xda, 0x49, 0x9e, 0xe4, 0xb6, 0xb0, 0x71, 0xb5, 0x16, 0x91,
-	0x08, 0xc4, 0x5d, 0xfd, 0x94, 0xf5, 0x82, 0x1a, 0x11, 0xff, 0x50, 0xf1, 0xbb, 0x92, 0x1d, 0x53,
-	0xed, 0x5d, 0x95, 0x01, 0x79, 0x49, 0x5e, 0x69, 0x91, 0xb6, 0xad, 0x32, 0x6b, 0x45, 0x87, 0xab,
-	0xec, 0x6a, 0xb3, 0x61, 0xcf, 0xa9, 0xfe, 0x26, 0xe5, 0x9b, 0x1b, 0x1f, 0x34, 0xb4, 0xc3, 0x48,
-	0x5f, 0x8b, 0x88, 0x01, 0x35, 0x04, 0x77, 0x5d, 0x18, 0xa3, 0xd0, 0x23, 0x63, 0x5d, 0x87, 0xad,
-	0x09, 0xe0, 0x10, 0xcd, 0xa8, 0x31, 0x81, 0xf5, 0x6b, 0x40, 0xf5, 0xb7, 0xfc, 0x26, 0xad, 0x32,
-	0xf5, 0x5a, 0x57, 0x6c, 0x4a, 0xe4, 0x6b, 0x5d, 0xc5, 0x3d, 0x18, 0x20, 0x1f, 0x48, 0xee, 0xf5,
-	0x96, 0xd1, 0xf0, 0x00, 0xf6, 0x45, 0xf1, 0x35, 0x0f, 0x14, 0x0f, 0x61, 0x88, 0x7c, 0x2a, 0x79,
-	0xa8, 0xf8, 0x39, 0xe8, 0xc8, 0xf7, 0x25, 0x3f, 0x57, 0xfc, 0x02, 0x0c, 0xe4, 0xcf, 0x24, 0xbf,
-	0x50, 0x7c, 0x01, 0x07, 0xc8, 0x99, 0xe4, 0x0b, 0xc5, 0x2f, 0x61, 0x84, 0xdc, 0x90, 0xfc, 0xb2,
-	0xfd, 0x78, 0x07, 0x28, 0x8a, 0xa3, 0xe6, 0xe3, 0x9d, 0x5d, 0x1a, 0xe6, 0xc1, 0x04, 0xcd, 0x71,
-	0x63, 0xbc, 0xd6, 0xf8, 0x30, 0x45, 0x73, 0xd0, 0x18, 0xbf, 0xbf, 0xc9, 0xad, 0x09, 0xe1, 0x08,
-	0xcd, 0xa4, 0x31, 0xa1, 0xf5, 0x79, 0x40, 0xb5, 0x65, 0x9a, 0xfc, 0x77, 0xef, 0x4f, 0x3b, 0xbd,
-	0x1f, 0x7b, 0xd3, 0x79, 0xfd, 0xf3, 0xd5, 0xa3, 0x54, 0xa3, 0x38, 0xf9, 0x6b, 0x14, 0x1a, 0xa6,
-	0x4d, 0x64, 0x9a, 0xf8, 0x8f, 0xfe, 0x19, 0xcc, 0xae, 0x03, 0x38, 0xed, 0x0c, 0xa0, 0x67, 0xf3,
-	0xc5, 0xd3, 0x76, 0xca, 0xfb, 0x44, 0xa8, 0xb1, 0xfc, 0xb3, 0x0d, 0x2f, 0xd8, 0x6b, 0x3a, 0xc2,
-	0xa6, 0xad, 0xca, 0x82, 0x5f, 0x65, 0xec, 0x50, 0xee, 0x2e, 0x0f, 0xce, 0x8c, 0xca, 0x18, 0x33,
-	0x1c, 0xc2, 0x6c, 0x3a, 0xa9, 0xcb, 0xea, 0xc9, 0xee, 0xd6, 0x8e, 0x0f, 0x9c, 0xd1, 0xb1, 0xe8,
-	0x4e, 0x4f, 0x7e, 0xa7, 0x83, 0x0e, 0x59, 0x9e, 0xdc, 0x7f, 0x37, 0xc9, 0x4f, 0x5c, 0x8f, 0xb8,
-	0xbe, 0x3c, 0x98, 0xe4, 0xeb, 0x83, 0xb9, 0xf7, 0x0d, 0xd7, 0x3d, 0xde, 0x3f, 0xe2, 0xf5, 0xe3,
-	0x0f, 0x73, 0x2f, 0xd6, 0xc5, 0xf1, 0xf6, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x2f, 0xd1,
-	0x48, 0x32, 0x04, 0x00, 0x00,
+	// 470 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0x41, 0x6e, 0xda, 0x40,
+	0x14, 0x86, 0x79, 0x38, 0xd8, 0x61, 0x80, 0x24, 0x9d, 0x45, 0xf5, 0x44, 0xa5, 0xd1, 0x08, 0x25,
+	0xd2, 0x74, 0x11, 0x6c, 0x0c, 0x24, 0x64, 0xeb, 0x45, 0x77, 0xed, 0x02, 0x4e, 0x10, 0x93, 0xc1,
+	0x58, 0xc2, 0xb8, 0x25, 0xf6, 0xbe, 0x87, 0xe8, 0x1d, 0xda, 0xa3, 0x74, 0xd9, 0x23, 0x04, 0xf7,
+	0x02, 0x5d, 0x66, 0xd1, 0x45, 0xd5, 0xf1, 0xd8, 0xd4, 0xaa, 0x2c, 0x51, 0xa9, 0x3b, 0xbf, 0xef,
+	0x1f, 0xcf, 0x7b, 0xf3, 0xff, 0x33, 0xa4, 0xbf, 0x8c, 0x23, 0x3f, 0x7e, 0xb4, 0xb7, 0x32, 0x4c,
+	0xd6, 0x72, 0x67, 0xfb, 0x72, 0xbb, 0x5c, 0x0f, 0xdf, 0xef, 0xe2, 0x24, 0xa6, 0x2d, 0x55, 0xf4,
+	0xaf, 0x83, 0x30, 0x59, 0xa7, 0xfe, 0x70, 0x19, 0x47, 0x76, 0x10, 0x07, 0xb1, 0xad, 0x54, 0x3f,
+	0x5d, 0xa9, 0x4a, 0x15, 0xea, 0x2b, 0xff, 0x6b, 0xf0, 0x8a, 0x58, 0x73, 0xf9, 0x21, 0x95, 0x8f,
+	0x09, 0xbd, 0x20, 0xc6, 0xbb, 0x34, 0x42, 0xe0, 0x20, 0x8c, 0xb9, 0xb1, 0x4d, 0xa3, 0xc1, 0x82,
+	0xb4, 0x16, 0xd1, 0xfd, 0x66, 0x43, 0x5f, 0x12, 0xf3, 0x4d, 0x28, 0x37, 0x0f, 0x63, 0x34, 0x38,
+	0x88, 0xd6, 0xdc, 0x5c, 0xa9, 0x8a, 0x22, 0xb1, 0x14, 0x1f, 0x8d, 0xb0, 0xc3, 0x41, 0x98, 0x73,
+	0x6b, 0x95, 0x97, 0x07, 0x65, 0x82, 0x67, 0x1c, 0x44, 0xbb, 0x50, 0x26, 0x83, 0x9f, 0x4d, 0x62,
+	0xbe, 0x95, 0x0f, 0x61, 0x1a, 0x95, 0xdb, 0x8e, 0x54, 0x53, 0xd0, 0xdb, 0x8e, 0x4a, 0xee, 0x62,
+	0x93, 0x83, 0x68, 0x6a, 0xee, 0xd6, 0x8e, 0x51, 0xf0, 0x09, 0x9e, 0xa8, 0xe1, 0x73, 0x3e, 0x29,
+	0xf9, 0x14, 0x5b, 0x1c, 0x44, 0x4f, 0xf3, 0x69, 0xc9, 0x6f, 0xd0, 0xe4, 0x20, 0x4e, 0x34, 0xbf,
+	0x29, 0xf9, 0x2d, 0x5a, 0x1c, 0xc4, 0x0b, 0xcd, 0x6f, 0x4b, 0x3e, 0xc3, 0x53, 0x0e, 0x82, 0x6a,
+	0x3e, 0x2b, 0xf9, 0x1d, 0xb6, 0x39, 0x08, 0x4b, 0xf3, 0xbb, 0xc3, 0xe1, 0x1d, 0x24, 0x1c, 0xc4,
+	0x79, 0x71, 0x78, 0xe7, 0x18, 0xc3, 0x5c, 0xec, 0x72, 0x10, 0x17, 0x85, 0xe2, 0x1e, 0x94, 0x31,
+	0xf6, 0x38, 0x88, 0xd3, 0x42, 0x19, 0xd7, 0x9b, 0x7c, 0x50, 0xa6, 0x78, 0xce, 0x41, 0x74, 0x0b,
+	0x65, 0x3a, 0xf8, 0xdc, 0x24, 0x86, 0x17, 0x06, 0xff, 0xec, 0xfd, 0x55, 0xc5, 0xfb, 0x8e, 0xdb,
+	0x1b, 0xe6, 0x97, 0x2f, 0x8f, 0xb2, 0x8c, 0xe2, 0xf2, 0x8f, 0x28, 0x0c, 0xd1, 0x71, 0xbb, 0x7a,
+	0x99, 0xba, 0x47, 0x7f, 0x05, 0x73, 0x6c, 0x00, 0x57, 0x95, 0x00, 0x6a, 0x9a, 0xcf, 0xfe, 0xaf,
+	0x53, 0xee, 0x27, 0x20, 0x96, 0xf7, 0xbb, 0x8d, 0xdc, 0xd1, 0xd7, 0xa4, 0xed, 0x85, 0xc1, 0x22,
+	0xd9, 0xc9, 0xfb, 0x88, 0x9e, 0xe9, 0xee, 0xfa, 0xe1, 0xf4, 0x89, 0xae, 0xbd, 0x30, 0x70, 0x80,
+	0xda, 0xa4, 0x9b, 0x8f, 0x55, 0xb3, 0xba, 0x3a, 0xbb, 0x03, 0xf4, 0x9a, 0x74, 0x94, 0x3b, 0x35,
+	0xeb, 0x2b, 0x0e, 0x3a, 0xe0, 0x5d, 0x3e, 0xed, 0x19, 0xfc, 0xd8, 0x33, 0x78, 0xde, 0x33, 0xf8,
+	0x92, 0x31, 0xf8, 0x9a, 0xb1, 0xc6, 0xb7, 0x8c, 0x35, 0x9e, 0x32, 0x06, 0xcf, 0x19, 0x6b, 0x7c,
+	0xfc, 0xce, 0x1a, 0xbe, 0xa9, 0x9e, 0xf7, 0xf8, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x2f,
+	0xd1, 0x48, 0x32, 0x04, 0x00, 0x00,
 }
diff --git a/bench/combos/unmarshaler/bench.pb.go b/bench/combos/unmarshaler/bench.pb.go
index 6d46d1b..2a991b8 100644
--- a/bench/combos/unmarshaler/bench.pb.go
+++ b/bench/combos/unmarshaler/bench.pb.go
@@ -43,7 +43,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Request struct {
 	Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
@@ -612,11 +614,12 @@ func valueToGoStringBench(v interface{}, typ string) string {
 	pv := reflect.Indirect(rv).Interface()
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
 }
-func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
+func extensionToGoStringBench(m github_com_gogo_protobuf_proto.Message) string {
+	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
 	if e == nil {
 		return "nil"
 	}
-	s := "map[int32]proto.Extension{"
+	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
 	keys := make([]int, 0, len(e))
 	for k := range e {
 		keys = append(keys, int(k))
@@ -626,7 +629,7 @@ func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extensi
 	for _, k := range keys {
 		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
 	}
-	s += strings.Join(ss, ",") + "}"
+	s += strings.Join(ss, ",") + "})"
 	return s
 }
 
@@ -636,7 +639,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for Bencher service
 
@@ -846,6 +849,7 @@ var _Bencher_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorBench,
 }
 
 func NewPopulatedRequest(r randyBench, easy bool) *Request {
@@ -2096,35 +2100,38 @@ var (
 	ErrIntOverflowBench   = fmt.Errorf("proto: integer overflow")
 )
 
+func init() { proto.RegisterFile("combos/unmarshaler/bench.proto", fileDescriptorBench) }
+
 var fileDescriptorBench = []byte{
-	// 460 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0xbb, 0x71, 0x63, 0x37, 0x9b, 0xa4, 0x2d, 0x7b, 0x40, 0xa3, 0x22, 0x59, 0x28, 0x6a,
-	0x25, 0x38, 0x34, 0x4e, 0xfc, 0xa7, 0x4d, 0xaf, 0x39, 0x70, 0x83, 0x83, 0xf3, 0x04, 0x76, 0xbb,
-	0x71, 0x2c, 0xd9, 0x31, 0x38, 0xf6, 0x9d, 0x87, 0xe0, 0x1d, 0xe0, 0x51, 0x38, 0xf2, 0x08, 0xa5,
-	0xbc, 0x00, 0xc7, 0x1e, 0x38, 0x30, 0xac, 0xd7, 0x6b, 0x2c, 0x64, 0x29, 0x48, 0x3d, 0xac, 0xec,
-	0xf9, 0x7d, 0x63, 0xcf, 0xec, 0x37, 0xbb, 0xd4, 0xbc, 0xcd, 0xd2, 0x30, 0xdb, 0x59, 0xe5, 0x36,
-	0x0d, 0xf2, 0xdd, 0x26, 0x48, 0x78, 0x6e, 0x85, 0x7c, 0x7b, 0xbb, 0x99, 0xbe, 0xcf, 0xb3, 0x22,
-	0x63, 0x7d, 0x11, 0x9c, 0x5d, 0x46, 0x71, 0xb1, 0x29, 0xc3, 0x29, 0x66, 0x5b, 0x51, 0x16, 0x65,
-	0x96, 0x50, 0xc3, 0x72, 0x2d, 0x22, 0x11, 0x88, 0xb7, 0xea, 0xab, 0xc9, 0x0b, 0x6a, 0xf8, 0xfc,
-	0x43, 0xc9, 0x77, 0x05, 0x3b, 0xa5, 0xda, 0xbb, 0x32, 0x05, 0xf2, 0x92, 0xbc, 0xd2, 0x7c, 0x6d,
-	0x5b, 0xa6, 0x93, 0x15, 0xed, 0xaf, 0xd2, 0x20, 0x49, 0xd8, 0x73, 0xaa, 0xbf, 0x89, 0x79, 0x72,
-	0xe7, 0x80, 0x86, 0x6a, 0xdf, 0xd7, 0xd7, 0x22, 0x62, 0x40, 0x0d, 0xc1, 0xe7, 0x73, 0x18, 0xa2,
-	0xa0, 0xfb, 0xc6, 0xba, 0x0a, 0x1b, 0xc5, 0x85, 0x63, 0x54, 0x06, 0xb5, 0xe2, 0x4e, 0x7e, 0xf5,
-	0xa8, 0xfe, 0x96, 0xdf, 0xc5, 0x65, 0xaa, 0x7e, 0x3b, 0x17, 0x45, 0x89, 0xfc, 0xed, 0x5c, 0x71,
-	0x1b, 0x7a, 0xc8, 0x7b, 0x92, 0xdb, 0x9d, 0x6d, 0xd4, 0xdc, 0x85, 0x43, 0xd1, 0x7c, 0xc5, 0x5d,
-	0xc5, 0x3d, 0xe8, 0x23, 0x1f, 0x4b, 0xee, 0x29, 0x7e, 0x05, 0x3a, 0xf2, 0x43, 0xc9, 0xaf, 0x14,
-	0xbf, 0x06, 0x03, 0xf9, 0x33, 0xc9, 0xaf, 0x15, 0x5f, 0xc0, 0x11, 0x72, 0x26, 0xf9, 0x42, 0xf1,
-	0x1b, 0x18, 0x20, 0x37, 0x24, 0xbf, 0x69, 0x36, 0x3f, 0x03, 0x8a, 0xc2, 0x49, 0xbd, 0xf9, 0xd9,
-	0x3e, 0x86, 0xd9, 0x30, 0x42, 0xe5, 0xb4, 0x56, 0xec, 0x46, 0x71, 0x60, 0x8c, 0xca, 0x51, 0xad,
-	0x38, 0xdd, 0x26, 0x37, 0x8a, 0x07, 0x27, 0xa8, 0x8c, 0x6a, 0xc5, 0x9b, 0x7c, 0xee, 0x51, 0x6d,
-	0x19, 0x47, 0xff, 0xed, 0xfd, 0x45, 0xcb, 0xfb, 0xa1, 0x3d, 0x9e, 0x56, 0x87, 0xaf, 0x1a, 0xa5,
-	0x1a, 0xc5, 0xf9, 0x5f, 0xa3, 0xd0, 0x30, 0x6d, 0x24, 0xd3, 0xc4, 0x39, 0xfa, 0x67, 0x30, 0xfb,
-	0x0e, 0xe0, 0xa2, 0x35, 0x80, 0x8e, 0xe2, 0x8b, 0xa7, 0x75, 0xca, 0xfe, 0x44, 0xa8, 0xb1, 0xfc,
-	0x53, 0x86, 0xe7, 0xec, 0x35, 0x1d, 0xa0, 0x69, 0xab, 0x22, 0xe7, 0x41, 0xca, 0x8e, 0x65, 0x75,
-	0x79, 0x71, 0xce, 0xa8, 0x8c, 0x31, 0x63, 0x46, 0x98, 0x45, 0x47, 0x55, 0x5b, 0x1d, 0xd9, 0xed,
-	0xde, 0xf1, 0x83, 0x4b, 0x3a, 0x14, 0xee, 0x74, 0xe4, 0xb7, 0x1c, 0x9c, 0x91, 0xe5, 0xf9, 0xfd,
-	0x77, 0x93, 0xfc, 0xc4, 0xf5, 0x88, 0xeb, 0xcb, 0x83, 0x49, 0xbe, 0x3e, 0x98, 0x07, 0xdf, 0xf0,
-	0x79, 0x8f, 0xeb, 0x11, 0xdf, 0x3f, 0xfe, 0x30, 0x0f, 0x42, 0x5d, 0x5c, 0x6f, 0xe7, 0x77, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xb7, 0x58, 0xc2, 0xd8, 0x36, 0x04, 0x00, 0x00,
+	// 473 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0x41, 0x6e, 0xda, 0x40,
+	0x14, 0x86, 0x79, 0x38, 0xd8, 0x61, 0x80, 0x24, 0x9d, 0x45, 0xf5, 0x94, 0x4a, 0xa3, 0x11, 0x4a,
+	0xa4, 0xe9, 0x22, 0xd8, 0x18, 0x48, 0xc8, 0xd6, 0x8b, 0xee, 0xda, 0x05, 0x9c, 0x00, 0x13, 0x63,
+	0x2c, 0x61, 0xdc, 0x1a, 0xbc, 0xef, 0x21, 0x7a, 0x87, 0xf6, 0x28, 0x5d, 0xf6, 0x08, 0xc1, 0xbd,
+	0x40, 0x97, 0x59, 0x74, 0x51, 0x75, 0x3c, 0x1e, 0x6a, 0x55, 0x96, 0x52, 0xa9, 0x3b, 0xbf, 0xef,
+	0x1f, 0xcf, 0x7b, 0xf3, 0xff, 0x33, 0x84, 0x2d, 0x93, 0xd8, 0x4f, 0x76, 0x76, 0xb6, 0x8d, 0x17,
+	0xe9, 0x6e, 0xbd, 0xd8, 0x04, 0xa9, 0xed, 0x07, 0xdb, 0xe5, 0x7a, 0xf0, 0x3e, 0x4d, 0xf6, 0x09,
+	0x6d, 0xc9, 0xe2, 0xf2, 0x26, 0x8c, 0xf6, 0xeb, 0xcc, 0x1f, 0x2c, 0x93, 0xd8, 0x0e, 0x93, 0x30,
+	0xb1, 0xa5, 0xea, 0x67, 0x2b, 0x59, 0xc9, 0x42, 0x7e, 0x15, 0x7f, 0xf5, 0x5f, 0x11, 0x6b, 0x16,
+	0x7c, 0xc8, 0x82, 0xdd, 0x9e, 0x5e, 0x10, 0xe3, 0x5d, 0x16, 0x23, 0x70, 0x10, 0xc6, 0xcc, 0xd8,
+	0x66, 0x71, 0x7f, 0x4e, 0x5a, 0xf3, 0x78, 0xb1, 0xd9, 0xd0, 0x97, 0xc4, 0x7c, 0x13, 0x05, 0x9b,
+	0x87, 0x11, 0x1a, 0x1c, 0x44, 0x6b, 0x66, 0xae, 0x64, 0x45, 0x91, 0x58, 0x92, 0x0f, 0x87, 0xd8,
+	0xe1, 0x20, 0xcc, 0x99, 0xb5, 0x2a, 0xca, 0xa3, 0x32, 0xc6, 0x33, 0x0e, 0xa2, 0x5d, 0x2a, 0xe3,
+	0xfe, 0xcf, 0x26, 0x31, 0xdf, 0x06, 0x0f, 0x51, 0x16, 0xeb, 0x6d, 0x87, 0xb2, 0x29, 0xa8, 0x6d,
+	0x87, 0x9a, 0xbb, 0xd8, 0xe4, 0x20, 0x9a, 0x8a, 0xbb, 0xb5, 0x63, 0x94, 0x7c, 0x8c, 0x27, 0x72,
+	0xf8, 0x82, 0x8f, 0x35, 0x9f, 0x60, 0x8b, 0x83, 0xe8, 0x29, 0x3e, 0xd1, 0xfc, 0x16, 0x4d, 0x0e,
+	0xe2, 0x44, 0xf1, 0x5b, 0xcd, 0xef, 0xd0, 0xe2, 0x20, 0x5e, 0x28, 0x7e, 0xa7, 0xf9, 0x14, 0x4f,
+	0x39, 0x08, 0xaa, 0xf8, 0x54, 0xf3, 0x7b, 0x6c, 0x73, 0x10, 0x96, 0xe2, 0xf7, 0xc7, 0xc3, 0x3b,
+	0x48, 0x38, 0x88, 0xf3, 0xf2, 0xf0, 0xce, 0x73, 0x0c, 0x73, 0xb1, 0xcb, 0x41, 0x5c, 0x94, 0x8a,
+	0x7b, 0x54, 0x46, 0xd8, 0xe3, 0x20, 0x4e, 0x4b, 0x65, 0x54, 0x6f, 0xf2, 0x51, 0x99, 0xe0, 0x39,
+	0x07, 0xd1, 0x2d, 0x95, 0x49, 0xff, 0x73, 0x93, 0x18, 0x5e, 0x14, 0xfe, 0xb3, 0xf7, 0xd7, 0x15,
+	0xef, 0x3b, 0x6e, 0x6f, 0x50, 0x5c, 0xbe, 0x22, 0x4a, 0x1d, 0xc5, 0xd5, 0x1f, 0x51, 0x18, 0xa2,
+	0xe3, 0x76, 0xd5, 0x32, 0x79, 0x8f, 0xfe, 0x0a, 0xe6, 0xb9, 0x01, 0x5c, 0x57, 0x02, 0xa8, 0x69,
+	0x3e, 0xfd, 0xbf, 0x4e, 0xb9, 0x9f, 0x80, 0x58, 0xde, 0xef, 0x36, 0x41, 0x4a, 0x5f, 0x93, 0xb6,
+	0x17, 0x85, 0xf3, 0x7d, 0x1a, 0x2c, 0x62, 0x7a, 0xa6, 0xba, 0xab, 0x87, 0x73, 0x49, 0x54, 0xed,
+	0x45, 0xa1, 0x03, 0xd4, 0x26, 0xdd, 0x62, 0xac, 0x9a, 0xd5, 0xd5, 0xd9, 0x1d, 0xa0, 0x37, 0xa4,
+	0x23, 0xdd, 0xa9, 0x59, 0x5f, 0x71, 0xd0, 0x01, 0xef, 0xea, 0xf1, 0xc0, 0xe0, 0xc7, 0x81, 0xc1,
+	0xd3, 0x81, 0xc1, 0x97, 0x9c, 0xc1, 0xd7, 0x9c, 0x35, 0xbe, 0xe5, 0x0c, 0x1e, 0x73, 0x06, 0x4f,
+	0x39, 0x6b, 0x7c, 0xfc, 0xce, 0x1a, 0xbe, 0x29, 0x9f, 0xf7, 0xe8, 0x57, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xb7, 0x58, 0xc2, 0xd8, 0x36, 0x04, 0x00, 0x00,
 }
diff --git a/bench/combos/unsafeboth/bench.pb.go b/bench/combos/unsafeboth/bench.pb.go
index 3dcc705..8b22f8c 100644
--- a/bench/combos/unsafeboth/bench.pb.go
+++ b/bench/combos/unsafeboth/bench.pb.go
@@ -45,7 +45,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Request struct {
 	Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
@@ -614,11 +616,12 @@ func valueToGoStringBench(v interface{}, typ string) string {
 	pv := reflect.Indirect(rv).Interface()
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
 }
-func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
+func extensionToGoStringBench(m github_com_gogo_protobuf_proto.Message) string {
+	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
 	if e == nil {
 		return "nil"
 	}
-	s := "map[int32]proto.Extension{"
+	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
 	keys := make([]int, 0, len(e))
 	for k := range e {
 		keys = append(keys, int(k))
@@ -628,7 +631,7 @@ func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extensi
 	for _, k := range keys {
 		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
 	}
-	s += strings.Join(ss, ",") + "}"
+	s += strings.Join(ss, ",") + "})"
 	return s
 }
 
@@ -638,7 +641,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for Bencher service
 
@@ -848,6 +851,7 @@ var _Bencher_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorBench,
 }
 
 func NewPopulatedRequest(r randyBench, easy bool) *Request {
@@ -2323,35 +2327,38 @@ var (
 	ErrIntOverflowBenchUnsafe   = fmt.Errorf("proto: integer overflow")
 )
 
+func init() { proto.RegisterFile("combos/unsafeboth/bench.proto", fileDescriptorBench) }
+
 var fileDescriptorBench = []byte{
-	// 457 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0xd9, 0xb8, 0xb1, 0x9b, 0x4d, 0xd2, 0x96, 0x3d, 0xa0, 0x51, 0x11, 0x11, 0xb2, 0x5a,
-	0x09, 0x0e, 0x8d, 0xff, 0xb7, 0xe9, 0x35, 0x07, 0x6e, 0x70, 0x70, 0x9e, 0x20, 0x6e, 0xd7, 0x8e,
-	0xa5, 0x38, 0x86, 0xc4, 0xbe, 0xf3, 0x10, 0xbc, 0x03, 0x3c, 0x0a, 0x47, 0x1e, 0xa1, 0x94, 0x17,
-	0xe0, 0xd8, 0x03, 0x07, 0x86, 0xf5, 0x7a, 0x8d, 0x85, 0x2c, 0x05, 0xa9, 0x87, 0x91, 0x3c, 0xbf,
-	0x6f, 0xec, 0x19, 0x7f, 0xb3, 0x4b, 0x5f, 0xdc, 0xe4, 0x59, 0x94, 0xef, 0xac, 0x72, 0xb3, 0x5b,
-	0xc6, 0x3c, 0xca, 0x8b, 0x95, 0x15, 0xf1, 0xcd, 0xcd, 0x6a, 0xfa, 0x7e, 0x9b, 0x17, 0x39, 0xeb,
-	0x8b, 0xe4, 0xf4, 0x22, 0x49, 0x8b, 0x55, 0x19, 0x4d, 0xb1, 0xd8, 0x4a, 0xf2, 0x24, 0xb7, 0x84,
-	0x1a, 0x95, 0xb1, 0xc8, 0x44, 0x22, 0x9e, 0xaa, 0xb7, 0xcc, 0xe7, 0xd4, 0x08, 0xf9, 0x87, 0x92,
-	0xef, 0x0a, 0x76, 0x42, 0xb5, 0x77, 0x65, 0x06, 0xe4, 0x25, 0x79, 0xa5, 0x85, 0xda, 0xa6, 0xcc,
-	0xcc, 0x05, 0xed, 0x2f, 0xb2, 0xe5, 0x7a, 0xcd, 0x9e, 0x51, 0xfd, 0x4d, 0xca, 0xd7, 0xb7, 0x1e,
-	0x68, 0xa8, 0xf6, 0x43, 0x3d, 0x16, 0x19, 0x03, 0x6a, 0x08, 0xee, 0x38, 0x30, 0x44, 0x41, 0x0f,
-	0x8d, 0xb8, 0x4a, 0x1b, 0xc5, 0x87, 0x23, 0x54, 0x06, 0xb5, 0xe2, 0x9b, 0xbf, 0x7a, 0x54, 0x7f,
-	0xcb, 0x6f, 0xd3, 0x32, 0x53, 0x9f, 0x75, 0x44, 0x53, 0x22, 0x3f, 0xeb, 0x28, 0xee, 0x42, 0x0f,
-	0x79, 0x4f, 0x72, 0xb7, 0x73, 0x8c, 0x9a, 0xfb, 0x70, 0x20, 0x86, 0xaf, 0xb8, 0xaf, 0x78, 0x00,
-	0x7d, 0xe4, 0x63, 0xc9, 0x03, 0xc5, 0x2f, 0x41, 0x47, 0x7e, 0x20, 0xf9, 0xa5, 0xe2, 0x57, 0x60,
-	0x20, 0x7f, 0x2a, 0xf9, 0x95, 0xe2, 0x33, 0x38, 0x44, 0xce, 0x24, 0x9f, 0x29, 0x7e, 0x0d, 0x03,
-	0xe4, 0x86, 0xe4, 0xd7, 0xcd, 0xcf, 0xdb, 0x40, 0x51, 0x38, 0xae, 0x7f, 0xde, 0xde, 0xc7, 0x30,
-	0x17, 0x46, 0xa8, 0x9c, 0xd4, 0x8a, 0xdb, 0x28, 0x1e, 0x8c, 0x51, 0x39, 0xac, 0x15, 0xaf, 0xdb,
-	0xe4, 0x46, 0x09, 0xe0, 0x18, 0x95, 0x51, 0xad, 0x04, 0xe6, 0xe7, 0x1e, 0xd5, 0xe6, 0x69, 0xf2,
-	0xdf, 0xde, 0x9f, 0xb7, 0xbc, 0x1f, 0xba, 0xe3, 0x69, 0x75, 0xf8, 0xaa, 0x55, 0xaa, 0x55, 0x9c,
-	0xfd, 0xb5, 0x0a, 0x0d, 0xcb, 0x46, 0xb2, 0x4c, 0x9c, 0xa3, 0x7f, 0x16, 0xb3, 0xef, 0x02, 0xce,
-	0x5b, 0x0b, 0xe8, 0x68, 0x3e, 0x7b, 0x5c, 0xa7, 0xdc, 0x4f, 0x84, 0x1a, 0xf3, 0x3f, 0x6d, 0xf8,
-	0x96, 0xbd, 0xa6, 0x03, 0x34, 0x6d, 0x51, 0x6c, 0xf9, 0x32, 0x63, 0x47, 0xb2, 0xbb, 0xbc, 0x38,
-	0xa7, 0x54, 0xe6, 0x58, 0x61, 0x13, 0x66, 0xd1, 0x51, 0x35, 0x56, 0x47, 0x75, 0x7b, 0x76, 0x7c,
-	0xe1, 0x82, 0x0e, 0x85, 0x3b, 0x1d, 0xf5, 0x2d, 0x07, 0x6d, 0x32, 0x3f, 0xbb, 0xfb, 0x3e, 0x21,
-	0x3f, 0x31, 0x1e, 0x30, 0xbe, 0xdc, 0x4f, 0xc8, 0xd7, 0xfb, 0xc9, 0x93, 0x6f, 0x18, 0x77, 0xf8,
-	0xfc, 0x80, 0xf1, 0xf1, 0xc7, 0x84, 0x44, 0xba, 0xb8, 0xde, 0xde, 0xef, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xe3, 0xdd, 0xcd, 0xad, 0x35, 0x04, 0x00, 0x00,
+	// 472 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0x41, 0x6e, 0xda, 0x40,
+	0x14, 0x86, 0xf3, 0x70, 0xb0, 0xc3, 0x00, 0x49, 0x3a, 0x8b, 0xea, 0x29, 0x55, 0x47, 0x23, 0x94,
+	0x48, 0xd3, 0x45, 0xb0, 0x31, 0x90, 0x90, 0xad, 0x17, 0xdd, 0xb5, 0x0b, 0x38, 0x01, 0x26, 0xc6,
+	0x58, 0xc2, 0xb8, 0x05, 0x7b, 0xdf, 0x43, 0xf4, 0x0e, 0xed, 0x51, 0xba, 0xec, 0x11, 0x82, 0x7b,
+	0x81, 0x2e, 0xb3, 0xe8, 0xa2, 0xea, 0x78, 0x3c, 0xd4, 0xaa, 0x2c, 0xa5, 0x52, 0x76, 0x7e, 0xdf,
+	0x3f, 0x9e, 0xf7, 0xe6, 0xff, 0x67, 0xc8, 0xeb, 0x45, 0x12, 0xfb, 0xc9, 0xce, 0xce, 0x36, 0xbb,
+	0xf9, 0x32, 0xf0, 0x93, 0x74, 0x65, 0xfb, 0xc1, 0x66, 0xb1, 0xea, 0x7f, 0xd8, 0x26, 0x69, 0x42,
+	0x9b, 0xb2, 0xb8, 0xb8, 0x0e, 0xa3, 0x74, 0x95, 0xf9, 0xfd, 0x45, 0x12, 0xdb, 0x61, 0x12, 0x26,
+	0xb6, 0x54, 0xfd, 0x6c, 0x29, 0x2b, 0x59, 0xc8, 0xaf, 0xe2, 0xaf, 0xde, 0x2b, 0x62, 0x4d, 0x83,
+	0x8f, 0x59, 0xb0, 0x4b, 0xe9, 0x39, 0x31, 0xde, 0x67, 0x31, 0x02, 0x07, 0x61, 0x4c, 0x8d, 0x4d,
+	0x16, 0xf7, 0x66, 0xa4, 0x39, 0x8b, 0xe7, 0xeb, 0x35, 0x7d, 0x49, 0xcc, 0xb7, 0x51, 0xb0, 0xbe,
+	0x1f, 0xa2, 0xc1, 0x41, 0x34, 0xa7, 0xe6, 0x52, 0x56, 0x14, 0x89, 0x25, 0xf9, 0x60, 0x80, 0x6d,
+	0x0e, 0xc2, 0x9c, 0x5a, 0xcb, 0xa2, 0x3c, 0x28, 0x23, 0x3c, 0xe5, 0x20, 0x5a, 0xa5, 0x32, 0xea,
+	0xfd, 0x6a, 0x10, 0xf3, 0x5d, 0x70, 0x1f, 0x65, 0xb1, 0xde, 0x76, 0x20, 0x9b, 0x82, 0xda, 0x76,
+	0xa0, 0xb9, 0x8b, 0x0d, 0x0e, 0xa2, 0xa1, 0xb8, 0x5b, 0x3b, 0x46, 0xc9, 0x47, 0x78, 0x2c, 0x87,
+	0x2f, 0xf8, 0x48, 0xf3, 0x31, 0x36, 0x39, 0x88, 0xae, 0xe2, 0x63, 0xcd, 0x6f, 0xd0, 0xe4, 0x20,
+	0x8e, 0x15, 0xbf, 0xd1, 0xfc, 0x16, 0x2d, 0x0e, 0xe2, 0x85, 0xe2, 0xb7, 0x9a, 0x4f, 0xf0, 0x84,
+	0x83, 0xa0, 0x8a, 0x4f, 0x34, 0xbf, 0xc3, 0x16, 0x07, 0x61, 0x29, 0x7e, 0x77, 0x38, 0xbc, 0x83,
+	0x84, 0x83, 0x38, 0x2b, 0x0f, 0xef, 0x3c, 0xc5, 0x30, 0x17, 0x3b, 0x1c, 0xc4, 0x79, 0xa9, 0xb8,
+	0x07, 0x65, 0x88, 0x5d, 0x0e, 0xe2, 0xa4, 0x54, 0x86, 0xf5, 0x26, 0x1f, 0x94, 0x31, 0x9e, 0x71,
+	0x10, 0x9d, 0x52, 0x19, 0xf7, 0xbe, 0x34, 0x88, 0xe1, 0x45, 0xe1, 0x7f, 0x7b, 0x7f, 0x55, 0xf1,
+	0xbe, 0xed, 0x76, 0xfb, 0xc5, 0xe5, 0x2b, 0xa2, 0xd4, 0x51, 0x5c, 0xfe, 0x15, 0x85, 0x21, 0xda,
+	0x6e, 0x47, 0x2d, 0x93, 0xf7, 0xe8, 0x9f, 0x60, 0x9e, 0x1a, 0xc0, 0x55, 0x25, 0x80, 0x9a, 0xe6,
+	0x93, 0xe7, 0x75, 0xca, 0xfd, 0x0c, 0xc4, 0xf2, 0xfe, 0xb4, 0x09, 0xb6, 0xf4, 0x0d, 0x69, 0x79,
+	0x51, 0x38, 0x4b, 0xb7, 0xc1, 0x3c, 0xa6, 0xa7, 0xaa, 0xbb, 0x7a, 0x38, 0x17, 0x44, 0xd5, 0x5e,
+	0x14, 0x3a, 0x40, 0x6d, 0xd2, 0x29, 0xc6, 0xaa, 0x59, 0x5d, 0x9d, 0xdd, 0x01, 0x7a, 0x4d, 0xda,
+	0xd2, 0x9d, 0x9a, 0xf5, 0x15, 0x07, 0x1d, 0xf0, 0x2e, 0x1f, 0xf6, 0x0c, 0x7e, 0xee, 0x19, 0x3c,
+	0xee, 0x19, 0x7c, 0xcd, 0x19, 0x7c, 0xcb, 0xd9, 0xd1, 0xf7, 0x9c, 0x1d, 0x3d, 0xe4, 0x0c, 0x1e,
+	0x73, 0x06, 0x9f, 0x7e, 0x30, 0xf0, 0x4d, 0xf9, 0xbc, 0x87, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff,
+	0xe3, 0xdd, 0xcd, 0xad, 0x35, 0x04, 0x00, 0x00,
 }
diff --git a/bench/combos/unsafemarshaler/bench.pb.go b/bench/combos/unsafemarshaler/bench.pb.go
index 58ffb09..2ff3207 100644
--- a/bench/combos/unsafemarshaler/bench.pb.go
+++ b/bench/combos/unsafemarshaler/bench.pb.go
@@ -43,7 +43,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Request struct {
 	Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
@@ -612,11 +614,12 @@ func valueToGoStringBench(v interface{}, typ string) string {
 	pv := reflect.Indirect(rv).Interface()
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
 }
-func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
+func extensionToGoStringBench(m github_com_gogo_protobuf_proto.Message) string {
+	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
 	if e == nil {
 		return "nil"
 	}
-	s := "map[int32]proto.Extension{"
+	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
 	keys := make([]int, 0, len(e))
 	for k := range e {
 		keys = append(keys, int(k))
@@ -626,7 +629,7 @@ func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extensi
 	for _, k := range keys {
 		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
 	}
-	s += strings.Join(ss, ",") + "}"
+	s += strings.Join(ss, ",") + "})"
 	return s
 }
 
@@ -636,7 +639,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for Bencher service
 
@@ -846,6 +849,7 @@ var _Bencher_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorBench,
 }
 
 func NewPopulatedRequest(r randyBench, easy bool) *Request {
@@ -1454,35 +1458,38 @@ func encodeVarintBench(data []byte, offset int, v uint64) int {
 	return offset + 1
 }
 
+func init() { proto.RegisterFile("combos/unsafemarshaler/bench.proto", fileDescriptorBench) }
+
 var fileDescriptorBench = []byte{
-	// 462 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0xbb, 0x71, 0x63, 0x37, 0x9b, 0xa4, 0x2d, 0x7b, 0x40, 0xa3, 0x22, 0x45, 0xc8, 0x6a,
-	0x25, 0x38, 0x34, 0x4e, 0x9c, 0xb8, 0x4d, 0xaf, 0x39, 0x70, 0x83, 0x83, 0xf3, 0x04, 0x76, 0xbb,
-	0x76, 0x2c, 0xd9, 0x31, 0xf8, 0xcf, 0x9d, 0x87, 0xe0, 0x1d, 0xe0, 0x51, 0x38, 0xf2, 0x08, 0xa5,
-	0xbc, 0x00, 0xc7, 0x1e, 0x38, 0x30, 0xac, 0xd7, 0x6b, 0x2c, 0x64, 0x29, 0x48, 0x3d, 0x8c, 0xe4,
-	0xf9, 0x7d, 0xb3, 0x9e, 0xf1, 0x37, 0x5e, 0x6a, 0xde, 0xa6, 0x89, 0x9f, 0xe6, 0x56, 0xb9, 0xcb,
-	0xbd, 0x80, 0x27, 0x5e, 0x96, 0x6f, 0xbd, 0x98, 0x67, 0x96, 0xcf, 0x77, 0xb7, 0xdb, 0xe9, 0xfb,
-	0x2c, 0x2d, 0x52, 0xd6, 0x17, 0xc9, 0xd9, 0x65, 0x18, 0x15, 0xdb, 0xd2, 0x9f, 0xe2, 0x09, 0x2b,
-	0x4c, 0xc3, 0xd4, 0x12, 0xaa, 0x5f, 0x06, 0x22, 0x13, 0x89, 0x78, 0xaa, 0x4e, 0x99, 0x2f, 0xa8,
-	0xe1, 0xf2, 0x0f, 0x25, 0xcf, 0x0b, 0x76, 0x4a, 0xb5, 0x77, 0x65, 0x02, 0xe4, 0x25, 0x79, 0xa5,
-	0xb9, 0xda, 0xae, 0x4c, 0xcc, 0x0d, 0xed, 0x6f, 0x12, 0x2f, 0x8e, 0xd9, 0x73, 0xaa, 0xbf, 0x89,
-	0x78, 0x7c, 0xb7, 0x00, 0x0d, 0xd5, 0xbe, 0xab, 0x07, 0x22, 0x63, 0x40, 0x0d, 0xc1, 0xe7, 0x73,
-	0x18, 0xa2, 0xa0, 0xbb, 0x46, 0x50, 0xa5, 0x8d, 0xb2, 0x84, 0x63, 0x54, 0x06, 0xb5, 0xb2, 0x34,
-	0x7f, 0xf5, 0xa8, 0xfe, 0x96, 0xdf, 0x45, 0x65, 0xa2, 0x5e, 0x3b, 0x17, 0x4d, 0x89, 0x7c, 0xed,
-	0x5c, 0x71, 0x1b, 0x7a, 0xc8, 0x7b, 0x92, 0xdb, 0x9d, 0x63, 0xd4, 0x7c, 0x09, 0x87, 0x62, 0xf8,
-	0x8a, 0x2f, 0x15, 0x77, 0xa0, 0x8f, 0x7c, 0x2c, 0xb9, 0xa3, 0xf8, 0x15, 0xe8, 0xc8, 0x0f, 0x25,
-	0xbf, 0x52, 0xfc, 0x1a, 0x0c, 0xe4, 0xcf, 0x24, 0xbf, 0x56, 0x7c, 0x05, 0x47, 0xc8, 0x99, 0xe4,
-	0x2b, 0xc5, 0x6f, 0x60, 0x80, 0xdc, 0x90, 0xfc, 0xa6, 0xf9, 0xf8, 0x19, 0x50, 0x14, 0x4e, 0xea,
-	0x8f, 0x9f, 0xed, 0x63, 0x98, 0x0d, 0x23, 0x54, 0x4e, 0x6b, 0xc5, 0x6e, 0x94, 0x05, 0x8c, 0x51,
-	0x39, 0xaa, 0x95, 0x45, 0xb7, 0xc9, 0x8d, 0xe2, 0xc0, 0x09, 0x2a, 0xa3, 0x5a, 0x71, 0xcc, 0xcf,
-	0x3d, 0xaa, 0xad, 0xa3, 0xf0, 0xbf, 0xbd, 0xbf, 0x68, 0x79, 0x3f, 0xb4, 0xc7, 0xd3, 0xea, 0xe7,
-	0xab, 0x56, 0xa9, 0x56, 0x71, 0xfe, 0xd7, 0x2a, 0x34, 0x2c, 0x1b, 0xc9, 0x32, 0xf1, 0x1f, 0xfd,
-	0xb3, 0x98, 0x7d, 0x17, 0x70, 0xd1, 0x5a, 0x40, 0x47, 0xf3, 0xd5, 0xd3, 0x3a, 0x65, 0x7f, 0x22,
-	0xd4, 0x58, 0xff, 0x69, 0xc3, 0x33, 0xf6, 0x9a, 0x0e, 0xd0, 0xb4, 0x4d, 0x91, 0x71, 0x2f, 0x61,
-	0xc7, 0xb2, 0xbb, 0xbc, 0x38, 0x67, 0x54, 0xe6, 0x58, 0x31, 0x23, 0xcc, 0xa2, 0xa3, 0x6a, 0xac,
-	0x8e, 0xea, 0xf6, 0xec, 0x78, 0xe0, 0x92, 0x0e, 0x85, 0x3b, 0x1d, 0xf5, 0x2d, 0x07, 0x67, 0x64,
-	0x7d, 0x7e, 0xff, 0x7d, 0x42, 0x7e, 0x62, 0x3c, 0x62, 0x7c, 0x79, 0x98, 0x90, 0xaf, 0x0f, 0x93,
-	0x83, 0x6f, 0x18, 0xf7, 0xf8, 0xfc, 0x88, 0xf1, 0xf1, 0xc7, 0xe4, 0xc0, 0xd7, 0xc5, 0xf5, 0x5e,
-	0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x29, 0x25, 0x70, 0x63, 0x3a, 0x04, 0x00, 0x00,
+	// 476 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0x31, 0x6e, 0xdb, 0x30,
+	0x14, 0x86, 0xfd, 0xac, 0x58, 0x8a, 0x69, 0x3b, 0x49, 0x39, 0x14, 0x44, 0x0a, 0x10, 0x84, 0x90,
+	0x00, 0xec, 0x10, 0x4b, 0x96, 0xed, 0xc4, 0x59, 0x35, 0x74, 0x6b, 0x07, 0xfb, 0x04, 0x92, 0x43,
+	0xcb, 0x02, 0x2c, 0xab, 0x95, 0xad, 0xbd, 0x87, 0xe8, 0x1d, 0xda, 0xa3, 0x74, 0xec, 0x11, 0x62,
+	0xf5, 0x02, 0x1d, 0x33, 0x74, 0x28, 0x4a, 0x51, 0x74, 0x85, 0x42, 0x40, 0x0a, 0x74, 0xd3, 0xfb,
+	0x7e, 0x8a, 0xef, 0xf1, 0xff, 0x49, 0x64, 0x2f, 0xd3, 0x24, 0x4c, 0x77, 0x4e, 0xbe, 0xdd, 0x05,
+	0x2b, 0x91, 0x04, 0xd9, 0x6e, 0x1d, 0x6c, 0x44, 0xe6, 0x84, 0x62, 0xbb, 0x5c, 0x0f, 0xdf, 0x67,
+	0xe9, 0x3e, 0xc5, 0x1d, 0x59, 0x5c, 0xde, 0x44, 0xf1, 0x7e, 0x9d, 0x87, 0xc3, 0x65, 0x9a, 0x38,
+	0x51, 0x1a, 0xa5, 0x8e, 0x54, 0xc3, 0x7c, 0x25, 0x2b, 0x59, 0xc8, 0xaf, 0xf2, 0x2f, 0xfb, 0x15,
+	0xb2, 0xe6, 0xe2, 0x43, 0x2e, 0x76, 0x7b, 0x7c, 0x81, 0x8c, 0x77, 0x79, 0x42, 0x80, 0x01, 0x37,
+	0xe6, 0xc6, 0x36, 0x4f, 0xec, 0x05, 0xea, 0x2c, 0x92, 0x60, 0xb3, 0xc1, 0x2f, 0x91, 0xf9, 0x26,
+	0x16, 0x9b, 0x87, 0x31, 0x31, 0x18, 0xf0, 0xce, 0xdc, 0x5c, 0xc9, 0x0a, 0x13, 0x64, 0x49, 0x3e,
+	0x1a, 0x91, 0x1e, 0x03, 0x6e, 0xce, 0xad, 0x55, 0x59, 0x1e, 0x95, 0x09, 0x39, 0x63, 0xc0, 0xbb,
+	0x95, 0x32, 0xb1, 0x7f, 0xb6, 0x91, 0xf9, 0x56, 0x3c, 0xc4, 0x79, 0xa2, 0xb7, 0x1d, 0xc9, 0xa6,
+	0xa0, 0xb6, 0x1d, 0x69, 0xee, 0x91, 0x36, 0x03, 0xde, 0x56, 0xdc, 0x6b, 0x1c, 0xa3, 0xe2, 0x13,
+	0x72, 0x22, 0x87, 0x2f, 0xf9, 0x44, 0xf3, 0x29, 0xe9, 0x30, 0xe0, 0x03, 0xc5, 0xa7, 0x9a, 0xdf,
+	0x12, 0x93, 0x01, 0x3f, 0x51, 0xfc, 0x56, 0xf3, 0x3b, 0x62, 0x31, 0xe0, 0x2f, 0x14, 0xbf, 0xd3,
+	0x7c, 0x46, 0x4e, 0x19, 0x70, 0xac, 0xf8, 0x4c, 0xf3, 0x7b, 0xd2, 0x65, 0xc0, 0x2d, 0xc5, 0xef,
+	0x8f, 0x87, 0x77, 0x09, 0x62, 0xc0, 0xcf, 0xab, 0xc3, 0xbb, 0xcf, 0x31, 0xcc, 0x23, 0x7d, 0x06,
+	0xfc, 0xa2, 0x52, 0xbc, 0xa3, 0x32, 0x26, 0x03, 0x06, 0xfc, 0xb4, 0x52, 0xc6, 0xcd, 0x26, 0x1f,
+	0x95, 0x29, 0x39, 0x67, 0xc0, 0xfb, 0x95, 0x32, 0xb5, 0x3f, 0xb7, 0x91, 0xe1, 0xc7, 0xd1, 0x3f,
+	0x7b, 0x7f, 0x5d, 0xf3, 0xbe, 0xe7, 0x0d, 0x86, 0xe5, 0xe5, 0x2b, 0xa3, 0xd4, 0x51, 0x5c, 0xfd,
+	0x11, 0x85, 0xc1, 0x7b, 0x5e, 0x5f, 0x2d, 0x93, 0xf7, 0xe8, 0xaf, 0x60, 0x9e, 0x1b, 0xc0, 0x75,
+	0x2d, 0x80, 0x86, 0xe6, 0xb3, 0xff, 0xeb, 0x94, 0xf7, 0x09, 0x90, 0xe5, 0xff, 0x6e, 0x23, 0x32,
+	0xfc, 0x1a, 0x75, 0xfd, 0x38, 0x5a, 0xec, 0x33, 0x11, 0x24, 0xf8, 0x4c, 0x75, 0x57, 0x0f, 0xe7,
+	0x12, 0xa9, 0xda, 0x8f, 0x23, 0x17, 0xb0, 0x83, 0xfa, 0xe5, 0x58, 0x0d, 0xab, 0xeb, 0xb3, 0xbb,
+	0x80, 0x6f, 0x50, 0x4f, 0xba, 0xd3, 0xb0, 0xbe, 0xe6, 0xa0, 0x0b, 0xfe, 0xd5, 0xe3, 0x81, 0xc2,
+	0x8f, 0x03, 0x85, 0xa7, 0x03, 0x85, 0x2f, 0x05, 0x85, 0xaf, 0x05, 0x6d, 0x7d, 0x2b, 0x68, 0xeb,
+	0xb1, 0xa0, 0xf0, 0x54, 0x50, 0xf8, 0xf8, 0x9d, 0xb6, 0x42, 0x53, 0x3e, 0xef, 0xf1, 0xaf, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x29, 0x25, 0x70, 0x63, 0x3a, 0x04, 0x00, 0x00,
 }
diff --git a/bench/combos/unsafeunmarshaler/bench.pb.go b/bench/combos/unsafeunmarshaler/bench.pb.go
index cb2f105..3bc5f44 100644
--- a/bench/combos/unsafeunmarshaler/bench.pb.go
+++ b/bench/combos/unsafeunmarshaler/bench.pb.go
@@ -44,7 +44,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Request struct {
 	Num int64 `protobuf:"varint,1,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
@@ -613,11 +615,12 @@ func valueToGoStringBench(v interface{}, typ string) string {
 	pv := reflect.Indirect(rv).Interface()
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
 }
-func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
+func extensionToGoStringBench(m github_com_gogo_protobuf_proto.Message) string {
+	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
 	if e == nil {
 		return "nil"
 	}
-	s := "map[int32]proto.Extension{"
+	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
 	keys := make([]int, 0, len(e))
 	for k := range e {
 		keys = append(keys, int(k))
@@ -627,7 +630,7 @@ func extensionToGoStringBench(e map[int32]github_com_gogo_protobuf_proto.Extensi
 	for _, k := range keys {
 		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
 	}
-	s += strings.Join(ss, ",") + "}"
+	s += strings.Join(ss, ",") + "})"
 	return s
 }
 
@@ -637,7 +640,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for Bencher service
 
@@ -847,6 +850,7 @@ var _Bencher_serviceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorBench,
 }
 
 func NewPopulatedRequest(r randyBench, easy bool) *Request {
@@ -2037,35 +2041,38 @@ var (
 	ErrIntOverflowBenchUnsafe   = fmt.Errorf("proto: integer overflow")
 )
 
+func init() { proto.RegisterFile("combos/unsafeunmarshaler/bench.proto", fileDescriptorBench) }
+
 var fileDescriptorBench = []byte{
-	// 464 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x40,
-	0x10, 0xc6, 0xd9, 0xb8, 0xb1, 0x9b, 0x4d, 0xd2, 0x96, 0x3d, 0xa0, 0x51, 0x91, 0x22, 0x14, 0xa5,
-	0x12, 0x1c, 0x1a, 0x27, 0x4e, 0xd2, 0xa6, 0xd7, 0x1c, 0xb8, 0xc1, 0x21, 0x79, 0x02, 0xbb, 0x5d,
-	0x3b, 0x96, 0xfc, 0x07, 0x6c, 0xef, 0x9d, 0x87, 0xe0, 0x1d, 0xe0, 0x51, 0x38, 0xf2, 0x08, 0xa5,
-	0xbc, 0x00, 0xc7, 0x1e, 0x38, 0x30, 0xac, 0xd7, 0x6b, 0x2c, 0x64, 0x29, 0x48, 0x1c, 0x56, 0xf6,
-	0xfc, 0xbe, 0x59, 0xcf, 0xf8, 0x9b, 0x5d, 0x3a, 0xb9, 0x4d, 0x63, 0x2f, 0xcd, 0x6d, 0x91, 0xe4,
-	0xae, 0xcf, 0x45, 0x12, 0xbb, 0x59, 0xbe, 0x77, 0x23, 0x9e, 0xd9, 0x1e, 0x4f, 0x6e, 0xf7, 0xd3,
-	0x77, 0x59, 0x5a, 0xa4, 0xac, 0x2b, 0x83, 0xf3, 0xcb, 0x20, 0x2c, 0xf6, 0xc2, 0x9b, 0xe2, 0x1e,
-	0x3b, 0x48, 0x83, 0xd4, 0x96, 0xaa, 0x27, 0x7c, 0x19, 0xc9, 0x40, 0xbe, 0x95, 0xbb, 0xc6, 0xcf,
-	0xa9, 0xb5, 0xe5, 0xef, 0x05, 0xcf, 0x0b, 0x76, 0x46, 0x8d, 0xb7, 0x22, 0x06, 0xf2, 0x82, 0xbc,
-	0x34, 0xb6, 0x46, 0x22, 0xe2, 0xf1, 0x8e, 0x76, 0x77, 0xb1, 0x1b, 0x45, 0xec, 0x19, 0x35, 0x5f,
-	0x87, 0x3c, 0xba, 0x5b, 0x80, 0x81, 0x6a, 0x77, 0x6b, 0xfa, 0x32, 0x62, 0x40, 0x2d, 0xc9, 0xe7,
-	0x73, 0xe8, 0xa3, 0x60, 0x6e, 0x2d, 0xbf, 0x0c, 0x6b, 0x65, 0x09, 0x27, 0xa8, 0xf4, 0x2a, 0x65,
-	0x39, 0xfe, 0xd9, 0xa1, 0xe6, 0x1b, 0x7e, 0x17, 0x8a, 0x58, 0x7f, 0x76, 0x2e, 0x8b, 0x12, 0xf5,
-	0xd9, 0xb9, 0xe6, 0x0e, 0x74, 0x90, 0x77, 0x14, 0x77, 0x5a, 0xdb, 0xa8, 0xf8, 0x12, 0x8e, 0x64,
-	0xf3, 0x25, 0x5f, 0x6a, 0xbe, 0x82, 0x2e, 0xf2, 0xa1, 0xe2, 0x2b, 0xcd, 0xaf, 0xc0, 0x44, 0x7e,
-	0xa4, 0xf8, 0x95, 0xe6, 0xd7, 0x60, 0x21, 0x7f, 0xaa, 0xf8, 0xb5, 0xe6, 0x6b, 0x38, 0x46, 0xce,
-	0x14, 0x5f, 0x6b, 0x7e, 0x03, 0x3d, 0xe4, 0x96, 0xe2, 0x37, 0xf5, 0xcf, 0xcf, 0x80, 0xa2, 0x70,
-	0x5a, 0xfd, 0xfc, 0xec, 0x10, 0xc3, 0x1c, 0x18, 0xa0, 0x72, 0x56, 0x29, 0x4e, 0xad, 0x2c, 0x60,
-	0x88, 0xca, 0x71, 0xa5, 0x2c, 0xda, 0x4d, 0xae, 0x95, 0x15, 0x9c, 0xa2, 0x32, 0xa8, 0x94, 0xd5,
-	0xf8, 0x53, 0x87, 0x1a, 0x9b, 0x30, 0xf8, 0x67, 0xef, 0x2f, 0x1a, 0xde, 0xf7, 0x9d, 0xe1, 0xb4,
-	0x3c, 0x7c, 0xe5, 0x28, 0xf5, 0x28, 0x26, 0x7f, 0x8c, 0xc2, 0xc0, 0xb4, 0x81, 0x4a, 0x93, 0xe7,
-	0xe8, 0xaf, 0xc1, 0x1c, 0x3a, 0x80, 0x8b, 0xc6, 0x00, 0x5a, 0x8a, 0xaf, 0xff, 0xaf, 0x53, 0xce,
-	0x47, 0x42, 0xad, 0xcd, 0xef, 0x32, 0x3c, 0x63, 0xaf, 0x68, 0x0f, 0x4d, 0xdb, 0x15, 0x19, 0x77,
-	0x63, 0x76, 0xa2, 0xaa, 0xab, 0x8b, 0x73, 0x4e, 0x55, 0x8c, 0x19, 0x33, 0xc2, 0x6c, 0x3a, 0x28,
-	0xdb, 0x6a, 0xc9, 0x6e, 0xf6, 0x8e, 0x1b, 0x2e, 0x69, 0x5f, 0xba, 0xd3, 0x92, 0xdf, 0x70, 0x70,
-	0x46, 0x36, 0x93, 0xfb, 0x6f, 0x23, 0xf2, 0x03, 0xd7, 0x23, 0xae, 0xcf, 0x0f, 0x23, 0xf2, 0xe5,
-	0x61, 0xf4, 0xe4, 0x2b, 0xae, 0x7b, 0x7c, 0x7f, 0xc4, 0xe7, 0x87, 0xef, 0x23, 0xe2, 0x99, 0xf2,
-	0x7a, 0x2f, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x75, 0x9f, 0x19, 0xa4, 0x3c, 0x04, 0x00, 0x00,
+	// 477 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x93, 0xc1, 0x6e, 0xda, 0x30,
+	0x18, 0xc7, 0xf9, 0x48, 0x49, 0x8a, 0x81, 0xb6, 0xf3, 0x61, 0xb2, 0x3a, 0xc9, 0xb2, 0x10, 0x95,
+	0xbc, 0x43, 0x49, 0x08, 0xd0, 0xd2, 0x6b, 0x0e, 0xbb, 0x6d, 0x07, 0x78, 0x82, 0x84, 0x9a, 0x10,
+	0x89, 0x90, 0x2d, 0x90, 0xfb, 0x1e, 0x62, 0xef, 0xb0, 0x3d, 0xca, 0x8e, 0x7b, 0x84, 0x92, 0xbd,
+	0xc0, 0x8e, 0x3d, 0xec, 0x30, 0xcd, 0x71, 0xcc, 0xa2, 0x29, 0x12, 0x93, 0x76, 0xcb, 0xf7, 0xfb,
+	0x3b, 0xfe, 0x3e, 0xff, 0xff, 0x36, 0x1a, 0x2c, 0x93, 0x38, 0x48, 0x76, 0x76, 0xb6, 0xdd, 0xf9,
+	0x2b, 0x91, 0x6d, 0x63, 0x3f, 0xdd, 0xad, 0xfd, 0x8d, 0x48, 0xed, 0x40, 0x6c, 0x97, 0xeb, 0xe1,
+	0xfb, 0x34, 0xd9, 0x27, 0xb8, 0x25, 0x8b, 0xeb, 0xdb, 0x30, 0xda, 0xaf, 0xb3, 0x60, 0xb8, 0x4c,
+	0x62, 0x3b, 0x4c, 0xc2, 0xc4, 0x96, 0x6a, 0x90, 0xad, 0x64, 0x25, 0x0b, 0xf9, 0x55, 0xfc, 0xd5,
+	0x7f, 0x85, 0xac, 0xb9, 0xf8, 0x90, 0x89, 0xdd, 0x1e, 0x5f, 0x21, 0xe3, 0x5d, 0x16, 0x13, 0x60,
+	0xc0, 0x8d, 0xb9, 0xb1, 0xcd, 0xe2, 0xfe, 0x02, 0xb5, 0x16, 0xb1, 0xbf, 0xd9, 0xe0, 0x97, 0xc8,
+	0x7c, 0x13, 0x89, 0xcd, 0xe3, 0x98, 0x18, 0x0c, 0x78, 0x6b, 0x6e, 0xae, 0x64, 0x85, 0x09, 0xb2,
+	0x24, 0x1f, 0x8d, 0x48, 0x87, 0x01, 0x37, 0xe7, 0xd6, 0xaa, 0x28, 0x8f, 0xca, 0x84, 0x5c, 0x30,
+	0xe0, 0xed, 0x52, 0x99, 0xf4, 0x7f, 0x36, 0x91, 0xf9, 0x56, 0x3c, 0x46, 0x59, 0xac, 0xb7, 0x1d,
+	0xc9, 0xa6, 0xa0, 0xb6, 0x1d, 0x69, 0xee, 0x92, 0x26, 0x03, 0xde, 0x54, 0xdc, 0xad, 0x1d, 0xa3,
+	0xe4, 0x13, 0x72, 0x26, 0x87, 0x2f, 0xf8, 0x44, 0xf3, 0x29, 0x69, 0x31, 0xe0, 0x3d, 0xc5, 0xa7,
+	0x9a, 0xdf, 0x11, 0x93, 0x01, 0x3f, 0x53, 0xfc, 0x4e, 0xf3, 0x7b, 0x62, 0x31, 0xe0, 0x2f, 0x14,
+	0xbf, 0xd7, 0x7c, 0x46, 0xce, 0x19, 0x70, 0xac, 0xf8, 0x4c, 0xf3, 0x07, 0xd2, 0x66, 0xc0, 0x2d,
+	0xc5, 0x1f, 0x8e, 0x87, 0x77, 0x08, 0x62, 0xc0, 0x2f, 0xcb, 0xc3, 0x3b, 0xa7, 0x18, 0xe6, 0x92,
+	0x2e, 0x03, 0x7e, 0x55, 0x2a, 0xee, 0x51, 0x19, 0x93, 0x1e, 0x03, 0x7e, 0x5e, 0x2a, 0xe3, 0x7a,
+	0x93, 0x8f, 0xca, 0x94, 0x5c, 0x32, 0xe0, 0xdd, 0x52, 0x99, 0xf6, 0x3f, 0x37, 0x91, 0xe1, 0x45,
+	0xe1, 0x3f, 0x7b, 0x7f, 0x53, 0xf1, 0xbe, 0xe3, 0xf6, 0x86, 0xc5, 0xe5, 0x2b, 0xa2, 0xd4, 0x51,
+	0x0c, 0xfe, 0x88, 0xc2, 0xe0, 0x1d, 0xb7, 0xab, 0x96, 0xc9, 0x7b, 0xf4, 0x57, 0x30, 0xa7, 0x06,
+	0x70, 0x53, 0x09, 0xa0, 0xa6, 0xf9, 0xec, 0xff, 0x3a, 0xe5, 0x7e, 0x02, 0x64, 0x79, 0xbf, 0xdb,
+	0x88, 0x14, 0xbf, 0x46, 0x6d, 0x2f, 0x0a, 0x17, 0xfb, 0x54, 0xf8, 0x31, 0xbe, 0x50, 0xdd, 0xd5,
+	0xc3, 0xb9, 0x46, 0xaa, 0xf6, 0xa2, 0xd0, 0x01, 0x6c, 0xa3, 0x6e, 0x31, 0x56, 0xcd, 0xea, 0xea,
+	0xec, 0x0e, 0xe0, 0x5b, 0xd4, 0x91, 0xee, 0xd4, 0xac, 0xaf, 0x38, 0xe8, 0x80, 0x37, 0x78, 0x3a,
+	0x50, 0xf8, 0x71, 0xa0, 0xf0, 0x7c, 0xa0, 0xf0, 0x25, 0xa7, 0xf0, 0x35, 0xa7, 0x8d, 0x6f, 0x39,
+	0x6d, 0x3c, 0xe5, 0x14, 0x9e, 0x73, 0xda, 0xf8, 0xf8, 0x9d, 0x42, 0x60, 0xca, 0xe7, 0x3d, 0xfe,
+	0x15, 0x00, 0x00, 0xff, 0xff, 0x75, 0x9f, 0x19, 0xa4, 0x3c, 0x04, 0x00, 0x00,
 }
diff --git a/gofast/gofast.pb.go b/gofast/gofast.pb.go
index 4899712..8d399ab 100644
--- a/gofast/gofast.pb.go
+++ b/gofast/gofast.pb.go
@@ -32,7 +32,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.ProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type MyRequest struct {
 	Value            *int64 `protobuf:"varint,1,opt,name=Value,json=value" json:"Value,omitempty"`
@@ -79,7 +81,7 @@ var _ grpc.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion2
+const _ = grpc.SupportPackageIsVersion3
 
 // Client API for MyTest service
 
@@ -141,7 +143,8 @@ var _MyTest_serviceDesc = grpc.ServiceDesc{
 			Handler:    _MyTest_UnaryCall_Handler,
 		},
 	},
-	Streams: []grpc.StreamDesc{},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: fileDescriptorGofast,
 }
 
 func (m *MyRequest) Marshal() (data []byte, err error) {
@@ -507,8 +510,10 @@ var (
 	ErrIntOverflowGofast   = fmt.Errorf("proto: integer overflow")
 )
 
+func init() { proto.RegisterFile("gofast.proto", fileDescriptorGofast) }
+
 var fileDescriptorGofast = []byte{
-	// 139 bytes of a gzipped FileDescriptorProto
+	// 142 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x49, 0xcf, 0x4f, 0x4b,
 	0x2c, 0x2e, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0x14, 0xb9, 0x38,
 	0x7d, 0x2b, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0x44, 0xb8, 0x58, 0xc3, 0x12, 0x73,
@@ -516,6 +521,6 @@ var fileDescriptorGofast = []byte{
 	0x2e, 0x90, 0x92, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0xec, 0x6a, 0x8c, 0x6c, 0xb8, 0xd8, 0x7c,
 	0x2b, 0x43, 0x40, 0x66, 0x18, 0x71, 0x71, 0x86, 0xe6, 0x25, 0x16, 0x55, 0x3a, 0x27, 0xe6, 0xe4,
 	0x08, 0x09, 0xea, 0x41, 0x2d, 0x85, 0xdb, 0x21, 0x25, 0x84, 0x2c, 0x04, 0x31, 0xd3, 0x49, 0xe0,
-	0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x40, 0xfc, 0x00, 0x88, 0x67, 0x3c, 0x96, 0x63, 0x00, 0x04, 0x00,
-	0x00, 0xff, 0xff, 0x32, 0xdb, 0xa9, 0xd6, 0xad, 0x00, 0x00, 0x00,
+	0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf1, 0x58, 0x8e,
+	0x01, 0x10, 0x00, 0x00, 0xff, 0xff, 0x32, 0xdb, 0xa9, 0xd6, 0xad, 0x00, 0x00, 0x00,
 }
diff --git a/simple/grpc.pb.go b/simple/grpc.pb.go
index 2a7d315..b6bcf69 100644
--- a/simple/grpc.pb.go
+++ b/simple/grpc.pb.go
@@ -33,7 +33,9 @@ var _ = math.Inf
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type MyRequest struct {
 	Value int64 `protobuf:"varint,1,opt,name=Value,json=value,proto3" json:"Value,omitempty"`
@@ -84,7 +86,7 @@ var _ grpc1.ClientConn
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc1.SupportPackageIsVersion2
+const _ = grpc1.SupportPackageIsVersion3
 
 // Client API for MyTest service
 
@@ -346,6 +348,7 @@ var _MyTest_serviceDesc = grpc1.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
+	Metadata: fileDescriptorGrpc,
 }
 
 // Client API for MyBench service
@@ -436,25 +439,28 @@ var _MyBench_serviceDesc = grpc1.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
+	Metadata: fileDescriptorGrpc,
 }
 
+func init() { proto.RegisterFile("grpc.proto", fileDescriptorGrpc) }
+
 var fileDescriptorGrpc = []byte{
-	// 268 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0x5f, 0x4b, 0xc3, 0x30,
-	0x14, 0xc5, 0x09, 0xb6, 0xd3, 0x5d, 0x05, 0x25, 0xf8, 0x20, 0x03, 0x45, 0x0b, 0x42, 0x61, 0x9a,
-	0x96, 0xfa, 0xe2, 0xf3, 0xf4, 0xb5, 0x0a, 0xd3, 0xf9, 0xde, 0xd6, 0x98, 0x16, 0xba, 0x24, 0xe6,
-	0x8f, 0xd2, 0xaf, 0xe6, 0xa7, 0x73, 0x89, 0x53, 0x27, 0xb5, 0x4f, 0xc9, 0x3d, 0xe7, 0xdc, 0xe4,
-	0x97, 0x5c, 0x00, 0xa6, 0x64, 0x45, 0xa4, 0x12, 0x46, 0xe0, 0xc0, 0xed, 0x27, 0x53, 0xd6, 0x98,
-	0xda, 0x96, 0xa4, 0x12, 0xcb, 0x84, 0x09, 0x26, 0x12, 0x6f, 0x96, 0xf6, 0x25, 0x31, 0x54, 0x9b,
-	0xc4, 0xd4, 0xd4, 0xad, 0x5f, 0x2d, 0xd1, 0x19, 0x8c, 0xf3, 0x6e, 0x4e, 0x5f, 0xed, 0x4a, 0xc2,
-	0x87, 0x10, 0x3e, 0x15, 0xad, 0xa5, 0x47, 0xe8, 0x14, 0xc5, 0x5b, 0xf3, 0xf0, 0xcd, 0x15, 0x51,
-	0x04, 0xe0, 0x22, 0x5a, 0x0a, 0xae, 0xe9, 0x40, 0xe6, 0x18, 0xc2, 0xbc, 0xcb, 0x35, 0x1b, 0xb0,
-	0x4f, 0x60, 0xe4, 0xed, 0xec, 0x7f, 0x3f, 0xfb, 0x40, 0x2e, 0xf0, 0xe8, 0x18, 0x08, 0x8c, 0x17,
-	0xbc, 0x50, 0xdd, 0x4d, 0xd1, 0xb6, 0x78, 0x9f, 0xf8, 0xd7, 0xfd, 0x10, 0x4e, 0x0e, 0x7e, 0x85,
-	0x35, 0xcf, 0x05, 0xc0, 0xad, 0x78, 0xe7, 0xda, 0x28, 0x5a, 0x2c, 0xfb, 0x0d, 0xbb, 0xdf, 0xc2,
-	0xea, 0xf6, 0x14, 0xe1, 0x29, 0xec, 0x2c, 0xe4, 0x3a, 0xbb, 0x69, 0xf5, 0x0f, 0x8e, 0x11, 0x3e,
-	0x87, 0x60, 0xd6, 0x3c, 0x37, 0x7f, 0x83, 0x7b, 0x1b, 0x45, 0x16, 0xa3, 0x14, 0x65, 0xd7, 0xb0,
-	0x9d, 0x77, 0x33, 0xca, 0xab, 0x1a, 0x5f, 0x42, 0xe0, 0x60, 0xfa, 0x18, 0x98, 0xf8, 0x3f, 0xbf,
-	0x6b, 0xf8, 0xbd, 0x34, 0x0f, 0x46, 0xd9, 0xca, 0xa4, 0xa8, 0x1c, 0xf9, 0x19, 0x5c, 0x7d, 0x06,
-	0x00, 0x00, 0xff, 0xff, 0x66, 0x80, 0x21, 0x1c, 0xc4, 0x01, 0x00, 0x00,
+	// 267 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0x41, 0x4b, 0xc3, 0x30,
+	0x14, 0xc7, 0x09, 0xb6, 0xd3, 0x3d, 0x05, 0x25, 0x78, 0x90, 0x81, 0xa2, 0x05, 0xa1, 0x30, 0x6d,
+	0x4b, 0xbd, 0x78, 0x9e, 0x5e, 0xab, 0x30, 0x9d, 0xf7, 0xb6, 0xc6, 0xb4, 0xd0, 0x25, 0x31, 0x79,
+	0x51, 0xfa, 0xd5, 0xfc, 0x74, 0x92, 0x38, 0x75, 0x52, 0x77, 0x4a, 0xde, 0xfb, 0xff, 0x5e, 0xf8,
+	0x25, 0x01, 0xe0, 0x5a, 0xd5, 0x89, 0xd2, 0x12, 0x25, 0x0d, 0xdc, 0x7e, 0x32, 0xe5, 0x2d, 0x36,
+	0xb6, 0x4a, 0x6a, 0xb9, 0x4c, 0xb9, 0xe4, 0x32, 0xf5, 0x61, 0x65, 0x5f, 0x52, 0x64, 0x06, 0x53,
+	0x6c, 0x98, 0x5b, 0xbf, 0x46, 0xa2, 0x33, 0x18, 0x17, 0xfd, 0x9c, 0xbd, 0x5a, 0x66, 0x90, 0x1e,
+	0x42, 0xf8, 0x54, 0x76, 0x96, 0x1d, 0x91, 0x53, 0x12, 0x6f, 0xcd, 0xc3, 0x37, 0x57, 0x44, 0x11,
+	0x80, 0x43, 0x8c, 0x92, 0xc2, 0xb0, 0x0d, 0xcc, 0x31, 0x84, 0x45, 0x5f, 0x18, 0xbe, 0x21, 0x3e,
+	0x81, 0x91, 0x8f, 0xf3, 0xff, 0xf3, 0xfc, 0x83, 0x38, 0xe0, 0xd1, 0x39, 0x24, 0x30, 0x5e, 0x88,
+	0x52, 0xf7, 0x37, 0x65, 0xd7, 0xd1, 0xfd, 0xc4, 0xdf, 0xee, 0xc7, 0x70, 0x72, 0xf0, 0xdb, 0x58,
+	0xf9, 0x5c, 0x00, 0xdc, 0xca, 0x77, 0x61, 0x50, 0xb3, 0x72, 0x39, 0x1c, 0xd8, 0xfd, 0x6e, 0x14,
+	0x86, 0x67, 0x84, 0x4e, 0x61, 0x67, 0xa1, 0x56, 0xec, 0x7a, 0x34, 0x3c, 0x38, 0x26, 0xf4, 0x1c,
+	0x82, 0x59, 0xfb, 0xdc, 0xfe, 0x05, 0xf7, 0xd6, 0x8a, 0x3c, 0x26, 0x19, 0xc9, 0xaf, 0x61, 0xbb,
+	0xe8, 0x67, 0x4c, 0xd4, 0x0d, 0xbd, 0x84, 0xc0, 0xc9, 0x0c, 0x35, 0x68, 0xe2, 0xdf, 0xfc, 0xae,
+	0x15, 0xf7, 0x0a, 0x1f, 0x50, 0xdb, 0x1a, 0x33, 0x52, 0x8d, 0xfc, 0x1f, 0x5c, 0x7d, 0x06, 0x00,
+	0x00, 0xff, 0xff, 0x66, 0x80, 0x21, 0x1c, 0xc4, 0x01, 0x00, 0x00,
 }