vom: move magicbyte handling into encode/decode.

  * move magicbyte handling into encode/decode and change
   New{Encoder,Decoder} API to no return error any more.

MultiPart: 3/3
Change-Id: I731af09d2d372bb09de4d2559c81b0514fef112a
diff --git a/src/gen-vdl/v.io/v23/vom/index.js b/src/gen-vdl/v.io/v23/vom/index.js
index 38a3555..8c728dd 100644
--- a/src/gen-vdl/v.io/v23/vom/index.js
+++ b/src/gen-vdl/v.io/v23/vom/index.js
@@ -52,7 +52,7 @@
 _typeDumpAtom.fields = [{name: "Kind", type: _typeDumpKind}, {name: "Bytes", type: _type1}, {name: "Data", type: _typePrimitive}, {name: "Debug", type: vdl.types.STRING}];
 _typeDumpKind.kind = vdl.kind.ENUM;
 _typeDumpKind.name = "v.io/v23/vom.DumpKind";
-_typeDumpKind.labels = ["Magic", "Control", "MsgId", "TypeMsg", "ValueMsg", "MsgLen", "TypeId", "PrimValue", "ByteLen", "ValueLen", "Index", "WireTypeIndex"];
+_typeDumpKind.labels = ["Version", "Control", "MsgId", "TypeMsg", "ValueMsg", "MsgLen", "TypeId", "PrimValue", "ByteLen", "ValueLen", "Index", "WireTypeIndex"];
 _typePrimitive.kind = vdl.kind.UNION;
 _typePrimitive.name = "v.io/v23/vom.Primitive";
 _typePrimitive.fields = [{name: "PBool", type: vdl.types.BOOL}, {name: "PByte", type: vdl.types.BYTE}, {name: "PUint", type: vdl.types.UINT64}, {name: "PInt", type: vdl.types.INT64}, {name: "PFloat", type: vdl.types.FLOAT64}, {name: "PString", type: vdl.types.STRING}, {name: "PControl", type: _typeControlKind}];
@@ -116,7 +116,7 @@
 };
 module.exports.DumpAtom = (vdl.registry.lookupOrCreateConstructor(_typeDumpAtom));
 module.exports.DumpKind = {
-  MAGIC: canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeDumpKind))('Magic', true), _typeDumpKind),
+  VERSION: canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeDumpKind))('Version', true), _typeDumpKind),
   CONTROL: canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeDumpKind))('Control', true), _typeDumpKind),
   MSG_ID: canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeDumpKind))('MsgId', true), _typeDumpKind),
   TYPE_MSG: canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeDumpKind))('TypeMsg', true), _typeDumpKind),
diff --git a/src/gen-vdl/v.io/v23/vom/testdata/index.js b/src/gen-vdl/v.io/v23/vom/testdata/index.js
index 657abea..6757508 100644
--- a/src/gen-vdl/v.io/v23/vom/testdata/index.js
+++ b/src/gen-vdl/v.io/v23/vom/testdata/index.js
@@ -306,7 +306,7 @@
 _typeStructOnlyMap.key = vdl.types.STRING;
 _typeTestCase.kind = vdl.kind.STRUCT;
 _typeTestCase.name = "v.io/v23/vom/testdata.TestCase";
-_typeTestCase.fields = [{name: "Name", type: vdl.types.STRING}, {name: "Value", type: vdl.types.ANY}, {name: "TypeString", type: vdl.types.STRING}, {name: "Hex", type: vdl.types.STRING}, {name: "HexMagic", type: vdl.types.STRING}, {name: "HexType", type: vdl.types.STRING}, {name: "HexValue", type: vdl.types.STRING}];
+_typeTestCase.fields = [{name: "Name", type: vdl.types.STRING}, {name: "Value", type: vdl.types.ANY}, {name: "TypeString", type: vdl.types.STRING}, {name: "Hex", type: vdl.types.STRING}, {name: "HexVersion", type: vdl.types.STRING}, {name: "HexType", type: vdl.types.STRING}, {name: "HexValue", type: vdl.types.STRING}];
 _typeVomdataStruct.kind = vdl.kind.STRUCT;
 _typeVomdataStruct.name = "v.io/v23/vom/testdata.VomdataStruct";
 _typeVomdataStruct.fields = [{name: "EncodeDecodeData", type: _type14}, {name: "CompatData", type: _type8}, {name: "ConvertData", type: _type12}];
@@ -481,7 +481,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.BOOL))(true, true), vdl.types.BOOL),
   'typeString': "bool",
   'hex': "800201",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0201",
 },
@@ -490,7 +490,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.BOOL))(false, true), vdl.types.BOOL),
   'typeString': "bool",
   'hex': "800200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0200",
 },
@@ -499,7 +499,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.STRING))("", true), vdl.types.STRING),
   'typeString': "string",
   'hex': "800600",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0600",
 },
@@ -508,7 +508,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.STRING))("abc", true), vdl.types.STRING),
   'typeString': "string",
   'hex': "800603616263",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0603616263",
 },
@@ -518,7 +518,7 @@
 ]), true), _type2),
   'typeString': "[]byte",
   'hex': "804e00",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "4e00",
 },
@@ -531,7 +531,7 @@
 ]), true), _type2),
   'typeString': "[]byte",
   'hex': "804e03010203",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "4e03010203",
 },
@@ -545,7 +545,7 @@
 ]), true), _type2),
   'typeString': "[]byte",
   'hex': "804e0461646566",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "4e0461646566",
 },
@@ -554,7 +554,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.BYTE))(0, true), vdl.types.BYTE),
   'typeString': "byte",
   'hex': "800400",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0400",
 },
@@ -563,7 +563,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.BYTE))(127, true), vdl.types.BYTE),
   'typeString': "byte",
   'hex': "80047f",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "047f",
 },
@@ -572,7 +572,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.BYTE))(255, true), vdl.types.BYTE),
   'typeString': "byte",
   'hex': "8004ff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "04ff",
 },
@@ -581,7 +581,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(0, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "800800",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0800",
 },
@@ -590,7 +590,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(1, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "800801",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0801",
 },
@@ -599,7 +599,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(2, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "800802",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0802",
 },
@@ -608,7 +608,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(63, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "80083f",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "083f",
 },
@@ -617,7 +617,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(64, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "800840",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0840",
 },
@@ -626,7 +626,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(127, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "80087f",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "087f",
 },
@@ -635,7 +635,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(128, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "8008ff80",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "08ff80",
 },
@@ -644,7 +644,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(255, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "8008ffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "08ffff",
 },
@@ -653,7 +653,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(256, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "8008fe0100",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "08fe0100",
 },
@@ -662,7 +662,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(32766, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "8008fe7ffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "08fe7ffe",
 },
@@ -671,7 +671,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(32767, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "8008fe7fff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "08fe7fff",
 },
@@ -680,7 +680,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(65534, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "8008fefffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "08fefffe",
 },
@@ -689,7 +689,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT16))(65535, true), vdl.types.UINT16),
   'typeString': "uint16",
   'hex': "8008feffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "08feffff",
 },
@@ -698,7 +698,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(0, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800a00",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0a00",
 },
@@ -707,7 +707,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(8388606, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800afd7ffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0afd7ffffe",
 },
@@ -716,7 +716,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(8388607, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800afd7fffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0afd7fffff",
 },
@@ -725,7 +725,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(16777214, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800afdfffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0afdfffffe",
 },
@@ -734,7 +734,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(16777215, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800afdffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0afdffffff",
 },
@@ -743,7 +743,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(2147483646, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800afc7ffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0afc7ffffffe",
 },
@@ -752,7 +752,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(2147483647, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800afc7fffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0afc7fffffff",
 },
@@ -761,7 +761,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(4294967294, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800afcfffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0afcfffffffe",
 },
@@ -770,7 +770,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT32))(4294967295, true), vdl.types.UINT32),
   'typeString': "uint32",
   'hex': "800afcffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0afcffffffff",
 },
@@ -779,7 +779,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(0, new Uint8Array([])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800c00",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0c00",
 },
@@ -788,7 +788,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cfb7ffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cfb7ffffffffe",
 },
@@ -797,7 +797,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cfb7fffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cfb7fffffffff",
 },
@@ -806,7 +806,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cfbfffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cfbfffffffffe",
 },
@@ -815,7 +815,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cfbffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cfbffffffffff",
 },
@@ -824,7 +824,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cfa7ffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cfa7ffffffffffe",
 },
@@ -833,7 +833,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cfa7fffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cfa7fffffffffff",
 },
@@ -842,7 +842,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cfafffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cfafffffffffffe",
 },
@@ -851,7 +851,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cfaffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cfaffffffffffff",
 },
@@ -860,7 +860,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cf97ffffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cf97ffffffffffffe",
 },
@@ -869,7 +869,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cf97fffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cf97fffffffffffff",
 },
@@ -878,7 +878,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cf9fffffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cf9fffffffffffffe",
 },
@@ -887,7 +887,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cf9ffffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cf9ffffffffffffff",
 },
@@ -896,7 +896,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cf87ffffffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cf87ffffffffffffffe",
 },
@@ -905,7 +905,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cf87fffffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cf87fffffffffffffff",
 },
@@ -914,7 +914,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cf8fffffffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cf8fffffffffffffffe",
 },
@@ -923,7 +923,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.UINT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.UINT64),
   'typeString': "uint64",
   'hex': "800cf8ffffffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0cf8ffffffffffffffff",
 },
@@ -932,7 +932,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(0, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800e00",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0e00",
 },
@@ -941,7 +941,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(1, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800e02",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0e02",
 },
@@ -950,7 +950,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(2, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800e04",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0e04",
 },
@@ -959,7 +959,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(63, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800e7e",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0e7e",
 },
@@ -968,7 +968,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(64, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800eff80",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0eff80",
 },
@@ -977,7 +977,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(127, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efffe",
 },
@@ -986,7 +986,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(128, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efe0100",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efe0100",
 },
@@ -995,7 +995,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(255, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efe01fe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efe01fe",
 },
@@ -1004,7 +1004,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(256, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efe0200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efe0200",
 },
@@ -1013,7 +1013,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(32766, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efefffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efefffc",
 },
@@ -1022,7 +1022,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(32767, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efefffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efefffe",
 },
@@ -1031,7 +1031,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(0, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "801000",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1000",
 },
@@ -1040,7 +1040,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(8388606, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fdfffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fdfffffc",
 },
@@ -1049,7 +1049,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(8388607, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fdfffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fdfffffe",
 },
@@ -1058,7 +1058,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(16777214, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fc01fffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fc01fffffc",
 },
@@ -1067,7 +1067,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(16777215, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fc01fffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fc01fffffe",
 },
@@ -1076,7 +1076,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(2147483646, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fcfffffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fcfffffffc",
 },
@@ -1085,7 +1085,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(2147483647, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fcfffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fcfffffffe",
 },
@@ -1094,7 +1094,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(0, new Uint8Array([])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "801200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1200",
 },
@@ -1103,7 +1103,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x1])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "801202",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1202",
 },
@@ -1112,7 +1112,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x2])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "801204",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1204",
 },
@@ -1121,7 +1121,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fbfffffffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fbfffffffffc",
 },
@@ -1130,7 +1130,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fbfffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fbfffffffffe",
 },
@@ -1139,7 +1139,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fa01fffffffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fa01fffffffffc",
 },
@@ -1148,7 +1148,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fa01fffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fa01fffffffffe",
 },
@@ -1157,7 +1157,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fafffffffffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fafffffffffffc",
 },
@@ -1166,7 +1166,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fafffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fafffffffffffe",
 },
@@ -1175,7 +1175,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f901fffffffffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f901fffffffffffc",
 },
@@ -1184,7 +1184,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f901fffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f901fffffffffffe",
 },
@@ -1193,7 +1193,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f9fffffffffffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f9fffffffffffffc",
 },
@@ -1202,7 +1202,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f9fffffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f9fffffffffffffe",
 },
@@ -1211,7 +1211,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f801fffffffffffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f801fffffffffffffc",
 },
@@ -1220,7 +1220,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f801fffffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f801fffffffffffffe",
 },
@@ -1229,7 +1229,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f8fffffffffffffffc",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f8fffffffffffffffc",
 },
@@ -1238,7 +1238,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f8fffffffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f8fffffffffffffffe",
 },
@@ -1247,7 +1247,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-1, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800e01",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0e01",
 },
@@ -1256,7 +1256,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-2, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800e03",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0e03",
 },
@@ -1265,7 +1265,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-64, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800e7f",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0e7f",
 },
@@ -1274,7 +1274,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-65, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800eff81",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0eff81",
 },
@@ -1283,7 +1283,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-128, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800effff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0effff",
 },
@@ -1292,7 +1292,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-129, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efe0101",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efe0101",
 },
@@ -1301,7 +1301,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-256, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efe01ff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efe01ff",
 },
@@ -1310,7 +1310,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-257, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efe0201",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efe0201",
 },
@@ -1319,7 +1319,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-32767, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efefffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efefffd",
 },
@@ -1328,7 +1328,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT16))(-32768, true), vdl.types.INT16),
   'typeString': "int16",
   'hex': "800efeffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "0efeffff",
 },
@@ -1337,7 +1337,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(-8388607, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fdfffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fdfffffd",
 },
@@ -1346,7 +1346,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(-8388608, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fdffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fdffffff",
 },
@@ -1355,7 +1355,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(-16777215, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fc01fffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fc01fffffd",
 },
@@ -1364,7 +1364,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(-16777216, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fc01ffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fc01ffffff",
 },
@@ -1373,7 +1373,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(-2147483647, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fcfffffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fcfffffffd",
 },
@@ -1382,7 +1382,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT32))(-2147483648, true), vdl.types.INT32),
   'typeString': "int32",
   'hex': "8010fcffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "10fcffffffff",
 },
@@ -1391,7 +1391,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x1])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "801201",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1201",
 },
@@ -1400,7 +1400,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x2])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "801203",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1203",
 },
@@ -1409,7 +1409,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fbfffffffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fbfffffffffd",
 },
@@ -1418,7 +1418,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x80, 0x0, 0x0, 0x0, 0x0])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fbffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fbffffffffff",
 },
@@ -1427,7 +1427,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fa01fffffffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fa01fffffffffd",
 },
@@ -1436,7 +1436,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x1, 0x0, 0x0, 0x0, 0x0, 0x0])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fa01ffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fa01ffffffffff",
 },
@@ -1445,7 +1445,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012fafffffffffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12fafffffffffffd",
 },
@@ -1454,7 +1454,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x80, 0x0, 0x0, 0x0, 0x0, 0x0])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012faffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12faffffffffffff",
 },
@@ -1463,7 +1463,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f901fffffffffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f901fffffffffffd",
 },
@@ -1472,7 +1472,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f901ffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f901ffffffffffff",
 },
@@ -1481,7 +1481,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f9fffffffffffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f9fffffffffffffd",
 },
@@ -1490,7 +1490,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f9ffffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f9ffffffffffffff",
 },
@@ -1499,7 +1499,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f801fffffffffffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f801fffffffffffffd",
 },
@@ -1508,7 +1508,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f801ffffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f801ffffffffffffff",
 },
@@ -1517,7 +1517,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f8fffffffffffffffd",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f8fffffffffffffffd",
 },
@@ -1526,7 +1526,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.INT64))(new vdl.BigInt(-1, new Uint8Array([0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0])), true), vdl.types.INT64),
   'typeString': "int64",
   'hex': "8012f8ffffffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "12f8ffffffffffffffff",
 },
@@ -1535,7 +1535,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.FLOAT32))(0, true), vdl.types.FLOAT32),
   'typeString': "float32",
   'hex': "801400",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1400",
 },
@@ -1544,7 +1544,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.FLOAT32))(32.5, true), vdl.types.FLOAT32),
   'typeString': "float32",
   'hex': "8014fd404040",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "14fd404040",
 },
@@ -1553,7 +1553,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.FLOAT32))(-32.5, true), vdl.types.FLOAT32),
   'typeString': "float32",
   'hex': "8014fd4040c0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "14fd4040c0",
 },
@@ -1562,7 +1562,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.FLOAT64))(0, true), vdl.types.FLOAT64),
   'typeString': "float64",
   'hex': "801600",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1600",
 },
@@ -1571,7 +1571,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.FLOAT64))(64.5, true), vdl.types.FLOAT64),
   'typeString': "float64",
   'hex': "8016fd205040",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "16fd205040",
 },
@@ -1580,7 +1580,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.FLOAT64))(-64.5, true), vdl.types.FLOAT64),
   'typeString': "float64",
   'hex': "8016fd2050c0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "16fd2050c0",
 },
@@ -1589,7 +1589,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.COMPLEX64))(new vdl.Complex(0.000000, 0.000000), true), vdl.types.COMPLEX64),
   'typeString': "complex64",
   'hex': "8018020000",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "18020000",
 },
@@ -1598,7 +1598,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.COMPLEX64))(new vdl.Complex(64.500000, 64.500000), true), vdl.types.COMPLEX64),
   'typeString': "complex64",
   'hex': "801808fd205040fd205040",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1808fd205040fd205040",
 },
@@ -1607,7 +1607,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.COMPLEX64))(new vdl.Complex(64.500000, -64.500000), true), vdl.types.COMPLEX64),
   'typeString': "complex64",
   'hex': "801808fd205040fd2050c0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1808fd205040fd2050c0",
 },
@@ -1616,7 +1616,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.COMPLEX128))(new vdl.Complex(0.000000, 0.000000), true), vdl.types.COMPLEX128),
   'typeString': "complex128",
   'hex': "801a020000",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1a020000",
 },
@@ -1625,7 +1625,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.COMPLEX128))(new vdl.Complex(128.500000, 128.500000), true), vdl.types.COMPLEX128),
   'typeString': "complex128",
   'hex': "801a08fd106040fd106040",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1a08fd106040fd106040",
 },
@@ -1634,7 +1634,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.COMPLEX128))(new vdl.Complex(128.500000, -128.500000), true), vdl.types.COMPLEX128),
   'typeString': "complex128",
   'hex': "801a08fd106040fd1060c0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1a08fd106040fd1060c0",
 },
@@ -1643,7 +1643,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNBool))(true, true), _typeNBool),
   'typeString': "v.io/v23/vom/testdata.NBool bool",
   'hex': "80512100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e15201",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1",
   'hexValue': "5201",
 },
@@ -1652,7 +1652,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNBool))(false, true), _typeNBool),
   'typeString': "v.io/v23/vom/testdata.NBool bool",
   'hex': "80512100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1",
   'hexValue': "5200",
 },
@@ -1661,7 +1661,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNString))("", true), _typeNString),
   'typeString': "v.io/v23/vom/testdata.NString string",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e537472696e670103e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e537472696e670103e1",
   'hexValue': "5200",
 },
@@ -1670,7 +1670,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNString))("abc", true), _typeNString),
   'typeString': "v.io/v23/vom/testdata.NString string",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e537472696e670103e15203616263",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e537472696e670103e1",
   'hexValue': "5203616263",
 },
@@ -1680,7 +1680,7 @@
 ]), true), _typeNByteSlice),
   'typeString': "v.io/v23/vom/testdata.NByteSlice []byte",
   'hex': "805126030020762e696f2f7632332f766f6d2f74657374646174612e4e42797465536c6963650102e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126030020762e696f2f7632332f766f6d2f74657374646174612e4e42797465536c6963650102e1",
   'hexValue': "5200",
 },
@@ -1693,7 +1693,7 @@
 ]), true), _typeNByteSlice),
   'typeString': "v.io/v23/vom/testdata.NByteSlice []byte",
   'hex': "805126030020762e696f2f7632332f766f6d2f74657374646174612e4e42797465536c6963650102e15203010203",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126030020762e696f2f7632332f766f6d2f74657374646174612e4e42797465536c6963650102e1",
   'hexValue': "5203010203",
 },
@@ -1706,7 +1706,7 @@
 ]), true), _typeNByteSlice),
   'typeString': "v.io/v23/vom/testdata.NByteSlice []byte",
   'hex': "805126030020762e696f2f7632332f766f6d2f74657374646174612e4e42797465536c6963650102e15203616263",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126030020762e696f2f7632332f766f6d2f74657374646174612e4e42797465536c6963650102e1",
   'hexValue': "5203616263",
 },
@@ -1720,7 +1720,7 @@
 ]), true), _typeNByteArray),
   'typeString': "v.io/v23/vom/testdata.NByteArray [4]byte",
   'hex': "805128020020762e696f2f7632332f766f6d2f74657374646174612e4e42797465417272617901020204e1520000000000",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5128020020762e696f2f7632332f766f6d2f74657374646174612e4e42797465417272617901020204e1",
   'hexValue': "520000000000",
 },
@@ -1734,7 +1734,7 @@
 ]), true), _typeNByteArray),
   'typeString': "v.io/v23/vom/testdata.NByteArray [4]byte",
   'hex': "805128020020762e696f2f7632332f766f6d2f74657374646174612e4e42797465417272617901020204e1520001020300",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5128020020762e696f2f7632332f766f6d2f74657374646174612e4e42797465417272617901020204e1",
   'hexValue': "520001020300",
 },
@@ -1748,7 +1748,7 @@
 ]), true), _typeNByteArray),
   'typeString': "v.io/v23/vom/testdata.NByteArray [4]byte",
   'hex': "805128020020762e696f2f7632332f766f6d2f74657374646174612e4e42797465417272617901020204e1520061626364",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5128020020762e696f2f7632332f766f6d2f74657374646174612e4e42797465417272617901020204e1",
   'hexValue': "520061626364",
 },
@@ -1757,7 +1757,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNByte))(0, true), _typeNByte),
   'typeString': "v.io/v23/vom/testdata.NByte byte",
   'hex': "80512100001b762e696f2f7632332f766f6d2f74657374646174612e4e427974650102e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512100001b762e696f2f7632332f766f6d2f74657374646174612e4e427974650102e1",
   'hexValue': "5200",
 },
@@ -1766,7 +1766,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNByte))(127, true), _typeNByte),
   'typeString': "v.io/v23/vom/testdata.NByte byte",
   'hex': "80512100001b762e696f2f7632332f766f6d2f74657374646174612e4e427974650102e1527f",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512100001b762e696f2f7632332f766f6d2f74657374646174612e4e427974650102e1",
   'hexValue': "527f",
 },
@@ -1775,7 +1775,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNByte))(255, true), _typeNByte),
   'typeString': "v.io/v23/vom/testdata.NByte byte",
   'hex': "80512100001b762e696f2f7632332f766f6d2f74657374646174612e4e427974650102e152ff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512100001b762e696f2f7632332f766f6d2f74657374646174612e4e427974650102e1",
   'hexValue': "52ff",
 },
@@ -1784,7 +1784,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUint16))(0, true), _typeNUint16),
   'typeString': "v.io/v23/vom/testdata.NUint16 uint16",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7431360104e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7431360104e1",
   'hexValue': "5200",
 },
@@ -1793,7 +1793,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUint16))(65535, true), _typeNUint16),
   'typeString': "v.io/v23/vom/testdata.NUint16 uint16",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7431360104e152feffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7431360104e1",
   'hexValue': "52feffff",
 },
@@ -1802,7 +1802,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUint32))(0, true), _typeNUint32),
   'typeString': "v.io/v23/vom/testdata.NUint32 uint32",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7433320105e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7433320105e1",
   'hexValue': "5200",
 },
@@ -1811,7 +1811,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUint32))(4294967295, true), _typeNUint32),
   'typeString': "v.io/v23/vom/testdata.NUint32 uint32",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7433320105e152fcffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7433320105e1",
   'hexValue': "52fcffffffff",
 },
@@ -1820,7 +1820,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUint64))(new vdl.BigInt(0, new Uint8Array([])), true), _typeNUint64),
   'typeString': "v.io/v23/vom/testdata.NUint64 uint64",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7436340106e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7436340106e1",
   'hexValue': "5200",
 },
@@ -1829,7 +1829,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUint64))(new vdl.BigInt(1, new Uint8Array([0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), _typeNUint64),
   'typeString': "v.io/v23/vom/testdata.NUint64 uint64",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7436340106e152f8ffffffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7436340106e1",
   'hexValue': "52f8ffffffffffffffff",
 },
@@ -1838,7 +1838,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt16))(0, true), _typeNInt16),
   'typeString': "v.io/v23/vom/testdata.NInt16 int16",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7431360107e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7431360107e1",
   'hexValue': "5200",
 },
@@ -1847,7 +1847,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt16))(32767, true), _typeNInt16),
   'typeString': "v.io/v23/vom/testdata.NInt16 int16",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7431360107e152fefffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7431360107e1",
   'hexValue': "52fefffe",
 },
@@ -1856,7 +1856,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt16))(-32768, true), _typeNInt16),
   'typeString': "v.io/v23/vom/testdata.NInt16 int16",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7431360107e152feffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7431360107e1",
   'hexValue': "52feffff",
 },
@@ -1865,7 +1865,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt32))(0, true), _typeNInt32),
   'typeString': "v.io/v23/vom/testdata.NInt32 int32",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7433320108e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7433320108e1",
   'hexValue': "5200",
 },
@@ -1874,7 +1874,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt32))(2147483647, true), _typeNInt32),
   'typeString': "v.io/v23/vom/testdata.NInt32 int32",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7433320108e152fcfffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7433320108e1",
   'hexValue': "52fcfffffffe",
 },
@@ -1883,7 +1883,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt32))(-2147483648, true), _typeNInt32),
   'typeString': "v.io/v23/vom/testdata.NInt32 int32",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7433320108e152fcffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7433320108e1",
   'hexValue': "52fcffffffff",
 },
@@ -1892,7 +1892,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt64))(new vdl.BigInt(0, new Uint8Array([])), true), _typeNInt64),
   'typeString': "v.io/v23/vom/testdata.NInt64 int64",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7436340109e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7436340109e1",
   'hexValue': "5200",
 },
@@ -1901,7 +1901,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt64))(new vdl.BigInt(1, new Uint8Array([0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])), true), _typeNInt64),
   'typeString': "v.io/v23/vom/testdata.NInt64 int64",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7436340109e152f8fffffffffffffffe",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7436340109e1",
   'hexValue': "52f8fffffffffffffffe",
 },
@@ -1910,7 +1910,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNInt64))(new vdl.BigInt(-1, new Uint8Array([0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0])), true), _typeNInt64),
   'typeString': "v.io/v23/vom/testdata.NInt64 int64",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7436340109e152f8ffffffffffffffff",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7436340109e1",
   'hexValue': "52f8ffffffffffffffff",
 },
@@ -1919,7 +1919,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNFloat32))(0, true), _typeNFloat32),
   'typeString': "v.io/v23/vom/testdata.NFloat32 float32",
   'hex': "80512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae1",
   'hexValue': "5200",
 },
@@ -1928,7 +1928,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNFloat32))(32.5, true), _typeNFloat32),
   'typeString': "v.io/v23/vom/testdata.NFloat32 float32",
   'hex': "80512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae152fd404040",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae1",
   'hexValue': "52fd404040",
 },
@@ -1937,7 +1937,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNFloat32))(-32.5, true), _typeNFloat32),
   'typeString': "v.io/v23/vom/testdata.NFloat32 float32",
   'hex': "80512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae152fd4040c0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae1",
   'hexValue': "52fd4040c0",
 },
@@ -1946,7 +1946,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNFloat64))(0, true), _typeNFloat64),
   'typeString': "v.io/v23/vom/testdata.NFloat64 float64",
   'hex': "80512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743634010be15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743634010be1",
   'hexValue': "5200",
 },
@@ -1955,7 +1955,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNFloat64))(64.5, true), _typeNFloat64),
   'typeString': "v.io/v23/vom/testdata.NFloat64 float64",
   'hex': "80512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743634010be152fd205040",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743634010be1",
   'hexValue': "52fd205040",
 },
@@ -1964,7 +1964,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNFloat64))(-64.5, true), _typeNFloat64),
   'typeString': "v.io/v23/vom/testdata.NFloat64 float64",
   'hex': "80512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743634010be152fd2050c0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743634010be1",
   'hexValue': "52fd2050c0",
 },
@@ -1973,7 +1973,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNComplex64))(new vdl.Complex(0.000000, 0.000000), true), _typeNComplex64),
   'typeString': "v.io/v23/vom/testdata.NComplex64 complex64",
   'hex': "805126000020762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c65783634010ce152020000",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126000020762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c65783634010ce1",
   'hexValue': "52020000",
 },
@@ -1982,7 +1982,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNComplex64))(new vdl.Complex(64.500000, 64.500000), true), _typeNComplex64),
   'typeString': "v.io/v23/vom/testdata.NComplex64 complex64",
   'hex': "805126000020762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c65783634010ce15208fd205040fd205040",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126000020762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c65783634010ce1",
   'hexValue': "5208fd205040fd205040",
 },
@@ -1991,7 +1991,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNComplex64))(new vdl.Complex(64.500000, -64.500000), true), _typeNComplex64),
   'typeString': "v.io/v23/vom/testdata.NComplex64 complex64",
   'hex': "805126000020762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c65783634010ce15208fd205040fd2050c0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126000020762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c65783634010ce1",
   'hexValue': "5208fd205040fd2050c0",
 },
@@ -2000,7 +2000,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNComplex128))(new vdl.Complex(0.000000, 0.000000), true), _typeNComplex128),
   'typeString': "v.io/v23/vom/testdata.NComplex128 complex128",
   'hex': "805127000021762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c6578313238010de152020000",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5127000021762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c6578313238010de1",
   'hexValue': "52020000",
 },
@@ -2009,7 +2009,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNComplex128))(new vdl.Complex(128.500000, 128.500000), true), _typeNComplex128),
   'typeString': "v.io/v23/vom/testdata.NComplex128 complex128",
   'hex': "805127000021762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c6578313238010de15208fd106040fd106040",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5127000021762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c6578313238010de1",
   'hexValue': "5208fd106040fd106040",
 },
@@ -2018,7 +2018,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNComplex128))(new vdl.Complex(128.500000, -128.500000), true), _typeNComplex128),
   'typeString': "v.io/v23/vom/testdata.NComplex128 complex128",
   'hex': "805127000021762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c6578313238010de15208fd106040fd1060c0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5127000021762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c6578313238010de1",
   'hexValue': "5208fd106040fd1060c0",
 },
@@ -2030,7 +2030,7 @@
 ], true), _typeNArray2Uint64),
   'typeString': "v.io/v23/vom/testdata.NArray2Uint64 [2]uint64",
   'hex': "80512b020023762e696f2f7632332f766f6d2f74657374646174612e4e41727261793255696e74363401060202e15203000102",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512b020023762e696f2f7632332f766f6d2f74657374646174612e4e41727261793255696e74363401060202e1",
   'hexValue': "5203000102",
 },
@@ -2042,7 +2042,7 @@
 ], true), _type3),
   'typeString': "[]uint64",
   'hex': "805104030106e15203020102",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5104030106e1",
   'hexValue': "5203020102",
 },
@@ -2054,7 +2054,7 @@
 ], true), _typeNListUint64),
   'typeString': "v.io/v23/vom/testdata.NListUint64 []uint64",
   'hex': "805127030021762e696f2f7632332f766f6d2f74657374646174612e4e4c69737455696e7436340106e15203020102",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5127030021762e696f2f7632332f766f6d2f74657374646174612e4e4c69737455696e7436340106e1",
   'hexValue': "5203020102",
 },
@@ -2064,7 +2064,7 @@
   new vdl.BigInt(1, new Uint8Array([0x1])), ]), true), _type4),
   'typeString': "set[uint64]",
   'hex': "805104040106e152020101",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5104040106e1",
   'hexValue': "52020101",
 },
@@ -2074,7 +2074,7 @@
   new vdl.BigInt(1, new Uint8Array([0x1])), ]), true), _typeNSetUint64),
   'typeString': "v.io/v23/vom/testdata.NSetUint64 set[uint64]",
   'hex': "805126040020762e696f2f7632332f766f6d2f74657374646174612e4e53657455696e7436340106e152020101",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126040020762e696f2f7632332f766f6d2f74657374646174612e4e53657455696e7436340106e1",
   'hexValue': "52020101",
 },
@@ -2084,7 +2084,7 @@
   [new vdl.BigInt(1, new Uint8Array([0x1])), "abc"]]), true), _type5),
   'typeString': "map[uint64]string",
   'hex': "8051060501060203e15206010103616263",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "51060501060203e1",
   'hexValue': "5206010103616263",
 },
@@ -2094,7 +2094,7 @@
   [new vdl.BigInt(1, new Uint8Array([0x1])), "abc"]]), true), _typeNMapUint64String),
   'typeString': "v.io/v23/vom/testdata.NMapUint64String map[uint64]string",
   'hex': "80512e050026762e696f2f7632332f766f6d2f74657374646174612e4e4d617055696e743634537472696e6701060203e15206010103616263",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512e050026762e696f2f7632332f766f6d2f74657374646174612e4e4d617055696e743634537472696e6701060203e1",
   'hexValue': "5206010103616263",
 },
@@ -2107,7 +2107,7 @@
 }, true), _typeNStruct),
   'typeString': "v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64}",
   'hex': "80513506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1520b0001010361626302fff6e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1",
   'hexValue': "520b0001010361626302fff6e1",
 },
@@ -2116,7 +2116,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_type6))(null, true), _type6),
   'typeString': "?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64}",
   'hex': "80533506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1510408012ae15201e0",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "533506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1510408012ae1",
   'hexValue': "5201e0",
 },
@@ -2129,7 +2129,7 @@
 }, true), _type6),
   'typeString': "?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64}",
   'hex': "80533506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1510408012ae15201e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "533506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1510408012ae1",
   'hexValue': "5201e1",
 },
@@ -2142,7 +2142,7 @@
 }, true), _type6),
   'typeString': "?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64}",
   'hex': "80533506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1510408012ae1520b0001010361626302fff6e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "533506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1510408012ae1",
   'hexValue': "520b0001010361626302fff6e1",
 },
@@ -2151,7 +2151,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNEnum))('A', true), _typeNEnum),
   'typeString': "v.io/v23/vom/testdata.NEnum enum{A;B;C}",
   'hex': "80512701001b762e696f2f7632332f766f6d2f74657374646174612e4e456e756d0103014101420143e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512701001b762e696f2f7632332f766f6d2f74657374646174612e4e456e756d0103014101420143e1",
   'hexValue': "5200",
 },
@@ -2160,7 +2160,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNEnum))('B', true), _typeNEnum),
   'typeString': "v.io/v23/vom/testdata.NEnum enum{A;B;C}",
   'hex': "80512701001b762e696f2f7632332f766f6d2f74657374646174612e4e456e756d0103014101420143e15201",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512701001b762e696f2f7632332f766f6d2f74657374646174612e4e456e756d0103014101420143e1",
   'hexValue': "5201",
 },
@@ -2169,7 +2169,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNEnum))('C', true), _typeNEnum),
   'typeString': "v.io/v23/vom/testdata.NEnum enum{A;B;C}",
   'hex': "80512701001b762e696f2f7632332f766f6d2f74657374646174612e4e456e756d0103014101420143e15202",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512701001b762e696f2f7632332f766f6d2f74657374646174612e4e456e756d0103014101420143e1",
   'hexValue': "5202",
 },
@@ -2178,7 +2178,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUnion))({ "a": true }, true), _typeNUnion),
   'typeString': "v.io/v23/vom/testdata.NUnion union{A bool;B string;C int64}",
   'hex': "80513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e152020001",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1",
   'hexValue': "52020001",
 },
@@ -2187,7 +2187,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUnion))({ "a": false }, true), _typeNUnion),
   'typeString': "v.io/v23/vom/testdata.NUnion union{A bool;B string;C int64}",
   'hex': "80513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e152020000",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1",
   'hexValue': "52020000",
 },
@@ -2196,7 +2196,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUnion))({ "b": "" }, true), _typeNUnion),
   'typeString': "v.io/v23/vom/testdata.NUnion union{A bool;B string;C int64}",
   'hex': "80513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e152020100",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1",
   'hexValue': "52020100",
 },
@@ -2205,7 +2205,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUnion))({ "b": "abc" }, true), _typeNUnion),
   'typeString': "v.io/v23/vom/testdata.NUnion union{A bool;B string;C int64}",
   'hex': "80513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e152050103616263",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1",
   'hexValue': "52050103616263",
 },
@@ -2214,7 +2214,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUnion))({ "c": new vdl.BigInt(0, new Uint8Array([])) }, true), _typeNUnion),
   'typeString': "v.io/v23/vom/testdata.NUnion union{A bool;B string;C int64}",
   'hex': "80513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e152020200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1",
   'hexValue': "52020200",
 },
@@ -2223,7 +2223,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUnion))({ "c": new vdl.BigInt(1, new Uint8Array([0x7b])) }, true), _typeNUnion),
   'typeString': "v.io/v23/vom/testdata.NUnion union{A bool;B string;C int64}",
   'hex': "80513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1520302fff6",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1",
   'hexValue': "520302fff6",
 },
@@ -2232,7 +2232,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeNUnion))({ "c": new vdl.BigInt(-1, new Uint8Array([0x7b])) }, true), _typeNUnion),
   'typeString': "v.io/v23/vom/testdata.NUnion union{A bool;B string;C int64}",
   'hex': "80513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1520302fff5",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1",
   'hexValue': "520302fff5",
 },
@@ -2241,7 +2241,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeMBool))(true, true), _typeMBool),
   'typeString': "v.io/v23/vom/testdata.MBool bool",
   'hex': "80512100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e15201",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1",
   'hexValue': "5201",
 },
@@ -2250,7 +2250,7 @@
   'value': canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(_typeMBool))(false, true), _typeMBool),
   'typeString': "v.io/v23/vom/testdata.MBool bool",
   'hex': "80512100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e15200",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1",
   'hexValue': "5200",
 },
@@ -2266,7 +2266,7 @@
 }, true), _typeMStruct),
   'typeString': "v.io/v23/vom/testdata.MStruct struct{A bool;B v.io/v23/vom/testdata.NBool bool;C v.io/v23/vom/testdata.MBool bool;D ?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64};E typeobject;F any}",
   'hex': "80532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e15207000101010201e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1",
   'hexValue': "5207000101010201e1",
 },
@@ -2282,7 +2282,7 @@
 }, true), _typeMStruct),
   'typeString': "v.io/v23/vom/testdata.MStruct struct{A bool;B v.io/v23/vom/testdata.NBool bool;C v.io/v23/vom/testdata.MBool bool;D ?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64};E typeobject;F any}",
   'hex': "80532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e15201e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1",
   'hexValue': "5201e1",
 },
@@ -2302,7 +2302,7 @@
 }, true), _typeMStruct),
   'typeString': "v.io/v23/vom/testdata.MStruct struct{A bool;B v.io/v23/vom/testdata.NBool bool;C v.io/v23/vom/testdata.MBool bool;D ?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64};E typeobject;F any}",
   'hex': "80532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1520303e1e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1",
   'hexValue': "520303e1e1",
 },
@@ -2322,7 +2322,7 @@
 }, true), _typeMStruct),
   'typeString': "v.io/v23/vom/testdata.MStruct struct{A bool;B v.io/v23/vom/testdata.NBool bool;C v.io/v23/vom/testdata.MBool bool;D ?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64};E typeobject;F any}",
   'hex': "80532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1520d030001010361626302fff6e1e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1",
   'hexValue': "520d030001010361626302fff6e1e1",
 },
@@ -2338,7 +2338,7 @@
 }, true), _typeMStruct),
   'typeString': "v.io/v23/vom/testdata.MStruct struct{A bool;B v.io/v23/vom/testdata.NBool bool;C v.io/v23/vom/testdata.MBool bool;D ?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64};E typeobject;F any}",
   'hex': "80532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e15207050303616263e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1",
   'hexValue': "5207050303616263e1",
 },
@@ -2354,7 +2354,7 @@
 }, true), _typeMStruct),
   'typeString': "v.io/v23/vom/testdata.MStruct struct{A bool;B v.io/v23/vom/testdata.NBool bool;C v.io/v23/vom/testdata.MBool bool;D ?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64};E typeobject;F any}",
   'hex': "80532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e15204052b01e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1",
   'hexValue': "5204052b01e1",
 },
@@ -2374,7 +2374,7 @@
 }, true), _typeMStruct),
   'typeString': "v.io/v23/vom/testdata.MStruct struct{A bool;B v.io/v23/vom/testdata.NBool bool;C v.io/v23/vom/testdata.MBool bool;D ?v.io/v23/vom/testdata.NStruct struct{A bool;B string;C int64};E typeobject;F any}",
   'hex': "80532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e15209052c0103616263e1e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1552100001b762e696f2f7632332f766f6d2f74657374646174612e4d426f6f6c0101e1593506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1570408012de1514706001d762e696f2f7632332f766f6d2f74657374646174612e4d53747275637401060001410101e1000142012ae1000143012be1000144012ce1000145010ee1000146010fe1e1",
   'hexValue': "5209052c0103616263e1e1",
 },
@@ -2393,7 +2393,7 @@
 ], true), _typeMList),
   'typeString': "v.io/v23/vom/testdata.MList []v.io/v23/vom/testdata.NListUint64 []uint64",
   'hex': "805327030021762e696f2f7632332f766f6d2f74657374646174612e4e4c69737455696e7436340106e1512103001b762e696f2f7632332f766f6d2f74657374646174612e4d4c697374012ae1520703020402000163",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5327030021762e696f2f7632332f766f6d2f74657374646174612e4e4c69737455696e7436340106e1512103001b762e696f2f7632332f766f6d2f74657374646174612e4d4c697374012ae1",
   'hexValue': "520703020402000163",
 },
@@ -2406,7 +2406,7 @@
 ]]]), true), _typeMMap),
   'typeString': "v.io/v23/vom/testdata.MMap map[v.io/v23/vom/testdata.NFloat32 float32]v.io/v23/vom/testdata.NListUint64 []uint64",
   'hex': "80532400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae15527030021762e696f2f7632332f766f6d2f74657374646174612e4e4c69737455696e7436340106e1512205001a762e696f2f7632332f766f6d2f74657374646174612e4d4d6170012a022be1520701fe1240020203",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae15527030021762e696f2f7632332f766f6d2f74657374646174612e4e4c69737455696e7436340106e1512205001a762e696f2f7632332f766f6d2f74657374646174612e4d4d6170012a022be1",
   'hexValue': "520701fe1240020203",
 },
@@ -2422,7 +2422,7 @@
 ], true), _typeRecA),
   'typeString': "v.io/v23/vom/testdata.RecA []v.io/v23/vom/testdata.RecA",
   'hex': "80512003001a762e696f2f7632332f766f6d2f74657374646174612e526563410129e1520402000100",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512003001a762e696f2f7632332f766f6d2f74657374646174612e526563410129e1",
   'hexValue': "520402000100",
 },
@@ -2440,7 +2440,7 @@
 ], true), _typeRecX),
   'typeString': "v.io/v23/vom/testdata.RecX []v.io/v23/vom/testdata.RecY []v.io/v23/vom/testdata.RecX",
   'hex': "80532003001a762e696f2f7632332f766f6d2f74657374646174612e526563590129e1512003001a762e696f2f7632332f766f6d2f74657374646174612e52656358012ae152050200020000",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "532003001a762e696f2f7632332f766f6d2f74657374646174612e526563590129e1512003001a762e696f2f7632332f766f6d2f74657374646174612e52656358012ae1",
   'hexValue': "52050200020000",
 },
@@ -2453,7 +2453,7 @@
 }, true), _typeRecStruct),
   'typeString': "v.io/v23/vom/testdata.RecStruct struct{A ?v.io/v23/vom/testdata.RecStruct}",
   'hex': "805304080129e1512b06001f762e696f2f7632332f766f6d2f74657374646174612e5265635374727563740101000141012ae1e1520300e1e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5304080129e1512b06001f762e696f2f7632332f766f6d2f74657374646174612e5265635374727563740101000141012ae1e1",
   'hexValue': "520300e1e1",
 },
@@ -2468,7 +2468,7 @@
 }, true), _typeRecStruct),
   'typeString': "v.io/v23/vom/testdata.RecStruct struct{A ?v.io/v23/vom/testdata.RecStruct}",
   'hex': "805304080129e1512b06001f762e696f2f7632332f766f6d2f74657374646174612e5265635374727563740101000141012ae1e152050000e1e1e1",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5304080129e1512b06001f762e696f2f7632332f766f6d2f74657374646174612e5265635374727563740101000141012ae1e1",
   'hexValue': "52050000e1e1e1",
 },
@@ -2477,7 +2477,7 @@
   'value': vdl.types.ANY,
   'typeString': "typeobject",
   'hex': "801c0f",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c0f",
 },
@@ -2486,7 +2486,7 @@
   'value': vdl.types.BOOL,
   'typeString': "typeobject",
   'hex': "801c01",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c01",
 },
@@ -2495,7 +2495,7 @@
   'value': vdl.types.UINT16,
   'typeString': "typeobject",
   'hex': "801c04",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c04",
 },
@@ -2504,7 +2504,7 @@
   'value': vdl.types.UINT32,
   'typeString': "typeobject",
   'hex': "801c05",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c05",
 },
@@ -2513,7 +2513,7 @@
   'value': vdl.types.UINT64,
   'typeString': "typeobject",
   'hex': "801c06",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c06",
 },
@@ -2522,7 +2522,7 @@
   'value': vdl.types.INT16,
   'typeString': "typeobject",
   'hex': "801c07",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c07",
 },
@@ -2531,7 +2531,7 @@
   'value': vdl.types.INT32,
   'typeString': "typeobject",
   'hex': "801c08",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c08",
 },
@@ -2540,7 +2540,7 @@
   'value': vdl.types.INT64,
   'typeString': "typeobject",
   'hex': "801c09",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c09",
 },
@@ -2549,7 +2549,7 @@
   'value': vdl.types.INT16,
   'typeString': "typeobject",
   'hex': "801c07",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c07",
 },
@@ -2558,7 +2558,7 @@
   'value': vdl.types.INT32,
   'typeString': "typeobject",
   'hex': "801c08",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c08",
 },
@@ -2567,7 +2567,7 @@
   'value': vdl.types.INT64,
   'typeString': "typeobject",
   'hex': "801c09",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c09",
 },
@@ -2576,7 +2576,7 @@
   'value': vdl.types.FLOAT32,
   'typeString': "typeobject",
   'hex': "801c0a",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c0a",
 },
@@ -2585,7 +2585,7 @@
   'value': vdl.types.FLOAT64,
   'typeString': "typeobject",
   'hex': "801c0b",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c0b",
 },
@@ -2594,7 +2594,7 @@
   'value': vdl.types.COMPLEX64,
   'typeString': "typeobject",
   'hex': "801c0c",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c0c",
 },
@@ -2603,7 +2603,7 @@
   'value': vdl.types.COMPLEX128,
   'typeString': "typeobject",
   'hex': "801c0d",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "",
   'hexValue': "1c0d",
 },
@@ -2612,7 +2612,7 @@
   'value': _typeNBool,
   'typeString': "typeobject",
   'hex': "80512100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512100001b762e696f2f7632332f766f6d2f74657374646174612e4e426f6f6c0101e1",
   'hexValue': "1c29",
 },
@@ -2621,7 +2621,7 @@
   'value': _typeNUint16,
   'typeString': "typeobject",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7431360104e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7431360104e1",
   'hexValue': "1c29",
 },
@@ -2630,7 +2630,7 @@
   'value': _typeNUint32,
   'typeString': "typeobject",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7433320105e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7433320105e1",
   'hexValue': "1c29",
 },
@@ -2639,7 +2639,7 @@
   'value': _typeNUint64,
   'typeString': "typeobject",
   'hex': "80512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7436340106e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512300001d762e696f2f7632332f766f6d2f74657374646174612e4e55696e7436340106e1",
   'hexValue': "1c29",
 },
@@ -2648,7 +2648,7 @@
   'value': _typeNInt16,
   'typeString': "typeobject",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7431360107e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7431360107e1",
   'hexValue': "1c29",
 },
@@ -2657,7 +2657,7 @@
   'value': _typeNInt32,
   'typeString': "typeobject",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7433320108e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7433320108e1",
   'hexValue': "1c29",
 },
@@ -2666,7 +2666,7 @@
   'value': _typeNInt64,
   'typeString': "typeobject",
   'hex': "80512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7436340109e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512200001c762e696f2f7632332f766f6d2f74657374646174612e4e496e7436340109e1",
   'hexValue': "1c29",
 },
@@ -2675,7 +2675,7 @@
   'value': _typeNFloat32,
   'typeString': "typeobject",
   'hex': "80512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743332010ae1",
   'hexValue': "1c29",
 },
@@ -2684,7 +2684,7 @@
   'value': _typeNFloat64,
   'typeString': "typeobject",
   'hex': "80512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743634010be11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512400001e762e696f2f7632332f766f6d2f74657374646174612e4e466c6f61743634010be1",
   'hexValue': "1c29",
 },
@@ -2693,7 +2693,7 @@
   'value': _typeNComplex64,
   'typeString': "typeobject",
   'hex': "805126000020762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c65783634010ce11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126000020762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c65783634010ce1",
   'hexValue': "1c29",
 },
@@ -2702,7 +2702,7 @@
   'value': _typeNComplex128,
   'typeString': "typeobject",
   'hex': "805127000021762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c6578313238010de11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5127000021762e696f2f7632332f766f6d2f74657374646174612e4e436f6d706c6578313238010de1",
   'hexValue': "1c29",
 },
@@ -2711,7 +2711,7 @@
   'value': _typeNArray2Uint64,
   'typeString': "typeobject",
   'hex': "80512b020023762e696f2f7632332f766f6d2f74657374646174612e4e41727261793255696e74363401060202e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512b020023762e696f2f7632332f766f6d2f74657374646174612e4e41727261793255696e74363401060202e1",
   'hexValue': "1c29",
 },
@@ -2720,7 +2720,7 @@
   'value': _type3,
   'typeString': "typeobject",
   'hex': "805104030106e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5104030106e1",
   'hexValue': "1c29",
 },
@@ -2729,7 +2729,7 @@
   'value': _typeNListUint64,
   'typeString': "typeobject",
   'hex': "805127030021762e696f2f7632332f766f6d2f74657374646174612e4e4c69737455696e7436340106e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5127030021762e696f2f7632332f766f6d2f74657374646174612e4e4c69737455696e7436340106e1",
   'hexValue': "1c29",
 },
@@ -2738,7 +2738,7 @@
   'value': _type4,
   'typeString': "typeobject",
   'hex': "805104040106e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5104040106e1",
   'hexValue': "1c29",
 },
@@ -2747,7 +2747,7 @@
   'value': _typeNSetUint64,
   'typeString': "typeobject",
   'hex': "805126040020762e696f2f7632332f766f6d2f74657374646174612e4e53657455696e7436340106e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "5126040020762e696f2f7632332f766f6d2f74657374646174612e4e53657455696e7436340106e1",
   'hexValue': "1c29",
 },
@@ -2756,7 +2756,7 @@
   'value': _type5,
   'typeString': "typeobject",
   'hex': "8051060501060203e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "51060501060203e1",
   'hexValue': "1c29",
 },
@@ -2765,7 +2765,7 @@
   'value': _typeNMapUint64String,
   'typeString': "typeobject",
   'hex': "80512e050026762e696f2f7632332f766f6d2f74657374646174612e4e4d617055696e743634537472696e6701060203e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512e050026762e696f2f7632332f766f6d2f74657374646174612e4e4d617055696e743634537472696e6701060203e1",
   'hexValue': "1c29",
 },
@@ -2774,7 +2774,7 @@
   'value': _typeNStruct,
   'typeString': "typeobject",
   'hex': "80513506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513506001d762e696f2f7632332f766f6d2f74657374646174612e4e53747275637401030001410101e10001420103e10001430109e1e1",
   'hexValue': "1c29",
 },
@@ -2783,7 +2783,7 @@
   'value': _typeNEnum,
   'typeString': "typeobject",
   'hex': "80512701001b762e696f2f7632332f766f6d2f74657374646174612e4e456e756d0103014101420143e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "512701001b762e696f2f7632332f766f6d2f74657374646174612e4e456e756d0103014101420143e1",
   'hexValue': "1c29",
 },
@@ -2792,7 +2792,7 @@
   'value': _typeNUnion,
   'typeString': "typeobject",
   'hex': "80513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e11c29",
-  'hexMagic': "80",
+  'hexVersion': "80",
   'hexType': "513407001c762e696f2f7632332f766f6d2f74657374646174612e4e556e696f6e01030001410101e10001420103e10001430109e1e1",
   'hexValue': "1c29",
 },