Don't create nested types (or field accessors) for map types.

I'm sure I've implemented this before, but somehow it's been lost in a maze of twisty little branches, all alike.

2 files changed, 0 insertions, 5771 deletions

diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
index 843991f8..5f6eae0c 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
@@ -14,49 +14,12 @@ namespace Google.Protobuf.TestProtos {
 
     #region Static variables
     internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapInt32Int32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapInt64Int64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapUint32Uint32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapUint64Uint64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapSint32Sint32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapSint64Sint64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapFixed32Fixed32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapFixed64Fixed64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapSfixed32Sfixed32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapSfixed64Sfixed64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapInt32FloatEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapInt32DoubleEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapBoolBoolEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapStringStringEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapInt32BytesEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapInt32EnumEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMap_MapInt32ForeignMessageEntry__FieldAccessorTable;
     internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMapSubmessage__FieldAccessorTable;
     internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMessageMap__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestMessageMap_MapInt32MessageEntry__FieldAccessorTable;
     internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestSameTypeMap__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestSameTypeMap_Map1Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestSameTypeMap_Map2Entry__FieldAccessorTable;
     internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapInt32Int32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapInt64Int64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapUint32Uint32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapUint64Uint64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapSint32Sint32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapSint64Sint64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapFixed32Fixed32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapFixed64Fixed64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapSfixed32Sfixed32Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapSfixed64Sfixed64Entry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapInt32FloatEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapInt32DoubleEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapBoolBoolEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapInt32EnumEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_TestArenaMap_MapInt32ForeignMessageEntry__FieldAccessorTable;
     internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MessageContainingEnumCalledType__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MessageContainingEnumCalledType_TypeEntry__FieldAccessorTable;
     internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MessageContainingMapCalledEntry__FieldAccessorTable;
-    internal static pbr::FieldAccessorTable internal__static_protobuf_unittest_MessageContainingMapCalledEntry_EntryEntry__FieldAccessorTable;
     #endregion
     #region Descriptor
     public static pbr::FileDescriptor Descriptor {
@@ -198,135 +161,24 @@ namespace Google.Protobuf.TestProtos {
       internal__static_protobuf_unittest_TestMap__FieldAccessorTable = 
           new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap), descriptor.MessageTypes[0],
               new string[] { "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapInt32Bytes", "MapInt32Enum", "MapInt32ForeignMessage", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapInt32Int32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapInt32Int32Entry), descriptor.MessageTypes[0].NestedTypes[0],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapInt64Int64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapInt64Int64Entry), descriptor.MessageTypes[0].NestedTypes[1],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapUint32Uint32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapUint32Uint32Entry), descriptor.MessageTypes[0].NestedTypes[2],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapUint64Uint64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapUint64Uint64Entry), descriptor.MessageTypes[0].NestedTypes[3],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapSint32Sint32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapSint32Sint32Entry), descriptor.MessageTypes[0].NestedTypes[4],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapSint64Sint64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapSint64Sint64Entry), descriptor.MessageTypes[0].NestedTypes[5],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapFixed32Fixed32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapFixed32Fixed32Entry), descriptor.MessageTypes[0].NestedTypes[6],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapFixed64Fixed64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapFixed64Fixed64Entry), descriptor.MessageTypes[0].NestedTypes[7],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapSfixed32Sfixed32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapSfixed32Sfixed32Entry), descriptor.MessageTypes[0].NestedTypes[8],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapSfixed64Sfixed64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapSfixed64Sfixed64Entry), descriptor.MessageTypes[0].NestedTypes[9],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapInt32FloatEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapInt32FloatEntry), descriptor.MessageTypes[0].NestedTypes[10],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapInt32DoubleEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapInt32DoubleEntry), descriptor.MessageTypes[0].NestedTypes[11],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapBoolBoolEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapBoolBoolEntry), descriptor.MessageTypes[0].NestedTypes[12],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapStringStringEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapStringStringEntry), descriptor.MessageTypes[0].NestedTypes[13],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapInt32BytesEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapInt32BytesEntry), descriptor.MessageTypes[0].NestedTypes[14],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapInt32EnumEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapInt32EnumEntry), descriptor.MessageTypes[0].NestedTypes[15],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestMap_MapInt32ForeignMessageEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMap.Types.MapInt32ForeignMessageEntry), descriptor.MessageTypes[0].NestedTypes[16],
-              new string[] { "Key", "Value", }, new string[] { });
       internal__static_protobuf_unittest_TestMapSubmessage__FieldAccessorTable = 
           new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMapSubmessage), descriptor.MessageTypes[1],
               new string[] { "TestMap", }, new string[] { });
       internal__static_protobuf_unittest_TestMessageMap__FieldAccessorTable = 
           new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMessageMap), descriptor.MessageTypes[2],
               new string[] { "MapInt32Message", }, new string[] { });
-      internal__static_protobuf_unittest_TestMessageMap_MapInt32MessageEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestMessageMap.Types.MapInt32MessageEntry), descriptor.MessageTypes[2].NestedTypes[0],
-              new string[] { "Key", "Value", }, new string[] { });
       internal__static_protobuf_unittest_TestSameTypeMap__FieldAccessorTable = 
           new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestSameTypeMap), descriptor.MessageTypes[3],
               new string[] { "Map1", "Map2", }, new string[] { });
-      internal__static_protobuf_unittest_TestSameTypeMap_Map1Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestSameTypeMap.Types.Map1Entry), descriptor.MessageTypes[3].NestedTypes[0],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestSameTypeMap_Map2Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestSameTypeMap.Types.Map2Entry), descriptor.MessageTypes[3].NestedTypes[1],
-              new string[] { "Key", "Value", }, new string[] { });
       internal__static_protobuf_unittest_TestArenaMap__FieldAccessorTable = 
           new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap), descriptor.MessageTypes[4],
               new string[] { "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapInt32Enum", "MapInt32ForeignMessage", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapInt32Int32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapInt32Int32Entry), descriptor.MessageTypes[4].NestedTypes[0],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapInt64Int64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapInt64Int64Entry), descriptor.MessageTypes[4].NestedTypes[1],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapUint32Uint32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapUint32Uint32Entry), descriptor.MessageTypes[4].NestedTypes[2],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapUint64Uint64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapUint64Uint64Entry), descriptor.MessageTypes[4].NestedTypes[3],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapSint32Sint32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapSint32Sint32Entry), descriptor.MessageTypes[4].NestedTypes[4],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapSint64Sint64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapSint64Sint64Entry), descriptor.MessageTypes[4].NestedTypes[5],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapFixed32Fixed32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapFixed32Fixed32Entry), descriptor.MessageTypes[4].NestedTypes[6],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapFixed64Fixed64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapFixed64Fixed64Entry), descriptor.MessageTypes[4].NestedTypes[7],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapSfixed32Sfixed32Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapSfixed32Sfixed32Entry), descriptor.MessageTypes[4].NestedTypes[8],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapSfixed64Sfixed64Entry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapSfixed64Sfixed64Entry), descriptor.MessageTypes[4].NestedTypes[9],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapInt32FloatEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapInt32FloatEntry), descriptor.MessageTypes[4].NestedTypes[10],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapInt32DoubleEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapInt32DoubleEntry), descriptor.MessageTypes[4].NestedTypes[11],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapBoolBoolEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapBoolBoolEntry), descriptor.MessageTypes[4].NestedTypes[12],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapInt32EnumEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapInt32EnumEntry), descriptor.MessageTypes[4].NestedTypes[13],
-              new string[] { "Key", "Value", }, new string[] { });
-      internal__static_protobuf_unittest_TestArenaMap_MapInt32ForeignMessageEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.TestArenaMap.Types.MapInt32ForeignMessageEntry), descriptor.MessageTypes[4].NestedTypes[14],
-              new string[] { "Key", "Value", }, new string[] { });
       internal__static_protobuf_unittest_MessageContainingEnumCalledType__FieldAccessorTable = 
           new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType), descriptor.MessageTypes[5],
               new string[] { "Type", }, new string[] { });
-      internal__static_protobuf_unittest_MessageContainingEnumCalledType_TypeEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Types.TypeEntry), descriptor.MessageTypes[5].NestedTypes[0],
-              new string[] { "Key", "Value", }, new string[] { });
       internal__static_protobuf_unittest_MessageContainingMapCalledEntry__FieldAccessorTable = 
           new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry), descriptor.MessageTypes[6],
               new string[] { "Entry", }, new string[] { });
-      internal__static_protobuf_unittest_MessageContainingMapCalledEntry_EntryEntry__FieldAccessorTable = 
-          new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry.Types.EntryEntry), descriptor.MessageTypes[6].NestedTypes[0],
-              new string[] { "Key", "Value", }, new string[] { });
     }
     #endregion
 
@@ -754,2501 +606,6 @@ namespace Google.Protobuf.TestProtos {
       }
     }
 
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32Int32Entry : pb::IMessage<MapInt32Int32Entry> {
-        private static readonly pb::MessageParser<MapInt32Int32Entry> _parser = new pb::MessageParser<MapInt32Int32Entry>(() => new MapInt32Int32Entry());
-        public static pb::MessageParser<MapInt32Int32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapInt32Int32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32Int32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32Int32Entry(MapInt32Int32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32Int32Entry Clone() {
-          return new MapInt32Int32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32Int32Entry);
-        }
-
-        public bool Equals(MapInt32Int32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32Int32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt64Int64Entry : pb::IMessage<MapInt64Int64Entry> {
-        private static readonly pb::MessageParser<MapInt64Int64Entry> _parser = new pb::MessageParser<MapInt64Int64Entry>(() => new MapInt64Int64Entry());
-        public static pb::MessageParser<MapInt64Int64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[1]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapInt64Int64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt64Int64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt64Int64Entry(MapInt64Int64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt64Int64Entry Clone() {
-          return new MapInt64Int64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private long key_;
-        public long Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private long value_;
-        public long Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt64Int64Entry);
-        }
-
-        public bool Equals(MapInt64Int64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0L) hash ^= Key.GetHashCode();
-          if (Value != 0L) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0L) {
-            output.WriteRawTag(8);
-            output.WriteInt64(Key);
-          }
-          if (Value != 0L) {
-            output.WriteRawTag(16);
-            output.WriteInt64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeInt64Size(Key);
-          }
-          if (Value != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeInt64Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt64Int64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0L) {
-            Key = other.Key;
-          }
-          if (other.Value != 0L) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt64();
-                break;
-              }
-              case 16: {
-                Value = input.ReadInt64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapUint32Uint32Entry : pb::IMessage<MapUint32Uint32Entry> {
-        private static readonly pb::MessageParser<MapUint32Uint32Entry> _parser = new pb::MessageParser<MapUint32Uint32Entry>(() => new MapUint32Uint32Entry());
-        public static pb::MessageParser<MapUint32Uint32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[2]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapUint32Uint32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapUint32Uint32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapUint32Uint32Entry(MapUint32Uint32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapUint32Uint32Entry Clone() {
-          return new MapUint32Uint32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private uint key_;
-        public uint Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private uint value_;
-        public uint Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapUint32Uint32Entry);
-        }
-
-        public bool Equals(MapUint32Uint32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteUInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteUInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapUint32Uint32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadUInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadUInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapUint64Uint64Entry : pb::IMessage<MapUint64Uint64Entry> {
-        private static readonly pb::MessageParser<MapUint64Uint64Entry> _parser = new pb::MessageParser<MapUint64Uint64Entry>(() => new MapUint64Uint64Entry());
-        public static pb::MessageParser<MapUint64Uint64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[3]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapUint64Uint64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapUint64Uint64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapUint64Uint64Entry(MapUint64Uint64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapUint64Uint64Entry Clone() {
-          return new MapUint64Uint64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private ulong key_;
-        public ulong Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private ulong value_;
-        public ulong Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapUint64Uint64Entry);
-        }
-
-        public bool Equals(MapUint64Uint64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0UL) hash ^= Key.GetHashCode();
-          if (Value != 0UL) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0UL) {
-            output.WriteRawTag(8);
-            output.WriteUInt64(Key);
-          }
-          if (Value != 0UL) {
-            output.WriteRawTag(16);
-            output.WriteUInt64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0UL) {
-            size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Key);
-          }
-          if (Value != 0UL) {
-            size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapUint64Uint64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0UL) {
-            Key = other.Key;
-          }
-          if (other.Value != 0UL) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadUInt64();
-                break;
-              }
-              case 16: {
-                Value = input.ReadUInt64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapSint32Sint32Entry : pb::IMessage<MapSint32Sint32Entry> {
-        private static readonly pb::MessageParser<MapSint32Sint32Entry> _parser = new pb::MessageParser<MapSint32Sint32Entry>(() => new MapSint32Sint32Entry());
-        public static pb::MessageParser<MapSint32Sint32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[4]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapSint32Sint32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapSint32Sint32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapSint32Sint32Entry(MapSint32Sint32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapSint32Sint32Entry Clone() {
-          return new MapSint32Sint32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapSint32Sint32Entry);
-        }
-
-        public bool Equals(MapSint32Sint32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteSInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteSInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeSInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeSInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapSint32Sint32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadSInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadSInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapSint64Sint64Entry : pb::IMessage<MapSint64Sint64Entry> {
-        private static readonly pb::MessageParser<MapSint64Sint64Entry> _parser = new pb::MessageParser<MapSint64Sint64Entry>(() => new MapSint64Sint64Entry());
-        public static pb::MessageParser<MapSint64Sint64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[5]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapSint64Sint64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapSint64Sint64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapSint64Sint64Entry(MapSint64Sint64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapSint64Sint64Entry Clone() {
-          return new MapSint64Sint64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private long key_;
-        public long Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private long value_;
-        public long Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapSint64Sint64Entry);
-        }
-
-        public bool Equals(MapSint64Sint64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0L) hash ^= Key.GetHashCode();
-          if (Value != 0L) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0L) {
-            output.WriteRawTag(8);
-            output.WriteSInt64(Key);
-          }
-          if (Value != 0L) {
-            output.WriteRawTag(16);
-            output.WriteSInt64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeSInt64Size(Key);
-          }
-          if (Value != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeSInt64Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapSint64Sint64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0L) {
-            Key = other.Key;
-          }
-          if (other.Value != 0L) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadSInt64();
-                break;
-              }
-              case 16: {
-                Value = input.ReadSInt64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapFixed32Fixed32Entry : pb::IMessage<MapFixed32Fixed32Entry> {
-        private static readonly pb::MessageParser<MapFixed32Fixed32Entry> _parser = new pb::MessageParser<MapFixed32Fixed32Entry>(() => new MapFixed32Fixed32Entry());
-        public static pb::MessageParser<MapFixed32Fixed32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 13, 21 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[6]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapFixed32Fixed32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapFixed32Fixed32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapFixed32Fixed32Entry(MapFixed32Fixed32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapFixed32Fixed32Entry Clone() {
-          return new MapFixed32Fixed32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private uint key_;
-        public uint Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private uint value_;
-        public uint Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapFixed32Fixed32Entry);
-        }
-
-        public bool Equals(MapFixed32Fixed32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(13);
-            output.WriteFixed32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(21);
-            output.WriteFixed32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + 4;
-          }
-          if (Value != 0) {
-            size += 1 + 4;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapFixed32Fixed32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 13: {
-                Key = input.ReadFixed32();
-                break;
-              }
-              case 21: {
-                Value = input.ReadFixed32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapFixed64Fixed64Entry : pb::IMessage<MapFixed64Fixed64Entry> {
-        private static readonly pb::MessageParser<MapFixed64Fixed64Entry> _parser = new pb::MessageParser<MapFixed64Fixed64Entry>(() => new MapFixed64Fixed64Entry());
-        public static pb::MessageParser<MapFixed64Fixed64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 9, 17 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[7]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapFixed64Fixed64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapFixed64Fixed64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapFixed64Fixed64Entry(MapFixed64Fixed64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapFixed64Fixed64Entry Clone() {
-          return new MapFixed64Fixed64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private ulong key_;
-        public ulong Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private ulong value_;
-        public ulong Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapFixed64Fixed64Entry);
-        }
-
-        public bool Equals(MapFixed64Fixed64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0UL) hash ^= Key.GetHashCode();
-          if (Value != 0UL) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0UL) {
-            output.WriteRawTag(9);
-            output.WriteFixed64(Key);
-          }
-          if (Value != 0UL) {
-            output.WriteRawTag(17);
-            output.WriteFixed64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0UL) {
-            size += 1 + 8;
-          }
-          if (Value != 0UL) {
-            size += 1 + 8;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapFixed64Fixed64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0UL) {
-            Key = other.Key;
-          }
-          if (other.Value != 0UL) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 9: {
-                Key = input.ReadFixed64();
-                break;
-              }
-              case 17: {
-                Value = input.ReadFixed64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapSfixed32Sfixed32Entry : pb::IMessage<MapSfixed32Sfixed32Entry> {
-        private static readonly pb::MessageParser<MapSfixed32Sfixed32Entry> _parser = new pb::MessageParser<MapSfixed32Sfixed32Entry>(() => new MapSfixed32Sfixed32Entry());
-        public static pb::MessageParser<MapSfixed32Sfixed32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 13, 21 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[8]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapSfixed32Sfixed32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapSfixed32Sfixed32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapSfixed32Sfixed32Entry(MapSfixed32Sfixed32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapSfixed32Sfixed32Entry Clone() {
-          return new MapSfixed32Sfixed32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapSfixed32Sfixed32Entry);
-        }
-
-        public bool Equals(MapSfixed32Sfixed32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(13);
-            output.WriteSFixed32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(21);
-            output.WriteSFixed32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + 4;
-          }
-          if (Value != 0) {
-            size += 1 + 4;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapSfixed32Sfixed32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 13: {
-                Key = input.ReadSFixed32();
-                break;
-              }
-              case 21: {
-                Value = input.ReadSFixed32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapSfixed64Sfixed64Entry : pb::IMessage<MapSfixed64Sfixed64Entry> {
-        private static readonly pb::MessageParser<MapSfixed64Sfixed64Entry> _parser = new pb::MessageParser<MapSfixed64Sfixed64Entry>(() => new MapSfixed64Sfixed64Entry());
-        public static pb::MessageParser<MapSfixed64Sfixed64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 9, 17 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[9]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapSfixed64Sfixed64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapSfixed64Sfixed64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapSfixed64Sfixed64Entry(MapSfixed64Sfixed64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapSfixed64Sfixed64Entry Clone() {
-          return new MapSfixed64Sfixed64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private long key_;
-        public long Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private long value_;
-        public long Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapSfixed64Sfixed64Entry);
-        }
-
-        public bool Equals(MapSfixed64Sfixed64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0L) hash ^= Key.GetHashCode();
-          if (Value != 0L) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0L) {
-            output.WriteRawTag(9);
-            output.WriteSFixed64(Key);
-          }
-          if (Value != 0L) {
-            output.WriteRawTag(17);
-            output.WriteSFixed64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0L) {
-            size += 1 + 8;
-          }
-          if (Value != 0L) {
-            size += 1 + 8;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapSfixed64Sfixed64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0L) {
-            Key = other.Key;
-          }
-          if (other.Value != 0L) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 9: {
-                Key = input.ReadSFixed64();
-                break;
-              }
-              case 17: {
-                Value = input.ReadSFixed64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32FloatEntry : pb::IMessage<MapInt32FloatEntry> {
-        private static readonly pb::MessageParser<MapInt32FloatEntry> _parser = new pb::MessageParser<MapInt32FloatEntry>(() => new MapInt32FloatEntry());
-        public static pb::MessageParser<MapInt32FloatEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 21 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[10]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapInt32FloatEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32FloatEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32FloatEntry(MapInt32FloatEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32FloatEntry Clone() {
-          return new MapInt32FloatEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private float value_;
-        public float Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32FloatEntry);
-        }
-
-        public bool Equals(MapInt32FloatEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0F) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0F) {
-            output.WriteRawTag(21);
-            output.WriteFloat(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0F) {
-            size += 1 + 4;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32FloatEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0F) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 21: {
-                Value = input.ReadFloat();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32DoubleEntry : pb::IMessage<MapInt32DoubleEntry> {
-        private static readonly pb::MessageParser<MapInt32DoubleEntry> _parser = new pb::MessageParser<MapInt32DoubleEntry>(() => new MapInt32DoubleEntry());
-        public static pb::MessageParser<MapInt32DoubleEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 17 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[11]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapInt32DoubleEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32DoubleEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32DoubleEntry(MapInt32DoubleEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32DoubleEntry Clone() {
-          return new MapInt32DoubleEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private double value_;
-        public double Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32DoubleEntry);
-        }
-
-        public bool Equals(MapInt32DoubleEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0D) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0D) {
-            output.WriteRawTag(17);
-            output.WriteDouble(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0D) {
-            size += 1 + 8;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32DoubleEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0D) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 17: {
-                Value = input.ReadDouble();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapBoolBoolEntry : pb::IMessage<MapBoolBoolEntry> {
-        private static readonly pb::MessageParser<MapBoolBoolEntry> _parser = new pb::MessageParser<MapBoolBoolEntry>(() => new MapBoolBoolEntry());
-        public static pb::MessageParser<MapBoolBoolEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[12]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapBoolBoolEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapBoolBoolEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapBoolBoolEntry(MapBoolBoolEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapBoolBoolEntry Clone() {
-          return new MapBoolBoolEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private bool key_;
-        public bool Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private bool value_;
-        public bool Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapBoolBoolEntry);
-        }
-
-        public bool Equals(MapBoolBoolEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != false) hash ^= Key.GetHashCode();
-          if (Value != false) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != false) {
-            output.WriteRawTag(8);
-            output.WriteBool(Key);
-          }
-          if (Value != false) {
-            output.WriteRawTag(16);
-            output.WriteBool(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != false) {
-            size += 1 + 1;
-          }
-          if (Value != false) {
-            size += 1 + 1;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapBoolBoolEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != false) {
-            Key = other.Key;
-          }
-          if (other.Value != false) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadBool();
-                break;
-              }
-              case 16: {
-                Value = input.ReadBool();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapStringStringEntry : pb::IMessage<MapStringStringEntry> {
-        private static readonly pb::MessageParser<MapStringStringEntry> _parser = new pb::MessageParser<MapStringStringEntry>(() => new MapStringStringEntry());
-        public static pb::MessageParser<MapStringStringEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 10, 18 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[13]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapStringStringEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapStringStringEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapStringStringEntry(MapStringStringEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapStringStringEntry Clone() {
-          return new MapStringStringEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private string key_ = "";
-        public string Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value ?? "";
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private string value_ = "";
-        public string Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value ?? "";
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapStringStringEntry);
-        }
-
-        public bool Equals(MapStringStringEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key.Length != 0) hash ^= Key.GetHashCode();
-          if (Value.Length != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(Key);
-          }
-          if (Value.Length != 0) {
-            output.WriteRawTag(18);
-            output.WriteString(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key.Length != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(Key);
-          }
-          if (Value.Length != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapStringStringEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key.Length != 0) {
-            Key = other.Key;
-          }
-          if (other.Value.Length != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 10: {
-                Key = input.ReadString();
-                break;
-              }
-              case 18: {
-                Value = input.ReadString();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32BytesEntry : pb::IMessage<MapInt32BytesEntry> {
-        private static readonly pb::MessageParser<MapInt32BytesEntry> _parser = new pb::MessageParser<MapInt32BytesEntry>(() => new MapInt32BytesEntry());
-        public static pb::MessageParser<MapInt32BytesEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 18 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[14]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapInt32BytesEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32BytesEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32BytesEntry(MapInt32BytesEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32BytesEntry Clone() {
-          return new MapInt32BytesEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private pb::ByteString value_ = pb::ByteString.Empty;
-        public pb::ByteString Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value ?? pb::ByteString.Empty;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32BytesEntry);
-        }
-
-        public bool Equals(MapInt32BytesEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value.Length != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value.Length != 0) {
-            output.WriteRawTag(18);
-            output.WriteBytes(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value.Length != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeBytesSize(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32BytesEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value.Length != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                Value = input.ReadBytes();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32EnumEntry : pb::IMessage<MapInt32EnumEntry> {
-        private static readonly pb::MessageParser<MapInt32EnumEntry> _parser = new pb::MessageParser<MapInt32EnumEntry>(() => new MapInt32EnumEntry());
-        public static pb::MessageParser<MapInt32EnumEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[15]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapInt32EnumEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32EnumEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32EnumEntry(MapInt32EnumEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32EnumEntry Clone() {
-          return new MapInt32EnumEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private global::Google.Protobuf.TestProtos.MapEnum value_ = global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO;
-        public global::Google.Protobuf.TestProtos.MapEnum Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32EnumEntry);
-        }
-
-        public bool Equals(MapInt32EnumEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO) {
-            output.WriteRawTag(16);
-            output.WriteEnum((int) Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO) {
-            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32EnumEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                value_ = (global::Google.Protobuf.TestProtos.MapEnum) input.ReadEnum();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32ForeignMessageEntry : pb::IMessage<MapInt32ForeignMessageEntry> {
-        private static readonly pb::MessageParser<MapInt32ForeignMessageEntry> _parser = new pb::MessageParser<MapInt32ForeignMessageEntry>(() => new MapInt32ForeignMessageEntry());
-        public static pb::MessageParser<MapInt32ForeignMessageEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 18 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMap.Descriptor.NestedTypes[16]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMap_MapInt32ForeignMessageEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32ForeignMessageEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32ForeignMessageEntry(MapInt32ForeignMessageEntry other) : this() {
-          key_ = other.key_;
-          Value = other.value_ != null ? other.Value.Clone() : null;
-        }
-
-        public MapInt32ForeignMessageEntry Clone() {
-          return new MapInt32ForeignMessageEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-          if (value_ != null) Value.Freeze();
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private global::Google.Protobuf.TestProtos.ForeignMessage value_;
-        public global::Google.Protobuf.TestProtos.ForeignMessage Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32ForeignMessageEntry);
-        }
-
-        public bool Equals(MapInt32ForeignMessageEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (!object.Equals(Value, other.Value)) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (value_ != null) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (value_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (value_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32ForeignMessageEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.value_ != null) {
-            if (value_ == null) {
-              value_ = new global::Google.Protobuf.TestProtos.ForeignMessage();
-            }
-            Value.MergeFrom(other.Value);
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                if (value_ == null) {
-                  value_ = new global::Google.Protobuf.TestProtos.ForeignMessage();
-                }
-                input.ReadMessage(value_);
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3486,165 +843,6 @@ namespace Google.Protobuf.TestProtos {
       }
     }
 
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32MessageEntry : pb::IMessage<MapInt32MessageEntry> {
-        private static readonly pb::MessageParser<MapInt32MessageEntry> _parser = new pb::MessageParser<MapInt32MessageEntry>(() => new MapInt32MessageEntry());
-        public static pb::MessageParser<MapInt32MessageEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 18 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestMessageMap.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestMessageMap_MapInt32MessageEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32MessageEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32MessageEntry(MapInt32MessageEntry other) : this() {
-          key_ = other.key_;
-          Value = other.value_ != null ? other.Value.Clone() : null;
-        }
-
-        public MapInt32MessageEntry Clone() {
-          return new MapInt32MessageEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-          if (value_ != null) Value.Freeze();
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private global::Google.Protobuf.TestProtos.TestAllTypes value_;
-        public global::Google.Protobuf.TestProtos.TestAllTypes Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32MessageEntry);
-        }
-
-        public bool Equals(MapInt32MessageEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (!object.Equals(Value, other.Value)) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (value_ != null) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (value_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (value_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32MessageEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.value_ != null) {
-            if (value_ == null) {
-              value_ = new global::Google.Protobuf.TestProtos.TestAllTypes();
-            }
-            Value.MergeFrom(other.Value);
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                if (value_ == null) {
-                  value_ = new global::Google.Protobuf.TestProtos.TestAllTypes();
-                }
-                input.ReadMessage(value_);
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3775,304 +973,6 @@ namespace Google.Protobuf.TestProtos {
       }
     }
 
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class Map1Entry : pb::IMessage<Map1Entry> {
-        private static readonly pb::MessageParser<Map1Entry> _parser = new pb::MessageParser<Map1Entry>(() => new Map1Entry());
-        public static pb::MessageParser<Map1Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestSameTypeMap.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestSameTypeMap_Map1Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public Map1Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public Map1Entry(Map1Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public Map1Entry Clone() {
-          return new Map1Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as Map1Entry);
-        }
-
-        public bool Equals(Map1Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(Map1Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class Map2Entry : pb::IMessage<Map2Entry> {
-        private static readonly pb::MessageParser<Map2Entry> _parser = new pb::MessageParser<Map2Entry>(() => new Map2Entry());
-        public static pb::MessageParser<Map2Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestSameTypeMap.Descriptor.NestedTypes[1]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestSameTypeMap_Map2Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public Map2Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public Map2Entry(Map2Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public Map2Entry Clone() {
-          return new Map2Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as Map2Entry);
-        }
-
-        public bool Equals(Map2Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(Map2Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4450,2209 +1350,6 @@ namespace Google.Protobuf.TestProtos {
       }
     }
 
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32Int32Entry : pb::IMessage<MapInt32Int32Entry> {
-        private static readonly pb::MessageParser<MapInt32Int32Entry> _parser = new pb::MessageParser<MapInt32Int32Entry>(() => new MapInt32Int32Entry());
-        public static pb::MessageParser<MapInt32Int32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapInt32Int32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32Int32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32Int32Entry(MapInt32Int32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32Int32Entry Clone() {
-          return new MapInt32Int32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32Int32Entry);
-        }
-
-        public bool Equals(MapInt32Int32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32Int32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt64Int64Entry : pb::IMessage<MapInt64Int64Entry> {
-        private static readonly pb::MessageParser<MapInt64Int64Entry> _parser = new pb::MessageParser<MapInt64Int64Entry>(() => new MapInt64Int64Entry());
-        public static pb::MessageParser<MapInt64Int64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[1]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapInt64Int64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt64Int64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt64Int64Entry(MapInt64Int64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt64Int64Entry Clone() {
-          return new MapInt64Int64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private long key_;
-        public long Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private long value_;
-        public long Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt64Int64Entry);
-        }
-
-        public bool Equals(MapInt64Int64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0L) hash ^= Key.GetHashCode();
-          if (Value != 0L) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0L) {
-            output.WriteRawTag(8);
-            output.WriteInt64(Key);
-          }
-          if (Value != 0L) {
-            output.WriteRawTag(16);
-            output.WriteInt64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeInt64Size(Key);
-          }
-          if (Value != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeInt64Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt64Int64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0L) {
-            Key = other.Key;
-          }
-          if (other.Value != 0L) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt64();
-                break;
-              }
-              case 16: {
-                Value = input.ReadInt64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapUint32Uint32Entry : pb::IMessage<MapUint32Uint32Entry> {
-        private static readonly pb::MessageParser<MapUint32Uint32Entry> _parser = new pb::MessageParser<MapUint32Uint32Entry>(() => new MapUint32Uint32Entry());
-        public static pb::MessageParser<MapUint32Uint32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[2]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapUint32Uint32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapUint32Uint32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapUint32Uint32Entry(MapUint32Uint32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapUint32Uint32Entry Clone() {
-          return new MapUint32Uint32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private uint key_;
-        public uint Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private uint value_;
-        public uint Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapUint32Uint32Entry);
-        }
-
-        public bool Equals(MapUint32Uint32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteUInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteUInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapUint32Uint32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadUInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadUInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapUint64Uint64Entry : pb::IMessage<MapUint64Uint64Entry> {
-        private static readonly pb::MessageParser<MapUint64Uint64Entry> _parser = new pb::MessageParser<MapUint64Uint64Entry>(() => new MapUint64Uint64Entry());
-        public static pb::MessageParser<MapUint64Uint64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[3]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapUint64Uint64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapUint64Uint64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapUint64Uint64Entry(MapUint64Uint64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapUint64Uint64Entry Clone() {
-          return new MapUint64Uint64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private ulong key_;
-        public ulong Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private ulong value_;
-        public ulong Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapUint64Uint64Entry);
-        }
-
-        public bool Equals(MapUint64Uint64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0UL) hash ^= Key.GetHashCode();
-          if (Value != 0UL) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0UL) {
-            output.WriteRawTag(8);
-            output.WriteUInt64(Key);
-          }
-          if (Value != 0UL) {
-            output.WriteRawTag(16);
-            output.WriteUInt64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0UL) {
-            size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Key);
-          }
-          if (Value != 0UL) {
-            size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapUint64Uint64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0UL) {
-            Key = other.Key;
-          }
-          if (other.Value != 0UL) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadUInt64();
-                break;
-              }
-              case 16: {
-                Value = input.ReadUInt64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapSint32Sint32Entry : pb::IMessage<MapSint32Sint32Entry> {
-        private static readonly pb::MessageParser<MapSint32Sint32Entry> _parser = new pb::MessageParser<MapSint32Sint32Entry>(() => new MapSint32Sint32Entry());
-        public static pb::MessageParser<MapSint32Sint32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[4]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapSint32Sint32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapSint32Sint32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapSint32Sint32Entry(MapSint32Sint32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapSint32Sint32Entry Clone() {
-          return new MapSint32Sint32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapSint32Sint32Entry);
-        }
-
-        public bool Equals(MapSint32Sint32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteSInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteSInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeSInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeSInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapSint32Sint32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadSInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadSInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapSint64Sint64Entry : pb::IMessage<MapSint64Sint64Entry> {
-        private static readonly pb::MessageParser<MapSint64Sint64Entry> _parser = new pb::MessageParser<MapSint64Sint64Entry>(() => new MapSint64Sint64Entry());
-        public static pb::MessageParser<MapSint64Sint64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[5]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapSint64Sint64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapSint64Sint64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapSint64Sint64Entry(MapSint64Sint64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapSint64Sint64Entry Clone() {
-          return new MapSint64Sint64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private long key_;
-        public long Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private long value_;
-        public long Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapSint64Sint64Entry);
-        }
-
-        public bool Equals(MapSint64Sint64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0L) hash ^= Key.GetHashCode();
-          if (Value != 0L) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0L) {
-            output.WriteRawTag(8);
-            output.WriteSInt64(Key);
-          }
-          if (Value != 0L) {
-            output.WriteRawTag(16);
-            output.WriteSInt64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeSInt64Size(Key);
-          }
-          if (Value != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeSInt64Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapSint64Sint64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0L) {
-            Key = other.Key;
-          }
-          if (other.Value != 0L) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadSInt64();
-                break;
-              }
-              case 16: {
-                Value = input.ReadSInt64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapFixed32Fixed32Entry : pb::IMessage<MapFixed32Fixed32Entry> {
-        private static readonly pb::MessageParser<MapFixed32Fixed32Entry> _parser = new pb::MessageParser<MapFixed32Fixed32Entry>(() => new MapFixed32Fixed32Entry());
-        public static pb::MessageParser<MapFixed32Fixed32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 13, 21 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[6]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapFixed32Fixed32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapFixed32Fixed32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapFixed32Fixed32Entry(MapFixed32Fixed32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapFixed32Fixed32Entry Clone() {
-          return new MapFixed32Fixed32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private uint key_;
-        public uint Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private uint value_;
-        public uint Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapFixed32Fixed32Entry);
-        }
-
-        public bool Equals(MapFixed32Fixed32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(13);
-            output.WriteFixed32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(21);
-            output.WriteFixed32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + 4;
-          }
-          if (Value != 0) {
-            size += 1 + 4;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapFixed32Fixed32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 13: {
-                Key = input.ReadFixed32();
-                break;
-              }
-              case 21: {
-                Value = input.ReadFixed32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapFixed64Fixed64Entry : pb::IMessage<MapFixed64Fixed64Entry> {
-        private static readonly pb::MessageParser<MapFixed64Fixed64Entry> _parser = new pb::MessageParser<MapFixed64Fixed64Entry>(() => new MapFixed64Fixed64Entry());
-        public static pb::MessageParser<MapFixed64Fixed64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 9, 17 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[7]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapFixed64Fixed64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapFixed64Fixed64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapFixed64Fixed64Entry(MapFixed64Fixed64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapFixed64Fixed64Entry Clone() {
-          return new MapFixed64Fixed64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private ulong key_;
-        public ulong Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private ulong value_;
-        public ulong Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapFixed64Fixed64Entry);
-        }
-
-        public bool Equals(MapFixed64Fixed64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0UL) hash ^= Key.GetHashCode();
-          if (Value != 0UL) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0UL) {
-            output.WriteRawTag(9);
-            output.WriteFixed64(Key);
-          }
-          if (Value != 0UL) {
-            output.WriteRawTag(17);
-            output.WriteFixed64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0UL) {
-            size += 1 + 8;
-          }
-          if (Value != 0UL) {
-            size += 1 + 8;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapFixed64Fixed64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0UL) {
-            Key = other.Key;
-          }
-          if (other.Value != 0UL) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 9: {
-                Key = input.ReadFixed64();
-                break;
-              }
-              case 17: {
-                Value = input.ReadFixed64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapSfixed32Sfixed32Entry : pb::IMessage<MapSfixed32Sfixed32Entry> {
-        private static readonly pb::MessageParser<MapSfixed32Sfixed32Entry> _parser = new pb::MessageParser<MapSfixed32Sfixed32Entry>(() => new MapSfixed32Sfixed32Entry());
-        public static pb::MessageParser<MapSfixed32Sfixed32Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 13, 21 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[8]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapSfixed32Sfixed32Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapSfixed32Sfixed32Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapSfixed32Sfixed32Entry(MapSfixed32Sfixed32Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapSfixed32Sfixed32Entry Clone() {
-          return new MapSfixed32Sfixed32Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapSfixed32Sfixed32Entry);
-        }
-
-        public bool Equals(MapSfixed32Sfixed32Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(13);
-            output.WriteSFixed32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(21);
-            output.WriteSFixed32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + 4;
-          }
-          if (Value != 0) {
-            size += 1 + 4;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapSfixed32Sfixed32Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 13: {
-                Key = input.ReadSFixed32();
-                break;
-              }
-              case 21: {
-                Value = input.ReadSFixed32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapSfixed64Sfixed64Entry : pb::IMessage<MapSfixed64Sfixed64Entry> {
-        private static readonly pb::MessageParser<MapSfixed64Sfixed64Entry> _parser = new pb::MessageParser<MapSfixed64Sfixed64Entry>(() => new MapSfixed64Sfixed64Entry());
-        public static pb::MessageParser<MapSfixed64Sfixed64Entry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 9, 17 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[9]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapSfixed64Sfixed64Entry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapSfixed64Sfixed64Entry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapSfixed64Sfixed64Entry(MapSfixed64Sfixed64Entry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapSfixed64Sfixed64Entry Clone() {
-          return new MapSfixed64Sfixed64Entry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private long key_;
-        public long Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private long value_;
-        public long Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapSfixed64Sfixed64Entry);
-        }
-
-        public bool Equals(MapSfixed64Sfixed64Entry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0L) hash ^= Key.GetHashCode();
-          if (Value != 0L) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0L) {
-            output.WriteRawTag(9);
-            output.WriteSFixed64(Key);
-          }
-          if (Value != 0L) {
-            output.WriteRawTag(17);
-            output.WriteSFixed64(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0L) {
-            size += 1 + 8;
-          }
-          if (Value != 0L) {
-            size += 1 + 8;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapSfixed64Sfixed64Entry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0L) {
-            Key = other.Key;
-          }
-          if (other.Value != 0L) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 9: {
-                Key = input.ReadSFixed64();
-                break;
-              }
-              case 17: {
-                Value = input.ReadSFixed64();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32FloatEntry : pb::IMessage<MapInt32FloatEntry> {
-        private static readonly pb::MessageParser<MapInt32FloatEntry> _parser = new pb::MessageParser<MapInt32FloatEntry>(() => new MapInt32FloatEntry());
-        public static pb::MessageParser<MapInt32FloatEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 21 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[10]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapInt32FloatEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32FloatEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32FloatEntry(MapInt32FloatEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32FloatEntry Clone() {
-          return new MapInt32FloatEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private float value_;
-        public float Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32FloatEntry);
-        }
-
-        public bool Equals(MapInt32FloatEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0F) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0F) {
-            output.WriteRawTag(21);
-            output.WriteFloat(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0F) {
-            size += 1 + 4;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32FloatEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0F) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 21: {
-                Value = input.ReadFloat();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32DoubleEntry : pb::IMessage<MapInt32DoubleEntry> {
-        private static readonly pb::MessageParser<MapInt32DoubleEntry> _parser = new pb::MessageParser<MapInt32DoubleEntry>(() => new MapInt32DoubleEntry());
-        public static pb::MessageParser<MapInt32DoubleEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 17 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[11]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapInt32DoubleEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32DoubleEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32DoubleEntry(MapInt32DoubleEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32DoubleEntry Clone() {
-          return new MapInt32DoubleEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private double value_;
-        public double Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32DoubleEntry);
-        }
-
-        public bool Equals(MapInt32DoubleEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0D) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0D) {
-            output.WriteRawTag(17);
-            output.WriteDouble(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0D) {
-            size += 1 + 8;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32DoubleEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0D) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 17: {
-                Value = input.ReadDouble();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapBoolBoolEntry : pb::IMessage<MapBoolBoolEntry> {
-        private static readonly pb::MessageParser<MapBoolBoolEntry> _parser = new pb::MessageParser<MapBoolBoolEntry>(() => new MapBoolBoolEntry());
-        public static pb::MessageParser<MapBoolBoolEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[12]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapBoolBoolEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapBoolBoolEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapBoolBoolEntry(MapBoolBoolEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapBoolBoolEntry Clone() {
-          return new MapBoolBoolEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private bool key_;
-        public bool Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private bool value_;
-        public bool Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapBoolBoolEntry);
-        }
-
-        public bool Equals(MapBoolBoolEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != false) hash ^= Key.GetHashCode();
-          if (Value != false) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != false) {
-            output.WriteRawTag(8);
-            output.WriteBool(Key);
-          }
-          if (Value != false) {
-            output.WriteRawTag(16);
-            output.WriteBool(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != false) {
-            size += 1 + 1;
-          }
-          if (Value != false) {
-            size += 1 + 1;
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapBoolBoolEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != false) {
-            Key = other.Key;
-          }
-          if (other.Value != false) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadBool();
-                break;
-              }
-              case 16: {
-                Value = input.ReadBool();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32EnumEntry : pb::IMessage<MapInt32EnumEntry> {
-        private static readonly pb::MessageParser<MapInt32EnumEntry> _parser = new pb::MessageParser<MapInt32EnumEntry>(() => new MapInt32EnumEntry());
-        public static pb::MessageParser<MapInt32EnumEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[13]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapInt32EnumEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32EnumEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32EnumEntry(MapInt32EnumEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public MapInt32EnumEntry Clone() {
-          return new MapInt32EnumEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private global::Google.Protobuf.TestProtos.MapEnum value_ = global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO;
-        public global::Google.Protobuf.TestProtos.MapEnum Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32EnumEntry);
-        }
-
-        public bool Equals(MapInt32EnumEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO) {
-            output.WriteRawTag(16);
-            output.WriteEnum((int) Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO) {
-            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32EnumEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != global::Google.Protobuf.TestProtos.MapEnum.MAP_ENUM_FOO) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                value_ = (global::Google.Protobuf.TestProtos.MapEnum) input.ReadEnum();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class MapInt32ForeignMessageEntry : pb::IMessage<MapInt32ForeignMessageEntry> {
-        private static readonly pb::MessageParser<MapInt32ForeignMessageEntry> _parser = new pb::MessageParser<MapInt32ForeignMessageEntry>(() => new MapInt32ForeignMessageEntry());
-        public static pb::MessageParser<MapInt32ForeignMessageEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 18 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestArenaMap.Descriptor.NestedTypes[14]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_TestArenaMap_MapInt32ForeignMessageEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public MapInt32ForeignMessageEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public MapInt32ForeignMessageEntry(MapInt32ForeignMessageEntry other) : this() {
-          key_ = other.key_;
-          Value = other.value_ != null ? other.Value.Clone() : null;
-        }
-
-        public MapInt32ForeignMessageEntry Clone() {
-          return new MapInt32ForeignMessageEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-          if (value_ != null) Value.Freeze();
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private global::Google.Protobuf.TestProtos.ForeignMessage value_;
-        public global::Google.Protobuf.TestProtos.ForeignMessage Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as MapInt32ForeignMessageEntry);
-        }
-
-        public bool Equals(MapInt32ForeignMessageEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (!object.Equals(Value, other.Value)) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (value_ != null) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (value_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (value_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(MapInt32ForeignMessageEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.value_ != null) {
-            if (value_ == null) {
-              value_ = new global::Google.Protobuf.TestProtos.ForeignMessage();
-            }
-            Value.MergeFrom(other.Value);
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                if (value_ == null) {
-                  value_ = new global::Google.Protobuf.TestProtos.ForeignMessage();
-                }
-                input.ReadMessage(value_);
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6771,159 +1468,6 @@ namespace Google.Protobuf.TestProtos {
         TYPE_FOO = 0,
       }
 
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class TypeEntry : pb::IMessage<TypeEntry> {
-        private static readonly pb::MessageParser<TypeEntry> _parser = new pb::MessageParser<TypeEntry>(() => new TypeEntry());
-        public static pb::MessageParser<TypeEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 18 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_MessageContainingEnumCalledType_TypeEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public TypeEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public TypeEntry(TypeEntry other) : this() {
-          key_ = other.key_;
-          Value = other.value_ != null ? other.Value.Clone() : null;
-        }
-
-        public TypeEntry Clone() {
-          return new TypeEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-          if (value_ != null) Value.Freeze();
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType value_;
-        public global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as TypeEntry);
-        }
-
-        public bool Equals(TypeEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (!object.Equals(Value, other.Value)) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (value_ != null) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (value_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (value_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(TypeEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.value_ != null) {
-            if (value_ == null) {
-              value_ = new global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType();
-            }
-            Value.MergeFrom(other.Value);
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                if (value_ == null) {
-                  value_ = new global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType();
-                }
-                input.ReadMessage(value_);
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
     }
     #endregion
 
@@ -7038,158 +1582,6 @@ namespace Google.Protobuf.TestProtos {
       }
     }
 
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class EntryEntry : pb::IMessage<EntryEntry> {
-        private static readonly pb::MessageParser<EntryEntry> _parser = new pb::MessageParser<EntryEntry>(() => new EntryEntry());
-        public static pb::MessageParser<EntryEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 8, 16 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.TestProtos.MapUnittestProto3.internal__static_protobuf_unittest_MessageContainingMapCalledEntry_EntryEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public EntryEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public EntryEntry(EntryEntry other) : this() {
-          key_ = other.key_;
-          value_ = other.value_;
-        }
-
-        public EntryEntry Clone() {
-          return new EntryEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-        }
-
-        public const int KeyFieldNumber = 1;
-        private int key_;
-        public int Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value;
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private int value_;
-        public int Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as EntryEntry);
-        }
-
-        public bool Equals(EntryEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (Value != other.Value) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key != 0) hash ^= Key.GetHashCode();
-          if (Value != 0) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Key);
-          }
-          if (Value != 0) {
-            output.WriteRawTag(16);
-            output.WriteInt32(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Key);
-          }
-          if (Value != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(EntryEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key != 0) {
-            Key = other.Key;
-          }
-          if (other.Value != 0) {
-            Value = other.Value;
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 8: {
-                Key = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Value = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
   }
 
   #endregion
diff --git a/csharp/src/ProtocolBuffers/WellKnownTypes/Struct.cs b/csharp/src/ProtocolBuffers/WellKnownTypes/Struct.cs
index 98cb8138..99f88a96 100644
--- a/csharp/src/ProtocolBuffers/WellKnownTypes/Struct.cs
+++ b/csharp/src/ProtocolBuffers/WellKnownTypes/Struct.cs
@@ -16,7 +16,6 @@ namespace Google.Protobuf.WellKnownTypes {
 
       #region Static variables
       internal static pbr::FieldAccessorTable internal__static_google_protobuf_Struct__FieldAccessorTable;
-      internal static pbr::FieldAccessorTable internal__static_google_protobuf_Struct_FieldsEntry__FieldAccessorTable;
       internal static pbr::FieldAccessorTable internal__static_google_protobuf_Value__FieldAccessorTable;
       internal static pbr::FieldAccessorTable internal__static_google_protobuf_ListValue__FieldAccessorTable;
       #endregion
@@ -49,9 +48,6 @@ namespace Google.Protobuf.WellKnownTypes {
         internal__static_google_protobuf_Struct__FieldAccessorTable = 
             new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Struct), descriptor.MessageTypes[0],
                 new string[] { "Fields", }, new string[] { });
-        internal__static_google_protobuf_Struct_FieldsEntry__FieldAccessorTable = 
-            new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Struct.Types.FieldsEntry), descriptor.MessageTypes[0].NestedTypes[0],
-                new string[] { "Key", "Value", }, new string[] { });
         internal__static_google_protobuf_Value__FieldAccessorTable = 
             new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.WellKnownTypes.Value), descriptor.MessageTypes[1],
                 new string[] { "NullValue", "NumberValue", "StringValue", "BoolValue", "StructValue", "ListValue", }, new string[] { "Kind", });
@@ -180,165 +176,6 @@ namespace Google.Protobuf.WellKnownTypes {
       }
     }
 
-    #region Nested types
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial class Types {
-      [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class FieldsEntry : pb::IMessage<FieldsEntry> {
-        private static readonly pb::MessageParser<FieldsEntry> _parser = new pb::MessageParser<FieldsEntry>(() => new FieldsEntry());
-        public static pb::MessageParser<FieldsEntry> Parser { get { return _parser; } }
-
-        private static readonly string[] _fieldNames = new string[] { "key", "value" };
-        private static readonly uint[] _fieldTags = new uint[] { 10, 18 };
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.WellKnownTypes.Struct.Descriptor.NestedTypes[0]; }
-        }
-
-        pbr::FieldAccessorTable pb::IReflectedMessage.Fields {
-          get { return global::Google.Protobuf.WellKnownTypes.Proto.Struct.internal__static_google_protobuf_Struct_FieldsEntry__FieldAccessorTable; }
-        }
-
-        private bool _frozen = false;
-        public bool IsFrozen { get { return _frozen; } }
-
-        public FieldsEntry() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        public FieldsEntry(FieldsEntry other) : this() {
-          key_ = other.key_;
-          Value = other.value_ != null ? other.Value.Clone() : null;
-        }
-
-        public FieldsEntry Clone() {
-          return new FieldsEntry(this);
-        }
-
-        public void Freeze() {
-          if (IsFrozen) {
-            return;
-          }
-          _frozen = true;
-          if (value_ != null) Value.Freeze();
-        }
-
-        public const int KeyFieldNumber = 1;
-        private string key_ = "";
-        public string Key {
-          get { return key_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            key_ = value ?? "";
-          }
-        }
-
-        public const int ValueFieldNumber = 2;
-        private global::Google.Protobuf.WellKnownTypes.Value value_;
-        public global::Google.Protobuf.WellKnownTypes.Value Value {
-          get { return value_; }
-          set {
-            pb::Freezable.CheckMutable(this);
-            value_ = value;
-          }
-        }
-
-        public override bool Equals(object other) {
-          return Equals(other as FieldsEntry);
-        }
-
-        public bool Equals(FieldsEntry other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Key != other.Key) return false;
-          if (!object.Equals(Value, other.Value)) return false;
-          return true;
-        }
-
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Key.Length != 0) hash ^= Key.GetHashCode();
-          if (value_ != null) hash ^= Value.GetHashCode();
-          return hash;
-        }
-
-        public override string ToString() {
-          return pb::JsonFormatter.Default.Format(this);
-        }
-
-        public void WriteTo(pb::CodedOutputStream output) {
-          if (Key.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(Key);
-          }
-          if (value_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Value);
-          }
-        }
-
-        public int CalculateSize() {
-          int size = 0;
-          if (Key.Length != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(Key);
-          }
-          if (value_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
-          }
-          return size;
-        }
-
-        public void MergeFrom(FieldsEntry other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Key.Length != 0) {
-            Key = other.Key;
-          }
-          if (other.value_ != null) {
-            if (value_ == null) {
-              value_ = new global::Google.Protobuf.WellKnownTypes.Value();
-            }
-            Value.MergeFrom(other.Value);
-          }
-        }
-
-        public void MergeFrom(pb::CodedInputStream input) {
-          uint tag;
-          while (input.ReadTag(out tag)) {
-            switch(tag) {
-              case 0:
-                throw pb::InvalidProtocolBufferException.InvalidTag();
-              default:
-                if (pb::WireFormat.IsEndGroupTag(tag)) {
-                  return;
-                }
-                break;
-              case 10: {
-                Key = input.ReadString();
-                break;
-              }
-              case 18: {
-                if (value_ == null) {
-                  value_ = new global::Google.Protobuf.WellKnownTypes.Value();
-                }
-                input.ReadMessage(value_);
-                break;
-              }
-            }
-          }
-        }
-
-      }
-
-    }
-    #endregion
-
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]