Regenerated code due to previous commit.

Note that now we need a proto3 version of addressbook.proto. This may affect other platforms, and could do with an overhaul to follow proto3 conventions anyway (e.g. repeated field names). Will need to think about that carefully before merging into master. Raised issue #565 for this.

8 files changed, 829 insertions, 377 deletions

diff --git a/csharp/src/AddressBook/Addressbook.cs b/csharp/src/AddressBook/Addressbook.cs
index 0b77ebf1..5f4a5139 100644
--- a/csharp/src/AddressBook/Addressbook.cs
+++ b/csharp/src/AddressBook/Addressbook.cs
@@ -26,15 +26,15 @@ namespace Google.Protobuf.Examples.AddressBook {
     static Addressbook() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChFhZGRyZXNzYm9vay5wcm90bxIIdHV0b3JpYWwi2gEKBlBlcnNvbhIMCgRu", 
-            "YW1lGAEgAigJEgoKAmlkGAIgAigFEg0KBWVtYWlsGAMgASgJEisKBXBob25l", 
-            "GAQgAygLMhwudHV0b3JpYWwuUGVyc29uLlBob25lTnVtYmVyGk0KC1Bob25l", 
-            "TnVtYmVyEg4KBm51bWJlchgBIAIoCRIuCgR0eXBlGAIgASgOMhoudHV0b3Jp", 
-            "YWwuUGVyc29uLlBob25lVHlwZToESE9NRSIrCglQaG9uZVR5cGUSCgoGTU9C", 
-            "SUxFEAASCAoESE9NRRABEggKBFdPUksQAiIvCgtBZGRyZXNzQm9vaxIgCgZw", 
-            "ZXJzb24YASADKAsyEC50dXRvcmlhbC5QZXJzb25CUAoUY29tLmV4YW1wbGUu", 
-            "dHV0b3JpYWxCEUFkZHJlc3NCb29rUHJvdG9zqgIkR29vZ2xlLlByb3RvYnVm", 
-          "LkV4YW1wbGVzLkFkZHJlc3NCb29r"));
+            "ChFhZGRyZXNzYm9vay5wcm90bxIIdHV0b3JpYWwi1AEKBlBlcnNvbhIMCgRu", 
+            "YW1lGAEgASgJEgoKAmlkGAIgASgFEg0KBWVtYWlsGAMgASgJEisKBXBob25l", 
+            "GAQgAygLMhwudHV0b3JpYWwuUGVyc29uLlBob25lTnVtYmVyGkcKC1Bob25l", 
+            "TnVtYmVyEg4KBm51bWJlchgBIAEoCRIoCgR0eXBlGAIgASgOMhoudHV0b3Jp", 
+            "YWwuUGVyc29uLlBob25lVHlwZSIrCglQaG9uZVR5cGUSCgoGTU9CSUxFEAAS", 
+            "CAoESE9NRRABEggKBFdPUksQAiIvCgtBZGRyZXNzQm9vaxIgCgZwZXJzb24Y", 
+            "ASADKAsyEC50dXRvcmlhbC5QZXJzb25CUAoUY29tLmV4YW1wbGUudHV0b3Jp", 
+            "YWxCEUFkZHJlc3NCb29rUHJvdG9zqgIkR29vZ2xlLlByb3RvYnVmLkV4YW1w", 
+          "bGVzLkFkZHJlc3NCb29rYgZwcm90bzM="));
       descriptor = pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
           new pbd::FileDescriptor[] {
           });
@@ -70,9 +70,13 @@ namespace Google.Protobuf.Examples.AddressBook {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public Person() { }
+    public Person() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public Person(Person other) {
+    public Person(Person other) : this() {
       name_ = other.name_;
       id_ = other.id_;
       email_ = other.email_;
@@ -261,9 +265,13 @@ namespace Google.Protobuf.Examples.AddressBook {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public PhoneNumber() { }
+        public PhoneNumber() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public PhoneNumber(PhoneNumber other) {
+        public PhoneNumber(PhoneNumber other) : this() {
           number_ = other.number_;
           type_ = other.type_;
         }
@@ -290,7 +298,7 @@ namespace Google.Protobuf.Examples.AddressBook {
         }
 
         public const int TypeFieldNumber = 2;
-        private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME;
+        private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE;
         public global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType Type {
           get { return type_; }
           set {
@@ -318,7 +326,7 @@ namespace Google.Protobuf.Examples.AddressBook {
         public override int GetHashCode() {
           int hash = 1;
           if (Number.Length != 0) hash ^= Number.GetHashCode();
-          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME) hash ^= Type.GetHashCode();
+          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) hash ^= Type.GetHashCode();
           return hash;
         }
 
@@ -327,7 +335,7 @@ namespace Google.Protobuf.Examples.AddressBook {
             output.WriteRawTag(10);
             output.WriteString(Number);
           }
-          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME) {
+          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) {
             output.WriteRawTag(16);
             output.WriteEnum((int) Type);
           }
@@ -338,7 +346,7 @@ namespace Google.Protobuf.Examples.AddressBook {
           if (Number.Length != 0) {
             size += 1 + pb::CodedOutputStream.ComputeStringSize(Number);
           }
-          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME) {
+          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) {
             size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
           }
           return size;
@@ -351,7 +359,7 @@ namespace Google.Protobuf.Examples.AddressBook {
           if (other.Number.Length != 0) {
             Number = other.Number;
           }
-          if (other.Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.HOME) {
+          if (other.Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) {
             Type = other.Type;
           }
         }
@@ -404,9 +412,13 @@ namespace Google.Protobuf.Examples.AddressBook {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public AddressBook() { }
+    public AddressBook() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public AddressBook(AddressBook other) {
+    public AddressBook(AddressBook other) : this() {
       person_ = other.person_.Clone();
     }
 
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
index 365c03a7..55434c53 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/MapUnittestProto3.cs
@@ -359,9 +359,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestMap() { }
+    public TestMap() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestMap(TestMap other) {
+    public TestMap(TestMap other) : this() {
       mapInt32Int32_ = other.mapInt32Int32_.Clone();
       mapInt64Int64_ = other.mapInt64Int64_.Clone();
       mapUint32Uint32_ = other.mapUint32Uint32_.Clone();
@@ -767,9 +771,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32Int32Entry() { }
+        public MapInt32Int32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32Int32Entry(MapInt32Int32Entry other) {
+        public MapInt32Int32Entry(MapInt32Int32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -905,9 +913,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt64Int64Entry() { }
+        public MapInt64Int64Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt64Int64Entry(MapInt64Int64Entry other) {
+        public MapInt64Int64Entry(MapInt64Int64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -1043,9 +1055,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapUint32Uint32Entry() { }
+        public MapUint32Uint32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapUint32Uint32Entry(MapUint32Uint32Entry other) {
+        public MapUint32Uint32Entry(MapUint32Uint32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -1181,9 +1197,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapUint64Uint64Entry() { }
+        public MapUint64Uint64Entry() {
+          OnConstruction();
+        }
 
-        public MapUint64Uint64Entry(MapUint64Uint64Entry other) {
+        partial void OnConstruction();
+
+        public MapUint64Uint64Entry(MapUint64Uint64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -1319,9 +1339,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapSint32Sint32Entry() { }
+        public MapSint32Sint32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapSint32Sint32Entry(MapSint32Sint32Entry other) {
+        public MapSint32Sint32Entry(MapSint32Sint32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -1457,9 +1481,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapSint64Sint64Entry() { }
+        public MapSint64Sint64Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapSint64Sint64Entry(MapSint64Sint64Entry other) {
+        public MapSint64Sint64Entry(MapSint64Sint64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -1595,9 +1623,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapFixed32Fixed32Entry() { }
+        public MapFixed32Fixed32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapFixed32Fixed32Entry(MapFixed32Fixed32Entry other) {
+        public MapFixed32Fixed32Entry(MapFixed32Fixed32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -1733,9 +1765,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapFixed64Fixed64Entry() { }
+        public MapFixed64Fixed64Entry() {
+          OnConstruction();
+        }
 
-        public MapFixed64Fixed64Entry(MapFixed64Fixed64Entry other) {
+        partial void OnConstruction();
+
+        public MapFixed64Fixed64Entry(MapFixed64Fixed64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -1871,9 +1907,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapSfixed32Sfixed32Entry() { }
+        public MapSfixed32Sfixed32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapSfixed32Sfixed32Entry(MapSfixed32Sfixed32Entry other) {
+        public MapSfixed32Sfixed32Entry(MapSfixed32Sfixed32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -2009,9 +2049,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapSfixed64Sfixed64Entry() { }
+        public MapSfixed64Sfixed64Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapSfixed64Sfixed64Entry(MapSfixed64Sfixed64Entry other) {
+        public MapSfixed64Sfixed64Entry(MapSfixed64Sfixed64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -2147,9 +2191,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32FloatEntry() { }
+        public MapInt32FloatEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32FloatEntry(MapInt32FloatEntry other) {
+        public MapInt32FloatEntry(MapInt32FloatEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -2285,9 +2333,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32DoubleEntry() { }
+        public MapInt32DoubleEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32DoubleEntry(MapInt32DoubleEntry other) {
+        public MapInt32DoubleEntry(MapInt32DoubleEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -2423,9 +2475,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapBoolBoolEntry() { }
+        public MapBoolBoolEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapBoolBoolEntry(MapBoolBoolEntry other) {
+        public MapBoolBoolEntry(MapBoolBoolEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -2561,9 +2617,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapStringStringEntry() { }
+        public MapStringStringEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapStringStringEntry(MapStringStringEntry other) {
+        public MapStringStringEntry(MapStringStringEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -2699,9 +2759,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32BytesEntry() { }
+        public MapInt32BytesEntry() {
+          OnConstruction();
+        }
 
-        public MapInt32BytesEntry(MapInt32BytesEntry other) {
+        partial void OnConstruction();
+
+        public MapInt32BytesEntry(MapInt32BytesEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -2837,9 +2901,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32EnumEntry() { }
+        public MapInt32EnumEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32EnumEntry(MapInt32EnumEntry other) {
+        public MapInt32EnumEntry(MapInt32EnumEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -2975,9 +3043,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32ForeignMessageEntry() { }
+        public MapInt32ForeignMessageEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32ForeignMessageEntry(MapInt32ForeignMessageEntry other) {
+        public MapInt32ForeignMessageEntry(MapInt32ForeignMessageEntry other) : this() {
           key_ = other.key_;
           Value = other.value_ != null ? other.Value.Clone() : null;
         }
@@ -3125,9 +3197,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestMapSubmessage() { }
+    public TestMapSubmessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestMapSubmessage(TestMapSubmessage other) {
+    public TestMapSubmessage(TestMapSubmessage other) : this() {
       TestMap = other.testMap_ != null ? other.TestMap.Clone() : null;
     }
 
@@ -3243,9 +3319,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestMessageMap() { }
+    public TestMessageMap() {
+      OnConstruction();
+    }
 
-    public TestMessageMap(TestMessageMap other) {
+    partial void OnConstruction();
+
+    public TestMessageMap(TestMessageMap other) : this() {
       mapInt32Message_ = other.mapInt32Message_.Clone();
     }
 
@@ -3347,9 +3427,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32MessageEntry() { }
+        public MapInt32MessageEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32MessageEntry(MapInt32MessageEntry other) {
+        public MapInt32MessageEntry(MapInt32MessageEntry other) : this() {
           key_ = other.key_;
           Value = other.value_ != null ? other.Value.Clone() : null;
         }
@@ -3497,9 +3581,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestSameTypeMap() { }
+    public TestSameTypeMap() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestSameTypeMap(TestSameTypeMap other) {
+    public TestSameTypeMap(TestSameTypeMap other) : this() {
       map1_ = other.map1_.Clone();
       map2_ = other.map2_.Clone();
     }
@@ -3620,9 +3708,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public Map1Entry() { }
+        public Map1Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public Map1Entry(Map1Entry other) {
+        public Map1Entry(Map1Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -3758,9 +3850,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public Map2Entry() { }
+        public Map2Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public Map2Entry(Map2Entry other) {
+        public Map2Entry(Map2Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -3901,9 +3997,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestArenaMap() { }
+    public TestArenaMap() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestArenaMap(TestArenaMap other) {
+    public TestArenaMap(TestArenaMap other) : this() {
       mapInt32Int32_ = other.mapInt32Int32_.Clone();
       mapInt64Int64_ = other.mapInt64Int64_.Clone();
       mapUint32Uint32_ = other.mapUint32Uint32_.Clone();
@@ -4271,9 +4371,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32Int32Entry() { }
+        public MapInt32Int32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32Int32Entry(MapInt32Int32Entry other) {
+        public MapInt32Int32Entry(MapInt32Int32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -4409,9 +4513,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt64Int64Entry() { }
+        public MapInt64Int64Entry() {
+          OnConstruction();
+        }
 
-        public MapInt64Int64Entry(MapInt64Int64Entry other) {
+        partial void OnConstruction();
+
+        public MapInt64Int64Entry(MapInt64Int64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -4547,9 +4655,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapUint32Uint32Entry() { }
+        public MapUint32Uint32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapUint32Uint32Entry(MapUint32Uint32Entry other) {
+        public MapUint32Uint32Entry(MapUint32Uint32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -4685,9 +4797,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapUint64Uint64Entry() { }
+        public MapUint64Uint64Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapUint64Uint64Entry(MapUint64Uint64Entry other) {
+        public MapUint64Uint64Entry(MapUint64Uint64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -4823,9 +4939,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapSint32Sint32Entry() { }
+        public MapSint32Sint32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapSint32Sint32Entry(MapSint32Sint32Entry other) {
+        public MapSint32Sint32Entry(MapSint32Sint32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -4961,9 +5081,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapSint64Sint64Entry() { }
+        public MapSint64Sint64Entry() {
+          OnConstruction();
+        }
 
-        public MapSint64Sint64Entry(MapSint64Sint64Entry other) {
+        partial void OnConstruction();
+
+        public MapSint64Sint64Entry(MapSint64Sint64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -5099,9 +5223,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapFixed32Fixed32Entry() { }
+        public MapFixed32Fixed32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapFixed32Fixed32Entry(MapFixed32Fixed32Entry other) {
+        public MapFixed32Fixed32Entry(MapFixed32Fixed32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -5237,9 +5365,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapFixed64Fixed64Entry() { }
+        public MapFixed64Fixed64Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapFixed64Fixed64Entry(MapFixed64Fixed64Entry other) {
+        public MapFixed64Fixed64Entry(MapFixed64Fixed64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -5375,9 +5507,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapSfixed32Sfixed32Entry() { }
+        public MapSfixed32Sfixed32Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapSfixed32Sfixed32Entry(MapSfixed32Sfixed32Entry other) {
+        public MapSfixed32Sfixed32Entry(MapSfixed32Sfixed32Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -5513,9 +5649,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapSfixed64Sfixed64Entry() { }
+        public MapSfixed64Sfixed64Entry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapSfixed64Sfixed64Entry(MapSfixed64Sfixed64Entry other) {
+        public MapSfixed64Sfixed64Entry(MapSfixed64Sfixed64Entry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -5651,9 +5791,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32FloatEntry() { }
+        public MapInt32FloatEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32FloatEntry(MapInt32FloatEntry other) {
+        public MapInt32FloatEntry(MapInt32FloatEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -5789,9 +5933,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32DoubleEntry() { }
+        public MapInt32DoubleEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32DoubleEntry(MapInt32DoubleEntry other) {
+        public MapInt32DoubleEntry(MapInt32DoubleEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -5927,9 +6075,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapBoolBoolEntry() { }
+        public MapBoolBoolEntry() {
+          OnConstruction();
+        }
 
-        public MapBoolBoolEntry(MapBoolBoolEntry other) {
+        partial void OnConstruction();
+
+        public MapBoolBoolEntry(MapBoolBoolEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -6065,9 +6217,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32EnumEntry() { }
+        public MapInt32EnumEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32EnumEntry(MapInt32EnumEntry other) {
+        public MapInt32EnumEntry(MapInt32EnumEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
@@ -6203,9 +6359,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public MapInt32ForeignMessageEntry() { }
+        public MapInt32ForeignMessageEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public MapInt32ForeignMessageEntry(MapInt32ForeignMessageEntry other) {
+        public MapInt32ForeignMessageEntry(MapInt32ForeignMessageEntry other) : this() {
           key_ = other.key_;
           Value = other.value_ != null ? other.Value.Clone() : null;
         }
@@ -6353,9 +6513,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public MessageContainingEnumCalledType() { }
+    public MessageContainingEnumCalledType() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public MessageContainingEnumCalledType(MessageContainingEnumCalledType other) {
+    public MessageContainingEnumCalledType(MessageContainingEnumCalledType other) : this() {
       type_ = other.type_.Clone();
     }
 
@@ -6461,9 +6625,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public TypeEntry() { }
+        public TypeEntry() {
+          OnConstruction();
+        }
 
-        public TypeEntry(TypeEntry other) {
+        partial void OnConstruction();
+
+        public TypeEntry(TypeEntry other) : this() {
           key_ = other.key_;
           Value = other.value_ != null ? other.Value.Clone() : null;
         }
@@ -6611,9 +6779,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public MessageContainingMapCalledEntry() { }
+    public MessageContainingMapCalledEntry() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public MessageContainingMapCalledEntry(MessageContainingMapCalledEntry other) {
+    public MessageContainingMapCalledEntry(MessageContainingMapCalledEntry other) : this() {
       entry_ = other.entry_.Clone();
     }
 
@@ -6715,9 +6887,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public EntryEntry() { }
+        public EntryEntry() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public EntryEntry(EntryEntry other) {
+        public EntryEntry(EntryEntry other) : this() {
           key_ = other.key_;
           value_ = other.value_;
         }
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs
index 5afcb4e0..d30f22db 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportProto3.cs
@@ -72,9 +72,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public ImportMessage() { }
+    public ImportMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public ImportMessage(ImportMessage other) {
+    public ImportMessage(ImportMessage other) : this() {
       d_ = other.d_;
     }
 
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
index 79c0876e..5aa03a64 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublicProto3.cs
@@ -57,9 +57,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public PublicImportMessage() { }
+    public PublicImportMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public PublicImportMessage(PublicImportMessage other) {
+    public PublicImportMessage(PublicImportMessage other) : this() {
       e_ = other.e_;
     }
 
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs
index 124f2de7..0e409c8b 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs
@@ -109,9 +109,13 @@ namespace UnitTest.Issues.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public Issue307() { }
+    public Issue307() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public Issue307(Issue307 other) {
+    public Issue307(Issue307 other) : this() {
     }
 
     public Issue307 Clone() {
@@ -194,9 +198,13 @@ namespace UnitTest.Issues.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public NestedOnce() { }
+        public NestedOnce() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public NestedOnce(NestedOnce other) {
+        public NestedOnce(NestedOnce other) : this() {
         }
 
         public NestedOnce Clone() {
@@ -279,9 +287,13 @@ namespace UnitTest.Issues.TestProtos {
             private bool _frozen = false;
             public bool IsFrozen { get { return _frozen; } }
 
-            public NestedTwice() { }
+            public NestedTwice() {
+              OnConstruction();
+            }
+
+            partial void OnConstruction();
 
-            public NestedTwice(NestedTwice other) {
+            public NestedTwice(NestedTwice other) : this() {
             }
 
             public NestedTwice Clone() {
@@ -373,9 +385,13 @@ namespace UnitTest.Issues.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public NegativeEnumMessage() { }
+    public NegativeEnumMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public NegativeEnumMessage(NegativeEnumMessage other) {
+    public NegativeEnumMessage(NegativeEnumMessage other) : this() {
       value_ = other.value_;
       values_ = other.values_.Clone();
       packedValues_ = other.packedValues_.Clone();
@@ -522,9 +538,13 @@ namespace UnitTest.Issues.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public DeprecatedChild() { }
+    public DeprecatedChild() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public DeprecatedChild(DeprecatedChild other) {
+    public DeprecatedChild(DeprecatedChild other) : this() {
     }
 
     public DeprecatedChild Clone() {
@@ -606,9 +626,13 @@ namespace UnitTest.Issues.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public DeprecatedFieldsMessage() { }
+    public DeprecatedFieldsMessage() {
+      OnConstruction();
+    }
 
-    public DeprecatedFieldsMessage(DeprecatedFieldsMessage other) {
+    partial void OnConstruction();
+
+    public DeprecatedFieldsMessage(DeprecatedFieldsMessage other) : this() {
       primitiveValue_ = other.primitiveValue_;
       primitiveArray_ = other.primitiveArray_.Clone();
       MessageValue = other.messageValue_ != null ? other.MessageValue.Clone() : null;
@@ -842,9 +866,13 @@ namespace UnitTest.Issues.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public ItemField() { }
+    public ItemField() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public ItemField(ItemField other) {
+    public ItemField(ItemField other) : this() {
       item_ = other.item_;
     }
 
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs
index c9aed740..d2437bf4 100644
--- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestProto3.cs
@@ -346,9 +346,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestAllTypes() { }
+    public TestAllTypes() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestAllTypes(TestAllTypes other) {
+    public TestAllTypes(TestAllTypes other) : this() {
       singleInt32_ = other.singleInt32_;
       singleInt64_ = other.singleInt64_;
       singleUint32_ = other.singleUint32_;
@@ -1639,9 +1643,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public NestedMessage() { }
+        public NestedMessage() {
+          OnConstruction();
+        }
 
-        public NestedMessage(NestedMessage other) {
+        partial void OnConstruction();
+
+        public NestedMessage(NestedMessage other) : this() {
           bb_ = other.bb_;
         }
 
@@ -1755,9 +1763,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public NestedTestAllTypes() { }
+    public NestedTestAllTypes() {
+      OnConstruction();
+    }
 
-    public NestedTestAllTypes(NestedTestAllTypes other) {
+    partial void OnConstruction();
+
+    public NestedTestAllTypes(NestedTestAllTypes other) : this() {
       Child = other.child_ != null ? other.Child.Clone() : null;
       Payload = other.payload_ != null ? other.Payload.Clone() : null;
       repeatedChild_ = other.repeatedChild_.Clone();
@@ -1926,9 +1938,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestDeprecatedFields() { }
+    public TestDeprecatedFields() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestDeprecatedFields(TestDeprecatedFields other) {
+    public TestDeprecatedFields(TestDeprecatedFields other) : this() {
       deprecatedInt32_ = other.deprecatedInt32_;
     }
 
@@ -2038,9 +2054,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public ForeignMessage() { }
+    public ForeignMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public ForeignMessage(ForeignMessage other) {
+    public ForeignMessage(ForeignMessage other) : this() {
       c_ = other.c_;
     }
 
@@ -2149,9 +2169,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestReservedFields() { }
+    public TestReservedFields() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestReservedFields(TestReservedFields other) {
+    public TestReservedFields(TestReservedFields other) : this() {
     }
 
     public TestReservedFields Clone() {
@@ -2233,9 +2257,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestForeignNested() { }
+    public TestForeignNested() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestForeignNested(TestForeignNested other) {
+    public TestForeignNested(TestForeignNested other) : this() {
       ForeignNested = other.foreignNested_ != null ? other.ForeignNested.Clone() : null;
     }
 
@@ -2351,9 +2379,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestReallyLargeTagNumber() { }
+    public TestReallyLargeTagNumber() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestReallyLargeTagNumber(TestReallyLargeTagNumber other) {
+    public TestReallyLargeTagNumber(TestReallyLargeTagNumber other) : this() {
       a_ = other.a_;
       bb_ = other.bb_;
     }
@@ -2489,9 +2521,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestRecursiveMessage() { }
+    public TestRecursiveMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestRecursiveMessage(TestRecursiveMessage other) {
+    public TestRecursiveMessage(TestRecursiveMessage other) : this() {
       A = other.a_ != null ? other.A.Clone() : null;
       i_ = other.i_;
     }
@@ -2634,9 +2670,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestMutualRecursionA() { }
+    public TestMutualRecursionA() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestMutualRecursionA(TestMutualRecursionA other) {
+    public TestMutualRecursionA(TestMutualRecursionA other) : this() {
       Bb = other.bb_ != null ? other.Bb.Clone() : null;
     }
 
@@ -2752,9 +2792,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestMutualRecursionB() { }
+    public TestMutualRecursionB() {
+      OnConstruction();
+    }
 
-    public TestMutualRecursionB(TestMutualRecursionB other) {
+    partial void OnConstruction();
+
+    public TestMutualRecursionB(TestMutualRecursionB other) : this() {
       A = other.a_ != null ? other.A.Clone() : null;
       optionalInt32_ = other.optionalInt32_;
     }
@@ -2897,9 +2941,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestCamelCaseFieldNames() { }
+    public TestCamelCaseFieldNames() {
+      OnConstruction();
+    }
 
-    public TestCamelCaseFieldNames(TestCamelCaseFieldNames other) {
+    partial void OnConstruction();
+
+    public TestCamelCaseFieldNames(TestCamelCaseFieldNames other) : this() {
       primitiveField_ = other.primitiveField_;
       stringField_ = other.stringField_;
       enumField_ = other.enumField_;
@@ -3173,9 +3221,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestFieldOrderings() { }
+    public TestFieldOrderings() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestFieldOrderings(TestFieldOrderings other) {
+    public TestFieldOrderings(TestFieldOrderings other) : this() {
       myString_ = other.myString_;
       myInt_ = other.myInt_;
       myFloat_ = other.myFloat_;
@@ -3373,9 +3425,13 @@ namespace Google.Protobuf.TestProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public NestedMessage() { }
+        public NestedMessage() {
+          OnConstruction();
+        }
 
-        public NestedMessage(NestedMessage other) {
+        partial void OnConstruction();
+
+        public NestedMessage(NestedMessage other) : this() {
           oo_ = other.oo_;
           bb_ = other.bb_;
         }
@@ -3516,9 +3572,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public SparseEnumMessage() { }
+    public SparseEnumMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public SparseEnumMessage(SparseEnumMessage other) {
+    public SparseEnumMessage(SparseEnumMessage other) : this() {
       sparseEnum_ = other.sparseEnum_;
     }
 
@@ -3627,9 +3687,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public OneString() { }
+    public OneString() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public OneString(OneString other) {
+    public OneString(OneString other) : this() {
       data_ = other.data_;
     }
 
@@ -3738,9 +3802,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public MoreString() { }
+    public MoreString() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public MoreString(MoreString other) {
+    public MoreString(MoreString other) : this() {
       data_ = other.data_.Clone();
     }
 
@@ -3841,9 +3909,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public OneBytes() { }
+    public OneBytes() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public OneBytes(OneBytes other) {
+    public OneBytes(OneBytes other) : this() {
       data_ = other.data_;
     }
 
@@ -3952,9 +4024,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public MoreBytes() { }
+    public MoreBytes() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public MoreBytes(MoreBytes other) {
+    public MoreBytes(MoreBytes other) : this() {
       data_ = other.data_;
     }
 
@@ -4063,9 +4139,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public Int32Message() { }
+    public Int32Message() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public Int32Message(Int32Message other) {
+    public Int32Message(Int32Message other) : this() {
       data_ = other.data_;
     }
 
@@ -4174,9 +4254,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public Uint32Message() { }
+    public Uint32Message() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public Uint32Message(Uint32Message other) {
+    public Uint32Message(Uint32Message other) : this() {
       data_ = other.data_;
     }
 
@@ -4285,9 +4369,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public Int64Message() { }
+    public Int64Message() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public Int64Message(Int64Message other) {
+    public Int64Message(Int64Message other) : this() {
       data_ = other.data_;
     }
 
@@ -4396,9 +4484,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public Uint64Message() { }
+    public Uint64Message() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public Uint64Message(Uint64Message other) {
+    public Uint64Message(Uint64Message other) : this() {
       data_ = other.data_;
     }
 
@@ -4507,9 +4599,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public BoolMessage() { }
+    public BoolMessage() {
+      OnConstruction();
+    }
 
-    public BoolMessage(BoolMessage other) {
+    partial void OnConstruction();
+
+    public BoolMessage(BoolMessage other) : this() {
       data_ = other.data_;
     }
 
@@ -4618,9 +4714,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestOneof() { }
+    public TestOneof() {
+      OnConstruction();
+    }
 
-    public TestOneof(TestOneof other) {
+    partial void OnConstruction();
+
+    public TestOneof(TestOneof other) : this() {
       switch (other.FooCase) {
         case FooOneofCase.FooInt:
           FooInt = other.FooInt;
@@ -4819,9 +4919,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestPackedTypes() { }
+    public TestPackedTypes() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestPackedTypes(TestPackedTypes other) {
+    public TestPackedTypes(TestPackedTypes other) : this() {
       packedInt32_ = other.packedInt32_.Clone();
       packedInt64_ = other.packedInt64_.Clone();
       packedUint32_ = other.packedUint32_.Clone();
@@ -5182,9 +5286,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestUnpackedTypes() { }
+    public TestUnpackedTypes() {
+      OnConstruction();
+    }
 
-    public TestUnpackedTypes(TestUnpackedTypes other) {
+    partial void OnConstruction();
+
+    public TestUnpackedTypes(TestUnpackedTypes other) : this() {
       unpackedInt32_ = other.unpackedInt32_.Clone();
       unpackedInt64_ = other.unpackedInt64_.Clone();
       unpackedUint32_ = other.unpackedUint32_.Clone();
@@ -5545,9 +5653,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestRepeatedScalarDifferentTagSizes() { }
+    public TestRepeatedScalarDifferentTagSizes() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestRepeatedScalarDifferentTagSizes(TestRepeatedScalarDifferentTagSizes other) {
+    public TestRepeatedScalarDifferentTagSizes(TestRepeatedScalarDifferentTagSizes other) : this() {
       repeatedFixed32_ = other.repeatedFixed32_.Clone();
       repeatedInt32_ = other.repeatedInt32_.Clone();
       repeatedFixed64_ = other.repeatedFixed64_.Clone();
@@ -5749,9 +5861,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public TestCommentInjectionMessage() { }
+    public TestCommentInjectionMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public TestCommentInjectionMessage(TestCommentInjectionMessage other) {
+    public TestCommentInjectionMessage(TestCommentInjectionMessage other) : this() {
       a_ = other.a_;
     }
 
@@ -5860,9 +5976,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FooRequest() { }
+    public FooRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FooRequest(FooRequest other) {
+    public FooRequest(FooRequest other) : this() {
     }
 
     public FooRequest Clone() {
@@ -5944,9 +6064,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FooResponse() { }
+    public FooResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FooResponse(FooResponse other) {
+    public FooResponse(FooResponse other) : this() {
     }
 
     public FooResponse Clone() {
@@ -6028,9 +6152,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FooClientMessage() { }
+    public FooClientMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FooClientMessage(FooClientMessage other) {
+    public FooClientMessage(FooClientMessage other) : this() {
     }
 
     public FooClientMessage Clone() {
@@ -6112,9 +6240,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FooServerMessage() { }
+    public FooServerMessage() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FooServerMessage(FooServerMessage other) {
+    public FooServerMessage(FooServerMessage other) : this() {
     }
 
     public FooServerMessage Clone() {
@@ -6196,9 +6328,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public BarRequest() { }
+    public BarRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public BarRequest(BarRequest other) {
+    public BarRequest(BarRequest other) : this() {
     }
 
     public BarRequest Clone() {
@@ -6280,9 +6416,13 @@ namespace Google.Protobuf.TestProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public BarResponse() { }
+    public BarResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public BarResponse(BarResponse other) {
+    public BarResponse(BarResponse other) : this() {
     }
 
     public BarResponse Clone() {
diff --git a/csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs b/csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
index 3be7c4a9..c87b367a 100644
--- a/csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
+++ b/csharp/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
@@ -10,7 +10,7 @@ using scg = global::System.Collections.Generic;
 namespace Google.Protobuf.DescriptorProtos {
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public static partial class DescriptorProtoFile {
+  internal static partial class DescriptorProtoFile {
 
     #region Static variables
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_FileDescriptorSet__FieldAccessorTable;
@@ -231,7 +231,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
   #region Messages
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FileDescriptorSet : pb::IMessage<FileDescriptorSet> {
+  internal sealed partial class FileDescriptorSet : pb::IMessage<FileDescriptorSet> {
     private static readonly pb::MessageParser<FileDescriptorSet> _parser = new pb::MessageParser<FileDescriptorSet>(() => new FileDescriptorSet());
     public static pb::MessageParser<FileDescriptorSet> Parser { get { return _parser; } }
 
@@ -248,9 +248,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FileDescriptorSet() { }
+    public FileDescriptorSet() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FileDescriptorSet(FileDescriptorSet other) {
+    public FileDescriptorSet(FileDescriptorSet other) : this() {
       file_ = other.file_.Clone();
     }
 
@@ -270,7 +274,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.FileDescriptorProto> _repeated_file_codec
         = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.DescriptorProtos.FileDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FileDescriptorProto> file_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FileDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FileDescriptorProto> File {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FileDescriptorProto> File {
       get { return file_; }
     }
 
@@ -334,7 +338,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FileDescriptorProto : pb::IMessage<FileDescriptorProto> {
+  internal sealed partial class FileDescriptorProto : pb::IMessage<FileDescriptorProto> {
     private static readonly pb::MessageParser<FileDescriptorProto> _parser = new pb::MessageParser<FileDescriptorProto>(() => new FileDescriptorProto());
     public static pb::MessageParser<FileDescriptorProto> Parser { get { return _parser; } }
 
@@ -351,9 +355,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FileDescriptorProto() { }
+    public FileDescriptorProto() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FileDescriptorProto(FileDescriptorProto other) {
+    public FileDescriptorProto(FileDescriptorProto other) : this() {
       name_ = other.name_;
       package_ = other.package_;
       dependency_ = other.dependency_.Clone();
@@ -390,7 +398,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NameFieldNumber = 1;
     private string name_ = "";
-    public string Name {
+    internal string Name {
       get { return name_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -400,7 +408,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int PackageFieldNumber = 2;
     private string package_ = "";
-    public string Package {
+    internal string Package {
       get { return package_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -412,7 +420,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<string> _repeated_dependency_codec
         = pb::FieldCodec.ForString(26);
     private readonly pbc::RepeatedField<string> dependency_ = new pbc::RepeatedField<string>();
-    public pbc::RepeatedField<string> Dependency {
+    internal pbc::RepeatedField<string> Dependency {
       get { return dependency_; }
     }
 
@@ -420,7 +428,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<int> _repeated_publicDependency_codec
         = pb::FieldCodec.ForInt32(80);
     private readonly pbc::RepeatedField<int> publicDependency_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> PublicDependency {
+    internal pbc::RepeatedField<int> PublicDependency {
       get { return publicDependency_; }
     }
 
@@ -428,7 +436,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<int> _repeated_weakDependency_codec
         = pb::FieldCodec.ForInt32(88);
     private readonly pbc::RepeatedField<int> weakDependency_ = new pbc::RepeatedField<int>();
-    public pbc::RepeatedField<int> WeakDependency {
+    internal pbc::RepeatedField<int> WeakDependency {
       get { return weakDependency_; }
     }
 
@@ -436,7 +444,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.DescriptorProto> _repeated_messageType_codec
         = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.DescriptorProtos.DescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto> messageType_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto> MessageType {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto> MessageType {
       get { return messageType_; }
     }
 
@@ -444,7 +452,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto> _repeated_enumType_codec
         = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto> enumType_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto> EnumType {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto> EnumType {
       get { return enumType_; }
     }
 
@@ -452,7 +460,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.ServiceDescriptorProto> _repeated_service_codec
         = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.DescriptorProtos.ServiceDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.ServiceDescriptorProto> service_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.ServiceDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.ServiceDescriptorProto> Service {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.ServiceDescriptorProto> Service {
       get { return service_; }
     }
 
@@ -460,13 +468,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> _repeated_extension_codec
         = pb::FieldCodec.ForMessage(58, global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> extension_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> Extension {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> Extension {
       get { return extension_; }
     }
 
     public const int OptionsFieldNumber = 8;
     private global::Google.Protobuf.DescriptorProtos.FileOptions options_;
-    public global::Google.Protobuf.DescriptorProtos.FileOptions Options {
+    internal global::Google.Protobuf.DescriptorProtos.FileOptions Options {
       get { return options_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -476,7 +484,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int SourceCodeInfoFieldNumber = 9;
     private global::Google.Protobuf.DescriptorProtos.SourceCodeInfo sourceCodeInfo_;
-    public global::Google.Protobuf.DescriptorProtos.SourceCodeInfo SourceCodeInfo {
+    internal global::Google.Protobuf.DescriptorProtos.SourceCodeInfo SourceCodeInfo {
       get { return sourceCodeInfo_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -486,7 +494,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int SyntaxFieldNumber = 12;
     private string syntax_ = "";
-    public string Syntax {
+    internal string Syntax {
       get { return syntax_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -702,7 +710,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class DescriptorProto : pb::IMessage<DescriptorProto> {
+  internal sealed partial class DescriptorProto : pb::IMessage<DescriptorProto> {
     private static readonly pb::MessageParser<DescriptorProto> _parser = new pb::MessageParser<DescriptorProto>(() => new DescriptorProto());
     public static pb::MessageParser<DescriptorProto> Parser { get { return _parser; } }
 
@@ -719,9 +727,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public DescriptorProto() { }
+    public DescriptorProto() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public DescriptorProto(DescriptorProto other) {
+    public DescriptorProto(DescriptorProto other) : this() {
       name_ = other.name_;
       field_ = other.field_.Clone();
       extension_ = other.extension_.Clone();
@@ -756,7 +768,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NameFieldNumber = 1;
     private string name_ = "";
-    public string Name {
+    internal string Name {
       get { return name_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -768,7 +780,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> _repeated_field_codec
         = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> field_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> Field {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> Field {
       get { return field_; }
     }
 
@@ -776,7 +788,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> _repeated_extension_codec
         = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> extension_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> Extension {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto> Extension {
       get { return extension_; }
     }
 
@@ -784,7 +796,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.DescriptorProto> _repeated_nestedType_codec
         = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.DescriptorProtos.DescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto> nestedType_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto> NestedType {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto> NestedType {
       get { return nestedType_; }
     }
 
@@ -792,7 +804,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto> _repeated_enumType_codec
         = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto> enumType_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto> EnumType {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumDescriptorProto> EnumType {
       get { return enumType_; }
     }
 
@@ -800,7 +812,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ExtensionRange> _repeated_extensionRange_codec
         = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ExtensionRange.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ExtensionRange> extensionRange_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ExtensionRange>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ExtensionRange> ExtensionRange {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ExtensionRange> ExtensionRange {
       get { return extensionRange_; }
     }
 
@@ -808,13 +820,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.OneofDescriptorProto> _repeated_oneofDecl_codec
         = pb::FieldCodec.ForMessage(66, global::Google.Protobuf.DescriptorProtos.OneofDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.OneofDescriptorProto> oneofDecl_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.OneofDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.OneofDescriptorProto> OneofDecl {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.OneofDescriptorProto> OneofDecl {
       get { return oneofDecl_; }
     }
 
     public const int OptionsFieldNumber = 7;
     private global::Google.Protobuf.DescriptorProtos.MessageOptions options_;
-    public global::Google.Protobuf.DescriptorProtos.MessageOptions Options {
+    internal global::Google.Protobuf.DescriptorProtos.MessageOptions Options {
       get { return options_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -826,7 +838,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ReservedRange> _repeated_reservedRange_codec
         = pb::FieldCodec.ForMessage(74, global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ReservedRange.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ReservedRange> reservedRange_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ReservedRange>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ReservedRange> ReservedRange {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.DescriptorProto.Types.ReservedRange> ReservedRange {
       get { return reservedRange_; }
     }
 
@@ -834,7 +846,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<string> _repeated_reservedName_codec
         = pb::FieldCodec.ForString(82);
     private readonly pbc::RepeatedField<string> reservedName_ = new pbc::RepeatedField<string>();
-    public pbc::RepeatedField<string> ReservedName {
+    internal pbc::RepeatedField<string> ReservedName {
       get { return reservedName_; }
     }
 
@@ -1000,7 +1012,7 @@ namespace Google.Protobuf.DescriptorProtos {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     public static partial class Types {
       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class ExtensionRange : pb::IMessage<ExtensionRange> {
+      internal sealed partial class ExtensionRange : pb::IMessage<ExtensionRange> {
         private static readonly pb::MessageParser<ExtensionRange> _parser = new pb::MessageParser<ExtensionRange>(() => new ExtensionRange());
         public static pb::MessageParser<ExtensionRange> Parser { get { return _parser; } }
 
@@ -1017,9 +1029,13 @@ namespace Google.Protobuf.DescriptorProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public ExtensionRange() { }
+        public ExtensionRange() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public ExtensionRange(ExtensionRange other) {
+        public ExtensionRange(ExtensionRange other) : this() {
           start_ = other.start_;
           end_ = other.end_;
         }
@@ -1037,7 +1053,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
         public const int StartFieldNumber = 1;
         private int start_;
-        public int Start {
+        internal int Start {
           get { return start_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -1047,7 +1063,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
         public const int EndFieldNumber = 2;
         private int end_;
-        public int End {
+        internal int End {
           get { return end_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -1138,7 +1154,7 @@ namespace Google.Protobuf.DescriptorProtos {
       }
 
       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class ReservedRange : pb::IMessage<ReservedRange> {
+      internal sealed partial class ReservedRange : pb::IMessage<ReservedRange> {
         private static readonly pb::MessageParser<ReservedRange> _parser = new pb::MessageParser<ReservedRange>(() => new ReservedRange());
         public static pb::MessageParser<ReservedRange> Parser { get { return _parser; } }
 
@@ -1155,9 +1171,13 @@ namespace Google.Protobuf.DescriptorProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public ReservedRange() { }
+        public ReservedRange() {
+          OnConstruction();
+        }
 
-        public ReservedRange(ReservedRange other) {
+        partial void OnConstruction();
+
+        public ReservedRange(ReservedRange other) : this() {
           start_ = other.start_;
           end_ = other.end_;
         }
@@ -1175,7 +1195,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
         public const int StartFieldNumber = 1;
         private int start_;
-        public int Start {
+        internal int Start {
           get { return start_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -1185,7 +1205,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
         public const int EndFieldNumber = 2;
         private int end_;
-        public int End {
+        internal int End {
           get { return end_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -1281,7 +1301,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FieldDescriptorProto : pb::IMessage<FieldDescriptorProto> {
+  internal sealed partial class FieldDescriptorProto : pb::IMessage<FieldDescriptorProto> {
     private static readonly pb::MessageParser<FieldDescriptorProto> _parser = new pb::MessageParser<FieldDescriptorProto>(() => new FieldDescriptorProto());
     public static pb::MessageParser<FieldDescriptorProto> Parser { get { return _parser; } }
 
@@ -1298,9 +1318,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FieldDescriptorProto() { }
+    public FieldDescriptorProto() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FieldDescriptorProto(FieldDescriptorProto other) {
+    public FieldDescriptorProto(FieldDescriptorProto other) : this() {
       name_ = other.name_;
       number_ = other.number_;
       label_ = other.label_;
@@ -1326,7 +1350,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NameFieldNumber = 1;
     private string name_ = "";
-    public string Name {
+    internal string Name {
       get { return name_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1336,7 +1360,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NumberFieldNumber = 3;
     private int number_;
-    public int Number {
+    internal int Number {
       get { return number_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1346,7 +1370,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int LabelFieldNumber = 4;
     private global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Label label_ = global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL;
-    public global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Label Label {
+    internal global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Label Label {
       get { return label_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1356,7 +1380,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int TypeFieldNumber = 5;
     private global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Type type_ = global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Type.TYPE_DOUBLE;
-    public global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Type Type {
+    internal global::Google.Protobuf.DescriptorProtos.FieldDescriptorProto.Types.Type Type {
       get { return type_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1366,7 +1390,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int TypeNameFieldNumber = 6;
     private string typeName_ = "";
-    public string TypeName {
+    internal string TypeName {
       get { return typeName_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1376,7 +1400,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int ExtendeeFieldNumber = 2;
     private string extendee_ = "";
-    public string Extendee {
+    internal string Extendee {
       get { return extendee_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1386,7 +1410,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DefaultValueFieldNumber = 7;
     private string defaultValue_ = "";
-    public string DefaultValue {
+    internal string DefaultValue {
       get { return defaultValue_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1396,7 +1420,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int OneofIndexFieldNumber = 9;
     private int oneofIndex_;
-    public int OneofIndex {
+    internal int OneofIndex {
       get { return oneofIndex_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1406,7 +1430,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int OptionsFieldNumber = 8;
     private global::Google.Protobuf.DescriptorProtos.FieldOptions options_;
-    public global::Google.Protobuf.DescriptorProtos.FieldOptions Options {
+    internal global::Google.Protobuf.DescriptorProtos.FieldOptions Options {
       get { return options_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1615,7 +1639,7 @@ namespace Google.Protobuf.DescriptorProtos {
     #region Nested types
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     public static partial class Types {
-      public enum Type {
+      internal enum Type {
         TYPE_DOUBLE = 1,
         TYPE_FLOAT = 2,
         TYPE_INT64 = 3,
@@ -1636,7 +1660,7 @@ namespace Google.Protobuf.DescriptorProtos {
         TYPE_SINT64 = 18,
       }
 
-      public enum Label {
+      internal enum Label {
         LABEL_OPTIONAL = 1,
         LABEL_REQUIRED = 2,
         LABEL_REPEATED = 3,
@@ -1648,7 +1672,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class OneofDescriptorProto : pb::IMessage<OneofDescriptorProto> {
+  internal sealed partial class OneofDescriptorProto : pb::IMessage<OneofDescriptorProto> {
     private static readonly pb::MessageParser<OneofDescriptorProto> _parser = new pb::MessageParser<OneofDescriptorProto>(() => new OneofDescriptorProto());
     public static pb::MessageParser<OneofDescriptorProto> Parser { get { return _parser; } }
 
@@ -1665,9 +1689,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public OneofDescriptorProto() { }
+    public OneofDescriptorProto() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public OneofDescriptorProto(OneofDescriptorProto other) {
+    public OneofDescriptorProto(OneofDescriptorProto other) : this() {
       name_ = other.name_;
     }
 
@@ -1684,7 +1712,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NameFieldNumber = 1;
     private string name_ = "";
-    public string Name {
+    internal string Name {
       get { return name_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1759,7 +1787,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class EnumDescriptorProto : pb::IMessage<EnumDescriptorProto> {
+  internal sealed partial class EnumDescriptorProto : pb::IMessage<EnumDescriptorProto> {
     private static readonly pb::MessageParser<EnumDescriptorProto> _parser = new pb::MessageParser<EnumDescriptorProto>(() => new EnumDescriptorProto());
     public static pb::MessageParser<EnumDescriptorProto> Parser { get { return _parser; } }
 
@@ -1776,9 +1804,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public EnumDescriptorProto() { }
+    public EnumDescriptorProto() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public EnumDescriptorProto(EnumDescriptorProto other) {
+    public EnumDescriptorProto(EnumDescriptorProto other) : this() {
       name_ = other.name_;
       value_ = other.value_.Clone();
       Options = other.options_ != null ? other.Options.Clone() : null;
@@ -1799,7 +1831,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NameFieldNumber = 1;
     private string name_ = "";
-    public string Name {
+    internal string Name {
       get { return name_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1811,13 +1843,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.EnumValueDescriptorProto> _repeated_value_codec
         = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.DescriptorProtos.EnumValueDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumValueDescriptorProto> value_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumValueDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumValueDescriptorProto> Value {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.EnumValueDescriptorProto> Value {
       get { return value_; }
     }
 
     public const int OptionsFieldNumber = 3;
     private global::Google.Protobuf.DescriptorProtos.EnumOptions options_;
-    public global::Google.Protobuf.DescriptorProtos.EnumOptions Options {
+    internal global::Google.Protobuf.DescriptorProtos.EnumOptions Options {
       get { return options_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1923,7 +1955,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class EnumValueDescriptorProto : pb::IMessage<EnumValueDescriptorProto> {
+  internal sealed partial class EnumValueDescriptorProto : pb::IMessage<EnumValueDescriptorProto> {
     private static readonly pb::MessageParser<EnumValueDescriptorProto> _parser = new pb::MessageParser<EnumValueDescriptorProto>(() => new EnumValueDescriptorProto());
     public static pb::MessageParser<EnumValueDescriptorProto> Parser { get { return _parser; } }
 
@@ -1940,9 +1972,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public EnumValueDescriptorProto() { }
+    public EnumValueDescriptorProto() {
+      OnConstruction();
+    }
 
-    public EnumValueDescriptorProto(EnumValueDescriptorProto other) {
+    partial void OnConstruction();
+
+    public EnumValueDescriptorProto(EnumValueDescriptorProto other) : this() {
       name_ = other.name_;
       number_ = other.number_;
       Options = other.options_ != null ? other.Options.Clone() : null;
@@ -1962,7 +1998,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NameFieldNumber = 1;
     private string name_ = "";
-    public string Name {
+    internal string Name {
       get { return name_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1972,7 +2008,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NumberFieldNumber = 2;
     private int number_;
-    public int Number {
+    internal int Number {
       get { return number_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -1982,7 +2018,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int OptionsFieldNumber = 3;
     private global::Google.Protobuf.DescriptorProtos.EnumValueOptions options_;
-    public global::Google.Protobuf.DescriptorProtos.EnumValueOptions Options {
+    internal global::Google.Protobuf.DescriptorProtos.EnumValueOptions Options {
       get { return options_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2095,7 +2131,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class ServiceDescriptorProto : pb::IMessage<ServiceDescriptorProto> {
+  internal sealed partial class ServiceDescriptorProto : pb::IMessage<ServiceDescriptorProto> {
     private static readonly pb::MessageParser<ServiceDescriptorProto> _parser = new pb::MessageParser<ServiceDescriptorProto>(() => new ServiceDescriptorProto());
     public static pb::MessageParser<ServiceDescriptorProto> Parser { get { return _parser; } }
 
@@ -2112,9 +2148,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public ServiceDescriptorProto() { }
+    public ServiceDescriptorProto() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public ServiceDescriptorProto(ServiceDescriptorProto other) {
+    public ServiceDescriptorProto(ServiceDescriptorProto other) : this() {
       name_ = other.name_;
       method_ = other.method_.Clone();
       Options = other.options_ != null ? other.Options.Clone() : null;
@@ -2135,7 +2175,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NameFieldNumber = 1;
     private string name_ = "";
-    public string Name {
+    internal string Name {
       get { return name_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2147,13 +2187,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.MethodDescriptorProto> _repeated_method_codec
         = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.DescriptorProtos.MethodDescriptorProto.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.MethodDescriptorProto> method_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.MethodDescriptorProto>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.MethodDescriptorProto> Method {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.MethodDescriptorProto> Method {
       get { return method_; }
     }
 
     public const int OptionsFieldNumber = 3;
     private global::Google.Protobuf.DescriptorProtos.ServiceOptions options_;
-    public global::Google.Protobuf.DescriptorProtos.ServiceOptions Options {
+    internal global::Google.Protobuf.DescriptorProtos.ServiceOptions Options {
       get { return options_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2259,7 +2299,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class MethodDescriptorProto : pb::IMessage<MethodDescriptorProto> {
+  internal sealed partial class MethodDescriptorProto : pb::IMessage<MethodDescriptorProto> {
     private static readonly pb::MessageParser<MethodDescriptorProto> _parser = new pb::MessageParser<MethodDescriptorProto>(() => new MethodDescriptorProto());
     public static pb::MessageParser<MethodDescriptorProto> Parser { get { return _parser; } }
 
@@ -2276,9 +2316,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public MethodDescriptorProto() { }
+    public MethodDescriptorProto() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public MethodDescriptorProto(MethodDescriptorProto other) {
+    public MethodDescriptorProto(MethodDescriptorProto other) : this() {
       name_ = other.name_;
       inputType_ = other.inputType_;
       outputType_ = other.outputType_;
@@ -2301,7 +2345,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NameFieldNumber = 1;
     private string name_ = "";
-    public string Name {
+    internal string Name {
       get { return name_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2311,7 +2355,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int InputTypeFieldNumber = 2;
     private string inputType_ = "";
-    public string InputType {
+    internal string InputType {
       get { return inputType_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2321,7 +2365,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int OutputTypeFieldNumber = 3;
     private string outputType_ = "";
-    public string OutputType {
+    internal string OutputType {
       get { return outputType_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2331,7 +2375,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int OptionsFieldNumber = 4;
     private global::Google.Protobuf.DescriptorProtos.MethodOptions options_;
-    public global::Google.Protobuf.DescriptorProtos.MethodOptions Options {
+    internal global::Google.Protobuf.DescriptorProtos.MethodOptions Options {
       get { return options_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2341,7 +2385,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int ClientStreamingFieldNumber = 5;
     private bool clientStreaming_;
-    public bool ClientStreaming {
+    internal bool ClientStreaming {
       get { return clientStreaming_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2351,7 +2395,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int ServerStreamingFieldNumber = 6;
     private bool serverStreaming_;
-    public bool ServerStreaming {
+    internal bool ServerStreaming {
       get { return serverStreaming_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2512,7 +2556,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FileOptions : pb::IMessage<FileOptions> {
+  internal sealed partial class FileOptions : pb::IMessage<FileOptions> {
     private static readonly pb::MessageParser<FileOptions> _parser = new pb::MessageParser<FileOptions>(() => new FileOptions());
     public static pb::MessageParser<FileOptions> Parser { get { return _parser; } }
 
@@ -2529,9 +2573,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FileOptions() { }
+    public FileOptions() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FileOptions(FileOptions other) {
+    public FileOptions(FileOptions other) : this() {
       javaPackage_ = other.javaPackage_;
       javaOuterClassname_ = other.javaOuterClassname_;
       javaMultipleFiles_ = other.javaMultipleFiles_;
@@ -2563,7 +2611,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int JavaPackageFieldNumber = 1;
     private string javaPackage_ = "";
-    public string JavaPackage {
+    internal string JavaPackage {
       get { return javaPackage_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2573,7 +2621,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int JavaOuterClassnameFieldNumber = 8;
     private string javaOuterClassname_ = "";
-    public string JavaOuterClassname {
+    internal string JavaOuterClassname {
       get { return javaOuterClassname_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2583,7 +2631,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int JavaMultipleFilesFieldNumber = 10;
     private bool javaMultipleFiles_;
-    public bool JavaMultipleFiles {
+    internal bool JavaMultipleFiles {
       get { return javaMultipleFiles_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2593,7 +2641,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int JavaGenerateEqualsAndHashFieldNumber = 20;
     private bool javaGenerateEqualsAndHash_;
-    public bool JavaGenerateEqualsAndHash {
+    internal bool JavaGenerateEqualsAndHash {
       get { return javaGenerateEqualsAndHash_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2603,7 +2651,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int JavaStringCheckUtf8FieldNumber = 27;
     private bool javaStringCheckUtf8_;
-    public bool JavaStringCheckUtf8 {
+    internal bool JavaStringCheckUtf8 {
       get { return javaStringCheckUtf8_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2613,7 +2661,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int OptimizeForFieldNumber = 9;
     private global::Google.Protobuf.DescriptorProtos.FileOptions.Types.OptimizeMode optimizeFor_ = global::Google.Protobuf.DescriptorProtos.FileOptions.Types.OptimizeMode.SPEED;
-    public global::Google.Protobuf.DescriptorProtos.FileOptions.Types.OptimizeMode OptimizeFor {
+    internal global::Google.Protobuf.DescriptorProtos.FileOptions.Types.OptimizeMode OptimizeFor {
       get { return optimizeFor_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2623,7 +2671,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int GoPackageFieldNumber = 11;
     private string goPackage_ = "";
-    public string GoPackage {
+    internal string GoPackage {
       get { return goPackage_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2633,7 +2681,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int CcGenericServicesFieldNumber = 16;
     private bool ccGenericServices_;
-    public bool CcGenericServices {
+    internal bool CcGenericServices {
       get { return ccGenericServices_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2643,7 +2691,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int JavaGenericServicesFieldNumber = 17;
     private bool javaGenericServices_;
-    public bool JavaGenericServices {
+    internal bool JavaGenericServices {
       get { return javaGenericServices_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2653,7 +2701,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int PyGenericServicesFieldNumber = 18;
     private bool pyGenericServices_;
-    public bool PyGenericServices {
+    internal bool PyGenericServices {
       get { return pyGenericServices_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2663,7 +2711,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DeprecatedFieldNumber = 23;
     private bool deprecated_;
-    public bool Deprecated {
+    internal bool Deprecated {
       get { return deprecated_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2673,7 +2721,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int CcEnableArenasFieldNumber = 31;
     private bool ccEnableArenas_;
-    public bool CcEnableArenas {
+    internal bool CcEnableArenas {
       get { return ccEnableArenas_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2683,7 +2731,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int ObjcClassPrefixFieldNumber = 36;
     private string objcClassPrefix_ = "";
-    public string ObjcClassPrefix {
+    internal string ObjcClassPrefix {
       get { return objcClassPrefix_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2693,7 +2741,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int CsharpNamespaceFieldNumber = 37;
     private string csharpNamespace_ = "";
-    public string CsharpNamespace {
+    internal string CsharpNamespace {
       get { return csharpNamespace_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -2705,7 +2753,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> _repeated_uninterpretedOption_codec
         = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
       get { return uninterpretedOption_; }
     }
 
@@ -2993,7 +3041,7 @@ namespace Google.Protobuf.DescriptorProtos {
     #region Nested types
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     public static partial class Types {
-      public enum OptimizeMode {
+      internal enum OptimizeMode {
         SPEED = 1,
         CODE_SIZE = 2,
         LITE_RUNTIME = 3,
@@ -3005,7 +3053,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class MessageOptions : pb::IMessage<MessageOptions> {
+  internal sealed partial class MessageOptions : pb::IMessage<MessageOptions> {
     private static readonly pb::MessageParser<MessageOptions> _parser = new pb::MessageParser<MessageOptions>(() => new MessageOptions());
     public static pb::MessageParser<MessageOptions> Parser { get { return _parser; } }
 
@@ -3022,9 +3070,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public MessageOptions() { }
+    public MessageOptions() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public MessageOptions(MessageOptions other) {
+    public MessageOptions(MessageOptions other) : this() {
       messageSetWireFormat_ = other.messageSetWireFormat_;
       noStandardDescriptorAccessor_ = other.noStandardDescriptorAccessor_;
       deprecated_ = other.deprecated_;
@@ -3046,7 +3098,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int MessageSetWireFormatFieldNumber = 1;
     private bool messageSetWireFormat_;
-    public bool MessageSetWireFormat {
+    internal bool MessageSetWireFormat {
       get { return messageSetWireFormat_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3056,7 +3108,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NoStandardDescriptorAccessorFieldNumber = 2;
     private bool noStandardDescriptorAccessor_;
-    public bool NoStandardDescriptorAccessor {
+    internal bool NoStandardDescriptorAccessor {
       get { return noStandardDescriptorAccessor_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3066,7 +3118,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DeprecatedFieldNumber = 3;
     private bool deprecated_;
-    public bool Deprecated {
+    internal bool Deprecated {
       get { return deprecated_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3076,7 +3128,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int MapEntryFieldNumber = 7;
     private bool mapEntry_;
-    public bool MapEntry {
+    internal bool MapEntry {
       get { return mapEntry_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3088,7 +3140,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> _repeated_uninterpretedOption_codec
         = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
       get { return uninterpretedOption_; }
     }
 
@@ -3216,7 +3268,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class FieldOptions : pb::IMessage<FieldOptions> {
+  internal sealed partial class FieldOptions : pb::IMessage<FieldOptions> {
     private static readonly pb::MessageParser<FieldOptions> _parser = new pb::MessageParser<FieldOptions>(() => new FieldOptions());
     public static pb::MessageParser<FieldOptions> Parser { get { return _parser; } }
 
@@ -3233,9 +3285,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public FieldOptions() { }
+    public FieldOptions() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public FieldOptions(FieldOptions other) {
+    public FieldOptions(FieldOptions other) : this() {
       ctype_ = other.ctype_;
       packed_ = other.packed_;
       jstype_ = other.jstype_;
@@ -3259,7 +3315,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int CtypeFieldNumber = 1;
     private global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.CType ctype_ = global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.CType.STRING;
-    public global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.CType Ctype {
+    internal global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.CType Ctype {
       get { return ctype_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3269,7 +3325,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int PackedFieldNumber = 2;
     private bool packed_;
-    public bool Packed {
+    internal bool Packed {
       get { return packed_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3279,7 +3335,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int JstypeFieldNumber = 6;
     private global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.JSType jstype_ = global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.JSType.JS_NORMAL;
-    public global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.JSType Jstype {
+    internal global::Google.Protobuf.DescriptorProtos.FieldOptions.Types.JSType Jstype {
       get { return jstype_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3289,7 +3345,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int LazyFieldNumber = 5;
     private bool lazy_;
-    public bool Lazy {
+    internal bool Lazy {
       get { return lazy_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3299,7 +3355,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DeprecatedFieldNumber = 3;
     private bool deprecated_;
-    public bool Deprecated {
+    internal bool Deprecated {
       get { return deprecated_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3309,7 +3365,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int WeakFieldNumber = 10;
     private bool weak_;
-    public bool Weak {
+    internal bool Weak {
       get { return weak_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3321,7 +3377,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> _repeated_uninterpretedOption_codec
         = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
       get { return uninterpretedOption_; }
     }
 
@@ -3481,13 +3537,13 @@ namespace Google.Protobuf.DescriptorProtos {
     #region Nested types
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     public static partial class Types {
-      public enum CType {
+      internal enum CType {
         STRING = 0,
         CORD = 1,
         STRING_PIECE = 2,
       }
 
-      public enum JSType {
+      internal enum JSType {
         JS_NORMAL = 0,
         JS_STRING = 1,
         JS_NUMBER = 2,
@@ -3499,7 +3555,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class EnumOptions : pb::IMessage<EnumOptions> {
+  internal sealed partial class EnumOptions : pb::IMessage<EnumOptions> {
     private static readonly pb::MessageParser<EnumOptions> _parser = new pb::MessageParser<EnumOptions>(() => new EnumOptions());
     public static pb::MessageParser<EnumOptions> Parser { get { return _parser; } }
 
@@ -3516,9 +3572,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public EnumOptions() { }
+    public EnumOptions() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public EnumOptions(EnumOptions other) {
+    public EnumOptions(EnumOptions other) : this() {
       allowAlias_ = other.allowAlias_;
       deprecated_ = other.deprecated_;
       uninterpretedOption_ = other.uninterpretedOption_.Clone();
@@ -3538,7 +3598,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int AllowAliasFieldNumber = 2;
     private bool allowAlias_;
-    public bool AllowAlias {
+    internal bool AllowAlias {
       get { return allowAlias_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3548,7 +3608,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DeprecatedFieldNumber = 3;
     private bool deprecated_;
-    public bool Deprecated {
+    internal bool Deprecated {
       get { return deprecated_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3560,7 +3620,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> _repeated_uninterpretedOption_codec
         = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
       get { return uninterpretedOption_; }
     }
 
@@ -3656,7 +3716,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class EnumValueOptions : pb::IMessage<EnumValueOptions> {
+  internal sealed partial class EnumValueOptions : pb::IMessage<EnumValueOptions> {
     private static readonly pb::MessageParser<EnumValueOptions> _parser = new pb::MessageParser<EnumValueOptions>(() => new EnumValueOptions());
     public static pb::MessageParser<EnumValueOptions> Parser { get { return _parser; } }
 
@@ -3673,9 +3733,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public EnumValueOptions() { }
+    public EnumValueOptions() {
+      OnConstruction();
+    }
 
-    public EnumValueOptions(EnumValueOptions other) {
+    partial void OnConstruction();
+
+    public EnumValueOptions(EnumValueOptions other) : this() {
       deprecated_ = other.deprecated_;
       uninterpretedOption_ = other.uninterpretedOption_.Clone();
     }
@@ -3694,7 +3758,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DeprecatedFieldNumber = 1;
     private bool deprecated_;
-    public bool Deprecated {
+    internal bool Deprecated {
       get { return deprecated_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3706,7 +3770,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> _repeated_uninterpretedOption_codec
         = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
       get { return uninterpretedOption_; }
     }
 
@@ -3786,7 +3850,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class ServiceOptions : pb::IMessage<ServiceOptions> {
+  internal sealed partial class ServiceOptions : pb::IMessage<ServiceOptions> {
     private static readonly pb::MessageParser<ServiceOptions> _parser = new pb::MessageParser<ServiceOptions>(() => new ServiceOptions());
     public static pb::MessageParser<ServiceOptions> Parser { get { return _parser; } }
 
@@ -3803,9 +3867,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public ServiceOptions() { }
+    public ServiceOptions() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public ServiceOptions(ServiceOptions other) {
+    public ServiceOptions(ServiceOptions other) : this() {
       deprecated_ = other.deprecated_;
       uninterpretedOption_ = other.uninterpretedOption_.Clone();
     }
@@ -3824,7 +3892,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DeprecatedFieldNumber = 33;
     private bool deprecated_;
-    public bool Deprecated {
+    internal bool Deprecated {
       get { return deprecated_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3836,7 +3904,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> _repeated_uninterpretedOption_codec
         = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
       get { return uninterpretedOption_; }
     }
 
@@ -3916,7 +3984,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class MethodOptions : pb::IMessage<MethodOptions> {
+  internal sealed partial class MethodOptions : pb::IMessage<MethodOptions> {
     private static readonly pb::MessageParser<MethodOptions> _parser = new pb::MessageParser<MethodOptions>(() => new MethodOptions());
     public static pb::MessageParser<MethodOptions> Parser { get { return _parser; } }
 
@@ -3933,9 +4001,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public MethodOptions() { }
+    public MethodOptions() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public MethodOptions(MethodOptions other) {
+    public MethodOptions(MethodOptions other) : this() {
       deprecated_ = other.deprecated_;
       uninterpretedOption_ = other.uninterpretedOption_.Clone();
     }
@@ -3954,7 +4026,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DeprecatedFieldNumber = 33;
     private bool deprecated_;
-    public bool Deprecated {
+    internal bool Deprecated {
       get { return deprecated_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -3966,7 +4038,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> _repeated_uninterpretedOption_codec
         = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption> UninterpretedOption {
       get { return uninterpretedOption_; }
     }
 
@@ -4046,7 +4118,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class UninterpretedOption : pb::IMessage<UninterpretedOption> {
+  internal sealed partial class UninterpretedOption : pb::IMessage<UninterpretedOption> {
     private static readonly pb::MessageParser<UninterpretedOption> _parser = new pb::MessageParser<UninterpretedOption>(() => new UninterpretedOption());
     public static pb::MessageParser<UninterpretedOption> Parser { get { return _parser; } }
 
@@ -4063,9 +4135,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public UninterpretedOption() { }
+    public UninterpretedOption() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public UninterpretedOption(UninterpretedOption other) {
+    public UninterpretedOption(UninterpretedOption other) : this() {
       name_ = other.name_.Clone();
       identifierValue_ = other.identifierValue_;
       positiveIntValue_ = other.positiveIntValue_;
@@ -4091,13 +4167,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Types.NamePart> _repeated_name_codec
         = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Types.NamePart.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Types.NamePart> name_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Types.NamePart>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Types.NamePart> Name {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.UninterpretedOption.Types.NamePart> Name {
       get { return name_; }
     }
 
     public const int IdentifierValueFieldNumber = 3;
     private string identifierValue_ = "";
-    public string IdentifierValue {
+    internal string IdentifierValue {
       get { return identifierValue_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -4107,7 +4183,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int PositiveIntValueFieldNumber = 4;
     private ulong positiveIntValue_;
-    public ulong PositiveIntValue {
+    internal ulong PositiveIntValue {
       get { return positiveIntValue_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -4117,7 +4193,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int NegativeIntValueFieldNumber = 5;
     private long negativeIntValue_;
-    public long NegativeIntValue {
+    internal long NegativeIntValue {
       get { return negativeIntValue_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -4127,7 +4203,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int DoubleValueFieldNumber = 6;
     private double doubleValue_;
-    public double DoubleValue {
+    internal double DoubleValue {
       get { return doubleValue_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -4137,7 +4213,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int StringValueFieldNumber = 7;
     private pb::ByteString stringValue_ = pb::ByteString.Empty;
-    public pb::ByteString StringValue {
+    internal pb::ByteString StringValue {
       get { return stringValue_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -4147,7 +4223,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
     public const int AggregateValueFieldNumber = 8;
     private string aggregateValue_ = "";
-    public string AggregateValue {
+    internal string AggregateValue {
       get { return aggregateValue_; }
       set {
         pb::Freezable.CheckMutable(this);
@@ -4312,7 +4388,7 @@ namespace Google.Protobuf.DescriptorProtos {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     public static partial class Types {
       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class NamePart : pb::IMessage<NamePart> {
+      internal sealed partial class NamePart : pb::IMessage<NamePart> {
         private static readonly pb::MessageParser<NamePart> _parser = new pb::MessageParser<NamePart>(() => new NamePart());
         public static pb::MessageParser<NamePart> Parser { get { return _parser; } }
 
@@ -4329,9 +4405,13 @@ namespace Google.Protobuf.DescriptorProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public NamePart() { }
+        public NamePart() {
+          OnConstruction();
+        }
 
-        public NamePart(NamePart other) {
+        partial void OnConstruction();
+
+        public NamePart(NamePart other) : this() {
           namePart_ = other.namePart_;
           isExtension_ = other.isExtension_;
         }
@@ -4349,7 +4429,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
         public const int NamePart_FieldNumber = 1;
         private string namePart_ = "";
-        public string NamePart_ {
+        internal string NamePart_ {
           get { return namePart_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -4359,7 +4439,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
         public const int IsExtensionFieldNumber = 2;
         private bool isExtension_;
-        public bool IsExtension {
+        internal bool IsExtension {
           get { return isExtension_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -4455,7 +4535,7 @@ namespace Google.Protobuf.DescriptorProtos {
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-  public sealed partial class SourceCodeInfo : pb::IMessage<SourceCodeInfo> {
+  internal sealed partial class SourceCodeInfo : pb::IMessage<SourceCodeInfo> {
     private static readonly pb::MessageParser<SourceCodeInfo> _parser = new pb::MessageParser<SourceCodeInfo>(() => new SourceCodeInfo());
     public static pb::MessageParser<SourceCodeInfo> Parser { get { return _parser; } }
 
@@ -4472,9 +4552,13 @@ namespace Google.Protobuf.DescriptorProtos {
     private bool _frozen = false;
     public bool IsFrozen { get { return _frozen; } }
 
-    public SourceCodeInfo() { }
+    public SourceCodeInfo() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
 
-    public SourceCodeInfo(SourceCodeInfo other) {
+    public SourceCodeInfo(SourceCodeInfo other) : this() {
       location_ = other.location_.Clone();
     }
 
@@ -4494,7 +4578,7 @@ namespace Google.Protobuf.DescriptorProtos {
     private static readonly pb::FieldCodec<global::Google.Protobuf.DescriptorProtos.SourceCodeInfo.Types.Location> _repeated_location_codec
         = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.DescriptorProtos.SourceCodeInfo.Types.Location.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.SourceCodeInfo.Types.Location> location_ = new pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.SourceCodeInfo.Types.Location>();
-    public pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.SourceCodeInfo.Types.Location> Location {
+    internal pbc::RepeatedField<global::Google.Protobuf.DescriptorProtos.SourceCodeInfo.Types.Location> Location {
       get { return location_; }
     }
 
@@ -4559,7 +4643,7 @@ namespace Google.Protobuf.DescriptorProtos {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     public static partial class Types {
       [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-      public sealed partial class Location : pb::IMessage<Location> {
+      internal sealed partial class Location : pb::IMessage<Location> {
         private static readonly pb::MessageParser<Location> _parser = new pb::MessageParser<Location>(() => new Location());
         public static pb::MessageParser<Location> Parser { get { return _parser; } }
 
@@ -4576,9 +4660,13 @@ namespace Google.Protobuf.DescriptorProtos {
         private bool _frozen = false;
         public bool IsFrozen { get { return _frozen; } }
 
-        public Location() { }
+        public Location() {
+          OnConstruction();
+        }
+
+        partial void OnConstruction();
 
-        public Location(Location other) {
+        public Location(Location other) : this() {
           path_ = other.path_.Clone();
           span_ = other.span_.Clone();
           leadingComments_ = other.leadingComments_;
@@ -4604,7 +4692,7 @@ namespace Google.Protobuf.DescriptorProtos {
         private static readonly pb::FieldCodec<int> _repeated_path_codec
             = pb::FieldCodec.ForInt32(10);
         private readonly pbc::RepeatedField<int> path_ = new pbc::RepeatedField<int>();
-        public pbc::RepeatedField<int> Path {
+        internal pbc::RepeatedField<int> Path {
           get { return path_; }
         }
 
@@ -4612,13 +4700,13 @@ namespace Google.Protobuf.DescriptorProtos {
         private static readonly pb::FieldCodec<int> _repeated_span_codec
             = pb::FieldCodec.ForInt32(18);
         private readonly pbc::RepeatedField<int> span_ = new pbc::RepeatedField<int>();
-        public pbc::RepeatedField<int> Span {
+        internal pbc::RepeatedField<int> Span {
           get { return span_; }
         }
 
         public const int LeadingCommentsFieldNumber = 3;
         private string leadingComments_ = "";
-        public string LeadingComments {
+        internal string LeadingComments {
           get { return leadingComments_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -4628,7 +4716,7 @@ namespace Google.Protobuf.DescriptorProtos {
 
         public const int TrailingCommentsFieldNumber = 4;
         private string trailingComments_ = "";
-        public string TrailingComments {
+        internal string TrailingComments {
           get { return trailingComments_; }
           set {
             pb::Freezable.CheckMutable(this);
@@ -4640,7 +4728,7 @@ namespace Google.Protobuf.DescriptorProtos {
         private static readonly pb::FieldCodec<string> _repeated_leadingDetachedComments_codec
             = pb::FieldCodec.ForString(50);
         private readonly pbc::RepeatedField<string> leadingDetachedComments_ = new pbc::RepeatedField<string>();
-        public pbc::RepeatedField<string> LeadingDetachedComments {
+        internal pbc::RepeatedField<string> LeadingDetachedComments {
           get { return leadingDetachedComments_; }
         }
 
diff --git a/examples/addressbook.proto b/examples/addressbook.proto
index 9ab45427..5da5fa39 100644
--- a/examples/addressbook.proto
+++ b/examples/addressbook.proto
@@ -1,6 +1,6 @@
 // See README.txt for information and build instructions.
 
-syntax = "proto2";
+syntax = "proto3";
 
 package tutorial;
 
@@ -9,9 +9,9 @@ option java_outer_classname = "AddressBookProtos";
 option csharp_namespace = "Google.Protobuf.Examples.AddressBook";
 
 message Person {
-  required string name = 1;
-  required int32 id = 2;        // Unique ID number for this person.
-  optional string email = 3;
+  string name = 1;
+  int32 id = 2;        // Unique ID number for this person.
+  string email = 3;
 
   enum PhoneType {
     MOBILE = 0;
@@ -20,8 +20,8 @@ message Person {
   }
 
   message PhoneNumber {
-    required string number = 1;
-    optional PhoneType type = 2 [default = HOME];
+    string number = 1;
+    PhoneType type = 2;
   }
 
   repeated PhoneNumber phone = 4;