Partial solution of #1085: mpc.exe #1092

commit d7a50b9d9a8de447a4dec61219fd584e862095a3
Merge: 02ae418 5a6cda6
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Mon Oct 26 09:33:45 2020 +0900

    Merge remote-tracking branch 'upstream/develop' into solution#1085-mpc

commit 02ae418a39cdd6d5bbdab7b900eb5169d80fa7e9
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Mon Oct 26 09:25:20 2020 +0900

    Update: Loop demonstration

commit d84ae759892b2ab9fc10d8d434902fca10ee88c1
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Mon Oct 26 09:24:31 2020 +0900

    Change: drop deserialized value -> reader.Skip()

commit 9b0d4a21a8824dc277a48ac63180e901b6f9890e
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Mon Oct 26 00:27:10 2020 +0900

    Fix: remove unused boolean local variables

commit fdfabeb2f1fc8b87bc41419fb0ccaee2c354b98a
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Mon Oct 26 00:00:28 2020 +0900

    Update: Make the same as Dynamic

commit bef4692e10cc47b137b7c647acb11feffb177206
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sun Oct 25 19:37:11 2020 +0900

    Add test project

commit a8fac80ec561f476f122d35ad2cbcd831a955d41
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sun Oct 25 18:55:27 2020 +0900

    Add types to sandbox

commit 6ffc3c309b6b47728e927799b574fc23b37fa2c8
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sun Oct 25 18:45:40 2020 +0900

    Update: string-key mpc.exe

commit 44819e6d551961598c29fdab5aa0bf65d53ed0e6
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sun Oct 25 18:05:24 2020 +0900

    Update: int-key mpc.exe

commit 0a2fef4d2f3ae7f568bd34a554792f006ec31275
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sun Oct 25 12:12:57 2020 +0900

    Fix: var -> global::MessagePack.IFormatterResolver

commit 086aa11e7ce4fb0723014c8bda554104b3b38463
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sun Oct 25 12:05:21 2020 +0900

    Fix: Line Feed

commit 39d3d0844848f1d742820e2786528baf2bd1627c
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sun Oct 25 12:03:37 2020 +0900

    Fix: space

commit c57f423a49fed8e1c1b365310017a2ec382b5f07
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sun Oct 25 12:00:32 2020 +0900

    Change: var to globall::
    Revert: DepthStep position
    Revert: }#> -> } #>

commit de6fd239491b3fb7aa373644a384a71772d23b43
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sat Oct 24 11:04:44 2020 +0900

     fix CRLF

commit 4b6ae7c6089f7d6732691a0af7f1d93424ccaa95
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Sat Oct 24 10:59:50 2020 +0900

    Change the format to decrease template part lines.

    Change the iterator `i` type from `int` to `var`.

commit 95f41adff75a0ff605e760d5cdc485de10ee13be
Author: pCYSl5EDgo <pCYSl5EDgo@yahoo.co.jp>
Date:   Fri Oct 23 21:03:54 2020 +0900

    This is a cherry-pick of #1074.
    This is a refactoring of int-key mpc.exe tt file.

2 files changed, 712 insertions, 706 deletions

diff --git a/sandbox/Sandbox/Generated.cs b/sandbox/Sandbox/Generated.cs
index aa978951..6db29c4c 100644
--- a/sandbox/Sandbox/Generated.cs
+++ b/sandbox/Sandbox/Generated.cs
@@ -49,7 +49,7 @@ namespace MessagePack.Resolvers
 
         static GeneratedResolverGetFormatterHelper()
         {
-            lookup = new global::System.Collections.Generic.Dictionary<Type, int>(65)
+            lookup = new global::System.Collections.Generic.Dictionary<Type, int>(71)
             {
                 { typeof(global::GlobalMyEnum[,]), 0 },
                 { typeof(global::GlobalMyEnum[]), 1 },
@@ -80,42 +80,48 @@ namespace MessagePack.Resolvers
                 { typeof(global::SharedData.Callback1_2), 26 },
                 { typeof(global::SharedData.Callback2), 27 },
                 { typeof(global::SharedData.Callback2_2), 28 },
-                { typeof(global::SharedData.Empty1), 29 },
-                { typeof(global::SharedData.Empty2), 30 },
-                { typeof(global::SharedData.EmptyClass), 31 },
-                { typeof(global::SharedData.EmptyStruct), 32 },
-                { typeof(global::SharedData.FirstSimpleData), 33 },
-                { typeof(global::SharedData.FooClass), 34 },
-                { typeof(global::SharedData.HolderV0), 35 },
-                { typeof(global::SharedData.HolderV1), 36 },
-                { typeof(global::SharedData.HolderV2), 37 },
-                { typeof(global::SharedData.MyClass), 38 },
-                { typeof(global::SharedData.MySubUnion1), 39 },
-                { typeof(global::SharedData.MySubUnion2), 40 },
-                { typeof(global::SharedData.MySubUnion3), 41 },
-                { typeof(global::SharedData.MySubUnion4), 42 },
-                { typeof(global::SharedData.NestParent.NestContract), 43 },
-                { typeof(global::SharedData.NonEmpty1), 44 },
-                { typeof(global::SharedData.NonEmpty2), 45 },
-                { typeof(global::SharedData.SimpleIntKeyData), 46 },
-                { typeof(global::SharedData.SimpleStringKeyData), 47 },
-                { typeof(global::SharedData.SimpleStructIntKeyData), 48 },
-                { typeof(global::SharedData.SimpleStructStringKeyData), 49 },
-                { typeof(global::SharedData.SubUnionType1), 50 },
-                { typeof(global::SharedData.SubUnionType2), 51 },
-                { typeof(global::SharedData.UnVersionBlockTest), 52 },
-                { typeof(global::SharedData.Vector2), 53 },
-                { typeof(global::SharedData.Vector3Like), 54 },
-                { typeof(global::SharedData.VectorLike2), 55 },
-                { typeof(global::SharedData.Version0), 56 },
-                { typeof(global::SharedData.Version1), 57 },
-                { typeof(global::SharedData.Version2), 58 },
-                { typeof(global::SharedData.VersionBlockTest), 59 },
-                { typeof(global::SharedData.VersioningUnion), 60 },
-                { typeof(global::SharedData.WithIndexer), 61 },
-                { typeof(global::SimpleModel), 62 },
-                { typeof(global::StampMessageBody), 63 },
-                { typeof(global::TextMessageBody), 64 },
+                { typeof(global::SharedData.DefaultValueIntKeyClassWithExplicitConstructor), 29 },
+                { typeof(global::SharedData.DefaultValueIntKeyClassWithoutExplicitConstructor), 30 },
+                { typeof(global::SharedData.DefaultValueIntKeyStructWithExplicitConstructor), 31 },
+                { typeof(global::SharedData.DefaultValueStringKeyClassWithExplicitConstructor), 32 },
+                { typeof(global::SharedData.DefaultValueStringKeyClassWithoutExplicitConstructor), 33 },
+                { typeof(global::SharedData.DefaultValueStringKeyStructWithExplicitConstructor), 34 },
+                { typeof(global::SharedData.Empty1), 35 },
+                { typeof(global::SharedData.Empty2), 36 },
+                { typeof(global::SharedData.EmptyClass), 37 },
+                { typeof(global::SharedData.EmptyStruct), 38 },
+                { typeof(global::SharedData.FirstSimpleData), 39 },
+                { typeof(global::SharedData.FooClass), 40 },
+                { typeof(global::SharedData.HolderV0), 41 },
+                { typeof(global::SharedData.HolderV1), 42 },
+                { typeof(global::SharedData.HolderV2), 43 },
+                { typeof(global::SharedData.MyClass), 44 },
+                { typeof(global::SharedData.MySubUnion1), 45 },
+                { typeof(global::SharedData.MySubUnion2), 46 },
+                { typeof(global::SharedData.MySubUnion3), 47 },
+                { typeof(global::SharedData.MySubUnion4), 48 },
+                { typeof(global::SharedData.NestParent.NestContract), 49 },
+                { typeof(global::SharedData.NonEmpty1), 50 },
+                { typeof(global::SharedData.NonEmpty2), 51 },
+                { typeof(global::SharedData.SimpleIntKeyData), 52 },
+                { typeof(global::SharedData.SimpleStringKeyData), 53 },
+                { typeof(global::SharedData.SimpleStructIntKeyData), 54 },
+                { typeof(global::SharedData.SimpleStructStringKeyData), 55 },
+                { typeof(global::SharedData.SubUnionType1), 56 },
+                { typeof(global::SharedData.SubUnionType2), 57 },
+                { typeof(global::SharedData.UnVersionBlockTest), 58 },
+                { typeof(global::SharedData.Vector2), 59 },
+                { typeof(global::SharedData.Vector3Like), 60 },
+                { typeof(global::SharedData.VectorLike2), 61 },
+                { typeof(global::SharedData.Version0), 62 },
+                { typeof(global::SharedData.Version1), 63 },
+                { typeof(global::SharedData.Version2), 64 },
+                { typeof(global::SharedData.VersionBlockTest), 65 },
+                { typeof(global::SharedData.VersioningUnion), 66 },
+                { typeof(global::SharedData.WithIndexer), 67 },
+                { typeof(global::SimpleModel), 68 },
+                { typeof(global::StampMessageBody), 69 },
+                { typeof(global::TextMessageBody), 70 },
             };
         }
 
@@ -158,42 +164,48 @@ namespace MessagePack.Resolvers
                 case 26: return new MessagePack.Formatters.SharedData.Callback1_2Formatter();
                 case 27: return new MessagePack.Formatters.SharedData.Callback2Formatter();
                 case 28: return new MessagePack.Formatters.SharedData.Callback2_2Formatter();
-                case 29: return new MessagePack.Formatters.SharedData.Empty1Formatter();
-                case 30: return new MessagePack.Formatters.SharedData.Empty2Formatter();
-                case 31: return new MessagePack.Formatters.SharedData.EmptyClassFormatter();
-                case 32: return new MessagePack.Formatters.SharedData.EmptyStructFormatter();
-                case 33: return new MessagePack.Formatters.SharedData.FirstSimpleDataFormatter();
-                case 34: return new MessagePack.Formatters.SharedData.FooClassFormatter();
-                case 35: return new MessagePack.Formatters.SharedData.HolderV0Formatter();
-                case 36: return new MessagePack.Formatters.SharedData.HolderV1Formatter();
-                case 37: return new MessagePack.Formatters.SharedData.HolderV2Formatter();
-                case 38: return new MessagePack.Formatters.SharedData.MyClassFormatter();
-                case 39: return new MessagePack.Formatters.SharedData.MySubUnion1Formatter();
-                case 40: return new MessagePack.Formatters.SharedData.MySubUnion2Formatter();
-                case 41: return new MessagePack.Formatters.SharedData.MySubUnion3Formatter();
-                case 42: return new MessagePack.Formatters.SharedData.MySubUnion4Formatter();
-                case 43: return new MessagePack.Formatters.SharedData.NestParent_NestContractFormatter();
-                case 44: return new MessagePack.Formatters.SharedData.NonEmpty1Formatter();
-                case 45: return new MessagePack.Formatters.SharedData.NonEmpty2Formatter();
-                case 46: return new MessagePack.Formatters.SharedData.SimpleIntKeyDataFormatter();
-                case 47: return new MessagePack.Formatters.SharedData.SimpleStringKeyDataFormatter();
-                case 48: return new MessagePack.Formatters.SharedData.SimpleStructIntKeyDataFormatter();
-                case 49: return new MessagePack.Formatters.SharedData.SimpleStructStringKeyDataFormatter();
-                case 50: return new MessagePack.Formatters.SharedData.SubUnionType1Formatter();
-                case 51: return new MessagePack.Formatters.SharedData.SubUnionType2Formatter();
-                case 52: return new MessagePack.Formatters.SharedData.UnVersionBlockTestFormatter();
-                case 53: return new MessagePack.Formatters.SharedData.Vector2Formatter();
-                case 54: return new MessagePack.Formatters.SharedData.Vector3LikeFormatter();
-                case 55: return new MessagePack.Formatters.SharedData.VectorLike2Formatter();
-                case 56: return new MessagePack.Formatters.SharedData.Version0Formatter();
-                case 57: return new MessagePack.Formatters.SharedData.Version1Formatter();
-                case 58: return new MessagePack.Formatters.SharedData.Version2Formatter();
-                case 59: return new MessagePack.Formatters.SharedData.VersionBlockTestFormatter();
-                case 60: return new MessagePack.Formatters.SharedData.VersioningUnionFormatter();
-                case 61: return new MessagePack.Formatters.SharedData.WithIndexerFormatter();
-                case 62: return new MessagePack.Formatters.SimpleModelFormatter();
-                case 63: return new MessagePack.Formatters.StampMessageBodyFormatter();
-                case 64: return new MessagePack.Formatters.TextMessageBodyFormatter();
+                case 29: return new MessagePack.Formatters.SharedData.DefaultValueIntKeyClassWithExplicitConstructorFormatter();
+                case 30: return new MessagePack.Formatters.SharedData.DefaultValueIntKeyClassWithoutExplicitConstructorFormatter();
+                case 31: return new MessagePack.Formatters.SharedData.DefaultValueIntKeyStructWithExplicitConstructorFormatter();
+                case 32: return new MessagePack.Formatters.SharedData.DefaultValueStringKeyClassWithExplicitConstructorFormatter();
+                case 33: return new MessagePack.Formatters.SharedData.DefaultValueStringKeyClassWithoutExplicitConstructorFormatter();
+                case 34: return new MessagePack.Formatters.SharedData.DefaultValueStringKeyStructWithExplicitConstructorFormatter();
+                case 35: return new MessagePack.Formatters.SharedData.Empty1Formatter();
+                case 36: return new MessagePack.Formatters.SharedData.Empty2Formatter();
+                case 37: return new MessagePack.Formatters.SharedData.EmptyClassFormatter();
+                case 38: return new MessagePack.Formatters.SharedData.EmptyStructFormatter();
+                case 39: return new MessagePack.Formatters.SharedData.FirstSimpleDataFormatter();
+                case 40: return new MessagePack.Formatters.SharedData.FooClassFormatter();
+                case 41: return new MessagePack.Formatters.SharedData.HolderV0Formatter();
+                case 42: return new MessagePack.Formatters.SharedData.HolderV1Formatter();
+                case 43: return new MessagePack.Formatters.SharedData.HolderV2Formatter();
+                case 44: return new MessagePack.Formatters.SharedData.MyClassFormatter();
+                case 45: return new MessagePack.Formatters.SharedData.MySubUnion1Formatter();
+                case 46: return new MessagePack.Formatters.SharedData.MySubUnion2Formatter();
+                case 47: return new MessagePack.Formatters.SharedData.MySubUnion3Formatter();
+                case 48: return new MessagePack.Formatters.SharedData.MySubUnion4Formatter();
+                case 49: return new MessagePack.Formatters.SharedData.NestParent_NestContractFormatter();
+                case 50: return new MessagePack.Formatters.SharedData.NonEmpty1Formatter();
+                case 51: return new MessagePack.Formatters.SharedData.NonEmpty2Formatter();
+                case 52: return new MessagePack.Formatters.SharedData.SimpleIntKeyDataFormatter();
+                case 53: return new MessagePack.Formatters.SharedData.SimpleStringKeyDataFormatter();
+                case 54: return new MessagePack.Formatters.SharedData.SimpleStructIntKeyDataFormatter();
+                case 55: return new MessagePack.Formatters.SharedData.SimpleStructStringKeyDataFormatter();
+                case 56: return new MessagePack.Formatters.SharedData.SubUnionType1Formatter();
+                case 57: return new MessagePack.Formatters.SharedData.SubUnionType2Formatter();
+                case 58: return new MessagePack.Formatters.SharedData.UnVersionBlockTestFormatter();
+                case 59: return new MessagePack.Formatters.SharedData.Vector2Formatter();
+                case 60: return new MessagePack.Formatters.SharedData.Vector3LikeFormatter();
+                case 61: return new MessagePack.Formatters.SharedData.VectorLike2Formatter();
+                case 62: return new MessagePack.Formatters.SharedData.Version0Formatter();
+                case 63: return new MessagePack.Formatters.SharedData.Version1Formatter();
+                case 64: return new MessagePack.Formatters.SharedData.Version2Formatter();
+                case 65: return new MessagePack.Formatters.SharedData.VersionBlockTestFormatter();
+                case 66: return new MessagePack.Formatters.SharedData.VersioningUnionFormatter();
+                case 67: return new MessagePack.Formatters.SharedData.WithIndexerFormatter();
+                case 68: return new MessagePack.Formatters.SimpleModelFormatter();
+                case 69: return new MessagePack.Formatters.StampMessageBodyFormatter();
+                case 70: return new MessagePack.Formatters.TextMessageBodyFormatter();
                 default: return null;
             }
         }
@@ -935,14 +947,14 @@ namespace MessagePack.Formatters.Abcdefg.Efcdigjl.Ateatatea.Hgfagfafgad
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty__ = default(int);
+            var ____result = new global::Abcdefg.Efcdigjl.Ateatatea.Hgfagfafgad.TnonodsfarnoiuAtatqaga();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -950,8 +962,6 @@ namespace MessagePack.Formatters.Abcdefg.Efcdigjl.Ateatatea.Hgfagfafgad
                 }
             }
 
-            var ____result = new global::Abcdefg.Efcdigjl.Ateatatea.Hgfagfafgad.TnonodsfarnoiuAtatqaga();
-            ____result.MyProperty = __MyProperty__;
             reader.Depth--;
             return ____result;
         }
@@ -1023,38 +1033,32 @@ namespace MessagePack.Formatters
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty0__ = default(int[]);
-            var __MyProperty1__ = default(int[,]);
-            var __MyProperty2__ = default(global::GlobalMyEnum[,]);
-            var __MyProperty3__ = default(int[,,]);
-            var __MyProperty4__ = default(int[,,,]);
-            var __MyProperty5__ = default(global::GlobalMyEnum[]);
-            var __MyProperty6__ = default(global::QuestMessageBody[]);
+            var ____result = new global::ArrayTestTest();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty0__ = formatterResolver.GetFormatterWithVerify<int[]>().Deserialize(ref reader, options);
+                        ____result.MyProperty0 = formatterResolver.GetFormatterWithVerify<int[]>().Deserialize(ref reader, options);
                         break;
                     case 1:
-                        __MyProperty1__ = formatterResolver.GetFormatterWithVerify<int[,]>().Deserialize(ref reader, options);
+                        ____result.MyProperty1 = formatterResolver.GetFormatterWithVerify<int[,]>().Deserialize(ref reader, options);
                         break;
                     case 2:
-                        __MyProperty2__ = formatterResolver.GetFormatterWithVerify<global::GlobalMyEnum[,]>().Deserialize(ref reader, options);
+                        ____result.MyProperty2 = formatterResolver.GetFormatterWithVerify<global::GlobalMyEnum[,]>().Deserialize(ref reader, options);
                         break;
                     case 3:
-                        __MyProperty3__ = formatterResolver.GetFormatterWithVerify<int[,,]>().Deserialize(ref reader, options);
+                        ____result.MyProperty3 = formatterResolver.GetFormatterWithVerify<int[,,]>().Deserialize(ref reader, options);
                         break;
                     case 4:
-                        __MyProperty4__ = formatterResolver.GetFormatterWithVerify<int[,,,]>().Deserialize(ref reader, options);
+                        ____result.MyProperty4 = formatterResolver.GetFormatterWithVerify<int[,,,]>().Deserialize(ref reader, options);
                         break;
                     case 5:
-                        __MyProperty5__ = formatterResolver.GetFormatterWithVerify<global::GlobalMyEnum[]>().Deserialize(ref reader, options);
+                        ____result.MyProperty5 = formatterResolver.GetFormatterWithVerify<global::GlobalMyEnum[]>().Deserialize(ref reader, options);
                         break;
                     case 6:
-                        __MyProperty6__ = formatterResolver.GetFormatterWithVerify<global::QuestMessageBody[]>().Deserialize(ref reader, options);
+                        ____result.MyProperty6 = formatterResolver.GetFormatterWithVerify<global::QuestMessageBody[]>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -1062,14 +1066,6 @@ namespace MessagePack.Formatters
                 }
             }
 
-            var ____result = new global::ArrayTestTest();
-            ____result.MyProperty0 = __MyProperty0__;
-            ____result.MyProperty1 = __MyProperty1__;
-            ____result.MyProperty2 = __MyProperty2__;
-            ____result.MyProperty3 = __MyProperty3__;
-            ____result.MyProperty4 = __MyProperty4__;
-            ____result.MyProperty5 = __MyProperty5__;
-            ____result.MyProperty6 = __MyProperty6__;
             reader.Depth--;
             return ____result;
         }
@@ -1099,14 +1095,14 @@ namespace MessagePack.Formatters
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty__ = default(int);
+            var ____result = new global::GlobalMan();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -1114,8 +1110,6 @@ namespace MessagePack.Formatters
                 }
             }
 
-            var ____result = new global::GlobalMan();
-            ____result.MyProperty = __MyProperty__;
             reader.Depth--;
             return ____result;
         }
@@ -1150,26 +1144,23 @@ namespace MessagePack.Formatters
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __UserId__ = default(int);
-            var __RoomId__ = default(int);
-            var __PostTime__ = default(global::System.DateTime);
-            var __Body__ = default(global::IMessageBody);
+            var ____result = new global::Message();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __UserId__ = reader.ReadInt32();
+                        ____result.UserId = reader.ReadInt32();
                         break;
                     case 1:
-                        __RoomId__ = reader.ReadInt32();
+                        ____result.RoomId = reader.ReadInt32();
                         break;
                     case 2:
-                        __PostTime__ = formatterResolver.GetFormatterWithVerify<global::System.DateTime>().Deserialize(ref reader, options);
+                        ____result.PostTime = formatterResolver.GetFormatterWithVerify<global::System.DateTime>().Deserialize(ref reader, options);
                         break;
                     case 3:
-                        __Body__ = formatterResolver.GetFormatterWithVerify<global::IMessageBody>().Deserialize(ref reader, options);
+                        ____result.Body = formatterResolver.GetFormatterWithVerify<global::IMessageBody>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -1177,11 +1168,6 @@ namespace MessagePack.Formatters
                 }
             }
 
-            var ____result = new global::Message();
-            ____result.UserId = __UserId__;
-            ____result.RoomId = __RoomId__;
-            ____result.PostTime = __PostTime__;
-            ____result.Body = __Body__;
             reader.Depth--;
             return ____result;
         }
@@ -1214,18 +1200,17 @@ namespace MessagePack.Formatters
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __QuestId__ = default(int);
-            var __Text__ = default(string);
+            var ____result = new global::QuestMessageBody();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __QuestId__ = reader.ReadInt32();
+                        ____result.QuestId = reader.ReadInt32();
                         break;
                     case 1:
-                        __Text__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        ____result.Text = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -1233,9 +1218,6 @@ namespace MessagePack.Formatters
                 }
             }
 
-            var ____result = new global::QuestMessageBody();
-            ____result.QuestId = __QuestId__;
-            ____result.Text = __Text__;
             reader.Depth--;
             return ____result;
         }
@@ -1265,14 +1247,14 @@ namespace MessagePack.Formatters
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __StampId__ = default(int);
+            var ____result = new global::StampMessageBody();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __StampId__ = reader.ReadInt32();
+                        ____result.StampId = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -1280,8 +1262,6 @@ namespace MessagePack.Formatters
                 }
             }
 
-            var ____result = new global::StampMessageBody();
-            ____result.StampId = __StampId__;
             reader.Depth--;
             return ____result;
         }
@@ -1313,14 +1293,14 @@ namespace MessagePack.Formatters
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __Text__ = default(string);
+            var ____result = new global::TextMessageBody();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __Text__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        ____result.Text = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -1328,8 +1308,6 @@ namespace MessagePack.Formatters
                 }
             }
 
-            var ____result = new global::TextMessageBody();
-            ____result.Text = __Text__;
             reader.Depth--;
             return ____result;
         }
@@ -1366,10 +1344,8 @@ namespace MessagePack.Formatters
 
 namespace MessagePack.Formatters
 {
-    using System;
-    using System.Buffers;
-    using System.Runtime.InteropServices;
-    using MessagePack;
+    using global::System.Buffers;
+    using global::MessagePack;
 
     public sealed class ComplexModelFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::ComplexModel>
     {
@@ -1394,7 +1370,7 @@ namespace MessagePack.Formatters
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(6);
             writer.WriteRaw(GetSpan_AdditionalProperty());
             formatterResolver.GetFormatterWithVerify<global::System.Collections.Generic.IDictionary<string, string>>().Serialize(ref writer, value.AdditionalProperty, options);
@@ -1418,18 +1394,13 @@ namespace MessagePack.Formatters
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __AdditionalProperty__ = default(global::System.Collections.Generic.IDictionary<string, string>);
-            var __CreatedOn__ = default(global::System.DateTimeOffset);
-            var __Id__ = default(global::System.Guid);
-            var __Name__ = default(string);
-            var __UpdatedOn__ = default(global::System.DateTimeOffset);
-            var __SimpleModels__ = default(global::System.Collections.Generic.IList<global::SimpleModel>);
+            var ____result = new global::ComplexModel();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -1439,7 +1410,7 @@ namespace MessagePack.Formatters
                     case 18:
                         if (!global::System.MemoryExtensions.SequenceEqual(stringKey, GetSpan_AdditionalProperty().Slice(1))) { goto FAIL; }
 
-                        __AdditionalProperty__ = formatterResolver.GetFormatterWithVerify<global::System.Collections.Generic.IDictionary<string, string>>().Deserialize(ref reader, options);
+                        reader.Skip();
                         continue;
                     case 9:
                         switch (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey))
@@ -1448,43 +1419,35 @@ namespace MessagePack.Formatters
                             case 5720808977192022595UL:
                                 if (stringKey[0] != 110) { goto FAIL; }
 
-                                __CreatedOn__ = formatterResolver.GetFormatterWithVerify<global::System.DateTimeOffset>().Deserialize(ref reader, options);
+                                ____result.CreatedOn = formatterResolver.GetFormatterWithVerify<global::System.DateTimeOffset>().Deserialize(ref reader, options);
                                 continue;
 
                             case 5720808977191956565UL:
                                 if (stringKey[0] != 110) { goto FAIL; }
 
-                                __UpdatedOn__ = formatterResolver.GetFormatterWithVerify<global::System.DateTimeOffset>().Deserialize(ref reader, options);
+                                ____result.UpdatedOn = formatterResolver.GetFormatterWithVerify<global::System.DateTimeOffset>().Deserialize(ref reader, options);
                                 continue;
 
                         }
                     case 2:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 25673UL) { goto FAIL; }
 
-                        __Id__ = formatterResolver.GetFormatterWithVerify<global::System.Guid>().Deserialize(ref reader, options);
+                        ____result.Id = formatterResolver.GetFormatterWithVerify<global::System.Guid>().Deserialize(ref reader, options);
                         continue;
                     case 4:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 1701667150UL) { goto FAIL; }
 
-                        __Name__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        ____result.Name = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                         continue;
                     case 12:
                         if (!global::System.MemoryExtensions.SequenceEqual(stringKey, GetSpan_SimpleModels().Slice(1))) { goto FAIL; }
 
-                        __SimpleModels__ = formatterResolver.GetFormatterWithVerify<global::System.Collections.Generic.IList<global::SimpleModel>>().Deserialize(ref reader, options);
+                        reader.Skip();
                         continue;
 
                 }
             }
 
-            var ____result = new global::ComplexModel()
-            {
-                CreatedOn = __CreatedOn__,
-                Id = __Id__,
-                Name = __Name__,
-                UpdatedOn = __UpdatedOn__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -1513,7 +1476,7 @@ namespace MessagePack.Formatters
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(6);
             writer.WriteRaw(GetSpan_Id());
             writer.Write(value.Id);
@@ -1537,18 +1500,13 @@ namespace MessagePack.Formatters
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __Id__ = default(int);
-            var __Name__ = default(string);
-            var __CreatedOn__ = default(global::System.DateTime);
-            var __Precision__ = default(int);
-            var __Money__ = default(decimal);
-            var __Amount__ = default(long);
+            var ____result = new global::SimpleModel();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -1558,12 +1516,12 @@ namespace MessagePack.Formatters
                     case 2:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 25673UL) { goto FAIL; }
 
-                        __Id__ = reader.ReadInt32();
+                        ____result.Id = reader.ReadInt32();
                         continue;
                     case 4:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 1701667150UL) { goto FAIL; }
 
-                        __Name__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        ____result.Name = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                         continue;
                     case 9:
                         switch (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey))
@@ -1572,39 +1530,30 @@ namespace MessagePack.Formatters
                             case 5720808977192022595UL:
                                 if (stringKey[0] != 110) { goto FAIL; }
 
-                                __CreatedOn__ = formatterResolver.GetFormatterWithVerify<global::System.DateTime>().Deserialize(ref reader, options);
+                                ____result.CreatedOn = formatterResolver.GetFormatterWithVerify<global::System.DateTime>().Deserialize(ref reader, options);
                                 continue;
 
                             case 8028074707240972880UL:
                                 if (stringKey[0] != 110) { goto FAIL; }
 
-                                __Precision__ = reader.ReadInt32();
+                                ____result.Precision = reader.ReadInt32();
                                 continue;
 
                         }
                     case 5:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 521392779085UL) { goto FAIL; }
 
-                        __Money__ = formatterResolver.GetFormatterWithVerify<decimal>().Deserialize(ref reader, options);
+                        ____result.Money = formatterResolver.GetFormatterWithVerify<decimal>().Deserialize(ref reader, options);
                         continue;
                     case 6:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 128017765461313UL) { goto FAIL; }
 
-                        __Amount__ = reader.ReadInt64();
+                        reader.Skip();
                         continue;
 
                 }
             }
 
-            var ____result = new global::SimpleModel()
-            {
-                Id = __Id__,
-                Name = __Name__,
-                CreatedOn = __CreatedOn__,
-                Precision = __Precision__,
-                Money = __Money__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -1629,10 +1578,8 @@ namespace MessagePack.Formatters
 
 namespace MessagePack.Formatters.PerfBenchmarkDotNet
 {
-    using System;
-    using System.Buffers;
-    using System.Runtime.InteropServices;
-    using MessagePack;
+    using global::System.Buffers;
+    using global::MessagePack;
 
     public sealed class StringKeySerializerTargetFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::PerfBenchmarkDotNet.StringKeySerializerTarget>
     {
@@ -1693,19 +1640,11 @@ namespace MessagePack.Formatters.PerfBenchmarkDotNet
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadMapHeader();
-            var __MyProperty1__ = default(int);
-            var __MyProperty2__ = default(int);
-            var __MyProperty3__ = default(int);
-            var __MyProperty4__ = default(int);
-            var __MyProperty5__ = default(int);
-            var __MyProperty6__ = default(int);
-            var __MyProperty7__ = default(int);
-            var __MyProperty8__ = default(int);
-            var __MyProperty9__ = default(int);
+            var ____result = new global::PerfBenchmarkDotNet.StringKeySerializerTarget();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -1721,31 +1660,31 @@ namespace MessagePack.Formatters.PerfBenchmarkDotNet
                                 {
                                     default: goto FAIL;
                                     case 3242356UL:
-                                        __MyProperty1__ = reader.ReadInt32();
+                                        ____result.MyProperty1 = reader.ReadInt32();
                                         continue;
                                     case 3307892UL:
-                                        __MyProperty2__ = reader.ReadInt32();
+                                        ____result.MyProperty2 = reader.ReadInt32();
                                         continue;
                                     case 3373428UL:
-                                        __MyProperty3__ = reader.ReadInt32();
+                                        ____result.MyProperty3 = reader.ReadInt32();
                                         continue;
                                     case 3438964UL:
-                                        __MyProperty4__ = reader.ReadInt32();
+                                        ____result.MyProperty4 = reader.ReadInt32();
                                         continue;
                                     case 3504500UL:
-                                        __MyProperty5__ = reader.ReadInt32();
+                                        ____result.MyProperty5 = reader.ReadInt32();
                                         continue;
                                     case 3570036UL:
-                                        __MyProperty6__ = reader.ReadInt32();
+                                        ____result.MyProperty6 = reader.ReadInt32();
                                         continue;
                                     case 3635572UL:
-                                        __MyProperty7__ = reader.ReadInt32();
+                                        ____result.MyProperty7 = reader.ReadInt32();
                                         continue;
                                     case 3701108UL:
-                                        __MyProperty8__ = reader.ReadInt32();
+                                        ____result.MyProperty8 = reader.ReadInt32();
                                         continue;
                                     case 3766644UL:
-                                        __MyProperty9__ = reader.ReadInt32();
+                                        ____result.MyProperty9 = reader.ReadInt32();
                                         continue;
                                 }
 
@@ -1754,19 +1693,6 @@ namespace MessagePack.Formatters.PerfBenchmarkDotNet
                 }
             }
 
-            var ____result = new global::PerfBenchmarkDotNet.StringKeySerializerTarget()
-            {
-                MyProperty1 = __MyProperty1__,
-                MyProperty2 = __MyProperty2__,
-                MyProperty3 = __MyProperty3__,
-                MyProperty4 = __MyProperty4__,
-                MyProperty5 = __MyProperty5__,
-                MyProperty6 = __MyProperty6__,
-                MyProperty7 = __MyProperty7__,
-                MyProperty8 = __MyProperty8__,
-                MyProperty9 = __MyProperty9__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -1833,74 +1759,59 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty0__ = default(int);
-            var __MyProperty1__ = default(int);
-            var __MyProperty2__ = default(int);
-            var __MyProperty3__ = default(int);
-            var __MyProperty4__ = default(int);
-            var __MyProperty5__ = default(int);
-            var __MyProperty6__ = default(int);
-            var __MyProperty7__ = default(int);
-            var __MyProperty8__ = default(int);
-            var __MyProvperty9__ = default(int);
-            var __MyProperty10__ = default(int);
-            var __MyProperty11__ = default(int);
-            var __MyPropverty12__ = default(int);
-            var __MyPropevrty13__ = default(int);
-            var __MyProperty14__ = default(int);
-            var __MyProperty15__ = default(int);
+            var ____result = new global::SharedData.ArrayOptimizeClass();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty0__ = reader.ReadInt32();
+                        ____result.MyProperty0 = reader.ReadInt32();
                         break;
                     case 1:
-                        __MyProperty1__ = reader.ReadInt32();
+                        ____result.MyProperty1 = reader.ReadInt32();
                         break;
                     case 2:
-                        __MyProperty2__ = reader.ReadInt32();
+                        ____result.MyProperty2 = reader.ReadInt32();
                         break;
                     case 3:
-                        __MyProperty3__ = reader.ReadInt32();
+                        ____result.MyProperty3 = reader.ReadInt32();
                         break;
                     case 4:
-                        __MyProperty4__ = reader.ReadInt32();
+                        ____result.MyProperty4 = reader.ReadInt32();
                         break;
                     case 5:
-                        __MyProperty5__ = reader.ReadInt32();
+                        ____result.MyProperty5 = reader.ReadInt32();
                         break;
                     case 6:
-                        __MyProperty6__ = reader.ReadInt32();
+                        ____result.MyProperty6 = reader.ReadInt32();
                         break;
                     case 7:
-                        __MyProperty7__ = reader.ReadInt32();
+                        ____result.MyProperty7 = reader.ReadInt32();
                         break;
                     case 8:
-                        __MyProperty8__ = reader.ReadInt32();
+                        ____result.MyProperty8 = reader.ReadInt32();
                         break;
                     case 9:
-                        __MyProvperty9__ = reader.ReadInt32();
+                        ____result.MyProvperty9 = reader.ReadInt32();
                         break;
                     case 10:
-                        __MyProperty10__ = reader.ReadInt32();
+                        ____result.MyProperty10 = reader.ReadInt32();
                         break;
                     case 11:
-                        __MyProperty11__ = reader.ReadInt32();
+                        ____result.MyProperty11 = reader.ReadInt32();
                         break;
                     case 12:
-                        __MyPropverty12__ = reader.ReadInt32();
+                        ____result.MyPropverty12 = reader.ReadInt32();
                         break;
                     case 13:
-                        __MyPropevrty13__ = reader.ReadInt32();
+                        ____result.MyPropevrty13 = reader.ReadInt32();
                         break;
                     case 14:
-                        __MyProperty14__ = reader.ReadInt32();
+                        ____result.MyProperty14 = reader.ReadInt32();
                         break;
                     case 15:
-                        __MyProperty15__ = reader.ReadInt32();
+                        ____result.MyProperty15 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -1908,23 +1819,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.ArrayOptimizeClass();
-            ____result.MyProperty0 = __MyProperty0__;
-            ____result.MyProperty1 = __MyProperty1__;
-            ____result.MyProperty2 = __MyProperty2__;
-            ____result.MyProperty3 = __MyProperty3__;
-            ____result.MyProperty4 = __MyProperty4__;
-            ____result.MyProperty5 = __MyProperty5__;
-            ____result.MyProperty6 = __MyProperty6__;
-            ____result.MyProperty7 = __MyProperty7__;
-            ____result.MyProperty8 = __MyProperty8__;
-            ____result.MyProvperty9 = __MyProvperty9__;
-            ____result.MyProperty10 = __MyProperty10__;
-            ____result.MyProperty11 = __MyProperty11__;
-            ____result.MyPropverty12 = __MyPropverty12__;
-            ____result.MyPropevrty13 = __MyPropevrty13__;
-            ____result.MyProperty14 = __MyProperty14__;
-            ____result.MyProperty15 = __MyProperty15__;
             reader.Depth--;
             return ____result;
         }
@@ -1956,14 +1850,14 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __OPQ__ = default(string);
+            var ____result = new global::SharedData.BarClass();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __OPQ__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        ____result.OPQ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -1971,8 +1865,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.BarClass();
-            ____result.OPQ = __OPQ__;
             reader.Depth--;
             return ____result;
         }
@@ -2019,7 +1911,6 @@ namespace MessagePack.Formatters.SharedData
             }
 
             var ____result = new global::SharedData.Callback1(__X__);
-            ____result.X = __X__;
             ____result.OnAfterDeserialize();
             reader.Depth--;
             return ____result;
@@ -2067,13 +1958,194 @@ namespace MessagePack.Formatters.SharedData
             }
 
             var ____result = new global::SharedData.Callback1_2(__X__);
-            ____result.X = __X__;
             ((global::MessagePack.IMessagePackSerializationCallbackReceiver)____result).OnAfterDeserialize();
             reader.Depth--;
             return ____result;
         }
     }
 
+    public sealed class DefaultValueIntKeyClassWithExplicitConstructorFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.DefaultValueIntKeyClassWithExplicitConstructor>
+    {
+
+        public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.DefaultValueIntKeyClassWithExplicitConstructor value, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (value == null)
+            {
+                writer.WriteNil();
+                return;
+            }
+
+            global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
+            writer.WriteArrayHeader(4);
+            writer.Write(value.Prop1);
+            writer.Write(value.Prop2);
+            formatterResolver.GetFormatterWithVerify<string>().Serialize(ref writer, value.Prop3, options);
+            formatterResolver.GetFormatterWithVerify<string>().Serialize(ref writer, value.Prop4, options);
+        }
+
+        public global::SharedData.DefaultValueIntKeyClassWithExplicitConstructor Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (reader.TryReadNil())
+            {
+                return null;
+            }
+
+            options.Security.DepthStep(ref reader);
+            global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
+            var length = reader.ReadArrayHeader();
+            var __Prop1__ = default(int);
+            var __Prop2__ = default(int);
+            var __Prop3__ = default(string);
+            var __Prop4__ = default(string);
+
+            for (int i = 0; i < length; i++)
+            {
+                switch (i)
+                {
+                    case 0:
+                        __Prop1__ = reader.ReadInt32();
+                        break;
+                    case 1:
+                        __Prop2__ = reader.ReadInt32();
+                        break;
+                    case 2:
+                        __Prop3__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        break;
+                    case 3:
+                        __Prop4__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        break;
+                    default:
+                        reader.Skip();
+                        break;
+                }
+            }
+
+            var ____result = new global::SharedData.DefaultValueIntKeyClassWithExplicitConstructor(__Prop1__);
+            if (length <= 1)
+            {
+                goto MEMBER_ASSIGNMENT_END;
+            }
+
+            ____result.Prop2 = __Prop2__;
+            if (length <= 2)
+            {
+                goto MEMBER_ASSIGNMENT_END;
+            }
+
+            ____result.Prop3 = __Prop3__;
+            if (length <= 3)
+            {
+                goto MEMBER_ASSIGNMENT_END;
+            }
+
+            ____result.Prop4 = __Prop4__;
+
+        MEMBER_ASSIGNMENT_END:
+            reader.Depth--;
+            return ____result;
+        }
+    }
+
+    public sealed class DefaultValueIntKeyClassWithoutExplicitConstructorFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.DefaultValueIntKeyClassWithoutExplicitConstructor>
+    {
+
+        public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.DefaultValueIntKeyClassWithoutExplicitConstructor value, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (value == null)
+            {
+                writer.WriteNil();
+                return;
+            }
+
+            writer.WriteArrayHeader(2);
+            writer.Write(value.Prop1);
+            writer.Write(value.Prop2);
+        }
+
+        public global::SharedData.DefaultValueIntKeyClassWithoutExplicitConstructor Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (reader.TryReadNil())
+            {
+                return null;
+            }
+
+            options.Security.DepthStep(ref reader);
+            var length = reader.ReadArrayHeader();
+            var ____result = new global::SharedData.DefaultValueIntKeyClassWithoutExplicitConstructor();
+
+            for (int i = 0; i < length; i++)
+            {
+                switch (i)
+                {
+                    case 0:
+                        ____result.Prop1 = reader.ReadInt32();
+                        break;
+                    case 1:
+                        ____result.Prop2 = reader.ReadInt32();
+                        break;
+                    default:
+                        reader.Skip();
+                        break;
+                }
+            }
+
+            reader.Depth--;
+            return ____result;
+        }
+    }
+
+    public sealed class DefaultValueIntKeyStructWithExplicitConstructorFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.DefaultValueIntKeyStructWithExplicitConstructor>
+    {
+
+        public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.DefaultValueIntKeyStructWithExplicitConstructor value, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            writer.WriteArrayHeader(2);
+            writer.Write(value.Prop1);
+            writer.Write(value.Prop2);
+        }
+
+        public global::SharedData.DefaultValueIntKeyStructWithExplicitConstructor Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (reader.TryReadNil())
+            {
+                throw new global::System.InvalidOperationException("typecode is null, struct not supported");
+            }
+
+            options.Security.DepthStep(ref reader);
+            var length = reader.ReadArrayHeader();
+            var __Prop1__ = default(int);
+            var __Prop2__ = default(int);
+
+            for (int i = 0; i < length; i++)
+            {
+                switch (i)
+                {
+                    case 0:
+                        __Prop1__ = reader.ReadInt32();
+                        break;
+                    case 1:
+                        __Prop2__ = reader.ReadInt32();
+                        break;
+                    default:
+                        reader.Skip();
+                        break;
+                }
+            }
+
+            var ____result = new global::SharedData.DefaultValueIntKeyStructWithExplicitConstructor(__Prop1__);
+            if (length <= 1)
+            {
+                goto MEMBER_ASSIGNMENT_END;
+            }
+
+            ____result.Prop2 = __Prop2__;
+
+        MEMBER_ASSIGNMENT_END:
+            reader.Depth--;
+            return ____result;
+        }
+    }
+
     public sealed class DynamicArgumentTupleFormatter<T1, T2, T3, T4, T5, T6, T7, T8, T9> : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.DynamicArgumentTuple<T1, T2, T3, T4, T5, T6, T7, T8, T9>>
     {
 
@@ -2176,22 +2248,8 @@ namespace MessagePack.Formatters.SharedData
                 return null;
             }
 
-            options.Security.DepthStep(ref reader);
-            var length = reader.ReadArrayHeader();
-
-            for (int i = 0; i < length; i++)
-            {
-                switch (i)
-                {
-                    default:
-                        reader.Skip();
-                        break;
-                }
-            }
-
-            var ____result = new global::SharedData.Empty1();
-            reader.Depth--;
-            return ____result;
+            reader.Skip();
+            return new global::SharedData.Empty1();
         }
     }
 
@@ -2216,22 +2274,8 @@ namespace MessagePack.Formatters.SharedData
                 return null;
             }
 
-            options.Security.DepthStep(ref reader);
-            var length = reader.ReadArrayHeader();
-
-            for (int i = 0; i < length; i++)
-            {
-                switch (i)
-                {
-                    default:
-                        reader.Skip();
-                        break;
-                }
-            }
-
-            var ____result = new global::SharedData.EmptyClass();
-            reader.Depth--;
-            return ____result;
+            reader.Skip();
+            return new global::SharedData.EmptyClass();
         }
     }
 
@@ -2250,22 +2294,8 @@ namespace MessagePack.Formatters.SharedData
                 throw new global::System.InvalidOperationException("typecode is null, struct not supported");
             }
 
-            options.Security.DepthStep(ref reader);
-            var length = reader.ReadArrayHeader();
-
-            for (int i = 0; i < length; i++)
-            {
-                switch (i)
-                {
-                    default:
-                        reader.Skip();
-                        break;
-                }
-            }
-
-            var ____result = new global::SharedData.EmptyStruct();
-            reader.Depth--;
-            return ____result;
+            reader.Skip();
+            return new global::SharedData.EmptyStruct();
         }
     }
 
@@ -2297,22 +2327,20 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __Prop1__ = default(int);
-            var __Prop2__ = default(string);
-            var __Prop3__ = default(int);
+            var ____result = new global::SharedData.FirstSimpleData();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __Prop1__ = reader.ReadInt32();
+                        ____result.Prop1 = reader.ReadInt32();
                         break;
                     case 1:
-                        __Prop2__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        ____result.Prop2 = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                         break;
                     case 2:
-                        __Prop3__ = reader.ReadInt32();
+                        ____result.Prop3 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2320,10 +2348,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.FirstSimpleData();
-            ____result.Prop1 = __Prop1__;
-            ____result.Prop2 = __Prop2__;
-            ____result.Prop3 = __Prop3__;
             reader.Depth--;
             return ____result;
         }
@@ -2353,14 +2377,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __XYZ__ = default(int);
+            var ____result = new global::SharedData.FooClass();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __XYZ__ = reader.ReadInt32();
+                        ____result.XYZ = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2368,8 +2392,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.FooClass();
-            ____result.XYZ = __XYZ__;
             reader.Depth--;
             return ____result;
         }
@@ -2402,18 +2424,17 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty0__ = default(T1);
-            var __MyProperty1__ = default(T2);
+            var ____result = new global::SharedData.GenericClass<T1, T2>();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty0__ = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
+                        ____result.MyProperty0 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
                         break;
                     case 1:
-                        __MyProperty1__ = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
+                        ____result.MyProperty1 = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -2421,9 +2442,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.GenericClass<T1, T2>();
-            ____result.MyProperty0 = __MyProperty0__;
-            ____result.MyProperty1 = __MyProperty1__;
             reader.Depth--;
             return ____result;
         }
@@ -2458,18 +2476,17 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty0__ = default(T1);
-            var __Comparer__ = default(T2);
+            var ____result = new global::SharedData.GenericConstrainedClassIntKey<T1, T2>();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty0__ = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
+                        ____result.MyProperty0 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
                         break;
                     case 1:
-                        __Comparer__ = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
+                        ____result.Comparer = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -2477,9 +2494,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.GenericConstrainedClassIntKey<T1, T2>();
-            ____result.MyProperty0 = __MyProperty0__;
-            ____result.Comparer = __Comparer__;
             reader.Depth--;
             return ____result;
         }
@@ -2508,18 +2522,17 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty0__ = default(T1);
-            var __Comparer__ = default(T2);
+            var ____result = new global::SharedData.GenericConstrainedStructIntKey<T1, T2>();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty0__ = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
+                        ____result.MyProperty0 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
                         break;
                     case 1:
-                        __Comparer__ = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
+                        ____result.Comparer = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -2527,9 +2540,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.GenericConstrainedStructIntKey<T1, T2>();
-            ____result.MyProperty0 = __MyProperty0__;
-            ____result.Comparer = __Comparer__;
             reader.Depth--;
             return ____result;
         }
@@ -2556,18 +2566,17 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty0__ = default(T1);
-            var __MyProperty1__ = default(T2);
+            var ____result = new global::SharedData.GenericStruct<T1, T2>();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty0__ = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
+                        ____result.MyProperty0 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
                         break;
                     case 1:
-                        __MyProperty1__ = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
+                        ____result.MyProperty1 = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -2575,9 +2584,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.GenericStruct<T1, T2>();
-            ____result.MyProperty0 = __MyProperty0__;
-            ____result.MyProperty1 = __MyProperty1__;
             reader.Depth--;
             return ____result;
         }
@@ -2610,18 +2616,17 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty1__ = default(global::SharedData.Version0);
-            var __After__ = default(int);
+            var ____result = new global::SharedData.HolderV0();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty1__ = formatterResolver.GetFormatterWithVerify<global::SharedData.Version0>().Deserialize(ref reader, options);
+                        ____result.MyProperty1 = formatterResolver.GetFormatterWithVerify<global::SharedData.Version0>().Deserialize(ref reader, options);
                         break;
                     case 1:
-                        __After__ = reader.ReadInt32();
+                        ____result.After = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2629,9 +2634,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.HolderV0();
-            ____result.MyProperty1 = __MyProperty1__;
-            ____result.After = __After__;
             reader.Depth--;
             return ____result;
         }
@@ -2664,18 +2666,17 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty1__ = default(global::SharedData.Version1);
-            var __After__ = default(int);
+            var ____result = new global::SharedData.HolderV1();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty1__ = formatterResolver.GetFormatterWithVerify<global::SharedData.Version1>().Deserialize(ref reader, options);
+                        ____result.MyProperty1 = formatterResolver.GetFormatterWithVerify<global::SharedData.Version1>().Deserialize(ref reader, options);
                         break;
                     case 1:
-                        __After__ = reader.ReadInt32();
+                        ____result.After = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2683,9 +2684,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.HolderV1();
-            ____result.MyProperty1 = __MyProperty1__;
-            ____result.After = __After__;
             reader.Depth--;
             return ____result;
         }
@@ -2718,18 +2716,17 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty1__ = default(global::SharedData.Version2);
-            var __After__ = default(int);
+            var ____result = new global::SharedData.HolderV2();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty1__ = formatterResolver.GetFormatterWithVerify<global::SharedData.Version2>().Deserialize(ref reader, options);
+                        ____result.MyProperty1 = formatterResolver.GetFormatterWithVerify<global::SharedData.Version2>().Deserialize(ref reader, options);
                         break;
                     case 1:
-                        __After__ = reader.ReadInt32();
+                        ____result.After = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2737,9 +2734,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.HolderV2();
-            ____result.MyProperty1 = __MyProperty1__;
-            ____result.After = __After__;
             reader.Depth--;
             return ____result;
         }
@@ -2771,22 +2765,20 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty1__ = default(int);
-            var __MyProperty2__ = default(int);
-            var __MyProperty3__ = default(int);
+            var ____result = new global::SharedData.MyClass();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty1__ = reader.ReadInt32();
+                        ____result.MyProperty1 = reader.ReadInt32();
                         break;
                     case 1:
-                        __MyProperty2__ = reader.ReadInt32();
+                        ____result.MyProperty2 = reader.ReadInt32();
                         break;
                     case 2:
-                        __MyProperty3__ = reader.ReadInt32();
+                        ____result.MyProperty3 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2794,10 +2786,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.MyClass();
-            ____result.MyProperty1 = __MyProperty1__;
-            ____result.MyProperty2 = __MyProperty2__;
-            ____result.MyProperty3 = __MyProperty3__;
             reader.Depth--;
             return ____result;
         }
@@ -2830,14 +2818,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __One__ = default(int);
+            var ____result = new global::SharedData.MySubUnion1();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 3:
-                        __One__ = reader.ReadInt32();
+                        ____result.One = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2845,8 +2833,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.MySubUnion1();
-            ____result.One = __One__;
             reader.Depth--;
             return ____result;
         }
@@ -2875,14 +2861,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __Two__ = default(int);
+            var ____result = new global::SharedData.MySubUnion2();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 5:
-                        __Two__ = reader.ReadInt32();
+                        ____result.Two = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2890,8 +2876,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.MySubUnion2();
-            ____result.Two = __Two__;
             reader.Depth--;
             return ____result;
         }
@@ -2923,14 +2907,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __Three__ = default(int);
+            var ____result = new global::SharedData.MySubUnion3();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 2:
-                        __Three__ = reader.ReadInt32();
+                        ____result.Three = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2938,8 +2922,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.MySubUnion3();
-            ____result.Three = __Three__;
             reader.Depth--;
             return ____result;
         }
@@ -2970,14 +2952,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __Four__ = default(int);
+            var ____result = new global::SharedData.MySubUnion4();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 7:
-                        __Four__ = reader.ReadInt32();
+                        ____result.Four = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -2985,8 +2967,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.MySubUnion4();
-            ____result.Four = __Four__;
             reader.Depth--;
             return ____result;
         }
@@ -3016,14 +2996,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty__ = default(int);
+            var ____result = new global::SharedData.NestParent.NestContract();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3031,8 +3011,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.NestParent.NestContract();
-            ____result.MyProperty = __MyProperty__;
             reader.Depth--;
             return ____result;
         }
@@ -3062,14 +3040,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty__ = default(int);
+            var ____result = new global::SharedData.NonEmpty1();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3077,8 +3055,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.NonEmpty1();
-            ____result.MyProperty = __MyProperty__;
             reader.Depth--;
             return ____result;
         }
@@ -3116,38 +3092,32 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __Prop1__ = default(int);
-            var __Prop2__ = default(global::SharedData.ByteEnum);
-            var __Prop3__ = default(string);
-            var __Prop4__ = default(global::SharedData.SimpleStringKeyData);
-            var __Prop5__ = default(global::SharedData.SimpleStructIntKeyData);
-            var __Prop6__ = default(global::SharedData.SimpleStructStringKeyData);
-            var __BytesSpecial__ = default(byte[]);
+            var ____result = new global::SharedData.SimpleIntKeyData();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __Prop1__ = reader.ReadInt32();
+                        ____result.Prop1 = reader.ReadInt32();
                         break;
                     case 1:
-                        __Prop2__ = formatterResolver.GetFormatterWithVerify<global::SharedData.ByteEnum>().Deserialize(ref reader, options);
+                        ____result.Prop2 = formatterResolver.GetFormatterWithVerify<global::SharedData.ByteEnum>().Deserialize(ref reader, options);
                         break;
                     case 2:
-                        __Prop3__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        ____result.Prop3 = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                         break;
                     case 3:
-                        __Prop4__ = formatterResolver.GetFormatterWithVerify<global::SharedData.SimpleStringKeyData>().Deserialize(ref reader, options);
+                        ____result.Prop4 = formatterResolver.GetFormatterWithVerify<global::SharedData.SimpleStringKeyData>().Deserialize(ref reader, options);
                         break;
                     case 4:
-                        __Prop5__ = formatterResolver.GetFormatterWithVerify<global::SharedData.SimpleStructIntKeyData>().Deserialize(ref reader, options);
+                        ____result.Prop5 = formatterResolver.GetFormatterWithVerify<global::SharedData.SimpleStructIntKeyData>().Deserialize(ref reader, options);
                         break;
                     case 5:
-                        __Prop6__ = formatterResolver.GetFormatterWithVerify<global::SharedData.SimpleStructStringKeyData>().Deserialize(ref reader, options);
+                        ____result.Prop6 = formatterResolver.GetFormatterWithVerify<global::SharedData.SimpleStructStringKeyData>().Deserialize(ref reader, options);
                         break;
                     case 6:
-                        __BytesSpecial__ = reader.ReadBytes()?.ToArray();
+                        ____result.BytesSpecial = reader.ReadBytes()?.ToArray();
                         break;
                     default:
                         reader.Skip();
@@ -3155,14 +3125,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.SimpleIntKeyData();
-            ____result.Prop1 = __Prop1__;
-            ____result.Prop2 = __Prop2__;
-            ____result.Prop3 = __Prop3__;
-            ____result.Prop4 = __Prop4__;
-            ____result.Prop5 = __Prop5__;
-            ____result.Prop6 = __Prop6__;
-            ____result.BytesSpecial = __BytesSpecial__;
             reader.Depth--;
             return ____result;
         }
@@ -3188,22 +3150,20 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __X__ = default(int);
-            var __Y__ = default(int);
-            var __BytesSpecial__ = default(byte[]);
+            var ____result = new global::SharedData.SimpleStructIntKeyData();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __X__ = reader.ReadInt32();
+                        ____result.X = reader.ReadInt32();
                         break;
                     case 1:
-                        __Y__ = reader.ReadInt32();
+                        ____result.Y = reader.ReadInt32();
                         break;
                     case 2:
-                        __BytesSpecial__ = reader.ReadBytes()?.ToArray();
+                        ____result.BytesSpecial = reader.ReadBytes()?.ToArray();
                         break;
                     default:
                         reader.Skip();
@@ -3211,10 +3171,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.SimpleStructIntKeyData();
-            ____result.X = __X__;
-            ____result.Y = __Y__;
-            ____result.BytesSpecial = __BytesSpecial__;
             reader.Depth--;
             return ____result;
         }
@@ -3245,18 +3201,17 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty1__ = default(int);
-            var __MyProperty__ = default(int);
+            var ____result = new global::SharedData.SubUnionType1();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         break;
                     case 1:
-                        __MyProperty1__ = reader.ReadInt32();
+                        ____result.MyProperty1 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3264,9 +3219,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.SubUnionType1();
-            ____result.MyProperty = __MyProperty__;
-            ____result.MyProperty1 = __MyProperty1__;
             reader.Depth--;
             return ____result;
         }
@@ -3297,18 +3249,17 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty2__ = default(int);
-            var __MyProperty__ = default(int);
+            var ____result = new global::SharedData.SubUnionType2();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         break;
                     case 1:
-                        __MyProperty2__ = reader.ReadInt32();
+                        ____result.MyProperty2 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3316,9 +3267,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.SubUnionType2();
-            ____result.MyProperty = __MyProperty__;
-            ____result.MyProperty2 = __MyProperty2__;
             reader.Depth--;
             return ____result;
         }
@@ -3350,18 +3298,17 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty__ = default(int);
-            var __MyProperty2__ = default(int);
+            var ____result = new global::SharedData.UnVersionBlockTest();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         break;
                     case 2:
-                        __MyProperty2__ = reader.ReadInt32();
+                        ____result.MyProperty2 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3369,9 +3316,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.UnVersionBlockTest();
-            ____result.MyProperty = __MyProperty__;
-            ____result.MyProperty2 = __MyProperty2__;
             reader.Depth--;
             return ____result;
         }
@@ -3465,9 +3409,6 @@ namespace MessagePack.Formatters.SharedData
             }
 
             var ____result = new global::SharedData.Vector3Like(__x__, __y__, __z__);
-            ____result.x = __x__;
-            ____result.y = __y__;
-            ____result.z = __z__;
             reader.Depth--;
             return ____result;
         }
@@ -3512,8 +3453,6 @@ namespace MessagePack.Formatters.SharedData
             }
 
             var ____result = new global::SharedData.VectorLike2(__x__, __y__);
-            ____result.x = __x__;
-            ____result.y = __y__;
             reader.Depth--;
             return ____result;
         }
@@ -3546,14 +3485,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty1__ = default(int);
+            var ____result = new global::SharedData.Version0();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 3:
-                        __MyProperty1__ = reader.ReadInt32();
+                        ____result.MyProperty1 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3561,8 +3500,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.Version0();
-            ____result.MyProperty1 = __MyProperty1__;
             reader.Depth--;
             return ____result;
         }
@@ -3597,22 +3534,20 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty1__ = default(int);
-            var __MyProperty2__ = default(int);
-            var __MyProperty3__ = default(int);
+            var ____result = new global::SharedData.Version1();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 3:
-                        __MyProperty1__ = reader.ReadInt32();
+                        ____result.MyProperty1 = reader.ReadInt32();
                         break;
                     case 4:
-                        __MyProperty2__ = reader.ReadInt32();
+                        ____result.MyProperty2 = reader.ReadInt32();
                         break;
                     case 5:
-                        __MyProperty3__ = reader.ReadInt32();
+                        ____result.MyProperty3 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3620,10 +3555,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.Version1();
-            ____result.MyProperty1 = __MyProperty1__;
-            ____result.MyProperty2 = __MyProperty2__;
-            ____result.MyProperty3 = __MyProperty3__;
             reader.Depth--;
             return ____result;
         }
@@ -3660,26 +3591,23 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __MyProperty1__ = default(int);
-            var __MyProperty2__ = default(int);
-            var __MyProperty3__ = default(int);
-            var __MyProperty5__ = default(int);
+            var ____result = new global::SharedData.Version2();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 3:
-                        __MyProperty1__ = reader.ReadInt32();
+                        ____result.MyProperty1 = reader.ReadInt32();
                         break;
                     case 4:
-                        __MyProperty2__ = reader.ReadInt32();
+                        ____result.MyProperty2 = reader.ReadInt32();
                         break;
                     case 5:
-                        __MyProperty3__ = reader.ReadInt32();
+                        ____result.MyProperty3 = reader.ReadInt32();
                         break;
                     case 7:
-                        __MyProperty5__ = reader.ReadInt32();
+                        ____result.MyProperty5 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3687,11 +3615,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.Version2();
-            ____result.MyProperty1 = __MyProperty1__;
-            ____result.MyProperty2 = __MyProperty2__;
-            ____result.MyProperty3 = __MyProperty3__;
-            ____result.MyProperty5 = __MyProperty5__;
             reader.Depth--;
             return ____result;
         }
@@ -3725,22 +3648,20 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __MyProperty__ = default(int);
-            var __UnknownBlock__ = default(global::SharedData.MyClass);
-            var __MyProperty2__ = default(int);
+            var ____result = new global::SharedData.VersionBlockTest();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         break;
                     case 1:
-                        __UnknownBlock__ = formatterResolver.GetFormatterWithVerify<global::SharedData.MyClass>().Deserialize(ref reader, options);
+                        ____result.UnknownBlock = formatterResolver.GetFormatterWithVerify<global::SharedData.MyClass>().Deserialize(ref reader, options);
                         break;
                     case 2:
-                        __MyProperty2__ = reader.ReadInt32();
+                        ____result.MyProperty2 = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3748,10 +3669,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.VersionBlockTest();
-            ____result.MyProperty = __MyProperty__;
-            ____result.UnknownBlock = __UnknownBlock__;
-            ____result.MyProperty2 = __MyProperty2__;
             reader.Depth--;
             return ____result;
         }
@@ -3788,14 +3705,14 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadArrayHeader();
-            var __FV__ = default(int);
+            var ____result = new global::SharedData.VersioningUnion();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 7:
-                        __FV__ = reader.ReadInt32();
+                        ____result.FV = reader.ReadInt32();
                         break;
                     default:
                         reader.Skip();
@@ -3803,8 +3720,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.VersioningUnion();
-            ____result.FV = __FV__;
             reader.Depth--;
             return ____result;
         }
@@ -3837,18 +3752,17 @@ namespace MessagePack.Formatters.SharedData
             options.Security.DepthStep(ref reader);
             global::MessagePack.IFormatterResolver formatterResolver = options.Resolver;
             var length = reader.ReadArrayHeader();
-            var __Data1__ = default(int);
-            var __Data2__ = default(string);
+            var ____result = new global::SharedData.WithIndexer();
 
             for (int i = 0; i < length; i++)
             {
                 switch (i)
                 {
                     case 0:
-                        __Data1__ = reader.ReadInt32();
+                        ____result.Data1 = reader.ReadInt32();
                         break;
                     case 1:
-                        __Data2__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                        ____result.Data2 = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                         break;
                     default:
                         reader.Skip();
@@ -3856,9 +3770,6 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.WithIndexer();
-            ____result.Data1 = __Data1__;
-            ____result.Data2 = __Data2__;
             reader.Depth--;
             return ____result;
         }
@@ -3895,10 +3806,8 @@ namespace MessagePack.Formatters.SharedData
 
 namespace MessagePack.Formatters.SharedData
 {
-    using System;
-    using System.Buffers;
-    using System.Runtime.InteropServices;
-    using MessagePack;
+    using global::System.Buffers;
+    using global::MessagePack;
 
     public sealed class Callback2Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.Callback2>
     {
@@ -3926,7 +3835,7 @@ namespace MessagePack.Formatters.SharedData
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -3942,11 +3851,7 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.Callback2(__X__)
-            {
-                X = __X__,
-            };
-
+            var ____result = new global::SharedData.Callback2(__X__);
             ____result.OnAfterDeserialize();
             reader.Depth--;
             return ____result;
@@ -3979,7 +3884,7 @@ namespace MessagePack.Formatters.SharedData
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -3995,20 +3900,213 @@ namespace MessagePack.Formatters.SharedData
                 }
             }
 
-            var ____result = new global::SharedData.Callback2_2(__X__)
+            var ____result = new global::SharedData.Callback2_2(__X__);
+            ((global::MessagePack.IMessagePackSerializationCallbackReceiver)____result).OnAfterDeserialize();
+            reader.Depth--;
+            return ____result;
+        }
+    }
+
+    public sealed class DefaultValueStringKeyClassWithExplicitConstructorFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.DefaultValueStringKeyClassWithExplicitConstructor>
+    {
+        // Prop1
+        private static global::System.ReadOnlySpan<byte> GetSpan_Prop1() => new byte[1 + 5] { 165, 80, 114, 111, 112, 49 };
+        // Prop2
+        private static global::System.ReadOnlySpan<byte> GetSpan_Prop2() => new byte[1 + 5] { 165, 80, 114, 111, 112, 50 };
+
+        public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.DefaultValueStringKeyClassWithExplicitConstructor value, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (value is null)
             {
-                X = __X__,
-            };
+                writer.WriteNil();
+                return;
+            }
+
+            writer.WriteMapHeader(2);
+            writer.WriteRaw(GetSpan_Prop1());
+            writer.Write(value.Prop1);
+            writer.WriteRaw(GetSpan_Prop2());
+            writer.Write(value.Prop2);
+        }
+
+        public global::SharedData.DefaultValueStringKeyClassWithExplicitConstructor Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (reader.TryReadNil())
+            {
+                return null;
+            }
+
+            options.Security.DepthStep(ref reader);
+            var length = reader.ReadMapHeader();
+            var __Prop1__ = default(int);
+            var __Prop2__IsInitialized = false;
+            var __Prop2__ = default(int);
+
+            for (int i = 0; i < length; i++)
+            {
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                switch (stringKey.Length)
+                {
+                    default:
+                    FAIL:
+                      reader.Skip();
+                      continue;
+                    case 5:
+                        switch (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey))
+                        {
+                            default: goto FAIL;
+                            case 212339749456UL:
+                                __Prop1__ = reader.ReadInt32();
+                                continue;
+                            case 216634716752UL:
+                                __Prop2__IsInitialized = true;
+                                __Prop2__ = reader.ReadInt32();
+                                continue;
+                        }
+
+                }
+            }
+
+            var ____result = new global::SharedData.DefaultValueStringKeyClassWithExplicitConstructor(__Prop1__);
+            if (__Prop2__IsInitialized)
+            {
+                ____result.Prop2 = __Prop2__;
+            }
 
-            ((global::MessagePack.IMessagePackSerializationCallbackReceiver)____result).OnAfterDeserialize();
             reader.Depth--;
             return ____result;
         }
     }
 
-    public sealed class Empty2Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.Empty2>
+    public sealed class DefaultValueStringKeyClassWithoutExplicitConstructorFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.DefaultValueStringKeyClassWithoutExplicitConstructor>
+    {
+        // Prop1
+        private static global::System.ReadOnlySpan<byte> GetSpan_Prop1() => new byte[1 + 5] { 165, 80, 114, 111, 112, 49 };
+        // Prop2
+        private static global::System.ReadOnlySpan<byte> GetSpan_Prop2() => new byte[1 + 5] { 165, 80, 114, 111, 112, 50 };
+
+        public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.DefaultValueStringKeyClassWithoutExplicitConstructor value, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (value is null)
+            {
+                writer.WriteNil();
+                return;
+            }
+
+            writer.WriteMapHeader(2);
+            writer.WriteRaw(GetSpan_Prop1());
+            writer.Write(value.Prop1);
+            writer.WriteRaw(GetSpan_Prop2());
+            writer.Write(value.Prop2);
+        }
+
+        public global::SharedData.DefaultValueStringKeyClassWithoutExplicitConstructor Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (reader.TryReadNil())
+            {
+                return null;
+            }
+
+            options.Security.DepthStep(ref reader);
+            var length = reader.ReadMapHeader();
+            var ____result = new global::SharedData.DefaultValueStringKeyClassWithoutExplicitConstructor();
+
+            for (int i = 0; i < length; i++)
+            {
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                switch (stringKey.Length)
+                {
+                    default:
+                    FAIL:
+                      reader.Skip();
+                      continue;
+                    case 5:
+                        switch (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey))
+                        {
+                            default: goto FAIL;
+                            case 212339749456UL:
+                                ____result.Prop1 = reader.ReadInt32();
+                                continue;
+                            case 216634716752UL:
+                                ____result.Prop2 = reader.ReadInt32();
+                                continue;
+                        }
+
+                }
+            }
+
+            reader.Depth--;
+            return ____result;
+        }
+    }
+
+    public sealed class DefaultValueStringKeyStructWithExplicitConstructorFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.DefaultValueStringKeyStructWithExplicitConstructor>
     {
+        // Prop1
+        private static global::System.ReadOnlySpan<byte> GetSpan_Prop1() => new byte[1 + 5] { 165, 80, 114, 111, 112, 49 };
+        // Prop2
+        private static global::System.ReadOnlySpan<byte> GetSpan_Prop2() => new byte[1 + 5] { 165, 80, 114, 111, 112, 50 };
+
+        public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.DefaultValueStringKeyStructWithExplicitConstructor value, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            writer.WriteMapHeader(2);
+            writer.WriteRaw(GetSpan_Prop1());
+            writer.Write(value.Prop1);
+            writer.WriteRaw(GetSpan_Prop2());
+            writer.Write(value.Prop2);
+        }
+
+        public global::SharedData.DefaultValueStringKeyStructWithExplicitConstructor Deserialize(ref global::MessagePack.MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (reader.TryReadNil())
+            {
+                throw new global::System.InvalidOperationException("typecode is null, struct not supported");
+            }
+
+            options.Security.DepthStep(ref reader);
+            var length = reader.ReadMapHeader();
+            var __Prop1__ = default(int);
+            var __Prop2__IsInitialized = false;
+            var __Prop2__ = default(int);
+
+            for (int i = 0; i < length; i++)
+            {
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                switch (stringKey.Length)
+                {
+                    default:
+                    FAIL:
+                      reader.Skip();
+                      continue;
+                    case 5:
+                        switch (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey))
+                        {
+                            default: goto FAIL;
+                            case 212339749456UL:
+                                __Prop1__ = reader.ReadInt32();
+                                continue;
+                            case 216634716752UL:
+                                __Prop2__IsInitialized = true;
+                                __Prop2__ = reader.ReadInt32();
+                                continue;
+                        }
 
+                }
+            }
+
+            var ____result = new global::SharedData.DefaultValueStringKeyStructWithExplicitConstructor(__Prop1__);
+            if (__Prop2__IsInitialized)
+            {
+                ____result.Prop2 = __Prop2__;
+            }
+
+            reader.Depth--;
+            return ____result;
+        }
+    }
+
+    public sealed class Empty2Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::SharedData.Empty2>
+    {
         public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.Empty2 value, global::MessagePack.MessagePackSerializerOptions options)
         {
             if (value is null)
@@ -4050,7 +4148,7 @@ namespace MessagePack.Formatters.SharedData
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(2);
             writer.WriteRaw(GetSpan_MyProperty0());
             formatterResolver.GetFormatterWithVerify<T1>().Serialize(ref writer, value.MyProperty0, options);
@@ -4066,14 +4164,13 @@ namespace MessagePack.Formatters.SharedData
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __MyProperty0__ = default(T1);
-            var __Comparer__ = default(T2);
+            var ____result = new global::SharedData.GenericConstrainedClassStringKey<T1, T2>();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -4083,23 +4180,17 @@ namespace MessagePack.Formatters.SharedData
                     case 11:
                         if (!global::System.MemoryExtensions.SequenceEqual(stringKey, GetSpan_MyProperty0().Slice(1))) { goto FAIL; }
 
-                        __MyProperty0__ = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
+                        ____result.MyProperty0 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
                         continue;
                     case 8:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 8243120455795175235UL) { goto FAIL; }
 
-                        __Comparer__ = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
+                        ____result.Comparer = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
                         continue;
 
                 }
             }
 
-            var ____result = new global::SharedData.GenericConstrainedClassStringKey<T1, T2>()
-            {
-                MyProperty0 = __MyProperty0__,
-                Comparer = __Comparer__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -4116,7 +4207,7 @@ namespace MessagePack.Formatters.SharedData
 
         public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.GenericConstrainedStructStringKey<T1, T2> value, global::MessagePack.MessagePackSerializerOptions options)
         {
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(2);
             writer.WriteRaw(GetSpan_MyProperty0());
             formatterResolver.GetFormatterWithVerify<T1>().Serialize(ref writer, value.MyProperty0, options);
@@ -4132,14 +4223,13 @@ namespace MessagePack.Formatters.SharedData
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __MyProperty0__ = default(T1);
-            var __Comparer__ = default(T2);
+            var ____result = new global::SharedData.GenericConstrainedStructStringKey<T1, T2>();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -4149,23 +4239,17 @@ namespace MessagePack.Formatters.SharedData
                     case 11:
                         if (!global::System.MemoryExtensions.SequenceEqual(stringKey, GetSpan_MyProperty0().Slice(1))) { goto FAIL; }
 
-                        __MyProperty0__ = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
+                        ____result.MyProperty0 = formatterResolver.GetFormatterWithVerify<T1>().Deserialize(ref reader, options);
                         continue;
                     case 8:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 8243120455795175235UL) { goto FAIL; }
 
-                        __Comparer__ = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
+                        ____result.Comparer = formatterResolver.GetFormatterWithVerify<T2>().Deserialize(ref reader, options);
                         continue;
 
                 }
             }
 
-            var ____result = new global::SharedData.GenericConstrainedStructStringKey<T1, T2>()
-            {
-                MyProperty0 = __MyProperty0__,
-                Comparer = __Comparer__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -4198,11 +4282,11 @@ namespace MessagePack.Formatters.SharedData
 
             options.Security.DepthStep(ref reader);
             var length = reader.ReadMapHeader();
-            var __MyProperty__ = default(int);
+            var ____result = new global::SharedData.NonEmpty2();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -4212,17 +4296,12 @@ namespace MessagePack.Formatters.SharedData
                     case 10:
                         if (!global::System.MemoryExtensions.SequenceEqual(stringKey, GetSpan_MyProperty().Slice(1))) { goto FAIL; }
 
-                        __MyProperty__ = reader.ReadInt32();
+                        ____result.MyProperty = reader.ReadInt32();
                         continue;
 
                 }
             }
 
-            var ____result = new global::SharedData.NonEmpty2()
-            {
-                MyProperty = __MyProperty__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -4245,7 +4324,7 @@ namespace MessagePack.Formatters.SharedData
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(3);
             writer.WriteRaw(GetSpan_Prop1());
             writer.Write(value.Prop1);
@@ -4263,15 +4342,13 @@ namespace MessagePack.Formatters.SharedData
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __Prop1__ = default(int);
-            var __Prop2__ = default(global::SharedData.ByteEnum);
-            var __Prop3__ = default(int);
+            var ____result = new global::SharedData.SimpleStringKeyData();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -4283,26 +4360,19 @@ namespace MessagePack.Formatters.SharedData
                         {
                             default: goto FAIL;
                             case 212339749456UL:
-                                __Prop1__ = reader.ReadInt32();
+                                ____result.Prop1 = reader.ReadInt32();
                                 continue;
                             case 216634716752UL:
-                                __Prop2__ = formatterResolver.GetFormatterWithVerify<global::SharedData.ByteEnum>().Deserialize(ref reader, options);
+                                ____result.Prop2 = formatterResolver.GetFormatterWithVerify<global::SharedData.ByteEnum>().Deserialize(ref reader, options);
                                 continue;
                             case 220929684048UL:
-                                __Prop3__ = reader.ReadInt32();
+                                ____result.Prop3 = reader.ReadInt32();
                                 continue;
                         }
 
                 }
             }
 
-            var ____result = new global::SharedData.SimpleStringKeyData()
-            {
-                Prop1 = __Prop1__,
-                Prop2 = __Prop2__,
-                Prop3 = __Prop3__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -4317,7 +4387,7 @@ namespace MessagePack.Formatters.SharedData
 
         public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::SharedData.SimpleStructStringKeyData value, global::MessagePack.MessagePackSerializerOptions options)
         {
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(2);
             writer.WriteRaw(GetSpan_X());
             writer.Write(value.X);
@@ -4333,14 +4403,13 @@ namespace MessagePack.Formatters.SharedData
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __X__ = default(int);
-            var __Y__ = default(int[]);
+            var ____result = new global::SharedData.SimpleStructStringKeyData();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -4352,22 +4421,16 @@ namespace MessagePack.Formatters.SharedData
                         {
                             default: goto FAIL;
                             case 378720052587UL:
-                                __X__ = reader.ReadInt32();
+                                ____result.X = reader.ReadInt32();
                                 continue;
                             case 383015019883UL:
-                                __Y__ = formatterResolver.GetFormatterWithVerify<int[]>().Deserialize(ref reader, options);
+                                ____result.Y = formatterResolver.GetFormatterWithVerify<int[]>().Deserialize(ref reader, options);
                                 continue;
                         }
 
                 }
             }
 
-            var ____result = new global::SharedData.SimpleStructStringKeyData()
-            {
-                X = __X__,
-                Y = __Y__,
-            };
-
             reader.Depth--;
             return ____result;
         }
diff --git a/sandbox/TestData2/Generated.cs b/sandbox/TestData2/Generated.cs
index 0d6025a9..75273320 100644
--- a/sandbox/TestData2/Generated.cs
+++ b/sandbox/TestData2/Generated.cs
@@ -181,10 +181,8 @@ namespace MessagePack.Formatters.TestData2
 
 namespace MessagePack.Formatters.TestData2
 {
-    using System;
-    using System.Buffers;
-    using System.Runtime.InteropServices;
-    using MessagePack;
+    using global::System.Buffers;
+    using global::MessagePack;
 
     public sealed class AFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::TestData2.A>
     {
@@ -203,7 +201,7 @@ namespace MessagePack.Formatters.TestData2
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(3);
             writer.WriteRaw(GetSpan_a());
             writer.Write(value.a);
@@ -221,15 +219,13 @@ namespace MessagePack.Formatters.TestData2
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __a__ = default(int);
-            var __bs__ = default(global::System.Collections.Generic.List<global::TestData2.B>);
-            var __c__ = default(global::TestData2.C);
+            var ____result = new global::TestData2.A();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -241,28 +237,21 @@ namespace MessagePack.Formatters.TestData2
                         {
                             default: goto FAIL;
                             case 97UL:
-                                __a__ = reader.ReadInt32();
+                                ____result.a = reader.ReadInt32();
                                 continue;
                             case 99UL:
-                                __c__ = formatterResolver.GetFormatterWithVerify<global::TestData2.C>().Deserialize(ref reader, options);
+                                ____result.c = formatterResolver.GetFormatterWithVerify<global::TestData2.C>().Deserialize(ref reader, options);
                                 continue;
                         }
                     case 2:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 29538UL) { goto FAIL; }
 
-                        __bs__ = formatterResolver.GetFormatterWithVerify<global::System.Collections.Generic.List<global::TestData2.B>>().Deserialize(ref reader, options);
+                        ____result.bs = formatterResolver.GetFormatterWithVerify<global::System.Collections.Generic.List<global::TestData2.B>>().Deserialize(ref reader, options);
                         continue;
 
                 }
             }
 
-            var ____result = new global::TestData2.A()
-            {
-                a = __a__,
-                bs = __bs__,
-                c = __c__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -285,7 +274,7 @@ namespace MessagePack.Formatters.TestData2
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(3);
             writer.WriteRaw(GetSpan_ass());
             formatterResolver.GetFormatterWithVerify<global::System.Collections.Generic.List<global::TestData2.A>>().Serialize(ref writer, value.ass, options);
@@ -303,15 +292,13 @@ namespace MessagePack.Formatters.TestData2
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __ass__ = default(global::System.Collections.Generic.List<global::TestData2.A>);
-            var __c__ = default(global::TestData2.C);
-            var __a__ = default(int);
+            var ____result = new global::TestData2.B();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -321,30 +308,23 @@ namespace MessagePack.Formatters.TestData2
                     case 3:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 7566177UL) { goto FAIL; }
 
-                        __ass__ = formatterResolver.GetFormatterWithVerify<global::System.Collections.Generic.List<global::TestData2.A>>().Deserialize(ref reader, options);
+                        ____result.ass = formatterResolver.GetFormatterWithVerify<global::System.Collections.Generic.List<global::TestData2.A>>().Deserialize(ref reader, options);
                         continue;
                     case 1:
                         switch (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey))
                         {
                             default: goto FAIL;
                             case 99UL:
-                                __c__ = formatterResolver.GetFormatterWithVerify<global::TestData2.C>().Deserialize(ref reader, options);
+                                ____result.c = formatterResolver.GetFormatterWithVerify<global::TestData2.C>().Deserialize(ref reader, options);
                                 continue;
                             case 97UL:
-                                __a__ = reader.ReadInt32();
+                                ____result.a = reader.ReadInt32();
                                 continue;
                         }
 
                 }
             }
 
-            var ____result = new global::TestData2.B()
-            {
-                ass = __ass__,
-                c = __c__,
-                a = __a__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -365,7 +345,7 @@ namespace MessagePack.Formatters.TestData2
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(2);
             writer.WriteRaw(GetSpan_b());
             formatterResolver.GetFormatterWithVerify<global::TestData2.B>().Serialize(ref writer, value.b, options);
@@ -381,14 +361,13 @@ namespace MessagePack.Formatters.TestData2
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __b__ = default(global::TestData2.B);
-            var __a__ = default(int);
+            var ____result = new global::TestData2.C();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -400,22 +379,16 @@ namespace MessagePack.Formatters.TestData2
                         {
                             default: goto FAIL;
                             case 98UL:
-                                __b__ = formatterResolver.GetFormatterWithVerify<global::TestData2.B>().Deserialize(ref reader, options);
+                                ____result.b = formatterResolver.GetFormatterWithVerify<global::TestData2.B>().Deserialize(ref reader, options);
                                 continue;
                             case 97UL:
-                                __a__ = reader.ReadInt32();
+                                ____result.a = reader.ReadInt32();
                                 continue;
                         }
 
                 }
             }
 
-            var ____result = new global::TestData2.C()
-            {
-                b = __b__,
-                a = __a__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -436,7 +409,7 @@ namespace MessagePack.Formatters.TestData2
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(2);
             writer.WriteRaw(GetSpan_EnumId());
             formatterResolver.GetFormatterWithVerify<global::TestData2.Nest1.Id>().Serialize(ref writer, value.EnumId, options);
@@ -452,14 +425,13 @@ namespace MessagePack.Formatters.TestData2
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __EnumId__ = default(global::TestData2.Nest1.Id);
-            var __ClassId__ = default(global::TestData2.Nest1.IdType);
+            var ____result = new global::TestData2.Nest1();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -469,23 +441,17 @@ namespace MessagePack.Formatters.TestData2
                     case 6:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 110266531802693UL) { goto FAIL; }
 
-                        __EnumId__ = formatterResolver.GetFormatterWithVerify<global::TestData2.Nest1.Id>().Deserialize(ref reader, options);
+                        ____result.EnumId = formatterResolver.GetFormatterWithVerify<global::TestData2.Nest1.Id>().Deserialize(ref reader, options);
                         continue;
                     case 7:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 28228257876896835UL) { goto FAIL; }
 
-                        __ClassId__ = formatterResolver.GetFormatterWithVerify<global::TestData2.Nest1.IdType>().Deserialize(ref reader, options);
+                        ____result.ClassId = formatterResolver.GetFormatterWithVerify<global::TestData2.Nest1.IdType>().Deserialize(ref reader, options);
                         continue;
 
                 }
             }
 
-            var ____result = new global::TestData2.Nest1()
-            {
-                EnumId = __EnumId__,
-                ClassId = __ClassId__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -493,7 +459,6 @@ namespace MessagePack.Formatters.TestData2
 
     public sealed class Nest1_IdTypeFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::TestData2.Nest1.IdType>
     {
-
         public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::TestData2.Nest1.IdType value, global::MessagePack.MessagePackSerializerOptions options)
         {
             if (value is null)
@@ -533,7 +498,7 @@ namespace MessagePack.Formatters.TestData2
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(2);
             writer.WriteRaw(GetSpan_EnumId());
             formatterResolver.GetFormatterWithVerify<global::TestData2.Nest2.Id>().Serialize(ref writer, value.EnumId, options);
@@ -549,14 +514,13 @@ namespace MessagePack.Formatters.TestData2
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __EnumId__ = default(global::TestData2.Nest2.Id);
-            var __ClassId__ = default(global::TestData2.Nest2.IdType);
+            var ____result = new global::TestData2.Nest2();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -566,23 +530,17 @@ namespace MessagePack.Formatters.TestData2
                     case 6:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 110266531802693UL) { goto FAIL; }
 
-                        __EnumId__ = formatterResolver.GetFormatterWithVerify<global::TestData2.Nest2.Id>().Deserialize(ref reader, options);
+                        ____result.EnumId = formatterResolver.GetFormatterWithVerify<global::TestData2.Nest2.Id>().Deserialize(ref reader, options);
                         continue;
                     case 7:
                         if (global::MessagePack.Internal.AutomataKeyGen.GetKey(ref stringKey) != 28228257876896835UL) { goto FAIL; }
 
-                        __ClassId__ = formatterResolver.GetFormatterWithVerify<global::TestData2.Nest2.IdType>().Deserialize(ref reader, options);
+                        ____result.ClassId = formatterResolver.GetFormatterWithVerify<global::TestData2.Nest2.IdType>().Deserialize(ref reader, options);
                         continue;
 
                 }
             }
 
-            var ____result = new global::TestData2.Nest2()
-            {
-                EnumId = __EnumId__,
-                ClassId = __ClassId__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -590,7 +548,6 @@ namespace MessagePack.Formatters.TestData2
 
     public sealed class Nest2_IdTypeFormatter : global::MessagePack.Formatters.IMessagePackFormatter<global::TestData2.Nest2.IdType>
     {
-
         public void Serialize(ref global::MessagePack.MessagePackWriter writer, global::TestData2.Nest2.IdType value, global::MessagePack.MessagePackSerializerOptions options)
         {
             if (value is null)
@@ -630,7 +587,7 @@ namespace MessagePack.Formatters.TestData2
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(2);
             writer.WriteRaw(GetSpan_MyProperty1());
             formatterResolver.GetFormatterWithVerify<string>().Serialize(ref writer, value.MyProperty1, options);
@@ -646,14 +603,13 @@ namespace MessagePack.Formatters.TestData2
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __MyProperty1__ = default(string);
-            var __MyProperty2__ = default(string);
+            var ____result = new global::TestData2.PropNameCheck1();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -669,10 +625,10 @@ namespace MessagePack.Formatters.TestData2
                                 {
                                     default: goto FAIL;
                                     case 3242356UL:
-                                        __MyProperty1__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                                        ____result.MyProperty1 = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                                         continue;
                                     case 3307892UL:
-                                        __MyProperty2__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                                        ____result.MyProperty2 = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                                         continue;
                                 }
 
@@ -681,12 +637,6 @@ namespace MessagePack.Formatters.TestData2
                 }
             }
 
-            var ____result = new global::TestData2.PropNameCheck1()
-            {
-                MyProperty1 = __MyProperty1__,
-                MyProperty2 = __MyProperty2__,
-            };
-
             reader.Depth--;
             return ____result;
         }
@@ -707,7 +657,7 @@ namespace MessagePack.Formatters.TestData2
                 return;
             }
 
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             writer.WriteMapHeader(2);
             writer.WriteRaw(GetSpan_MyProperty1());
             formatterResolver.GetFormatterWithVerify<string>().Serialize(ref writer, value.MyProperty1, options);
@@ -723,14 +673,13 @@ namespace MessagePack.Formatters.TestData2
             }
 
             options.Security.DepthStep(ref reader);
-            IFormatterResolver formatterResolver = options.Resolver;
+            var formatterResolver = options.Resolver;
             var length = reader.ReadMapHeader();
-            var __MyProperty1__ = default(string);
-            var __MyProperty2__ = default(string);
+            var ____result = new global::TestData2.PropNameCheck2();
 
             for (int i = 0; i < length; i++)
             {
-                ReadOnlySpan<byte> stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
+                var stringKey = global::MessagePack.Internal.CodeGenHelpers.ReadStringSpan(ref reader);
                 switch (stringKey.Length)
                 {
                     default:
@@ -746,10 +695,10 @@ namespace MessagePack.Formatters.TestData2
                                 {
                                     default: goto FAIL;
                                     case 3242356UL:
-                                        __MyProperty1__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                                        ____result.MyProperty1 = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                                         continue;
                                     case 3307892UL:
-                                        __MyProperty2__ = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
+                                        ____result.MyProperty2 = formatterResolver.GetFormatterWithVerify<string>().Deserialize(ref reader, options);
                                         continue;
                                 }
 
@@ -758,12 +707,6 @@ namespace MessagePack.Formatters.TestData2
                 }
             }
 
-            var ____result = new global::TestData2.PropNameCheck2()
-            {
-                MyProperty1 = __MyProperty1__,
-                MyProperty2 = __MyProperty2__,
-            };
-
             reader.Depth--;
             return ____result;
         }