diff --git a/src/gen-vdl/v.io/v23/vom/index.js b/src/gen-vdl/v.io/v23/vom/index.js
index 92e1a41..b667afe 100644
--- a/src/gen-vdl/v.io/v23/vom/index.js
+++ b/src/gen-vdl/v.io/v23/vom/index.js
@@ -202,6 +202,8 @@
 
   module.exports.WireCtrlTypeLastChunk = canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.BYTE))(231, true), vdl.types.BYTE);
 
+  module.exports.WireCtrlTypeIncomplete = canonicalize.reduce(new (vdl.registry.lookupOrCreateConstructor(vdl.types.BYTE))(232, true), vdl.types.BYTE);
+
 
 
 // Errors:
diff --git a/src/gen-vdl/v.io/v23/vom/testdata/data80/index.js b/src/gen-vdl/v.io/v23/vom/testdata/data80/index.js
index 67280ff..93e5b7f 100644
--- a/src/gen-vdl/v.io/v23/vom/testdata/data80/index.js
+++ b/src/gen-vdl/v.io/v23/vom/testdata/data80/index.js
@@ -2066,6 +2066,24 @@
   'hexValue': "52050200020000",
 },
 {
+  'name': "types.Rec1{{{{{}}}}}",
+  'value': canonicalize.reduce(new types.Rec1([
+[
+[
+[
+[
+],
+],
+],
+],
+], true), new types.Rec1()._type),
+  'typeString': "v.io/v23/vom/testdata/types.Rec1 []v.io/v23/vom/testdata/types.Rec2 []v.io/v23/vom/testdata/types.Rec3 []v.io/v23/vom/testdata/types.Rec4 []v.io/v23/vom/testdata/types.Rec1",
+  'hex': "805726030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563340129e15526030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656333012ce15326030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656332012be15126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331012ae152050101010100",
+  'hexVersion': "80",
+  'hexType': "5726030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563340129e15526030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656333012ce15326030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656332012be15126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331012ae1",
+  'hexValue': "52050101010100",
+},
+{
   'name': "types.RecStruct{A: {}}",
   'value': canonicalize.reduce(new types.RecStruct({
   'a': {
@@ -2094,6 +2112,62 @@
   'hexValue': "52050000e1e1e1",
 },
 {
+  'name': "types.Rec1234All{A: {A: {{}}, Rec1234: {{}}}, B: {B: {{}}, Rec1234: {{R2: {{}}}}}}",
+  'value': canonicalize.reduce(new types.Rec1234All({
+  'a': {
+  'a': [
+{
+  'a': [
+],
+  'rec1234': [
+],
+},
+],
+  'rec1234': [
+{
+  'r1': [
+],
+  'r2': [
+],
+  'r3': [
+],
+  'r4': [
+],
+},
+],
+},
+  'b': {
+  'b': [
+{
+  'b': [
+],
+  'rec1234': [
+],
+},
+],
+  'rec1234': [
+{
+  'r1': [
+],
+  'r2': [
+[
+],
+],
+  'r3': [
+],
+  'r4': [
+],
+},
+],
+},
+}, true), new types.Rec1234All()._type),
+  'typeString': "v.io/v23/vom/testdata/types.Rec1234All struct{A v.io/v23/vom/testdata/types.Rec1234A struct{A []v.io/v23/vom/testdata/types.Rec1234A;Rec1234 []v.io/v23/vom/testdata/types.Rec1234 struct{R1 v.io/v23/vom/testdata/types.Rec1 []v.io/v23/vom/testdata/types.Rec2 []v.io/v23/vom/testdata/types.Rec3 []v.io/v23/vom/testdata/types.Rec4 []v.io/v23/vom/testdata/types.Rec1;R2 v.io/v23/vom/testdata/types.Rec2;R3 v.io/v23/vom/testdata/types.Rec3;R4 v.io/v23/vom/testdata/types.Rec4}};B v.io/v23/vom/testdata/types.Rec1234B struct{B []v.io/v23/vom/testdata/types.Rec1234B;Rec1234 []v.io/v23/vom/testdata/types.Rec1234}}",
+  'hex': "80550403012ae16126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656334012ee15f26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563330131e15d26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563320130e15b26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331012fe15945060023762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334010400025231012ee100025232012fe1000252330130e1000252340131e1e1570403012de1533c060024762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334410102000141012be1000752656331323334012ce1e16504030132e1633c060024762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563313233344201020001420133e1000752656331323334012ce1e15138060026762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334416c6c0102000141012ae10001420132e1e15214000001e10101e1e1010001e10101010100e1e1e1",
+  'hexVersion': "80",
+  'hexType': "550403012ae16126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656334012ee15f26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563330131e15d26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563320130e15b26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331012fe15945060023762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334010400025231012ee100025232012fe1000252330130e1000252340131e1e1570403012de1533c060024762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334410102000141012be1000752656331323334012ce1e16504030132e1633c060024762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563313233344201020001420133e1000752656331323334012ce1e15138060026762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334416c6c0102000141012ae10001420132e1e1",
+  'hexValue': "5214000001e10101e1e1010001e10101010100e1e1e1",
+},
+{
   'name': "typeobject(any)",
   'value': vdl.types.ANY,
   'typeString': "typeobject",
diff --git a/src/gen-vdl/v.io/v23/vom/testdata/data81/index.js b/src/gen-vdl/v.io/v23/vom/testdata/data81/index.js
index be3a6f9..f18044a 100644
--- a/src/gen-vdl/v.io/v23/vom/testdata/data81/index.js
+++ b/src/gen-vdl/v.io/v23/vom/testdata/data81/index.js
@@ -2060,12 +2060,30 @@
 ],
 ], true), new types.RecX()._type),
   'typeString': "v.io/v23/vom/testdata/types.RecX []v.io/v23/vom/testdata/types.RecY []v.io/v23/vom/testdata/types.RecX",
-  'hex': "815326030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563590129e15126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656358012ae152050200020000",
+  'hex': "81e85326030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563590129e15126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656358012ae152050200020000",
   'hexVersion': "81",
-  'hexType': "5326030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563590129e15126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656358012ae1",
+  'hexType': "e85326030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563590129e15126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656358012ae1",
   'hexValue': "52050200020000",
 },
 {
+  'name': "types.Rec1{{{{{}}}}}",
+  'value': canonicalize.reduce(new types.Rec1([
+[
+[
+[
+[
+],
+],
+],
+],
+], true), new types.Rec1()._type),
+  'typeString': "v.io/v23/vom/testdata/types.Rec1 []v.io/v23/vom/testdata/types.Rec2 []v.io/v23/vom/testdata/types.Rec3 []v.io/v23/vom/testdata/types.Rec4 []v.io/v23/vom/testdata/types.Rec1",
+  'hex': "81e85726030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563340129e1e85526030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656333012ce1e85326030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656332012be15126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331012ae152050101010100",
+  'hexVersion': "81",
+  'hexType': "e85726030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563340129e1e85526030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656333012ce1e85326030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656332012be15126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331012ae1",
+  'hexValue': "52050101010100",
+},
+{
   'name': "types.RecStruct{A: {}}",
   'value': canonicalize.reduce(new types.RecStruct({
   'a': {
@@ -2073,9 +2091,9 @@
 },
 }, true), new types.RecStruct()._type),
   'typeString': "v.io/v23/vom/testdata/types.RecStruct struct{A ?v.io/v23/vom/testdata/types.RecStruct}",
-  'hex': "815304080129e15131060025762e696f2f7632332f766f6d2f74657374646174612f74797065732e5265635374727563740101000141012ae1e1520300e1e1",
+  'hex': "81e85304080129e15131060025762e696f2f7632332f766f6d2f74657374646174612f74797065732e5265635374727563740101000141012ae1e1520300e1e1",
   'hexVersion': "81",
-  'hexType': "5304080129e15131060025762e696f2f7632332f766f6d2f74657374646174612f74797065732e5265635374727563740101000141012ae1e1",
+  'hexType': "e85304080129e15131060025762e696f2f7632332f766f6d2f74657374646174612f74797065732e5265635374727563740101000141012ae1e1",
   'hexValue': "520300e1e1",
 },
 {
@@ -2088,12 +2106,68 @@
 },
 }, true), new types.RecStruct()._type),
   'typeString': "v.io/v23/vom/testdata/types.RecStruct struct{A ?v.io/v23/vom/testdata/types.RecStruct}",
-  'hex': "815304080129e15131060025762e696f2f7632332f766f6d2f74657374646174612f74797065732e5265635374727563740101000141012ae1e152050000e1e1e1",
+  'hex': "81e85304080129e15131060025762e696f2f7632332f766f6d2f74657374646174612f74797065732e5265635374727563740101000141012ae1e152050000e1e1e1",
   'hexVersion': "81",
-  'hexType': "5304080129e15131060025762e696f2f7632332f766f6d2f74657374646174612f74797065732e5265635374727563740101000141012ae1e1",
+  'hexType': "e85304080129e15131060025762e696f2f7632332f766f6d2f74657374646174612f74797065732e5265635374727563740101000141012ae1e1",
   'hexValue': "52050000e1e1e1",
 },
 {
+  'name': "types.Rec1234All{A: {A: {{}}, Rec1234: {{}}}, B: {B: {{}}, Rec1234: {{R2: {{}}}}}}",
+  'value': canonicalize.reduce(new types.Rec1234All({
+  'a': {
+  'a': [
+{
+  'a': [
+],
+  'rec1234': [
+],
+},
+],
+  'rec1234': [
+{
+  'r1': [
+],
+  'r2': [
+],
+  'r3': [
+],
+  'r4': [
+],
+},
+],
+},
+  'b': {
+  'b': [
+{
+  'b': [
+],
+  'rec1234': [
+],
+},
+],
+  'rec1234': [
+{
+  'r1': [
+],
+  'r2': [
+[
+],
+],
+  'r3': [
+],
+  'r4': [
+],
+},
+],
+},
+}, true), new types.Rec1234All()._type),
+  'typeString': "v.io/v23/vom/testdata/types.Rec1234All struct{A v.io/v23/vom/testdata/types.Rec1234A struct{A []v.io/v23/vom/testdata/types.Rec1234A;Rec1234 []v.io/v23/vom/testdata/types.Rec1234 struct{R1 v.io/v23/vom/testdata/types.Rec1 []v.io/v23/vom/testdata/types.Rec2 []v.io/v23/vom/testdata/types.Rec3 []v.io/v23/vom/testdata/types.Rec4 []v.io/v23/vom/testdata/types.Rec1;R2 v.io/v23/vom/testdata/types.Rec2;R3 v.io/v23/vom/testdata/types.Rec3;R4 v.io/v23/vom/testdata/types.Rec4}};B v.io/v23/vom/testdata/types.Rec1234B struct{B []v.io/v23/vom/testdata/types.Rec1234B;Rec1234 []v.io/v23/vom/testdata/types.Rec1234}}",
+  'hex': "81e8550403012ae1e86126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656334012ee1e85f26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563330131e1e85d26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563320130e15b26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331012fe15945060023762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334010400025231012ee100025232012fe1000252330130e1000252340131e1e1570403012de1533c060024762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334410102000141012be1000752656331323334012ce1e1e86504030132e1633c060024762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563313233344201020001420133e1000752656331323334012ce1e15138060026762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334416c6c0102000141012ae10001420132e1e15214000001e10101e1e1010001e10101010100e1e1e1",
+  'hexVersion': "81",
+  'hexType': "e8550403012ae1e86126030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656334012ee1e85f26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563330131e1e85d26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563320130e15b26030020762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331012fe15945060023762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334010400025231012ee100025232012fe1000252330130e1000252340131e1e1570403012de1533c060024762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334410102000141012be1000752656331323334012ce1e1e86504030132e1633c060024762e696f2f7632332f766f6d2f74657374646174612f74797065732e526563313233344201020001420133e1000752656331323334012ce1e15138060026762e696f2f7632332f766f6d2f74657374646174612f74797065732e52656331323334416c6c0102000141012ae10001420132e1e1",
+  'hexValue': "5214000001e10101e1e1010001e10101010100e1e1e1",
+},
+{
   'name': "typeobject(any)",
   'value': vdl.types.ANY,
   'typeString': "typeobject",
diff --git a/src/gen-vdl/v.io/v23/vom/testdata/types/index.js b/src/gen-vdl/v.io/v23/vom/testdata/types/index.js
index 02a5ffa..7d9623a 100644
--- a/src/gen-vdl/v.io/v23/vom/testdata/types/index.js
+++ b/src/gen-vdl/v.io/v23/vom/testdata/types/index.js
@@ -20,6 +20,9 @@
 var _type10 = new vdl.Type();
 var _type11 = new vdl.Type();
 var _type12 = new vdl.Type();
+var _type13 = new vdl.Type();
+var _type14 = new vdl.Type();
+var _type15 = new vdl.Type();
 var _type2 = new vdl.Type();
 var _type3 = new vdl.Type();
 var _type4 = new vdl.Type();
@@ -78,6 +81,14 @@
 var _typeNUint32 = new vdl.Type();
 var _typeNUint64 = new vdl.Type();
 var _typeNUnion = new vdl.Type();
+var _typeRec1 = new vdl.Type();
+var _typeRec1234 = new vdl.Type();
+var _typeRec1234A = new vdl.Type();
+var _typeRec1234All = new vdl.Type();
+var _typeRec1234B = new vdl.Type();
+var _typeRec2 = new vdl.Type();
+var _typeRec3 = new vdl.Type();
+var _typeRec4 = new vdl.Type();
 var _typeRecA = new vdl.Type();
 var _typeRecStruct = new vdl.Type();
 var _typeRecX = new vdl.Type();
@@ -103,13 +114,23 @@
 _type1.elem = vdl.types.ANY;
 _type10.kind = vdl.kind.LIST;
 _type10.name = "";
-_type10.elem = vdl.types.BYTE;
-_type11.kind = vdl.kind.OPTIONAL;
+_type10.elem = _typeRec1234;
+_type11.kind = vdl.kind.LIST;
 _type11.name = "";
-_type11.elem = _typeLargeMessageType;
-_type12.kind = vdl.kind.OPTIONAL;
+_type11.elem = _typeRec1234B;
+_type12.kind = vdl.kind.MAP;
 _type12.name = "";
-_type12.elem = _typeLargeAnyMessageType;
+_type12.elem = vdl.types.INT64;
+_type12.key = vdl.types.INT64;
+_type13.kind = vdl.kind.LIST;
+_type13.name = "";
+_type13.elem = vdl.types.BYTE;
+_type14.kind = vdl.kind.OPTIONAL;
+_type14.name = "";
+_type14.elem = _typeLargeMessageType;
+_type15.kind = vdl.kind.OPTIONAL;
+_type15.name = "";
+_type15.elem = _typeLargeAnyMessageType;
 _type2.kind = vdl.kind.MAP;
 _type2.name = "";
 _type2.elem = _type1;
@@ -134,10 +155,9 @@
 _type8.kind = vdl.kind.OPTIONAL;
 _type8.name = "";
 _type8.elem = _typeRecStruct;
-_type9.kind = vdl.kind.MAP;
+_type9.kind = vdl.kind.LIST;
 _type9.name = "";
-_type9.elem = vdl.types.INT64;
-_type9.key = vdl.types.INT64;
+_type9.elem = _typeRec1234A;
 _typeAbcStruct.kind = vdl.kind.STRUCT;
 _typeAbcStruct.name = "v.io/v23/vom/testdata/types.AbcStruct";
 _typeAbcStruct.fields = [{name: "A", type: vdl.types.BOOL}, {name: "B", type: vdl.types.STRING}, {name: "C", type: vdl.types.INT64}];
@@ -172,10 +192,10 @@
 _typeFoodEnum.labels = ["Bean", "Brie", "Cherry"];
 _typeLargeAnyMessageType.kind = vdl.kind.STRUCT;
 _typeLargeAnyMessageType.name = "v.io/v23/vom/testdata/types.LargeAnyMessageType";
-_typeLargeAnyMessageType.fields = [{name: "Payload", type: vdl.types.ANY}, {name: "Next", type: _type12}];
+_typeLargeAnyMessageType.fields = [{name: "Payload", type: vdl.types.ANY}, {name: "Next", type: _type15}];
 _typeLargeMessageType.kind = vdl.kind.STRUCT;
 _typeLargeMessageType.name = "v.io/v23/vom/testdata/types.LargeMessageType";
-_typeLargeMessageType.fields = [{name: "Payload", type: _type10}, {name: "Next", type: _type11}];
+_typeLargeMessageType.fields = [{name: "Payload", type: _type13}, {name: "Next", type: _type14}];
 _typeListString.kind = vdl.kind.LIST;
 _typeListString.name = "v.io/v23/vom/testdata/types.ListString";
 _typeListString.elem = vdl.types.STRING;
@@ -283,6 +303,30 @@
 _typeNUnion.kind = vdl.kind.UNION;
 _typeNUnion.name = "v.io/v23/vom/testdata/types.NUnion";
 _typeNUnion.fields = [{name: "A", type: vdl.types.BOOL}, {name: "B", type: vdl.types.STRING}, {name: "C", type: vdl.types.INT64}];
+_typeRec1.kind = vdl.kind.LIST;
+_typeRec1.name = "v.io/v23/vom/testdata/types.Rec1";
+_typeRec1.elem = _typeRec2;
+_typeRec1234.kind = vdl.kind.STRUCT;
+_typeRec1234.name = "v.io/v23/vom/testdata/types.Rec1234";
+_typeRec1234.fields = [{name: "R1", type: _typeRec1}, {name: "R2", type: _typeRec2}, {name: "R3", type: _typeRec3}, {name: "R4", type: _typeRec4}];
+_typeRec1234A.kind = vdl.kind.STRUCT;
+_typeRec1234A.name = "v.io/v23/vom/testdata/types.Rec1234A";
+_typeRec1234A.fields = [{name: "A", type: _type9}, {name: "Rec1234", type: _type10}];
+_typeRec1234All.kind = vdl.kind.STRUCT;
+_typeRec1234All.name = "v.io/v23/vom/testdata/types.Rec1234All";
+_typeRec1234All.fields = [{name: "A", type: _typeRec1234A}, {name: "B", type: _typeRec1234B}];
+_typeRec1234B.kind = vdl.kind.STRUCT;
+_typeRec1234B.name = "v.io/v23/vom/testdata/types.Rec1234B";
+_typeRec1234B.fields = [{name: "B", type: _type11}, {name: "Rec1234", type: _type10}];
+_typeRec2.kind = vdl.kind.LIST;
+_typeRec2.name = "v.io/v23/vom/testdata/types.Rec2";
+_typeRec2.elem = _typeRec3;
+_typeRec3.kind = vdl.kind.LIST;
+_typeRec3.name = "v.io/v23/vom/testdata/types.Rec3";
+_typeRec3.elem = _typeRec4;
+_typeRec4.kind = vdl.kind.LIST;
+_typeRec4.name = "v.io/v23/vom/testdata/types.Rec4";
+_typeRec4.elem = _typeRec1;
 _typeRecA.kind = vdl.kind.LIST;
 _typeRecA.name = "v.io/v23/vom/testdata/types.RecA";
 _typeRecA.elem = _typeRecA;
@@ -324,10 +368,10 @@
 _typeStructAny.fields = [{name: "Any", type: vdl.types.ANY}];
 _typeStructManyTypes.kind = vdl.kind.STRUCT;
 _typeStructManyTypes.name = "v.io/v23/vom/testdata/types.StructManyTypes";
-_typeStructManyTypes.fields = [{name: "Bool", type: vdl.types.BOOL}, {name: "AByte", type: vdl.types.BYTE}, {name: "Int16", type: vdl.types.INT16}, {name: "Int32", type: vdl.types.INT32}, {name: "Int64", type: vdl.types.INT64}, {name: "Uint16", type: vdl.types.UINT16}, {name: "Uint32", type: vdl.types.UINT32}, {name: "Uint64", type: vdl.types.UINT64}, {name: "String", type: vdl.types.STRING}, {name: "Bytes", type: _type10}, {name: "Float32", type: vdl.types.FLOAT32}, {name: "Float64", type: vdl.types.FLOAT64}, {name: "Complex64", type: vdl.types.COMPLEX64}, {name: "Complex128", type: vdl.types.COMPLEX128}, {name: "FoodEnum", type: _typeFoodEnum}, {name: "NEnum", type: _typeNEnum}, {name: "NListUint64", type: _typeNListUint64}, {name: "NByteArray", type: _typeNByteArray}, {name: "NArray2Uint64", type: _typeNArray2Uint64}, {name: "NSetUint64", type: _typeNSetUint64}, {name: "NMapUint64String", type: _typeNMapUint64String}, {name: "NStruct", type: _typeNStruct}, {name: "NUnion", type: _typeNUnion}, {name: "TypeObject", type: vdl.types.TYPEOBJECT}];
+_typeStructManyTypes.fields = [{name: "Bool", type: vdl.types.BOOL}, {name: "AByte", type: vdl.types.BYTE}, {name: "Int16", type: vdl.types.INT16}, {name: "Int32", type: vdl.types.INT32}, {name: "Int64", type: vdl.types.INT64}, {name: "Uint16", type: vdl.types.UINT16}, {name: "Uint32", type: vdl.types.UINT32}, {name: "Uint64", type: vdl.types.UINT64}, {name: "String", type: vdl.types.STRING}, {name: "Bytes", type: _type13}, {name: "Float32", type: vdl.types.FLOAT32}, {name: "Float64", type: vdl.types.FLOAT64}, {name: "Complex64", type: vdl.types.COMPLEX64}, {name: "Complex128", type: vdl.types.COMPLEX128}, {name: "FoodEnum", type: _typeFoodEnum}, {name: "NEnum", type: _typeNEnum}, {name: "NListUint64", type: _typeNListUint64}, {name: "NByteArray", type: _typeNByteArray}, {name: "NArray2Uint64", type: _typeNArray2Uint64}, {name: "NSetUint64", type: _typeNSetUint64}, {name: "NMapUint64String", type: _typeNMapUint64String}, {name: "NStruct", type: _typeNStruct}, {name: "NUnion", type: _typeNUnion}, {name: "TypeObject", type: vdl.types.TYPEOBJECT}];
 _typeStructMap.kind = vdl.kind.STRUCT;
 _typeStructMap.name = "v.io/v23/vom/testdata/types.StructMap";
-_typeStructMap.fields = [{name: "Map", type: _type9}];
+_typeStructMap.fields = [{name: "Map", type: _type12}];
 _typeStructOnlyMap.kind = vdl.kind.MAP;
 _typeStructOnlyMap.name = "v.io/v23/vom/testdata/types.StructOnlyMap";
 _typeStructOnlyMap.elem = vdl.types.UINT64;
@@ -351,6 +395,9 @@
 _type10.freeze();
 _type11.freeze();
 _type12.freeze();
+_type13.freeze();
+_type14.freeze();
+_type15.freeze();
 _type2.freeze();
 _type3.freeze();
 _type4.freeze();
@@ -409,6 +456,14 @@
 _typeNUint32.freeze();
 _typeNUint64.freeze();
 _typeNUnion.freeze();
+_typeRec1.freeze();
+_typeRec1234.freeze();
+_typeRec1234A.freeze();
+_typeRec1234All.freeze();
+_typeRec1234B.freeze();
+_typeRec2.freeze();
+_typeRec3.freeze();
+_typeRec4.freeze();
 _typeRecA.freeze();
 _typeRecStruct.freeze();
 _typeRecX.freeze();
@@ -493,6 +548,14 @@
 module.exports.NUint32 = (vdl.registry.lookupOrCreateConstructor(_typeNUint32));
 module.exports.NUint64 = (vdl.registry.lookupOrCreateConstructor(_typeNUint64));
 module.exports.NUnion = (vdl.registry.lookupOrCreateConstructor(_typeNUnion));
+module.exports.Rec1 = (vdl.registry.lookupOrCreateConstructor(_typeRec1));
+module.exports.Rec1234 = (vdl.registry.lookupOrCreateConstructor(_typeRec1234));
+module.exports.Rec1234A = (vdl.registry.lookupOrCreateConstructor(_typeRec1234A));
+module.exports.Rec1234All = (vdl.registry.lookupOrCreateConstructor(_typeRec1234All));
+module.exports.Rec1234B = (vdl.registry.lookupOrCreateConstructor(_typeRec1234B));
+module.exports.Rec2 = (vdl.registry.lookupOrCreateConstructor(_typeRec2));
+module.exports.Rec3 = (vdl.registry.lookupOrCreateConstructor(_typeRec3));
+module.exports.Rec4 = (vdl.registry.lookupOrCreateConstructor(_typeRec4));
 module.exports.RecA = (vdl.registry.lookupOrCreateConstructor(_typeRecA));
 module.exports.RecStruct = (vdl.registry.lookupOrCreateConstructor(_typeRecStruct));
 module.exports.RecX = (vdl.registry.lookupOrCreateConstructor(_typeRecX));