diff --git a/compiler/c.capnp.c b/compiler/c.capnp.c
index f940824..205311c 100644
--- a/compiler/c.capnp.c
+++ b/compiler/c.capnp.c
@@ -1,2 +1,10 @@
 #include "c.capnp.h"
 /* AUTO GENERATED - DO NOT EDIT */
+#ifdef __GNUC__
+# define capnp_unused __attribute__((unused))
+# define capnp_use(x) (void) x;
+#else
+# define capnp_unused
+# define capnp_use(x)
+#endif
+
diff --git a/compiler/c.capnp.h b/compiler/c.capnp.h
index 07f769e..1821338 100644
--- a/compiler/c.capnp.h
+++ b/compiler/c.capnp.h
@@ -7,6 +7,14 @@
 #error "version mismatch between capnp_c.h and generated code"
 #endif
 
+#ifndef capnp_nowarn
+# ifdef __GNUC__
+#  define capnp_nowarn __extension__
+# else
+#  define capnp_nowarn
+# endif
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/compiler/schema.capnp.c b/compiler/schema.capnp.c
index f2dd737..b49645f 100644
--- a/compiler/schema.capnp.c
+++ b/compiler/schema.capnp.c
@@ -761,8 +761,8 @@ void read_Type(struct Type *s capnp_unused, Type_ptr p) {
 		s->_interface.brand.p = capn_getp(p.p, 0, 0);
 		break;
 	case Type_anyPointer:
-		s->anyPointer_which = (enum Type_anyPointer_which)(int) capn_read16(p.p, 8);
-		switch (s->anyPointer_which) {
+		s->anyPointer.which = (enum Type_anyPointer_which)(int) capn_read16(p.p, 8);
+		switch (s->anyPointer.which) {
 		case Type_anyPointer_parameter:
 			s->anyPointer.parameter.scopeId = capn_read64(p.p, 16);
 			s->anyPointer.parameter.parameterIndex = capn_read16(p.p, 10);
@@ -799,8 +799,8 @@ void write_Type(const struct Type *s capnp_unused, Type_ptr p) {
 		capn_setp(p.p, 0, s->_interface.brand.p);
 		break;
 	case Type_anyPointer:
-		capn_write16(p.p, 8, s->anyPointer_which);
-		switch (s->anyPointer_which) {
+		capn_write16(p.p, 8, s->anyPointer.which);
+		switch (s->anyPointer.which) {
 		case Type_anyPointer_parameter:
 			capn_write64(p.p, 16, s->anyPointer.parameter.scopeId);
 			capn_write16(p.p, 10, s->anyPointer.parameter.parameterIndex);
diff --git a/compiler/schema.capnp.h b/compiler/schema.capnp.h
index 665b243..c986fbc 100644
--- a/compiler/schema.capnp.h
+++ b/compiler/schema.capnp.h
@@ -15,8 +15,6 @@
 # endif
 #endif
 
-#include "c++.capnp.h"
-#include "c.capnp.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -148,6 +146,7 @@ static const size_t Node_pointer_count = 6;
 
 static const size_t Node_struct_bytes_count = 88;
 
+
 uint64_t Node_get_id(Node_ptr p);
 
 capn_text Node_get_displayName(Node_ptr p);
@@ -190,6 +189,7 @@ static const size_t Node_Parameter_pointer_count = 1;
 
 static const size_t Node_Parameter_struct_bytes_count = 8;
 
+
 capn_text Node_Parameter_get_name(Node_Parameter_ptr p);
 
 void Node_Parameter_set_name(Node_Parameter_ptr p, capn_text name);
@@ -205,6 +205,7 @@ static const size_t Node_NestedNode_pointer_count = 1;
 
 static const size_t Node_NestedNode_struct_bytes_count = 16;
 
+
 capn_text Node_NestedNode_get_name(Node_NestedNode_ptr p);
 
 uint64_t Node_NestedNode_get_id(Node_NestedNode_ptr p);
@@ -250,6 +251,7 @@ static const size_t Field_pointer_count = 4;
 
 static const size_t Field_struct_bytes_count = 56;
 
+
 capn_text Field_get_name(Field_ptr p);
 
 uint16_t Field_get_codeOrder(Field_ptr p);
@@ -278,6 +280,7 @@ static const size_t Enumerant_pointer_count = 2;
 
 static const size_t Enumerant_struct_bytes_count = 24;
 
+
 capn_text Enumerant_get_name(Enumerant_ptr p);
 
 uint16_t Enumerant_get_codeOrder(Enumerant_ptr p);
@@ -301,6 +304,7 @@ static const size_t Superclass_pointer_count = 1;
 
 static const size_t Superclass_struct_bytes_count = 16;
 
+
 uint64_t Superclass_get_id(Superclass_ptr p);
 
 Brand_ptr Superclass_get_brand(Superclass_ptr p);
@@ -326,6 +330,7 @@ static const size_t Method_pointer_count = 5;
 
 static const size_t Method_struct_bytes_count = 64;
 
+
 capn_text Method_get_name(Method_ptr p);
 
 uint16_t Method_get_codeOrder(Method_ptr p);
@@ -402,15 +407,17 @@ struct Type {
 			uint64_t typeId;
 			Brand_ptr brand;
 		} _interface;
-		enum Type_anyPointer_which anyPointer_which;
-		capnp_nowarn union {
-			capnp_nowarn struct {
-				uint64_t scopeId;
-				uint16_t parameterIndex;
-			} parameter;
-			capnp_nowarn struct {
-				uint16_t parameterIndex;
-			} implicitMethodParameter;
+		capnp_nowarn struct {
+			enum Type_anyPointer_which which;
+			capnp_nowarn union {
+				capnp_nowarn struct {
+					uint64_t scopeId;
+					uint16_t parameterIndex;
+				} parameter;
+				capnp_nowarn struct {
+					uint16_t parameterIndex;
+				} implicitMethodParameter;
+			};
 		} anyPointer;
 	};
 };
@@ -421,6 +428,7 @@ static const size_t Type_pointer_count = 1;
 
 static const size_t Type_struct_bytes_count = 32;
 
+
 struct Brand {
 	Brand_Scope_list scopes;
 };
@@ -431,6 +439,7 @@ static const size_t Brand_pointer_count = 1;
 
 static const size_t Brand_struct_bytes_count = 8;
 
+
 Brand_Scope_list Brand_get_scopes(Brand_ptr p);
 
 void Brand_set_scopes(Brand_ptr p, Brand_Scope_list scopes);
@@ -453,6 +462,7 @@ static const size_t Brand_Scope_pointer_count = 1;
 
 static const size_t Brand_Scope_struct_bytes_count = 24;
 
+
 uint64_t Brand_Scope_get_scopeId(Brand_Scope_ptr p);
 
 void Brand_Scope_set_scopeId(Brand_Scope_ptr p, uint64_t scopeId);
@@ -473,6 +483,7 @@ static const size_t Brand_Binding_word_count = 1;
 static const size_t Brand_Binding_pointer_count = 1;
 
 static const size_t Brand_Binding_struct_bytes_count = 16;
+
 enum Value_which {
 	Value__void = 0,
 	Value__bool = 1,
@@ -524,6 +535,7 @@ static const size_t Value_pointer_count = 1;
 
 static const size_t Value_struct_bytes_count = 24;
 
+
 struct Annotation {
 	uint64_t id;
 	Brand_ptr brand;
@@ -536,6 +548,7 @@ static const size_t Annotation_pointer_count = 2;
 
 static const size_t Annotation_struct_bytes_count = 24;
 
+
 uint64_t Annotation_get_id(Annotation_ptr p);
 
 Brand_ptr Annotation_get_brand(Annotation_ptr p);
@@ -559,6 +572,7 @@ static const size_t CodeGeneratorRequest_pointer_count = 2;
 
 static const size_t CodeGeneratorRequest_struct_bytes_count = 16;
 
+
 Node_list CodeGeneratorRequest_get_nodes(CodeGeneratorRequest_ptr p);
 
 CodeGeneratorRequest_RequestedFile_list CodeGeneratorRequest_get_requestedFiles(CodeGeneratorRequest_ptr p);
@@ -579,6 +593,7 @@ static const size_t CodeGeneratorRequest_RequestedFile_pointer_count = 2;
 
 static const size_t CodeGeneratorRequest_RequestedFile_struct_bytes_count = 24;
 
+
 uint64_t CodeGeneratorRequest_RequestedFile_get_id(CodeGeneratorRequest_RequestedFile_ptr p);
 
 capn_text CodeGeneratorRequest_RequestedFile_get_filename(CodeGeneratorRequest_RequestedFile_ptr p);
@@ -602,6 +617,7 @@ static const size_t CodeGeneratorRequest_RequestedFile_Import_pointer_count = 1;
 
 static const size_t CodeGeneratorRequest_RequestedFile_Import_struct_bytes_count = 16;
 
+
 uint64_t CodeGeneratorRequest_RequestedFile_Import_get_id(CodeGeneratorRequest_RequestedFile_Import_ptr p);
 
 capn_text CodeGeneratorRequest_RequestedFile_Import_get_name(CodeGeneratorRequest_RequestedFile_Import_ptr p);
diff --git a/compiler/test.capnp.c b/compiler/test.capnp.c
index d2b9a17..6962a3d 100644
--- a/compiler/test.capnp.c
+++ b/compiler/test.capnp.c
@@ -10,18 +10,1168 @@
 
 static const capn_text capn_val0 = {0,"",0};
 static const capn_ptr capn_null = {CAPN_NULL};
-static const uint8_t capn_buf[72] = {
+static const uint8_t capn_buf[9272] = {
 	102,111,111,0,0,0,0,0,
 	98,97,114,0,0,0,0,0,
+	1,244,128,13,14,16,76,251,
+	78,115,232,56,166,51,0,0,
+	90,0,210,4,20,136,98,3,
+	210,10,111,18,33,25,204,4,
+	95,112,9,175,2,0,0,0,
+	0,0,0,0,0,144,117,64,
+	77,0,0,0,34,0,0,0,
+	77,0,0,0,26,0,0,0,
+	76,0,0,0,6,0,20,0,
+	37,1,0,0,24,0,0,0,
+	33,1,0,0,41,0,0,0,
+	33,1,0,0,34,0,0,0,
+	33,1,0,0,35,0,0,0,
+	33,1,0,0,36,0,0,0,
+	37,1,0,0,37,0,0,0,
+	49,1,0,0,34,0,0,0,
+	49,1,0,0,35,0,0,0,
+	49,1,0,0,36,0,0,0,
+	53,1,0,0,37,0,0,0,
+	65,1,0,0,52,0,0,0,
+	73,1,0,0,53,0,0,0,
+	93,1,0,0,30,0,0,0,
+	113,1,0,0,30,0,0,0,
+	133,1,0,0,119,2,0,0,
+	213,2,0,0,27,0,0,0,
+	0,0,0,0,0,0,0,0,
+	98,97,122,0,0,0,0,0,
+	113,117,120,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	77,0,0,0,58,0,0,0,
+	0,0,0,0,0,0,0,0,
+	72,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	110,101,115,116,101,100,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	77,0,0,0,114,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	114,101,97,108,108,121,32,110,
+	101,115,116,101,100,0,0,0,
+	26,0,0,0,0,0,0,0,
+	12,222,128,127,0,0,0,0,
+	210,4,210,233,0,128,255,127,
+	78,97,188,0,64,211,160,250,
+	0,0,0,128,255,255,255,127,
+	121,223,13,134,72,112,0,0,
+	46,117,19,253,138,150,253,255,
+	0,0,0,0,0,0,0,128,
+	255,255,255,255,255,255,255,127,
+	12,34,0,255,0,0,0,0,
+	210,4,46,22,0,0,255,255,
+	78,97,188,0,192,44,95,5,
+	0,0,0,0,255,255,255,255,
+	121,223,13,134,72,112,0,0,
+	210,138,236,2,117,105,2,0,
+	0,0,0,0,0,0,0,0,
+	255,255,255,255,255,255,255,255,
+	0,0,0,0,56,180,150,73,
+	194,189,240,124,194,189,240,252,
+	234,28,8,2,234,28,8,130,
+	0,0,0,0,0,0,0,0,
+	64,222,119,131,33,18,220,66,
+	41,144,35,202,229,200,118,127,
+	41,144,35,202,229,200,118,255,
+	145,247,80,55,158,120,102,0,
+	145,247,80,55,158,120,102,128,
+	9,0,0,0,42,0,0,0,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,58,0,0,0,
+	113,117,117,120,0,0,0,0,
+	99,111,114,103,101,0,0,0,
+	103,114,97,117,108,116,0,0,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,42,0,0,0,
+	9,0,0,0,34,0,0,0,
+	103,97,114,112,108,121,0,0,
+	119,97,108,100,111,0,0,0,
+	102,114,101,100,0,0,0,0,
+	12,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	29,1,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	189,0,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	93,0,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,49,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,50,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,51,0,0,
+	3,0,1,0,6,0,0,0,
 	9,0,0,0,0,0,0,0,
 	111,145,0,0,0,0,0,0,
 	103,43,153,212,0,0,0,0,
 	199,107,159,6,57,148,96,249,
 	199,113,196,43,171,117,107,15,
 	57,142,59,212,84,138,148,240,
-	111,222,0,0,0,0,0,0
+	111,222,0,0,0,0,0,0,
+	53,130,156,173,0,0,0,0,
+	85,161,174,198,0,0,0,0,
+	199,113,172,181,175,152,50,154,
+	0,156,173,69,0,0,128,127,
+	0,0,128,255,0,0,192,127,
+	0,0,0,0,192,97,190,64,
+	0,0,0,0,0,0,240,127,
+	0,0,0,0,0,0,240,255,
+	0,0,0,0,0,0,248,127,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,42,0,0,0,
+	112,108,117,103,104,0,0,0,
+	120,121,122,122,121,0,0,0,
+	116,104,117,100,0,0,0,0,
+	9,0,0,0,34,0,0,0,
+	9,0,0,0,74,0,0,0,
+	13,0,0,0,58,0,0,0,
+	111,111,112,115,0,0,0,0,
+	101,120,104,97,117,115,116,101,
+	100,0,0,0,0,0,0,0,
+	114,102,99,51,48,57,50,0,
+	12,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	29,1,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	189,0,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	93,0,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,49,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,50,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,51,0,0,0,0,
+	0,0,7,0,0,0,0,0,
+	102,111,111,98,97,114,0,0,
+	0,0,0,0,49,212,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	5,0,0,0,34,0,0,0,
+	0,0,0,0,0,0,0,0,
+	102,111,111,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,57,48,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	77,0,0,0,34,0,0,0,
+	0,0,0,0,0,0,0,0,
+	72,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	117,3,0,0,19,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	77,3,0,0,119,2,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	102,111,111,0,0,0,0,0,
+	1,244,128,13,14,16,76,251,
+	78,115,232,56,166,51,0,0,
+	90,0,210,4,20,136,98,3,
+	210,10,111,18,33,25,204,4,
+	95,112,9,175,2,0,0,0,
+	0,0,0,0,0,144,117,64,
+	77,0,0,0,34,0,0,0,
+	77,0,0,0,26,0,0,0,
+	76,0,0,0,6,0,20,0,
+	37,1,0,0,24,0,0,0,
+	33,1,0,0,41,0,0,0,
+	33,1,0,0,34,0,0,0,
+	33,1,0,0,35,0,0,0,
+	33,1,0,0,36,0,0,0,
+	37,1,0,0,37,0,0,0,
+	49,1,0,0,34,0,0,0,
+	49,1,0,0,35,0,0,0,
+	49,1,0,0,36,0,0,0,
+	53,1,0,0,37,0,0,0,
+	65,1,0,0,52,0,0,0,
+	73,1,0,0,53,0,0,0,
+	93,1,0,0,30,0,0,0,
+	113,1,0,0,30,0,0,0,
+	133,1,0,0,119,2,0,0,
+	213,2,0,0,27,0,0,0,
+	0,0,0,0,0,0,0,0,
+	98,97,122,0,0,0,0,0,
+	113,117,120,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	77,0,0,0,58,0,0,0,
+	0,0,0,0,0,0,0,0,
+	72,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	110,101,115,116,101,100,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	77,0,0,0,114,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	114,101,97,108,108,121,32,110,
+	101,115,116,101,100,0,0,0,
+	26,0,0,0,0,0,0,0,
+	12,222,128,127,0,0,0,0,
+	210,4,210,233,0,128,255,127,
+	78,97,188,0,64,211,160,250,
+	0,0,0,128,255,255,255,127,
+	121,223,13,134,72,112,0,0,
+	46,117,19,253,138,150,253,255,
+	0,0,0,0,0,0,0,128,
+	255,255,255,255,255,255,255,127,
+	12,34,0,255,0,0,0,0,
+	210,4,46,22,0,0,255,255,
+	78,97,188,0,192,44,95,5,
+	0,0,0,0,255,255,255,255,
+	121,223,13,134,72,112,0,0,
+	210,138,236,2,117,105,2,0,
+	0,0,0,0,0,0,0,0,
+	255,255,255,255,255,255,255,255,
+	0,0,0,0,56,180,150,73,
+	194,189,240,124,194,189,240,252,
+	234,28,8,2,234,28,8,130,
+	0,0,0,0,0,0,0,0,
+	64,222,119,131,33,18,220,66,
+	41,144,35,202,229,200,118,127,
+	41,144,35,202,229,200,118,255,
+	145,247,80,55,158,120,102,0,
+	145,247,80,55,158,120,102,128,
+	9,0,0,0,42,0,0,0,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,58,0,0,0,
+	113,117,117,120,0,0,0,0,
+	99,111,114,103,101,0,0,0,
+	103,114,97,117,108,116,0,0,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,42,0,0,0,
+	9,0,0,0,34,0,0,0,
+	103,97,114,112,108,121,0,0,
+	119,97,108,100,111,0,0,0,
+	102,114,101,100,0,0,0,0,
+	12,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	29,1,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	189,0,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	93,0,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,49,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,50,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,51,0,0,
+	3,0,1,0,6,0,0,0,
+	103,43,153,212,0,0,0,0,
+	12,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	29,1,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	189,0,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	93,0,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,49,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,50,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,51,0,0,0,0,
+	102,111,111,0,0,0,0,0,
+	98,97,114,0,0,0,0,0,
+	1,244,128,13,14,16,76,251,
+	78,115,232,56,166,51,0,0,
+	90,0,210,4,20,136,98,3,
+	210,10,111,18,33,25,204,4,
+	95,112,9,175,2,0,0,0,
+	0,0,0,0,0,144,117,64,
+	77,0,0,0,34,0,0,0,
+	77,0,0,0,26,0,0,0,
+	76,0,0,0,6,0,20,0,
+	37,1,0,0,24,0,0,0,
+	33,1,0,0,41,0,0,0,
+	33,1,0,0,34,0,0,0,
+	33,1,0,0,35,0,0,0,
+	33,1,0,0,36,0,0,0,
+	37,1,0,0,37,0,0,0,
+	49,1,0,0,34,0,0,0,
+	49,1,0,0,35,0,0,0,
+	49,1,0,0,36,0,0,0,
+	53,1,0,0,37,0,0,0,
+	65,1,0,0,52,0,0,0,
+	73,1,0,0,53,0,0,0,
+	93,1,0,0,30,0,0,0,
+	113,1,0,0,30,0,0,0,
+	133,1,0,0,119,2,0,0,
+	213,2,0,0,27,0,0,0,
+	0,0,0,0,0,0,0,0,
+	98,97,122,0,0,0,0,0,
+	113,117,120,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	77,0,0,0,58,0,0,0,
+	0,0,0,0,0,0,0,0,
+	72,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	110,101,115,116,101,100,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	77,0,0,0,114,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	114,101,97,108,108,121,32,110,
+	101,115,116,101,100,0,0,0,
+	26,0,0,0,0,0,0,0,
+	12,222,128,127,0,0,0,0,
+	210,4,210,233,0,128,255,127,
+	78,97,188,0,64,211,160,250,
+	0,0,0,128,255,255,255,127,
+	121,223,13,134,72,112,0,0,
+	46,117,19,253,138,150,253,255,
+	0,0,0,0,0,0,0,128,
+	255,255,255,255,255,255,255,127,
+	12,34,0,255,0,0,0,0,
+	210,4,46,22,0,0,255,255,
+	78,97,188,0,192,44,95,5,
+	0,0,0,0,255,255,255,255,
+	121,223,13,134,72,112,0,0,
+	210,138,236,2,117,105,2,0,
+	0,0,0,0,0,0,0,0,
+	255,255,255,255,255,255,255,255,
+	0,0,0,0,56,180,150,73,
+	194,189,240,124,194,189,240,252,
+	234,28,8,2,234,28,8,130,
+	0,0,0,0,0,0,0,0,
+	64,222,119,131,33,18,220,66,
+	41,144,35,202,229,200,118,127,
+	41,144,35,202,229,200,118,255,
+	145,247,80,55,158,120,102,0,
+	145,247,80,55,158,120,102,128,
+	9,0,0,0,42,0,0,0,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,58,0,0,0,
+	113,117,117,120,0,0,0,0,
+	99,111,114,103,101,0,0,0,
+	103,114,97,117,108,116,0,0,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,42,0,0,0,
+	9,0,0,0,34,0,0,0,
+	103,97,114,112,108,121,0,0,
+	119,97,108,100,111,0,0,0,
+	102,114,101,100,0,0,0,0,
+	12,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	29,1,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	189,0,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	93,0,0,0,122,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,49,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,50,0,0,
+	120,32,115,116,114,117,99,116,
+	108,105,115,116,32,51,0,0,
+	3,0,1,0,6,0,0,0,
+	9,0,0,0,0,0,0,0,
+	111,145,0,0,0,0,0,0,
+	103,43,153,212,0,0,0,0,
+	199,107,159,6,57,148,96,249,
+	199,113,196,43,171,117,107,15,
+	57,142,59,212,84,138,148,240,
+	111,222,0,0,0,0,0,0,
+	53,130,156,173,0,0,0,0,
+	85,161,174,198,0,0,0,0,
+	199,113,172,181,175,152,50,154,
+	0,156,173,69,0,0,128,127,
+	0,0,128,255,0,0,192,127,
+	0,0,0,0,192,97,190,64,
+	0,0,0,0,0,0,240,127,
+	0,0,0,0,0,0,240,255,
+	0,0,0,0,0,0,248,127,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,50,0,0,0,
+	9,0,0,0,42,0,0,0,
+	112,108,117,103,104,0,0,0,
+	120,121,122,122,121,0,0,0,
+	116,104,117,100,0,0,0,0,
+	9,0,0,0,34,0,0,0,
+	9,0,0,0,74,0,0,0,
+	13,0,0,0,58,0,0,0,
+	111,111,112,115,0,0,0,0,
+	101,120,104,97,117,115,116,101,
+	100,0,0,0,0,0,0,0,
+	114,102,99,51,48,57,50,0,
+	12,0,0,0,6,0,20,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	29,1,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	189,0,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	93,0,0,0,106,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,49,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,50,0,0,0,0,
+	115,116,114,117,99,116,108,105,
+	115,116,32,51,0,0,0,0,
+	0,0,7,0,0,0,0,0,
+	3,0,3,0,4,0,1,0,
+	65,1,0,0,0,0,0,0,
+	0,123,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,55,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	135,75,107,93,84,220,43,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	7,0,11,0,0,0,3,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	1,0,0,0,0,0,0,0,
+	0,0,0,0,78,97,188,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	1,0,0,0,34,0,0,0,
+	102,111,111,0,0,0,0,0,
+	123,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,1,0,0,0,
+	65,1,0,0,0,0,0,0,
+	5,0,0,0,34,0,0,0,
+	5,0,0,0,34,0,0,0,
+	102,111,111,0,0,0,0,0,
+	98,97,114,0,0,0,0,0,
+	37,0,0,0,16,0,0,0,
+	33,0,0,0,37,0,0,0,
+	45,0,0,0,21,0,0,0,
+	49,0,0,0,21,0,0,0,
+	53,0,0,0,21,0,0,0,
+	57,0,0,0,21,0,0,0,
+	61,0,0,0,23,0,0,0,
+	77,0,0,0,30,0,0,0,
+	101,0,0,0,30,0,0,0,
+	149,0,0,0,22,0,0,0,
+	1,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	1,0,0,0,0,0,0,0,
+	1,0,0,0,0,0,0,0,
+	123,0,0,0,0,0,0,0,
+	45,0,0,0,0,0,0,0,
+	57,48,0,0,0,0,0,0,
+	133,26,0,0,0,0,0,0,
+	21,205,91,7,0,0,0,0,
+	210,56,251,13,0,0,0,0,
+	192,186,138,60,213,98,4,0,
+	135,75,170,237,97,85,8,0,
+	8,0,0,0,0,0,1,0,
+	5,0,0,0,34,0,0,0,
+	5,0,0,0,34,0,0,0,
+	102,111,111,0,0,0,0,0,
+	98,97,114,0,0,0,0,0,
+	9,0,0,0,28,0,0,0,
+	13,0,0,0,20,0,0,0,
+	13,0,0,0,12,0,0,0,
+	1,0,0,0,2,0,0,0,
+	3,0,0,0,0,0,0,0,
+	4,0,0,0,5,0,0,0,
+	242,79,188,0,0,0,0,0,
+	9,0,0,0,22,0,0,0,
+	21,0,0,0,14,0,0,0,
+	25,0,0,0,22,0,0,0,
+	5,0,0,0,34,0,0,0,
+	5,0,0,0,34,0,0,0,
+	102,111,111,0,0,0,0,0,
+	98,97,114,0,0,0,0,0,
+	1,0,0,0,34,0,0,0,
+	98,97,122,0,0,0,0,0,
+	5,0,0,0,34,0,0,0,
+	5,0,0,0,50,0,0,0,
+	113,117,120,0,0,0,0,0,
+	99,111,114,103,101,0,0,0,
+	5,0,0,0,167,1,0,0,
+	213,0,0,0,215,0,0,0,
+	8,0,0,0,6,0,20,0,
+	0,0,0,0,123,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,200,1,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	4,0,0,0,6,0,20,0,
+	0,0,0,0,21,3,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,
+	98,97,122,0,0,0,0,0
 };
-static const struct capn_segment capn_seg = {{0},0,0,0,(char*)&capn_buf[0],72,72,0};
+static const struct capn_segment capn_seg = {{0},0,0,0,(char*)&capn_buf[0],9272,9272,0};
 union capn_conv_f32 TestWholeFloatDefault_constant = {0x43e40000u};
 union capn_conv_f32 TestWholeFloatDefault_bigConstant = {0x7249f2cau};
 unsigned TestConstants_boolConst = 1;
@@ -37,29 +1187,29 @@ union capn_conv_f32 TestConstants_float32Const = {0x449a5000u};
 union capn_conv_f64 TestConstants_float64Const = {((uint64_t) 0xc9b58b82u << 32) | 0xc0e0bb00u};
 capn_text TestConstants_textConst = {3,(char*)&capn_buf[0],(struct capn_segment*)&capn_seg};
 capn_data TestConstants_dataConst = {{2,0,0,0,1,0,3,(char*)&capn_buf[8],(struct capn_segment*)&capn_seg}};
-TestAllTypes_ptr TestConstants_structConst = {{1,1,0,0,48,20,0,(char*)&capn_buf[0],(struct capn_segment*)&capn_seg}};
+TestAllTypes_ptr TestConstants_structConst = {{1,0,0,0,48,20,0,(char*)&capn_buf[16],(struct capn_segment*)&capn_seg}};
 enum TestEnum TestConstants_enumConst = (enum TestEnum) 5u;
-capn_ptr TestConstants_voidListConst = {2,0,0,0,0,0,6,(char*)&capn_buf[16],(struct capn_segment*)&capn_seg};
-capn_list1 TestConstants_boolListConst = {{4,0,0,0,1,0,4,(char*)&capn_buf[16],(struct capn_segment*)&capn_seg}};
-capn_list8 TestConstants_int8ListConst = {{2,0,0,0,1,0,2,(char*)&capn_buf[24],(struct capn_segment*)&capn_seg}};
-capn_list16 TestConstants_int16ListConst = {{2,0,0,0,2,0,2,(char*)&capn_buf[32],(struct capn_segment*)&capn_seg}};
-capn_list32 TestConstants_int32ListConst = {{2,0,0,0,4,0,2,(char*)&capn_buf[40],(struct capn_segment*)&capn_seg}};
-capn_list64 TestConstants_int64ListConst = {{2,0,0,0,8,0,2,(char*)&capn_buf[48],(struct capn_segment*)&capn_seg}};
-capn_list8 TestConstants_uint8ListConst = {{2,0,0,0,1,0,2,(char*)&capn_buf[64],(struct capn_segment*)&capn_seg}};
-capn_list16 TestConstants_uint16ListConst = {{2,1,0,0,2,0,2,(char*)&capn_buf[1664],(struct capn_segment*)&capn_seg}};
-capn_list32 TestConstants_uint32ListConst = {{2,1,0,0,4,0,1,(char*)&capn_buf[1680],(struct capn_segment*)&capn_seg}};
-capn_list64 TestConstants_uint64ListConst = {{2,1,0,0,8,0,1,(char*)&capn_buf[1696],(struct capn_segment*)&capn_seg}};
-capn_list32 TestConstants_float32ListConst = {{2,1,0,0,4,0,4,(char*)&capn_buf[1712],(struct capn_segment*)&capn_seg}};
-capn_list64 TestConstants_float64ListConst = {{2,1,0,0,8,0,4,(char*)&capn_buf[1736],(struct capn_segment*)&capn_seg}};
-capn_ptr TestConstants_textListConst = {3,1,0,0,0,0,3,(char*)&capn_buf[1776],(struct capn_segment*)&capn_seg};
-capn_ptr TestConstants_dataListConst = {3,1,0,0,0,0,3,(char*)&capn_buf[1832],(struct capn_segment*)&capn_seg};
-TestAllTypes_list TestConstants_structListConst = {{2,1,0,1,48,20,3,(char*)&capn_buf[1904],(struct capn_segment*)&capn_seg}};
-capn_list16 TestConstants_enumListConst = {{2,1,0,0,2,0,2,(char*)&capn_buf[2584],(struct capn_segment*)&capn_seg}};
+capn_ptr TestConstants_voidListConst = {2,0,0,0,0,0,6,(char*)&capn_buf[1672],(struct capn_segment*)&capn_seg};
+capn_list1 TestConstants_boolListConst = {{4,0,0,0,1,0,4,(char*)&capn_buf[1672],(struct capn_segment*)&capn_seg}};
+capn_list8 TestConstants_int8ListConst = {{2,0,0,0,1,0,2,(char*)&capn_buf[1680],(struct capn_segment*)&capn_seg}};
+capn_list16 TestConstants_int16ListConst = {{2,0,0,0,2,0,2,(char*)&capn_buf[1688],(struct capn_segment*)&capn_seg}};
+capn_list32 TestConstants_int32ListConst = {{2,0,0,0,4,0,2,(char*)&capn_buf[1696],(struct capn_segment*)&capn_seg}};
+capn_list64 TestConstants_int64ListConst = {{2,0,0,0,8,0,2,(char*)&capn_buf[1704],(struct capn_segment*)&capn_seg}};
+capn_list8 TestConstants_uint8ListConst = {{2,0,0,0,1,0,2,(char*)&capn_buf[1720],(struct capn_segment*)&capn_seg}};
+capn_list16 TestConstants_uint16ListConst = {{2,0,0,0,2,0,2,(char*)&capn_buf[1728],(struct capn_segment*)&capn_seg}};
+capn_list32 TestConstants_uint32ListConst = {{2,0,0,0,4,0,1,(char*)&capn_buf[1736],(struct capn_segment*)&capn_seg}};
+capn_list64 TestConstants_uint64ListConst = {{2,0,0,0,8,0,1,(char*)&capn_buf[1744],(struct capn_segment*)&capn_seg}};
+capn_list32 TestConstants_float32ListConst = {{2,0,0,0,4,0,4,(char*)&capn_buf[1752],(struct capn_segment*)&capn_seg}};
+capn_list64 TestConstants_float64ListConst = {{2,0,0,0,8,0,4,(char*)&capn_buf[1768],(struct capn_segment*)&capn_seg}};
+capn_ptr TestConstants_textListConst = {3,0,0,0,0,0,3,(char*)&capn_buf[1800],(struct capn_segment*)&capn_seg};
+capn_ptr TestConstants_dataListConst = {3,0,0,0,0,0,3,(char*)&capn_buf[1848],(struct capn_segment*)&capn_seg};
+TestAllTypes_list TestConstants_structListConst = {{2,0,0,1,48,20,3,(char*)&capn_buf[1912],(struct capn_segment*)&capn_seg}};
+capn_list16 TestConstants_enumListConst = {{2,0,0,0,2,0,2,(char*)&capn_buf[2584],(struct capn_segment*)&capn_seg}};
 uint32_t globalInt = 12345u;
-capn_text globalText = {6,(char*)&capn_buf[2600],(struct capn_segment*)&capn_seg};
-TestAllTypes_ptr globalStruct = {{1,1,0,0,48,20,0,(char*)&capn_buf[2616],(struct capn_segment*)&capn_seg}};
-TestPrintInlineStructs_ptr globalPrintableStruct = {{1,1,0,0,0,2,0,(char*)&capn_buf[2832],(struct capn_segment*)&capn_seg}};
-TestAllTypes_ptr derivedConstant = {{1,1,0,0,48,20,0,(char*)&capn_buf[2864],(struct capn_segment*)&capn_seg}};
+capn_text globalText = {6,(char*)&capn_buf[2592],(struct capn_segment*)&capn_seg};
+TestAllTypes_ptr globalStruct = {{1,0,0,0,48,20,0,(char*)&capn_buf[2600],(struct capn_segment*)&capn_seg}};
+TestPrintInlineStructs_ptr globalPrintableStruct = {{1,0,0,0,0,2,0,(char*)&capn_buf[2808],(struct capn_segment*)&capn_seg}};
+TestAllTypes_ptr derivedConstant = {{1,0,0,0,48,20,0,(char*)&capn_buf[2832],(struct capn_segment*)&capn_seg}};
 
 TestAllTypes_ptr new_TestAllTypes(struct capn_segment *s) {
 	TestAllTypes_ptr p;
@@ -537,25 +1687,25 @@ void TestAllTypes_set_interfaceList(TestAllTypes_ptr p, capn_ptr interfaceList)
 {
 	capn_setp(p.p, 19, interfaceList);
 }
-static capn_text capn_val1 = {3,(char*)&capn_buf[1464],(struct capn_segment*)&capn_seg};
-static capn_data capn_val2 = {{2,1,0,0,1,0,3,(char*)&capn_buf[1480],(struct capn_segment*)&capn_seg}};
-static TestAllTypes_ptr capn_val3 = {{1,1,0,0,48,20,0,(char*)&capn_buf[1496],(struct capn_segment*)&capn_seg}};
-static capn_ptr capn_val4 = {2,0,0,0,0,0,6,(char*)&capn_buf[72],(struct capn_segment*)&capn_seg};
-static capn_list1 capn_val5 = {{4,1,0,0,1,0,4,(char*)&capn_buf[3160],(struct capn_segment*)&capn_seg}};
-static capn_list8 capn_val6 = {{2,1,0,0,1,0,2,(char*)&capn_buf[3176],(struct capn_segment*)&capn_seg}};
-static capn_list16 capn_val7 = {{2,1,0,0,2,0,2,(char*)&capn_buf[3192],(struct capn_segment*)&capn_seg}};
-static capn_list32 capn_val8 = {{2,1,0,0,4,0,2,(char*)&capn_buf[3208],(struct capn_segment*)&capn_seg}};
-static capn_list64 capn_val9 = {{2,1,0,0,8,0,2,(char*)&capn_buf[3224],(struct capn_segment*)&capn_seg}};
-static capn_list8 capn_val10 = {{2,1,0,0,1,0,2,(char*)&capn_buf[3248],(struct capn_segment*)&capn_seg}};
-static capn_list16 capn_val11 = {{2,1,0,0,2,0,2,(char*)&capn_buf[3264],(struct capn_segment*)&capn_seg}};
-static capn_list32 capn_val12 = {{2,1,0,0,4,0,1,(char*)&capn_buf[3280],(struct capn_segment*)&capn_seg}};
-static capn_list64 capn_val13 = {{2,1,0,0,8,0,1,(char*)&capn_buf[3296],(struct capn_segment*)&capn_seg}};
-static capn_list32 capn_val14 = {{2,1,0,0,4,0,4,(char*)&capn_buf[3312],(struct capn_segment*)&capn_seg}};
-static capn_list64 capn_val15 = {{2,1,0,0,8,0,4,(char*)&capn_buf[3336],(struct capn_segment*)&capn_seg}};
-static capn_ptr capn_val16 = {3,1,0,0,0,0,3,(char*)&capn_buf[3376],(struct capn_segment*)&capn_seg};
-static capn_ptr capn_val17 = {3,1,0,0,0,0,3,(char*)&capn_buf[3432],(struct capn_segment*)&capn_seg};
-static TestAllTypes_list capn_val18 = {{2,1,0,1,48,20,3,(char*)&capn_buf[8],(struct capn_segment*)&capn_seg}};
-static capn_list16 capn_val19 = {{2,1,0,0,2,0,2,(char*)&capn_buf[3496],(struct capn_segment*)&capn_seg}};
+static capn_text capn_val1 = {3,(char*)&capn_buf[5392],(struct capn_segment*)&capn_seg};
+static capn_data capn_val2 = {{2,0,0,0,1,0,3,(char*)&capn_buf[5400],(struct capn_segment*)&capn_seg}};
+static TestAllTypes_ptr capn_val3 = {{1,0,0,0,48,20,0,(char*)&capn_buf[5408],(struct capn_segment*)&capn_seg}};
+static capn_ptr capn_val4 = {2,0,0,0,0,0,6,(char*)&capn_buf[7064],(struct capn_segment*)&capn_seg};
+static capn_list1 capn_val5 = {{4,0,0,0,1,0,4,(char*)&capn_buf[7064],(struct capn_segment*)&capn_seg}};
+static capn_list8 capn_val6 = {{2,0,0,0,1,0,2,(char*)&capn_buf[7072],(struct capn_segment*)&capn_seg}};
+static capn_list16 capn_val7 = {{2,0,0,0,2,0,2,(char*)&capn_buf[7080],(struct capn_segment*)&capn_seg}};
+static capn_list32 capn_val8 = {{2,0,0,0,4,0,2,(char*)&capn_buf[7088],(struct capn_segment*)&capn_seg}};
+static capn_list64 capn_val9 = {{2,0,0,0,8,0,2,(char*)&capn_buf[7096],(struct capn_segment*)&capn_seg}};
+static capn_list8 capn_val10 = {{2,0,0,0,1,0,2,(char*)&capn_buf[7112],(struct capn_segment*)&capn_seg}};
+static capn_list16 capn_val11 = {{2,0,0,0,2,0,2,(char*)&capn_buf[7120],(struct capn_segment*)&capn_seg}};
+static capn_list32 capn_val12 = {{2,0,0,0,4,0,1,(char*)&capn_buf[7128],(struct capn_segment*)&capn_seg}};
+static capn_list64 capn_val13 = {{2,0,0,0,8,0,1,(char*)&capn_buf[7136],(struct capn_segment*)&capn_seg}};
+static capn_list32 capn_val14 = {{2,0,0,0,4,0,4,(char*)&capn_buf[7144],(struct capn_segment*)&capn_seg}};
+static capn_list64 capn_val15 = {{2,0,0,0,8,0,4,(char*)&capn_buf[7160],(struct capn_segment*)&capn_seg}};
+static capn_ptr capn_val16 = {3,0,0,0,0,0,3,(char*)&capn_buf[7192],(struct capn_segment*)&capn_seg};
+static capn_ptr capn_val17 = {3,0,0,0,0,0,3,(char*)&capn_buf[7240],(struct capn_segment*)&capn_seg};
+static TestAllTypes_list capn_val18 = {{2,0,0,1,48,20,3,(char*)&capn_buf[7304],(struct capn_segment*)&capn_seg}};
+static capn_list16 capn_val19 = {{2,0,0,0,2,0,2,(char*)&capn_buf[7976],(struct capn_segment*)&capn_seg}};
 
 TestDefaults_ptr new_TestDefaults(struct capn_segment *s) {
 	TestDefaults_ptr p;
@@ -1777,8 +2927,8 @@ void read_TestUnionInUnion(struct TestUnionInUnion *s capnp_unused, TestUnionInU
 		s->outer.baz = (int32_t) ((int32_t)capn_read32(p.p, 0));
 		break;
 	case TestUnionInUnion_outer_inner:
-		s->outer.inner_which = (enum TestUnionInUnion_outer_inner_which)(int) capn_read16(p.p, 4);
-		switch (s->outer.inner_which) {
+		s->outer.inner.which = (enum TestUnionInUnion_outer_inner_which)(int) capn_read16(p.p, 4);
+		switch (s->outer.inner.which) {
 		case TestUnionInUnion_outer_inner_foo:
 		case TestUnionInUnion_outer_inner_bar:
 			s->outer.inner.bar = (int32_t) ((int32_t)capn_read32(p.p, 0));
@@ -1800,8 +2950,8 @@ void write_TestUnionInUnion(const struct TestUnionInUnion *s capnp_unused, TestU
 		capn_write32(p.p, 0, (uint32_t) (s->outer.baz));
 		break;
 	case TestUnionInUnion_outer_inner:
-		capn_write16(p.p, 4, s->outer.inner_which);
-		switch (s->outer.inner_which) {
+		capn_write16(p.p, 4, s->outer.inner.which);
+		switch (s->outer.inner.which) {
 		case TestUnionInUnion_outer_inner_foo:
 		case TestUnionInUnion_outer_inner_bar:
 			capn_write32(p.p, 0, (uint32_t) (s->outer.inner.bar));
@@ -2002,10 +3152,10 @@ void set_TestInterleavedGroups(const struct TestInterleavedGroups *s, TestInterl
 	p.p = capn_getp(l.p, i, 0);
 	write_TestInterleavedGroups(s, p);
 }
-static TestUnion_ptr capn_val20 = {{1,1,0,0,64,2,0,(char*)&capn_buf[3512],(struct capn_segment*)&capn_seg}};
-static TestUnion_ptr capn_val21 = {{1,1,0,0,64,2,0,(char*)&capn_buf[3600],(struct capn_segment*)&capn_seg}};
-static TestUnnamedUnion_ptr capn_val22 = {{1,1,0,0,16,2,0,(char*)&capn_buf[3696],(struct capn_segment*)&capn_seg}};
-static TestUnnamedUnion_ptr capn_val23 = {{1,1,0,0,16,2,0,(char*)&capn_buf[3736],(struct capn_segment*)&capn_seg}};
+static TestUnion_ptr capn_val20 = {{1,0,0,0,64,2,0,(char*)&capn_buf[7984],(struct capn_segment*)&capn_seg}};
+static TestUnion_ptr capn_val21 = {{1,0,0,0,64,2,0,(char*)&capn_buf[8064],(struct capn_segment*)&capn_seg}};
+static TestUnnamedUnion_ptr capn_val22 = {{1,0,0,0,16,2,0,(char*)&capn_buf[8152],(struct capn_segment*)&capn_seg}};
+static TestUnnamedUnion_ptr capn_val23 = {{1,0,0,0,16,2,0,(char*)&capn_buf[8184],(struct capn_segment*)&capn_seg}};
 
 TestUnionDefaults_ptr new_TestUnionDefaults(struct capn_segment *s) {
 	TestUnionDefaults_ptr p;
@@ -3156,7 +4306,7 @@ void read_TestFieldZeroIsBit(struct TestFieldZeroIsBit *s capnp_unused, TestFiel
 	capn_resolve(&p.p);
 	capnp_use(s);
 	s->bit = (capn_read8(p.p, 0) & 1) != 0;
-	s->secondBit = (capn_read8(p.p, 0) & 2) != 1;
+	s->secondBit = (capn_read8(p.p, 0) & 2) != 2;
 	s->thirdField = capn_read8(p.p, 1) ^ 123u;
 }
 void write_TestFieldZeroIsBit(const struct TestFieldZeroIsBit *s capnp_unused, TestFieldZeroIsBit_ptr p) {
@@ -3187,7 +4337,7 @@ unsigned TestFieldZeroIsBit_get_bit(TestFieldZeroIsBit_ptr p)
 unsigned TestFieldZeroIsBit_get_secondBit(TestFieldZeroIsBit_ptr p)
 {
 	unsigned secondBit;
-	secondBit = (capn_read8(p.p, 0) & 2) != 1;
+	secondBit = (capn_read8(p.p, 0) & 2) != 2;
 	return secondBit;
 }
 
@@ -3212,7 +4362,7 @@ void TestFieldZeroIsBit_set_thirdField(TestFieldZeroIsBit_ptr p, uint8_t thirdFi
 {
 	capn_write8(p.p, 1, thirdField ^ 123u);
 }
-static TestLists_ptr capn_val24 = {{1,1,0,0,0,10,0,(char*)&capn_buf[3792],(struct capn_segment*)&capn_seg}};
+static TestLists_ptr capn_val24 = {{1,0,0,0,0,10,0,(char*)&capn_buf[8232],(struct capn_segment*)&capn_seg}};
 
 TestListDefaults_ptr new_TestListDefaults(struct capn_segment *s) {
 	TestListDefaults_ptr p;
@@ -3460,7 +4610,7 @@ void TestOldVersion_set_old3(TestOldVersion_ptr p, TestOldVersion_ptr old3)
 {
 	capn_setp(p.p, 1, old3.p);
 }
-static capn_text capn_val25 = {3,(char*)&capn_buf[1544],(struct capn_segment*)&capn_seg};
+static capn_text capn_val25 = {3,(char*)&capn_buf[9264],(struct capn_segment*)&capn_seg};
 
 TestNewVersion_ptr new_TestNewVersion(struct capn_segment *s) {
 	TestNewVersion_ptr p;
diff --git a/compiler/test.capnp.h b/compiler/test.capnp.h
index 5a0b26b..a33dfd5 100644
--- a/compiler/test.capnp.h
+++ b/compiler/test.capnp.h
@@ -15,8 +15,6 @@
 # endif
 #endif
 
-#include "c++.capnp.h"
-#include "c.capnp.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -294,6 +292,7 @@ static const size_t TestAllTypes_pointer_count = 20;
 
 static const size_t TestAllTypes_struct_bytes_count = 208;
 
+
 unsigned TestAllTypes_get_boolField(TestAllTypes_ptr p);
 
 int8_t TestAllTypes_get_int8Field(TestAllTypes_ptr p);
@@ -463,6 +462,7 @@ static const size_t TestDefaults_pointer_count = 20;
 
 static const size_t TestDefaults_struct_bytes_count = 208;
 
+
 unsigned TestDefaults_get_boolField(TestDefaults_ptr p);
 
 int8_t TestDefaults_get_int8Field(TestDefaults_ptr p);
@@ -601,6 +601,7 @@ static const size_t TestAnyPointer_pointer_count = 1;
 
 static const size_t TestAnyPointer_struct_bytes_count = 8;
 
+
 capn_ptr TestAnyPointer_get_anyPointerField(TestAnyPointer_ptr p);
 
 void TestAnyPointer_set_anyPointerField(TestAnyPointer_ptr p, capn_ptr anyPointerField);
@@ -623,6 +624,7 @@ static const size_t TestOutOfOrder_pointer_count = 9;
 
 static const size_t TestOutOfOrder_struct_bytes_count = 72;
 
+
 capn_text TestOutOfOrder_get_foo(TestOutOfOrder_ptr p);
 
 capn_text TestOutOfOrder_get_bar(TestOutOfOrder_ptr p);
@@ -780,6 +782,7 @@ static const size_t TestUnion_pointer_count = 2;
 
 static const size_t TestUnion_struct_bytes_count = 80;
 
+
 unsigned TestUnion_get_bit0(TestUnion_ptr p);
 
 unsigned TestUnion_get_bit2(TestUnion_ptr p);
@@ -833,6 +836,7 @@ static const size_t TestUnnamedUnion_pointer_count = 2;
 
 static const size_t TestUnnamedUnion_struct_bytes_count = 32;
 
+
 capn_text TestUnnamedUnion_get_before(TestUnnamedUnion_ptr p);
 
 void TestUnnamedUnion_set_before(TestUnnamedUnion_ptr p, capn_text before);
@@ -848,10 +852,12 @@ enum TestUnionInUnion_outer_which {
 struct TestUnionInUnion {
 	enum TestUnionInUnion_outer_which outer_which;
 	capnp_nowarn union {
-		enum TestUnionInUnion_outer_inner_which inner_which;
-		capnp_nowarn union {
-			int32_t foo;
-			int32_t bar;
+		capnp_nowarn struct {
+			enum TestUnionInUnion_outer_inner_which which;
+			capnp_nowarn union {
+				int32_t foo;
+				int32_t bar;
+			};
 		} inner;
 		int32_t baz;
 	} outer;
@@ -862,6 +868,7 @@ static const size_t TestUnionInUnion_word_count = 2;
 static const size_t TestUnionInUnion_pointer_count = 0;
 
 static const size_t TestUnionInUnion_struct_bytes_count = 16;
+
 enum TestGroups_groups_which {
 	TestGroups_groups_foo = 0,
 	TestGroups_groups_bar = 2,
@@ -894,6 +901,7 @@ static const size_t TestGroups_word_count = 2;
 static const size_t TestGroups_pointer_count = 2;
 
 static const size_t TestGroups_struct_bytes_count = 32;
+
 enum TestInterleavedGroups_group1_which {
 	TestInterleavedGroups_group1_qux = 0,
 	TestInterleavedGroups_group1_corge = 1,
@@ -946,6 +954,7 @@ static const size_t TestInterleavedGroups_pointer_count = 6;
 
 static const size_t TestInterleavedGroups_struct_bytes_count = 96;
 
+
 struct TestUnionDefaults {
 	TestUnion_ptr s16s8s64s8Set;
 	TestUnion_ptr s0sps1s32Set;
@@ -959,6 +968,7 @@ static const size_t TestUnionDefaults_pointer_count = 4;
 
 static const size_t TestUnionDefaults_struct_bytes_count = 32;
 
+
 TestUnion_ptr TestUnionDefaults_get_s16s8s64s8Set(TestUnionDefaults_ptr p);
 
 TestUnion_ptr TestUnionDefaults_get_s0sps1s32Set(TestUnionDefaults_ptr p);
@@ -987,6 +997,7 @@ static const size_t TestNestedTypes_pointer_count = 1;
 
 static const size_t TestNestedTypes_struct_bytes_count = 16;
 
+
 TestNestedTypes_NestedStruct_ptr TestNestedTypes_get_nestedStruct(TestNestedTypes_ptr p);
 
 enum TestNestedTypes_NestedEnum TestNestedTypes_get_outerNestedEnum(TestNestedTypes_ptr p);
@@ -1010,6 +1021,7 @@ static const size_t TestNestedTypes_NestedStruct_pointer_count = 0;
 
 static const size_t TestNestedTypes_NestedStruct_struct_bytes_count = 8;
 
+
 enum TestNestedTypes_NestedEnum TestNestedTypes_NestedStruct_get_outerNestedEnum(TestNestedTypes_NestedStruct_ptr p);
 
 enum TestNestedTypes_NestedStruct_NestedEnum TestNestedTypes_NestedStruct_get_innerNestedEnum(TestNestedTypes_NestedStruct_ptr p);
@@ -1029,6 +1041,7 @@ static const size_t TestUsing_pointer_count = 0;
 
 static const size_t TestUsing_struct_bytes_count = 8;
 
+
 enum TestNestedTypes_NestedEnum TestUsing_get_outerNestedEnum(TestUsing_ptr p);
 
 enum TestNestedTypes_NestedStruct_NestedEnum TestUsing_get_innerNestedEnum(TestUsing_ptr p);
@@ -1056,6 +1069,7 @@ static const size_t TestLists_pointer_count = 10;
 
 static const size_t TestLists_struct_bytes_count = 80;
 
+
 TestLists_Struct0_list TestLists_get_list0(TestLists_ptr p);
 
 TestLists_Struct1_list TestLists_get_list1(TestLists_ptr p);
@@ -1105,6 +1119,7 @@ static const size_t TestLists_Struct0_pointer_count = 0;
 
 static const size_t TestLists_Struct0_struct_bytes_count = 0;
 
+
 struct TestLists_Struct1 {
 	unsigned f : 1;
 };
@@ -1115,6 +1130,7 @@ static const size_t TestLists_Struct1_pointer_count = 0;
 
 static const size_t TestLists_Struct1_struct_bytes_count = 8;
 
+
 unsigned TestLists_Struct1_get_f(TestLists_Struct1_ptr p);
 
 void TestLists_Struct1_set_f(TestLists_Struct1_ptr p, unsigned f);
@@ -1129,6 +1145,7 @@ static const size_t TestLists_Struct8_pointer_count = 0;
 
 static const size_t TestLists_Struct8_struct_bytes_count = 8;
 
+
 uint8_t TestLists_Struct8_get_f(TestLists_Struct8_ptr p);
 
 void TestLists_Struct8_set_f(TestLists_Struct8_ptr p, uint8_t f);
@@ -1143,6 +1160,7 @@ static const size_t TestLists_Struct16_pointer_count = 0;
 
 static const size_t TestLists_Struct16_struct_bytes_count = 8;
 
+
 uint16_t TestLists_Struct16_get_f(TestLists_Struct16_ptr p);
 
 void TestLists_Struct16_set_f(TestLists_Struct16_ptr p, uint16_t f);
@@ -1157,6 +1175,7 @@ static const size_t TestLists_Struct32_pointer_count = 0;
 
 static const size_t TestLists_Struct32_struct_bytes_count = 8;
 
+
 uint32_t TestLists_Struct32_get_f(TestLists_Struct32_ptr p);
 
 void TestLists_Struct32_set_f(TestLists_Struct32_ptr p, uint32_t f);
@@ -1171,6 +1190,7 @@ static const size_t TestLists_Struct64_pointer_count = 0;
 
 static const size_t TestLists_Struct64_struct_bytes_count = 8;
 
+
 uint64_t TestLists_Struct64_get_f(TestLists_Struct64_ptr p);
 
 void TestLists_Struct64_set_f(TestLists_Struct64_ptr p, uint64_t f);
@@ -1185,6 +1205,7 @@ static const size_t TestLists_StructP_pointer_count = 1;
 
 static const size_t TestLists_StructP_struct_bytes_count = 8;
 
+
 capn_text TestLists_StructP_get_f(TestLists_StructP_ptr p);
 
 void TestLists_StructP_set_f(TestLists_StructP_ptr p, capn_text f);
@@ -1199,6 +1220,7 @@ static const size_t TestLists_Struct0c_pointer_count = 1;
 
 static const size_t TestLists_Struct0c_struct_bytes_count = 8;
 
+
 capn_text TestLists_Struct0c_get_pad(TestLists_Struct0c_ptr p);
 
 void TestLists_Struct0c_set_pad(TestLists_Struct0c_ptr p, capn_text pad);
@@ -1214,6 +1236,7 @@ static const size_t TestLists_Struct1c_pointer_count = 1;
 
 static const size_t TestLists_Struct1c_struct_bytes_count = 16;
 
+
 unsigned TestLists_Struct1c_get_f(TestLists_Struct1c_ptr p);
 
 capn_text TestLists_Struct1c_get_pad(TestLists_Struct1c_ptr p);
@@ -1233,6 +1256,7 @@ static const size_t TestLists_Struct8c_pointer_count = 1;
 
 static const size_t TestLists_Struct8c_struct_bytes_count = 16;
 
+
 uint8_t TestLists_Struct8c_get_f(TestLists_Struct8c_ptr p);
 
 capn_text TestLists_Struct8c_get_pad(TestLists_Struct8c_ptr p);
@@ -1252,6 +1276,7 @@ static const size_t TestLists_Struct16c_pointer_count = 1;
 
 static const size_t TestLists_Struct16c_struct_bytes_count = 16;
 
+
 uint16_t TestLists_Struct16c_get_f(TestLists_Struct16c_ptr p);
 
 capn_text TestLists_Struct16c_get_pad(TestLists_Struct16c_ptr p);
@@ -1271,6 +1296,7 @@ static const size_t TestLists_Struct32c_pointer_count = 1;
 
 static const size_t TestLists_Struct32c_struct_bytes_count = 16;
 
+
 uint32_t TestLists_Struct32c_get_f(TestLists_Struct32c_ptr p);
 
 capn_text TestLists_Struct32c_get_pad(TestLists_Struct32c_ptr p);
@@ -1290,6 +1316,7 @@ static const size_t TestLists_Struct64c_pointer_count = 1;
 
 static const size_t TestLists_Struct64c_struct_bytes_count = 16;
 
+
 uint64_t TestLists_Struct64c_get_f(TestLists_Struct64c_ptr p);
 
 capn_text TestLists_Struct64c_get_pad(TestLists_Struct64c_ptr p);
@@ -1309,6 +1336,7 @@ static const size_t TestLists_StructPc_pointer_count = 1;
 
 static const size_t TestLists_StructPc_struct_bytes_count = 16;
 
+
 capn_text TestLists_StructPc_get_f(TestLists_StructPc_ptr p);
 
 uint64_t TestLists_StructPc_get_pad(TestLists_StructPc_ptr p);
@@ -1329,6 +1357,7 @@ static const size_t TestFieldZeroIsBit_pointer_count = 0;
 
 static const size_t TestFieldZeroIsBit_struct_bytes_count = 8;
 
+
 unsigned TestFieldZeroIsBit_get_bit(TestFieldZeroIsBit_ptr p);
 
 unsigned TestFieldZeroIsBit_get_secondBit(TestFieldZeroIsBit_ptr p);
@@ -1351,6 +1380,7 @@ static const size_t TestListDefaults_pointer_count = 1;
 
 static const size_t TestListDefaults_struct_bytes_count = 8;
 
+
 TestLists_ptr TestListDefaults_get_lists(TestListDefaults_ptr p);
 
 void TestListDefaults_set_lists(TestListDefaults_ptr p, TestLists_ptr lists);
@@ -1389,6 +1419,7 @@ static const size_t TestLateUnion_pointer_count = 3;
 
 static const size_t TestLateUnion_struct_bytes_count = 48;
 
+
 int32_t TestLateUnion_get_foo(TestLateUnion_ptr p);
 
 capn_text TestLateUnion_get_bar(TestLateUnion_ptr p);
@@ -1413,6 +1444,7 @@ static const size_t TestOldVersion_pointer_count = 2;
 
 static const size_t TestOldVersion_struct_bytes_count = 24;
 
+
 int64_t TestOldVersion_get_old1(TestOldVersion_ptr p);
 
 capn_text TestOldVersion_get_old2(TestOldVersion_ptr p);
@@ -1439,6 +1471,7 @@ static const size_t TestNewVersion_pointer_count = 3;
 
 static const size_t TestNewVersion_struct_bytes_count = 40;
 
+
 int64_t TestNewVersion_get_old1(TestNewVersion_ptr p);
 
 capn_text TestNewVersion_get_old2(TestNewVersion_ptr p);
@@ -1477,6 +1510,7 @@ static const size_t TestStructUnion_pointer_count = 1;
 
 static const size_t TestStructUnion_struct_bytes_count = 16;
 
+
 struct TestStructUnion_SomeStruct {
 	capn_text someText;
 	capn_text moreText;
@@ -1488,6 +1522,7 @@ static const size_t TestStructUnion_SomeStruct_pointer_count = 2;
 
 static const size_t TestStructUnion_SomeStruct_struct_bytes_count = 16;
 
+
 capn_text TestStructUnion_SomeStruct_get_someText(TestStructUnion_SomeStruct_ptr p);
 
 capn_text TestStructUnion_SomeStruct_get_moreText(TestStructUnion_SomeStruct_ptr p);
@@ -1507,6 +1542,7 @@ static const size_t TestPrintInlineStructs_pointer_count = 2;
 
 static const size_t TestPrintInlineStructs_struct_bytes_count = 16;
 
+
 capn_text TestPrintInlineStructs_get_someText(TestPrintInlineStructs_ptr p);
 
 TestPrintInlineStructs_InlineStruct_list TestPrintInlineStructs_get_structList(TestPrintInlineStructs_ptr p);
@@ -1526,6 +1562,7 @@ static const size_t TestPrintInlineStructs_InlineStruct_pointer_count = 1;
 
 static const size_t TestPrintInlineStructs_InlineStruct_struct_bytes_count = 16;
 
+
 int32_t TestPrintInlineStructs_InlineStruct_get_int32Field(TestPrintInlineStructs_InlineStruct_ptr p);
 
 capn_text TestPrintInlineStructs_InlineStruct_get_textField(TestPrintInlineStructs_InlineStruct_ptr p);
@@ -1545,6 +1582,7 @@ static const size_t TestWholeFloatDefault_pointer_count = 0;
 
 static const size_t TestWholeFloatDefault_struct_bytes_count = 8;
 
+
 float TestWholeFloatDefault_get_field(TestWholeFloatDefault_ptr p);
 
 float TestWholeFloatDefault_get_bigField(TestWholeFloatDefault_ptr p);
@@ -1562,6 +1600,7 @@ static const size_t TestEmptyStruct_pointer_count = 0;
 
 static const size_t TestEmptyStruct_struct_bytes_count = 0;
 
+
 capnp_nowarn struct TestConstants {
 };
 
@@ -1571,6 +1610,7 @@ static const size_t TestConstants_pointer_count = 0;
 
 static const size_t TestConstants_struct_bytes_count = 0;
 
+
 struct TestSturdyRef {
 	TestSturdyRefHostId_ptr hostId;
 	capn_ptr objectId;
@@ -1582,6 +1622,7 @@ static const size_t TestSturdyRef_pointer_count = 2;
 
 static const size_t TestSturdyRef_struct_bytes_count = 16;
 
+
 TestSturdyRefHostId_ptr TestSturdyRef_get_hostId(TestSturdyRef_ptr p);
 
 capn_ptr TestSturdyRef_get_objectId(TestSturdyRef_ptr p);
@@ -1600,6 +1641,7 @@ static const size_t TestSturdyRefHostId_pointer_count = 1;
 
 static const size_t TestSturdyRefHostId_struct_bytes_count = 8;
 
+
 capn_text TestSturdyRefHostId_get_host(TestSturdyRefHostId_ptr p);
 
 void TestSturdyRefHostId_set_host(TestSturdyRefHostId_ptr p, capn_text host);
@@ -1614,6 +1656,7 @@ static const size_t TestSturdyRefObjectId_pointer_count = 0;
 
 static const size_t TestSturdyRefObjectId_struct_bytes_count = 8;
 
+
 enum TestSturdyRefObjectId_Tag TestSturdyRefObjectId_get_tag(TestSturdyRefObjectId_ptr p);
 
 void TestSturdyRefObjectId_set_tag(TestSturdyRefObjectId_ptr p, enum TestSturdyRefObjectId_Tag tag);
@@ -1627,6 +1670,7 @@ static const size_t TestProvisionId_pointer_count = 0;
 
 static const size_t TestProvisionId_struct_bytes_count = 0;
 
+
 capnp_nowarn struct TestRecipientId {
 };
 
@@ -1636,6 +1680,7 @@ static const size_t TestRecipientId_pointer_count = 0;
 
 static const size_t TestRecipientId_struct_bytes_count = 0;
 
+
 capnp_nowarn struct TestThirdPartyCapId {
 };
 
@@ -1645,6 +1690,7 @@ static const size_t TestThirdPartyCapId_pointer_count = 0;
 
 static const size_t TestThirdPartyCapId_struct_bytes_count = 0;
 
+
 capnp_nowarn struct TestJoinResult {
 };
 
@@ -1653,6 +1699,7 @@ static const size_t TestJoinResult_word_count = 0;
 static const size_t TestJoinResult_pointer_count = 0;
 
 static const size_t TestJoinResult_struct_bytes_count = 0;
+
 enum TestNameAnnotation_which {
 	TestNameAnnotation_badFieldName = 0,
 	TestNameAnnotation_bar = 1
@@ -1682,6 +1729,7 @@ static const size_t TestNameAnnotation_pointer_count = 1;
 
 static const size_t TestNameAnnotation_struct_bytes_count = 16;
 
+
 struct TestNameAnnotation_NestedStruct {
 	unsigned badNestedFieldName : 1;
 	TestNameAnnotation_NestedStruct_ptr anotherBadNestedFieldName;
@@ -1693,6 +1741,7 @@ static const size_t TestNameAnnotation_NestedStruct_pointer_count = 1;
 
 static const size_t TestNameAnnotation_NestedStruct_struct_bytes_count = 16;
 
+
 unsigned TestNameAnnotation_NestedStruct_get_badNestedFieldName(TestNameAnnotation_NestedStruct_ptr p);
 
 TestNameAnnotation_NestedStruct_ptr TestNameAnnotation_NestedStruct_get_anotherBadNestedFieldName(TestNameAnnotation_NestedStruct_ptr p);