diff --git a/compiler/src/main/cpp/capnpc-java.c++ b/compiler/src/main/cpp/capnpc-java.c++
index e1ea8d0..4a4691c 100644
--- a/compiler/src/main/cpp/capnpc-java.c++
+++ b/compiler/src/main/cpp/capnpc-java.c++
@@ -1027,8 +1027,8 @@ private:
 
     } else if (kind == FieldKind::INTERFACE) {
 
-      auto factoryArg = makeFactoryArg(schema::Type::ANY_POINTER);
-      auto capType = typeName(field.getType(), kj::str("Client")).flatten();
+      auto factoryArg = kj::str(typeName(field.getType()), ".factory");
+      auto capType = kj::str(typeName(field.getType()), ".Client");
 
       return FieldText {
         kj::strTree(
@@ -1040,7 +1040,7 @@ private:
 
             spaces(indent), "  public ", capType, " get", titleCase, "() {\n",
             unionDiscrim.check,
-            spaces(indent), "    return new ", capType, "(_getPointerField(", factoryArg, ", ", offset, ").getAsCap());\n",
+            spaces(indent), "    return _getPointerField(", factoryArg, ", ", offset, ");\n",
             spaces(indent), "  }\n"),
 
         kj::strTree(
@@ -1051,13 +1051,12 @@ private:
 
             spaces(indent), "  public ", capType, " get", titleCase, "() {\n",
             unionDiscrim.check,
-            spaces(indent), "    return new ", capType, "(\n",
-            spaces(indent), "      _getPointerField(", factoryArg, ", ", offset, ").getAsCap());\n",
+            spaces(indent), "    return _getPointerField(", factoryArg, ", ", offset, ");\n",
             spaces(indent), "  }\n",
 
             spaces(indent), "  public void set", titleCase, "(", capType, " value) {\n",
             unionDiscrim.set,
-            spaces(indent), "    _initPointerField(", factoryArg, ", ", offset, ", 0).setAsCap(value);\n",
+            spaces(indent), "    _initPointerField(", factoryArg, ", ", offset, ", 0);\n",
             spaces(indent), "  }\n",
             "\n")
           };
@@ -1593,8 +1592,13 @@ private:
 
     return InterfaceText {
       kj::strTree(
-          spaces(indent), "public static class ", name, "{\n",
-          spaces(indent), "\n",
+          spaces(indent), "public static class ", name, " {\n",
+          spaces(indent), "  public static final class Factory extends org.capnproto.Capability.Factory<Client> {\n",
+          spaces(indent), "    public final Client newClient(org.capnproto.ClientHook hook) {\n",
+          spaces(indent), "      return new Client(hook);\n",
+          spaces(indent), "    }\n",
+          spaces(indent), "  }\n",
+          spaces(indent), "  public static final Factory factory = new Factory();\n",
           spaces(indent), "  public static class Client extends org.capnproto.Capability.Client {\n",
           spaces(indent), "    public Client() {}\n",
           spaces(indent), "    public Client(org.capnproto.ClientHook hook) { super(hook); }\n",
@@ -1653,15 +1657,62 @@ private:
 
     bool isStreaming = method.isStreaming();
 
+    auto implicitParamsReader = proto.getImplicitParameters();
+
     auto interfaceTypeName = javaFullName(method.getContainingInterface());
+    kj::String paramType;
+    kj::String genericParamType;
 
-    kj::String paramType = (paramProto.getScopeId() == 0)
-      ? kj::str(interfaceTypeName, "Params")
-      : kj::str(javaFullName(paramSchema, method));
+    if (paramProto.getScopeId() == 0) {
+      paramType = kj::str(interfaceTypeName);
+      if (implicitParamsReader.size() == 0) {
+        paramType = kj::str(titleCase, "Params");
+        genericParamType = kj::str(paramType);
+      } else {
+        KJ_FAIL_REQUIRE("Generic interfaces not supported");
+        //genericParamType = paramType;
+        //genericParamType.addMemberTemplate(kj::str(titleCase, "Params"), nullptr);
+        //paramType.addMemberTemplate(kj::str(titleCase, "Params"),
+        //                            kj::heapArray(implicitParams.asPtr()));
+      }
+    } else {
+      paramType = kj::str(javaFullName(paramSchema, method));
+      genericParamType = kj::str(javaFullName(paramSchema, nullptr));
+    }
 
-    kj::String resultType = (resultProto.getScopeId() == 0)
-      ? kj::str(interfaceTypeName, "Results")
-      : kj::str(javaFullName(resultSchema, method));
+    kj::String resultType;
+    kj::String genericResultType;
+    if (isStreaming) {
+      // We don't use resultType or genericResultType in this case. We want to avoid computing them
+      // at all so that we don't end up marking stream.capnp.h in usedImports.
+    } else if (resultProto.getScopeId() == 0) {
+      resultType = kj::str(interfaceTypeName);
+      if (implicitParamsReader.size() == 0) {
+        resultType = kj::str(titleCase, "Results");
+        genericResultType = kj::str(resultType);
+      } else {
+        KJ_FAIL_REQUIRE("Generic interfaces not supported");
+        //genericResultType = resultType;
+        //genericResultType.addMemberTemplate(kj::str(titleCase, "Results"), nullptr);
+        //resultType.addMemberTemplate(kj::str(titleCase, "Results"),
+        //                             kj::heapArray(implicitParams.asPtr()));
+      }
+    } else {
+      resultType = kj::str(javaFullName(resultSchema, method));
+      genericResultType = kj::str(javaFullName(resultSchema, nullptr));
+    }
+
+    kj::String shortParamType = paramProto.getScopeId() == 0 ?
+        kj::str(titleCase, "Params") : kj::str(genericParamType);
+    kj::String shortResultType = resultProto.getScopeId() == 0 || isStreaming ?
+        kj::str(titleCase, "Results") : kj::str(genericResultType);
+
+    if (paramProto.getScopeId() == 0) {
+      paramType = kj::str(javaFullName(paramSchema, method));
+    }
+    if (resultProto.getScopeId() == 0) {
+      paramType = kj::str(javaFullName(resultSchema, method));
+    }
 
     auto interfaceProto = method.getContainingInterface().getProto();
     uint64_t interfaceId = interfaceProto.getId();
@@ -1692,8 +1743,8 @@ private:
           "          return org.capnproto.Capability.Server.",
           isStreaming ? "streamResult" : "result", "(\n",
           "            this.", identifierName, "(org.capnproto.Capability.Server.typedContext(\n"
-          "              ", paramType, ".factory,\n",
-          "              ", resultType, ".factory, context)));\n")
+          "              ", genericParamType, ".factory,\n",
+          "              ", genericResultType, ".factory, context)));\n")
     };
   }
 
diff --git a/runtime/src/main/java/org/capnproto/AnyPointer.java b/runtime/src/main/java/org/capnproto/AnyPointer.java
index 1fb76f6..feb304e 100644
--- a/runtime/src/main/java/org/capnproto/AnyPointer.java
+++ b/runtime/src/main/java/org/capnproto/AnyPointer.java
@@ -69,11 +69,6 @@ public final class AnyPointer {
             return factory.fromPointerReader(this.segment, this.capTable, this.pointer, this.nestingLimit);
         }
 
-        public final Capability.Client getAsCap() {
-            return new Capability.Client(
-                    WireHelpers.readCapabilityPointer(this.segment, capTable, this.pointer, 0));
-        }
-
         public final ClientHook getPipelinedCap(PipelineOp[] ops) {
             for (var op: ops) {
                 switch (op.type) {
diff --git a/runtime/src/main/java/org/capnproto/Capability.java b/runtime/src/main/java/org/capnproto/Capability.java
index 3087bda..ad75eb7 100644
--- a/runtime/src/main/java/org/capnproto/Capability.java
+++ b/runtime/src/main/java/org/capnproto/Capability.java
@@ -12,6 +12,30 @@ public final class Capability {
         CapTableReader capTable;
     }
 
+    public static abstract class Factory<T>
+            implements FromPointerReader<T>,
+                       FromPointerBuilder<T> {
+        @Override
+        public T fromPointerReader(SegmentReader segment, CapTableReader capTable, int pointer, int nestingLimit) {
+            var hook = WireHelpers.readCapabilityPointer(segment, capTable, pointer, 0);
+            return newClient(hook);
+        }
+
+        @Override
+        public T fromPointerBuilder(SegmentBuilder segment, CapTableBuilder capTable, int pointer) {
+            var hook = WireHelpers.readCapabilityPointer(segment, capTable, pointer, 0);
+            return newClient(hook);
+        }
+
+        @Override
+        public T initFromPointerBuilder(SegmentBuilder segment, CapTableBuilder capTable, int pointer, int elementCount) {
+            var hook = WireHelpers.readCapabilityPointer(segment, capTable, pointer, 0);
+            return newClient(hook);
+        }
+
+        public abstract T newClient(ClientHook hook);
+    }
+
     public static class Client {
 
         final ClientHook hook;
diff --git a/runtime/src/main/java/org/capnproto/WireHelpers.java b/runtime/src/main/java/org/capnproto/WireHelpers.java
index f96ca2c..8330212 100644
--- a/runtime/src/main/java/org/capnproto/WireHelpers.java
+++ b/runtime/src/main/java/org/capnproto/WireHelpers.java
@@ -1355,7 +1355,7 @@ final class WireHelpers {
             zeroPointerAndFars(segment, refOffset);
         }
         else if (capTable != null) {
-            WirePointer.setCap(segment.buffer, refOffset, capTable.injectCap(cap));
+            WirePointer.setCapability(segment.buffer, refOffset, capTable.injectCap(cap));
         }
         else {
             assert false: "Cannot set capability pointer without capTable";
diff --git a/runtime/src/main/java/org/capnproto/WirePointer.java b/runtime/src/main/java/org/capnproto/WirePointer.java
index 167b649..4d9b547 100644
--- a/runtime/src/main/java/org/capnproto/WirePointer.java
+++ b/runtime/src/main/java/org/capnproto/WirePointer.java
@@ -91,7 +91,7 @@ final class WirePointer {
         return offsetAndKind(wirePointer) == OTHER;
     }
 
-    public static void setCap(ByteBuffer buffer, int offset, int cap) {
+    public static void setCapability(ByteBuffer buffer, int offset, int cap) {
         setOffsetAndKind(buffer, offset, OTHER);
         buffer.putInt(offset*8 + 4, cap);
     }
diff --git a/runtime/src/test/java/org/capnproto/TwoPartyTest.java b/runtime/src/test/java/org/capnproto/TwoPartyTest.java
index 6178dd9..a946e43 100644
--- a/runtime/src/test/java/org/capnproto/TwoPartyTest.java
+++ b/runtime/src/test/java/org/capnproto/TwoPartyTest.java
@@ -1,20 +1,17 @@
 package org.capnproto;
 
 import org.capnproto.demo.Demo;
+import org.capnproto.demo.DemoFoo;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.nio.channels.AsynchronousServerSocketChannel;
 import java.nio.channels.AsynchronousSocketChannel;
-import java.nio.channels.CompletionHandler;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-import static org.junit.Assert.*;
-
 class TestCap0 {
 
     static final class Client extends org.capnproto.Capability.Client {
@@ -35,44 +32,31 @@ class TestCap0 {
         }
     }
 
-    static abstract class Server extends org.capnproto.Capability.Server {
-
-        public class TestMethod0Context extends CallContext<Demo.TestParams0.Reader, Demo.TestResults0.Builder> {
-            public TestMethod0Context(CallContextHook hook) {
-                super(Demo.TestParams0.factory, Demo.TestResults0.factory, hook);
-            }
-        }
-
-        public class TestMethod1Context extends CallContext<Demo.TestParams1.Reader, Demo.TestResults1.Builder> {
-            public TestMethod1Context(CallContextHook hook) {
-                super(Demo.TestParams1.factory, Demo.TestResults1.factory, hook);
-            }
-        }
-
+    public static class Server extends Capability.Server {
         @Override
         public DispatchCallResult dispatchCall(long interfaceId, short methodId, CallContext<AnyPointer.Reader, AnyPointer.Builder> context) {
             if (interfaceId == 0xa65f4a3d7f622e6bL) {
                 return dispatchCallInternal(methodId, context);
             }
-            return internalUnimplemented(Demo.class.getName(), interfaceId);
+            return result(internalUnimplemented(Demo.class.getName(), interfaceId));
         }
 
-        private DispatchCallResult dispatchCallInternal(short methodId, CallContext<AnyPointer.Reader, AnyPointer.Builder> ctx) {
+        DispatchCallResult dispatchCallInternal(short methodId, CallContext<AnyPointer.Reader, AnyPointer.Builder> ctx) {
             switch (methodId) {
                 case 0:
-                    return new DispatchCallResult(testMethod0(new TestMethod0Context(ctx.getHook())));
+                    return result(testMethod0(typedContext(Demo.TestParams0.factory, Demo.TestResults0.factory, ctx)));
                 case 1:
-                    return new DispatchCallResult(testMethod1(new TestMethod1Context(ctx.getHook())));
+                    return result(testMethod1(typedContext(Demo.TestParams1.factory, Demo.TestResults1.factory, ctx)));
                 default:
-                    return internalUnimplemented(Demo.class.getName(), 0xa27d3c231c7b9202L, methodId);
+                    return result(internalUnimplemented(Demo.class.getName(), 0xa27d3c231c7b9202L, methodId));
             }
         }
 
-        public CompletableFuture<?> testMethod0(TestMethod0Context ctx) {
+        public CompletableFuture<?> testMethod0(CallContext<Demo.TestParams0.Reader, Demo.TestResults0.Builder> ctx) {
             return CompletableFuture.failedFuture(RpcException.unimplemented("testMethod0"));
         }
 
-        public CompletableFuture<?> testMethod1(TestMethod1Context ctx) {
+        public CompletableFuture<?> testMethod1(CallContext<Demo.TestParams1.Reader, Demo.TestResults1.Builder>  ctx) {
             return CompletableFuture.failedFuture(RpcException.unimplemented("testMethod1"));
         }
     }
@@ -97,13 +81,13 @@ class TestCap1 {
             if (interfaceId == 0x81da3f8f6079c216L) {
                 return dispatchCallInternal(methodId, context);
             }
-            return internalUnimplemented(Demo.class.getName(), interfaceId);
+            return result(internalUnimplemented(Demo.class.getName(), interfaceId));
         }
 
         private DispatchCallResult dispatchCallInternal(short methodId, CallContext<AnyPointer.Reader, AnyPointer.Builder> ctx) {
             switch (methodId) {
                 default:
-                    return internalUnimplemented(Demo.class.getName(), 0x81da3f8f6079c216L, methodId);
+                    return result(internalUnimplemented(Demo.class.getName(), 0x81da3f8f6079c216L, methodId));
             }
         }
     }
@@ -114,22 +98,22 @@ class TestCap0Impl extends TestCap0.Server {
     final TestCap1.Client testCap1a = new TestCap1.Client(new TestCap1Impl());
     final TestCap1.Client testCap1b = new TestCap1.Client(new TestCap1Impl());
 
-    public CompletableFuture<?> testMethod0(TestCap0.Server.TestMethod0Context ctx) {
+    public CompletableFuture<?> testMethod0(CallContext<Demo.TestParams0.Reader, Demo.TestResults0.Builder>  ctx) {
         var params = ctx.getParams();
         var results = ctx.getResults();
         results.setResult0(params.getParam0());
         return CompletableFuture.completedFuture(null);
     }
 
-    public CompletableFuture<?> testMethod1(TestCap0.Server.TestMethod1Context ctx) {
+    public CompletableFuture<?> testMethod1(CallContext<Demo.TestParams1.Reader, Demo.TestResults1.Builder>  ctx) {
         var params = ctx.getParams();
         var results = ctx.getResults();
         var res0 = results.getResult0();
-        res0.setAsCapability(testCap1a);
+        res0.setAsCap(testCap1a);
         var res1 = results.getResult1();
-        res1.setAsCapability(testCap1b);
+        res1.setAsCap(testCap1b);
         var res2 = results.getResult2();
-        res2.setAsCapability(testCap1b);
+        res2.setAsCap(testCap1b);
         return CompletableFuture.completedFuture(null);
     }
 }
@@ -204,15 +188,16 @@ public class TwoPartyTest {
         }
         Assert.assertTrue(resultsPromise.isDone());
         var results = resultsPromise.get();
-        var cap0 = results.getResult0().getAsCapability();
-        Assert.assertFalse(cap0.hook.isNull());
-        Assert.assertFalse(cap0.hook.isError());
-        var cap1 = results.getResult1().getAsCapability();
-        Assert.assertFalse(cap1.hook.isNull());
-        Assert.assertFalse(cap1.hook.isError());
-        var cap2 = results.getResult2().getAsCapability();
-        Assert.assertFalse(cap2.hook.isNull());
-        Assert.assertFalse(cap2.hook.isError());
+        var cap0 = results.getResult0();
+        Assert.assertFalse(cap0.isNull());
+        var cap1 = results.getResult1();
+        Assert.assertFalse(cap1.isNull());
+        var cap2 = results.getResult2();
+        Assert.assertFalse(cap2.isNull());
+
+        var cap3 = results.getResult2().getAs(Demo.Iface0.factory);
+        Assert.assertFalse(cap2.isNull());
+        //Assert.assertFalse(cap2.hook.isError());
     }
 
     @Test
@@ -225,4 +210,15 @@ public class TwoPartyTest {
         var results = request.send().get();
         Assert.assertEquals(params.getParam0(), results.getResult0());
     }
+
+    @Test
+    public void testGenericServer() throws ExecutionException, InterruptedException {
+        var demo = new TestCap0Impl();
+        var client = new TestCap0.Client(demo);
+        var request = client.testMethod0Request();
+        var params = request.params();
+        params.setParam0(4321);
+        var results = request.send().get();
+        Assert.assertEquals(params.getParam0(), results.getResult0());
+    }
 }
\ No newline at end of file
diff --git a/runtime/src/test/java/org/capnproto/demo/Demo.java b/runtime/src/test/java/org/capnproto/demo/Demo.java
index 46687de..820e36e 100644
--- a/runtime/src/test/java/org/capnproto/demo/Demo.java
+++ b/runtime/src/test/java/org/capnproto/demo/Demo.java
@@ -263,7 +263,7 @@ public final class Demo {
 
 
   public static class Struct0 {
-    public static final org.capnproto.StructSize STRUCT_SIZE = new org.capnproto.StructSize((short)6,(short)3);
+    public static final org.capnproto.StructSize STRUCT_SIZE = new org.capnproto.StructSize((short)1,(short)0);
     public static final class Factory extends org.capnproto.StructFactory<Builder, Reader> {
       public Factory() {
       }
@@ -297,105 +297,6 @@ public final class Demo {
         _setBooleanField(0, value);
       }
 
-      public final short getF1() {
-        return _getShortField(1);
-      }
-      public final void setF1(short value) {
-        _setShortField(1, value);
-      }
-
-      public final short getF2() {
-        return _getShortField(2);
-      }
-      public final void setF2(short value) {
-        _setShortField(2, value);
-      }
-
-      public final int getF3() {
-        return _getIntField(2);
-      }
-      public final void setF3(int value) {
-        _setIntField(2, value);
-      }
-
-      public final int getF4() {
-        return _getIntField(3);
-      }
-      public final void setF4(int value) {
-        _setIntField(3, value);
-      }
-
-      public final long getF5() {
-        return _getLongField(2);
-      }
-      public final void setF5(long value) {
-        _setLongField(2, value);
-      }
-
-      public final long getF6() {
-        return _getLongField(3);
-      }
-      public final void setF6(long value) {
-        _setLongField(3, value);
-      }
-
-      public final float getF7() {
-        return _getFloatField(8);
-      }
-      public final void setF7(float value) {
-        _setFloatField(8, value);
-      }
-
-      public final double getF8() {
-        return _getDoubleField(5);
-      }
-      public final void setF8(double value) {
-        _setDoubleField(5, value);
-      }
-
-      public final boolean hasF9() {
-        return !_pointerFieldIsNull(0);
-      }
-      public final org.capnproto.Text.Builder getF9() {
-        return _getPointerField(org.capnproto.Text.factory, 0, null, 0, 0);
-      }
-      public final void setF9(org.capnproto.Text.Reader value) {
-        _setPointerField(org.capnproto.Text.factory, 0, value);
-      }
-      public final void setF9(String value) {
-        _setPointerField(org.capnproto.Text.factory, 0, new org.capnproto.Text.Reader(value));
-      }
-      public final org.capnproto.Text.Builder initF9(int size) {
-        return _initPointerField(org.capnproto.Text.factory, 0, size);
-      }
-      public final boolean hasF10() {
-        return !_pointerFieldIsNull(1);
-      }
-      public final org.capnproto.Data.Builder getF10() {
-        return _getPointerField(org.capnproto.Data.factory, 1, null, 0, 0);
-      }
-      public final void setF10(org.capnproto.Data.Reader value) {
-        _setPointerField(org.capnproto.Data.factory, 1, value);
-      }
-      public final void setF10(byte [] value) {
-        _setPointerField(org.capnproto.Data.factory, 1, new org.capnproto.Data.Reader(value));
-      }
-      public final org.capnproto.Data.Builder initF10(int size) {
-        return _initPointerField(org.capnproto.Data.factory, 1, size);
-      }
-      public final boolean hasF11() {
-        return !_pointerFieldIsNull(2);
-      }
-      public org.capnproto.AnyPointer.Builder getF11() {
-        return _getPointerField(org.capnproto.AnyPointer.factory, 2);
-      }
-      public org.capnproto.AnyPointer.Builder initF11() {
-        return _initPointerField(org.capnproto.AnyPointer.factory, 2, 0);
-      }
-      public org.capnproto.AnyPointer.Builder initF11(int size) {
-        return _initPointerField(org.capnproto.AnyPointer.factory, 2, size);
-      }
-
     }
 
     public static final class Reader extends org.capnproto.StructReader {
@@ -407,65 +308,18 @@ public final class Demo {
         return _getBooleanField(0);
       }
 
-      public final short getF1() {
-        return _getShortField(1);
-      }
-
-      public final short getF2() {
-        return _getShortField(2);
-      }
-
-      public final int getF3() {
-        return _getIntField(2);
-      }
-
-      public final int getF4() {
-        return _getIntField(3);
-      }
-
-      public final long getF5() {
-        return _getLongField(2);
-      }
-
-      public final long getF6() {
-        return _getLongField(3);
-      }
-
-      public final float getF7() {
-        return _getFloatField(8);
-      }
-
-      public final double getF8() {
-        return _getDoubleField(5);
-      }
-
-      public boolean hasF9() {
-        return !_pointerFieldIsNull(0);
-      }
-      public org.capnproto.Text.Reader getF9() {
-        return _getPointerField(org.capnproto.Text.factory, 0, null, 0, 0);
-      }
-
-      public boolean hasF10() {
-        return !_pointerFieldIsNull(1);
-      }
-      public org.capnproto.Data.Reader getF10() {
-        return _getPointerField(org.capnproto.Data.factory, 1, null, 0, 0);
-      }
-
-      public boolean hasF11() {
-        return !_pointerFieldIsNull(2);
-      }
-      public org.capnproto.AnyPointer.Reader getF11() {
-        return _getPointerField(org.capnproto.AnyPointer.factory, 2);
-      }
     }
 
   }
 
 
   public static class Iface0 {
-  
+    public static final class Factory extends org.capnproto.Capability.Factory<Client> {
+      public final Client newClient(org.capnproto.ClientHook hook) {
+        return new Client(hook);
+      }
+    }
+    public static final Factory factory = new Factory();
     public static class Client extends org.capnproto.Capability.Client {
       public Client() {}
       public Client(org.capnproto.ClientHook hook) { super(hook); }
@@ -486,7 +340,7 @@ public final class Demo {
             org.capnproto.Capability.Server.internalUnimplemented("Iface0", interfaceId));
       }
   
-      protected  org.capnproto.DispatchCallResult dispatchCallInternal(short methodId, org.capnproto.CallContext<org.capnproto.AnyPointer.Reader, org.capnproto.AnyPointer.Builder> context) {
+      protected org.capnproto.DispatchCallResult dispatchCallInternal(short methodId, org.capnproto.CallContext<org.capnproto.AnyPointer.Reader, org.capnproto.AnyPointer.Builder> context) {
         switch (methodId) {
         default:
           return org.capnproto.Capability.Server.result(
@@ -497,8 +351,6 @@ public final class Demo {
     }
   
   
-      static Object brand() { return null; /*schema.defaultBrand;*/ }
-
   }
   
   public static class Struct2 {
@@ -546,11 +398,10 @@ public final class Demo {
         return !_pointerFieldIsNull(1);
       }
       public org.capnproto.demo.Demo.Iface0.Client getF1i() {
-        return new org.capnproto.demo.Demo.Iface0.Client(
-          _getPointerField(org.capnproto.AnyPointer.factory, 1).getAsCap());
+        return _getPointerField(org.capnproto.demo.Demo.Iface0.factory, 1);
       }
       public void setF1i(org.capnproto.demo.Demo.Iface0.Client value) {
-        _initPointerField(org.capnproto.AnyPointer.factory, 1, 0).setAsCap(value);
+        _initPointerField(org.capnproto.demo.Demo.Iface0.factory, 1, 0);
       }
 
     }
@@ -570,7 +421,7 @@ public final class Demo {
         return !_pointerFieldIsNull(1);
       }
       public org.capnproto.demo.Demo.Iface0.Client getF1i() {
-        return new org.capnproto.demo.Demo.Iface0.Client(_getPointerField(org.capnproto.AnyPointer.factory, 1).getAsCap());
+        return _getPointerField(org.capnproto.demo.Demo.Iface0.factory, 1);
       }
     }
 
@@ -578,7 +429,12 @@ public final class Demo {
 
 
   public static class Iface1 {
-  
+    public static final class Factory extends org.capnproto.Capability.Factory<Client> {
+      public final Client newClient(org.capnproto.ClientHook hook) {
+        return new Client(hook);
+      }
+    }
+    public static final Factory factory = new Factory();
     public static class Client extends org.capnproto.Capability.Client {
       public Client() {}
       public Client(org.capnproto.ClientHook hook) { super(hook); }
@@ -599,18 +455,18 @@ public final class Demo {
             org.capnproto.Capability.Server.internalUnimplemented("Iface1", interfaceId));
       }
   
-      protected  org.capnproto.DispatchCallResult dispatchCallInternal(short methodId, org.capnproto.CallContext<org.capnproto.AnyPointer.Reader, org.capnproto.AnyPointer.Builder> context) {
+      protected org.capnproto.DispatchCallResult dispatchCallInternal(short methodId, org.capnproto.CallContext<org.capnproto.AnyPointer.Reader, org.capnproto.AnyPointer.Builder> context) {
         switch (methodId) {
         case 0:
           return org.capnproto.Capability.Server.result(
             this.method0(org.capnproto.Capability.Server.typedContext(
-              org.capnproto.demo.Demo.Iface1.Method0Params.factory,
-              org.capnproto.demo.Demo.Iface1.Method0Results.factory, context)));
+              Method0Params.factory,
+              Method0Results.factory, context)));
         case 1:
           return org.capnproto.Capability.Server.result(
             this.method1(org.capnproto.Capability.Server.typedContext(
-              org.capnproto.demo.Demo.Iface1.Method1Params.factory,
-              org.capnproto.demo.Demo.Iface1.Method1Results.factory, context)));
+              Method1Params.factory,
+              Method1Results.factory, context)));
         default:
           return org.capnproto.Capability.Server.result(
             org.capnproto.Capability.Server.internalUnimplemented("Iface1", 0xd52dcf38c9f6f7c0L, methodId));
@@ -632,7 +488,7 @@ public final class Demo {
     }
   
     public static class Struct1 {
-      public static final org.capnproto.StructSize STRUCT_SIZE = new org.capnproto.StructSize((short)6,(short)3);
+      public static final org.capnproto.StructSize STRUCT_SIZE = new org.capnproto.StructSize((short)1,(short)1);
       public static final class Factory extends org.capnproto.StructFactory<Builder, Reader> {
         public Factory() {
         }
@@ -666,103 +522,17 @@ public final class Demo {
           _setBooleanField(0, value);
         }
 
-        public final short getF1() {
-          return _getShortField(1);
-        }
-        public final void setF1(short value) {
-          _setShortField(1, value);
-        }
-
-        public final short getF2() {
-          return _getShortField(2);
-        }
-        public final void setF2(short value) {
-          _setShortField(2, value);
-        }
-
-        public final int getF3() {
-          return _getIntField(2);
-        }
-        public final void setF3(int value) {
-          _setIntField(2, value);
-        }
-
-        public final int getF4() {
-          return _getIntField(3);
-        }
-        public final void setF4(int value) {
-          _setIntField(3, value);
-        }
-
-        public final long getF5() {
-          return _getLongField(2);
-        }
-        public final void setF5(long value) {
-          _setLongField(2, value);
-        }
-
-        public final long getF6() {
-          return _getLongField(3);
-        }
-        public final void setF6(long value) {
-          _setLongField(3, value);
-        }
-
-        public final float getF7() {
-          return _getFloatField(8);
-        }
-        public final void setF7(float value) {
-          _setFloatField(8, value);
-        }
-
-        public final double getF8() {
-          return _getDoubleField(5);
-        }
-        public final void setF8(double value) {
-          _setDoubleField(5, value);
-        }
-
-        public final boolean hasF9() {
+        public final boolean hasF1() {
           return !_pointerFieldIsNull(0);
         }
-        public final org.capnproto.Text.Builder getF9() {
-          return _getPointerField(org.capnproto.Text.factory, 0, null, 0, 0);
+        public org.capnproto.AnyPointer.Builder getF1() {
+          return _getPointerField(org.capnproto.AnyPointer.factory, 0);
         }
-        public final void setF9(org.capnproto.Text.Reader value) {
-          _setPointerField(org.capnproto.Text.factory, 0, value);
+        public org.capnproto.AnyPointer.Builder initF1() {
+          return _initPointerField(org.capnproto.AnyPointer.factory, 0, 0);
         }
-        public final void setF9(String value) {
-          _setPointerField(org.capnproto.Text.factory, 0, new org.capnproto.Text.Reader(value));
-        }
-        public final org.capnproto.Text.Builder initF9(int size) {
-          return _initPointerField(org.capnproto.Text.factory, 0, size);
-        }
-        public final boolean hasF10() {
-          return !_pointerFieldIsNull(1);
-        }
-        public final org.capnproto.Data.Builder getF10() {
-          return _getPointerField(org.capnproto.Data.factory, 1, null, 0, 0);
-        }
-        public final void setF10(org.capnproto.Data.Reader value) {
-          _setPointerField(org.capnproto.Data.factory, 1, value);
-        }
-        public final void setF10(byte [] value) {
-          _setPointerField(org.capnproto.Data.factory, 1, new org.capnproto.Data.Reader(value));
-        }
-        public final org.capnproto.Data.Builder initF10(int size) {
-          return _initPointerField(org.capnproto.Data.factory, 1, size);
-        }
-        public final boolean hasF11() {
-          return !_pointerFieldIsNull(2);
-        }
-        public org.capnproto.AnyPointer.Builder getF11() {
-          return _getPointerField(org.capnproto.AnyPointer.factory, 2);
-        }
-        public org.capnproto.AnyPointer.Builder initF11() {
-          return _initPointerField(org.capnproto.AnyPointer.factory, 2, 0);
-        }
-        public org.capnproto.AnyPointer.Builder initF11(int size) {
-          return _initPointerField(org.capnproto.AnyPointer.factory, 2, size);
+        public org.capnproto.AnyPointer.Builder initF1(int size) {
+          return _initPointerField(org.capnproto.AnyPointer.factory, 0, size);
         }
 
       }
@@ -776,57 +546,11 @@ public final class Demo {
           return _getBooleanField(0);
         }
 
-        public final short getF1() {
-          return _getShortField(1);
-        }
-
-        public final short getF2() {
-          return _getShortField(2);
-        }
-
-        public final int getF3() {
-          return _getIntField(2);
-        }
-
-        public final int getF4() {
-          return _getIntField(3);
-        }
-
-        public final long getF5() {
-          return _getLongField(2);
-        }
-
-        public final long getF6() {
-          return _getLongField(3);
-        }
-
-        public final float getF7() {
-          return _getFloatField(8);
-        }
-
-        public final double getF8() {
-          return _getDoubleField(5);
-        }
-
-        public boolean hasF9() {
+        public boolean hasF1() {
           return !_pointerFieldIsNull(0);
         }
-        public org.capnproto.Text.Reader getF9() {
-          return _getPointerField(org.capnproto.Text.factory, 0, null, 0, 0);
-        }
-
-        public boolean hasF10() {
-          return !_pointerFieldIsNull(1);
-        }
-        public org.capnproto.Data.Reader getF10() {
-          return _getPointerField(org.capnproto.Data.factory, 1, null, 0, 0);
-        }
-
-        public boolean hasF11() {
-          return !_pointerFieldIsNull(2);
-        }
-        public org.capnproto.AnyPointer.Reader getF11() {
-          return _getPointerField(org.capnproto.AnyPointer.factory, 2);
+        public org.capnproto.AnyPointer.Reader getF1() {
+          return _getPointerField(org.capnproto.AnyPointer.factory, 0);
         }
       }
 
@@ -1017,11 +741,10 @@ public final class Demo {
           return !_pointerFieldIsNull(0);
         }
         public org.capnproto.demo.Demo.Iface0.Client getResult0() {
-          return new org.capnproto.demo.Demo.Iface0.Client(
-            _getPointerField(org.capnproto.AnyPointer.factory, 0).getAsCap());
+          return _getPointerField(org.capnproto.demo.Demo.Iface0.factory, 0);
         }
         public void setResult0(org.capnproto.demo.Demo.Iface0.Client value) {
-          _initPointerField(org.capnproto.AnyPointer.factory, 0, 0).setAsCap(value);
+          _initPointerField(org.capnproto.demo.Demo.Iface0.factory, 0, 0);
         }
 
       }
@@ -1035,7 +758,7 @@ public final class Demo {
           return !_pointerFieldIsNull(0);
         }
         public org.capnproto.demo.Demo.Iface0.Client getResult0() {
-          return new org.capnproto.demo.Demo.Iface0.Client(_getPointerField(org.capnproto.AnyPointer.factory, 0).getAsCap());
+          return _getPointerField(org.capnproto.demo.Demo.Iface0.factory, 0);
         }
       }
 
@@ -1043,8 +766,6 @@ public final class Demo {
 
 
   
-      static Object brand() { return null; /*schema.defaultBrand;*/ }
-
   }
   
 
@@ -1241,14 +962,14 @@ public static final org.capnproto.SegmentReader b_b1af51b6aef0e7bc =
    org.capnproto.GeneratedClassSupport.decodeRawBytes(
    "\u0000\u0000\u0000\u0000\u0005\u0000\u0006\u0000" +
    "\u00bc\u00e7\u00f0\u00ae\u00b6\u0051\u00af\u00b1" +
-   "\u0034\u0000\u0000\u0000\u0001\u0000\u0006\u0000" +
+   "\u0034\u0000\u0000\u0000\u0001\u0000\u0001\u0000" +
    "\u0042\u0047\u00e8\u0082\u0015\u007a\u0057\u00b6" +
-   "\u0003\u0000\u0007\u0000\u0000\u0000\u0000\u0000" +
+   "\u0000\u0000\u0007\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0015\u0000\u0000\u0000\u00e2\u0001\u0000\u0000" +
    "\u0031\u0000\u0000\u0000\u0007\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u002d\u0000\u0000\u0000\u00a7\u0002\u0000\u0000" +
+   "\u002d\u0000\u0000\u0000\u003f\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0072\u0075\u006e\u0074\u0069\u006d\u0065\u002f" +
@@ -1260,91 +981,14 @@ public static final org.capnproto.SegmentReader b_b1af51b6aef0e7bc =
    "\u0070\u006e\u0070\u003a\u0053\u0074\u0072\u0075" +
    "\u0063\u0074\u0030\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000" +
-   "\u0030\u0000\u0000\u0000\u0003\u0000\u0004\u0000" +
+   "\u0004\u0000\u0000\u0000\u0003\u0000\u0004\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0041\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
+   "\r\u0000\u0000\u0000\u001a\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u003c\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0048\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0001\u0000\u0000\u0000\u0001\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0045\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0040\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u004c\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0002\u0000\u0000\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0049\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0044\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0050\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0003\u0000\u0000\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0003\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u004d\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0048\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0054\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0004\u0000\u0000\u0000\u0003\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0004\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0051\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u004c\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0058\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0005\u0000\u0000\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0005\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0055\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0050\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\\\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0006\u0000\u0000\u0000\u0003\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0006\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0059\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0054\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0060\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0007\u0000\u0000\u0000\u0008\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0007\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u005d\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0058\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0064\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0008\u0000\u0000\u0000\u0005\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0008\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0061\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\\\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0068\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0009\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0009\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0065\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0060\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u006c\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\n\u0000\u0000\u0000\u0001\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\n\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0069\u0001\u0000\u0000\"\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0064\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0070\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u000b\u0000\u0000\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u000b\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u006d\u0001\u0000\u0000\"\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0068\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0074\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
+   "\u0008\u0000\u0000\u0000\u0003\u0000\u0001\u0000" +
+   "\u0014\u0000\u0000\u0000\u0002\u0000\u0001\u0000" +
    "\u0066\u0030\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
@@ -1352,94 +996,6 @@ public static final org.capnproto.SegmentReader b_b1af51b6aef0e7bc =
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0031\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0007\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0007\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0032\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0033\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0008\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0008\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0034\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0035\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0009\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0009\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0036\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0005\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0005\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0037\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0038\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u000b\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u000b\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0039\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u000c\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u000c\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0031\u0030\u0000\u0000\u0000\u0000\u0000" +
-   "\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0031\u0031\u0000\u0000\u0000\u0000\u0000" +
-   "\u0012\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0012\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" + "");
 public static final org.capnproto.SegmentReader b_ac6d126c2fac16eb =
    org.capnproto.GeneratedClassSupport.decodeRawBytes(
@@ -1572,14 +1128,14 @@ public static final org.capnproto.SegmentReader b_800ca862fbfddd38 =
    org.capnproto.GeneratedClassSupport.decodeRawBytes(
    "\u0000\u0000\u0000\u0000\u0005\u0000\u0006\u0000" +
    "\u0038\u00dd\u00fd\u00fb\u0062\u00a8\u000c\u0080" +
-   "\u003b\u0000\u0000\u0000\u0001\u0000\u0006\u0000" +
+   "\u003b\u0000\u0000\u0000\u0001\u0000\u0001\u0000" +
    "\u00c0\u00f7\u00f6\u00c9\u0038\u00cf\u002d\u00d5" +
-   "\u0003\u0000\u0007\u0000\u0000\u0000\u0000\u0000" +
+   "\u0001\u0000\u0007\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0015\u0000\u0000\u0000\u001a\u0002\u0000\u0000" +
    "\u0035\u0000\u0000\u0000\u0007\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0031\u0000\u0000\u0000\u00a7\u0002\u0000\u0000" +
+   "\u0031\u0000\u0000\u0000\u0077\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0072\u0075\u006e\u0074\u0069\u006d\u0065\u002f" +
@@ -1592,91 +1148,21 @@ public static final org.capnproto.SegmentReader b_800ca862fbfddd38 =
    "\u0065\u0031\u002e\u0053\u0074\u0072\u0075\u0063" +
    "\u0074\u0031\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000" +
-   "\u0030\u0000\u0000\u0000\u0003\u0000\u0004\u0000" +
+   "\u0008\u0000\u0000\u0000\u0003\u0000\u0004\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0001\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0041\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
+   "\u0029\u0000\u0000\u0000\u001a\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u003c\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0048\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0001\u0000\u0000\u0000\u0001\u0000\u0000\u0000" +
+   "\u0024\u0000\u0000\u0000\u0003\u0000\u0001\u0000" +
+   "\u0030\u0000\u0000\u0000\u0002\u0000\u0001\u0000" +
+   "\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0045\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
+   "\u002d\u0000\u0000\u0000\u001a\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0040\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u004c\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0002\u0000\u0000\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0049\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0044\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0050\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0003\u0000\u0000\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0003\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u004d\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0048\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0054\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0004\u0000\u0000\u0000\u0003\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0004\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0051\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u004c\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0058\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0005\u0000\u0000\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0005\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0055\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0050\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\\\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0006\u0000\u0000\u0000\u0003\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0006\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0059\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0054\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0060\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0007\u0000\u0000\u0000\u0008\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0007\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u005d\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0058\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0064\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0008\u0000\u0000\u0000\u0005\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0008\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0061\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\\\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0068\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u0009\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u0009\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0065\u0001\u0000\u0000\u001a\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0060\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u006c\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\n\u0000\u0000\u0000\u0001\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\n\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0069\u0001\u0000\u0000\"\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0064\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0070\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
-   "\u000b\u0000\u0000\u0000\u0002\u0000\u0000\u0000" +
-   "\u0000\u0000\u0001\u0000\u000b\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u006d\u0001\u0000\u0000\"\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0068\u0001\u0000\u0000\u0003\u0000\u0001\u0000" +
-   "\u0074\u0001\u0000\u0000\u0002\u0000\u0001\u0000" +
+   "\u0028\u0000\u0000\u0000\u0003\u0000\u0001\u0000" +
+   "\u0034\u0000\u0000\u0000\u0002\u0000\u0001\u0000" +
    "\u0066\u0030\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
@@ -1686,86 +1172,6 @@ public static final org.capnproto.SegmentReader b_800ca862fbfddd38 =
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0066\u0031\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0007\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0007\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0032\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0003\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0033\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0008\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0008\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0034\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0004\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0035\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0009\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0009\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0036\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0005\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0005\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0037\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\n\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0038\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u000b\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u000b\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0039\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u000c\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u000c\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0031\u0030\u0000\u0000\u0000\u0000\u0000" +
-   "\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\r\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
-   "\u0066\u0031\u0031\u0000\u0000\u0000\u0000\u0000" +
    "\u0012\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
    "\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" +
diff --git a/runtime/src/test/java/org/capnproto/demo/demo.capnp b/runtime/src/test/java/org/capnproto/demo/demo.capnp
index 550f9c0..a9676ed 100644
--- a/runtime/src/test/java/org/capnproto/demo/demo.capnp
+++ b/runtime/src/test/java/org/capnproto/demo/demo.capnp
@@ -24,17 +24,6 @@ struct TestResults1 {
 
 struct Struct0 {
     f0  @0  :Bool;
-    f1  @1  :UInt16;
-    f2  @2  :Int16;
-    f3  @3  :UInt32;
-    f4  @4  :Int32;
-    f5  @5  :UInt64;
-    f6  @6  :Int64;
-    f7  @7  :Float32;
-    f8  @8  :Float64;
-    f9  @9  :Text;
-    f10 @10 :Data;
-    f11 @11 :AnyPointer;
 }
 
 interface Iface0 {
@@ -49,22 +38,11 @@ interface Iface1 {
 
   struct Struct1 {
     f0  @0  :Bool;
-    f1  @1  :UInt16;
-    f2  @2  :Int16;
-    f3  @3  :UInt32;
-    f4  @4  :Int32;
-    f5  @5  :UInt64;
-    f6  @6  :Int64;
-    f7  @7  :Float32;
-    f8  @8  :Float64;
-    f9  @9  :Text;
-    f10 @10 :Data;
-    f11 @11 :AnyPointer;
+    f1 @1 :AnyPointer;
   }
 
   method0 @0 () -> (result0 :Struct0, result1 :Struct1);
   method1 @1 () -> (result0: Iface0);
-
 }
 
 
diff --git a/runtime/src/test/java/org/capnproto/demo/demo.capnp.c++ b/runtime/src/test/java/org/capnproto/demo/demo.capnp.c++
index 5dd280d..db120da 100644
--- a/runtime/src/test/java/org/capnproto/demo/demo.capnp.c++
+++ b/runtime/src/test/java/org/capnproto/demo/demo.capnp.c++
@@ -229,17 +229,17 @@ const ::capnp::_::RawSchema s_d1342392ab536963 = {
   0, 3, i_d1342392ab536963, nullptr, nullptr, { &s_d1342392ab536963, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
-static const ::capnp::_::AlignedData<202> b_b1af51b6aef0e7bc = {
+static const ::capnp::_::AlignedData<37> b_b1af51b6aef0e7bc = {
   {   0,   0,   0,   0,   5,   0,   6,   0,
     188, 231, 240, 174, 182,  81, 175, 177,
-     52,   0,   0,   0,   1,   0,   6,   0,
+     52,   0,   0,   0,   1,   0,   1,   0,
      66,  71, 232, 130,  21, 122,  87, 182,
-      3,   0,   7,   0,   0,   0,   0,   0,
+      0,   0,   7,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
      21,   0,   0,   0, 226,   1,   0,   0,
      49,   0,   0,   0,   7,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     45,   0,   0,   0, 167,   2,   0,   0,
+     45,   0,   0,   0,  63,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
     114, 117, 110, 116, 105, 109, 101,  47,
@@ -251,195 +251,30 @@ static const ::capnp::_::AlignedData<202> b_b1af51b6aef0e7bc = {
     112, 110, 112,  58,  83, 116, 114, 117,
      99, 116,  48,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   1,   0,   1,   0,
-     48,   0,   0,   0,   3,   0,   4,   0,
+      4,   0,   0,   0,   3,   0,   4,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   1,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     65,   1,   0,   0,  26,   0,   0,   0,
+     13,   0,   0,   0,  26,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     60,   1,   0,   0,   3,   0,   1,   0,
-     72,   1,   0,   0,   2,   0,   1,   0,
-      1,   0,   0,   0,   1,   0,   0,   0,
-      0,   0,   1,   0,   1,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     69,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     64,   1,   0,   0,   3,   0,   1,   0,
-     76,   1,   0,   0,   2,   0,   1,   0,
-      2,   0,   0,   0,   2,   0,   0,   0,
-      0,   0,   1,   0,   2,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     73,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     68,   1,   0,   0,   3,   0,   1,   0,
-     80,   1,   0,   0,   2,   0,   1,   0,
-      3,   0,   0,   0,   2,   0,   0,   0,
-      0,   0,   1,   0,   3,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     77,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     72,   1,   0,   0,   3,   0,   1,   0,
-     84,   1,   0,   0,   2,   0,   1,   0,
-      4,   0,   0,   0,   3,   0,   0,   0,
-      0,   0,   1,   0,   4,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     81,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     76,   1,   0,   0,   3,   0,   1,   0,
-     88,   1,   0,   0,   2,   0,   1,   0,
-      5,   0,   0,   0,   2,   0,   0,   0,
-      0,   0,   1,   0,   5,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     85,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     80,   1,   0,   0,   3,   0,   1,   0,
-     92,   1,   0,   0,   2,   0,   1,   0,
-      6,   0,   0,   0,   3,   0,   0,   0,
-      0,   0,   1,   0,   6,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     89,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     84,   1,   0,   0,   3,   0,   1,   0,
-     96,   1,   0,   0,   2,   0,   1,   0,
-      7,   0,   0,   0,   8,   0,   0,   0,
-      0,   0,   1,   0,   7,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     93,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     88,   1,   0,   0,   3,   0,   1,   0,
-    100,   1,   0,   0,   2,   0,   1,   0,
-      8,   0,   0,   0,   5,   0,   0,   0,
-      0,   0,   1,   0,   8,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     97,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     92,   1,   0,   0,   3,   0,   1,   0,
-    104,   1,   0,   0,   2,   0,   1,   0,
-      9,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   1,   0,   9,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    101,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     96,   1,   0,   0,   3,   0,   1,   0,
-    108,   1,   0,   0,   2,   0,   1,   0,
-     10,   0,   0,   0,   1,   0,   0,   0,
-      0,   0,   1,   0,  10,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    105,   1,   0,   0,  34,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    100,   1,   0,   0,   3,   0,   1,   0,
-    112,   1,   0,   0,   2,   0,   1,   0,
-     11,   0,   0,   0,   2,   0,   0,   0,
-      0,   0,   1,   0,  11,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    109,   1,   0,   0,  34,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    104,   1,   0,   0,   3,   0,   1,   0,
-    116,   1,   0,   0,   2,   0,   1,   0,
+      8,   0,   0,   0,   3,   0,   1,   0,
+     20,   0,   0,   0,   2,   0,   1,   0,
     102,  48,   0,   0,   0,   0,   0,   0,
       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,
       1,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  49,   0,   0,   0,   0,   0,   0,
-      7,   0,   0,   0,   0,   0,   0,   0,
-      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,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  50,   0,   0,   0,   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,   0,   0,   0,   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,
-    102,  51,   0,   0,   0,   0,   0,   0,
-      8,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      8,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  52,   0,   0,   0,   0,   0,   0,
-      4,   0,   0,   0,   0,   0,   0,   0,
-      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,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  53,   0,   0,   0,   0,   0,   0,
-      9,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      9,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  54,   0,   0,   0,   0,   0,   0,
-      5,   0,   0,   0,   0,   0,   0,   0,
-      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,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  55,   0,   0,   0,   0,   0,   0,
-     10,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     10,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  56,   0,   0,   0,   0,   0,   0,
-     11,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     11,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  57,   0,   0,   0,   0,   0,   0,
-     12,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     12,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  49,  48,   0,   0,   0,   0,   0,
-     13,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     13,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  49,  49,   0,   0,   0,   0,   0,
-     18,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     18,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0, }
 };
 ::capnp::word const* const bp_b1af51b6aef0e7bc = b_b1af51b6aef0e7bc.words;
 #if !CAPNP_LITE
-static const uint16_t m_b1af51b6aef0e7bc[] = {0, 1, 10, 11, 2, 3, 4, 5, 6, 7, 8, 9};
-static const uint16_t i_b1af51b6aef0e7bc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
+static const uint16_t m_b1af51b6aef0e7bc[] = {0};
+static const uint16_t i_b1af51b6aef0e7bc[] = {0};
 const ::capnp::_::RawSchema s_b1af51b6aef0e7bc = {
-  0xb1af51b6aef0e7bc, b_b1af51b6aef0e7bc.words, 202, nullptr, m_b1af51b6aef0e7bc,
-  0, 12, i_b1af51b6aef0e7bc, nullptr, nullptr, { &s_b1af51b6aef0e7bc, nullptr, nullptr, 0, 0, nullptr }
+  0xb1af51b6aef0e7bc, b_b1af51b6aef0e7bc.words, 37, nullptr, m_b1af51b6aef0e7bc,
+  0, 1, i_b1af51b6aef0e7bc, nullptr, nullptr, { &s_b1af51b6aef0e7bc, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<23> b_ac6d126c2fac16eb = {
@@ -602,17 +437,17 @@ const ::capnp::_::RawSchema s_d52dcf38c9f6f7c0 = {
   4, 2, nullptr, nullptr, nullptr, { &s_d52dcf38c9f6f7c0, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
-static const ::capnp::_::AlignedData<203> b_800ca862fbfddd38 = {
+static const ::capnp::_::AlignedData<53> b_800ca862fbfddd38 = {
   {   0,   0,   0,   0,   5,   0,   6,   0,
      56, 221, 253, 251,  98, 168,  12, 128,
-     59,   0,   0,   0,   1,   0,   6,   0,
+     59,   0,   0,   0,   1,   0,   1,   0,
     192, 247, 246, 201,  56, 207,  45, 213,
-      3,   0,   7,   0,   0,   0,   0,   0,
+      1,   0,   7,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
      21,   0,   0,   0,  26,   2,   0,   0,
      53,   0,   0,   0,   7,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     49,   0,   0,   0, 167,   2,   0,   0,
+     49,   0,   0,   0, 119,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
     114, 117, 110, 116, 105, 109, 101,  47,
@@ -625,91 +460,21 @@ static const ::capnp::_::AlignedData<203> b_800ca862fbfddd38 = {
     101,  49,  46,  83, 116, 114, 117,  99,
     116,  49,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   1,   0,   1,   0,
-     48,   0,   0,   0,   3,   0,   4,   0,
+      8,   0,   0,   0,   3,   0,   4,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   1,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     65,   1,   0,   0,  26,   0,   0,   0,
+     41,   0,   0,   0,  26,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     60,   1,   0,   0,   3,   0,   1,   0,
-     72,   1,   0,   0,   2,   0,   1,   0,
-      1,   0,   0,   0,   1,   0,   0,   0,
+     36,   0,   0,   0,   3,   0,   1,   0,
+     48,   0,   0,   0,   2,   0,   1,   0,
+      1,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   1,   0,   1,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     69,   1,   0,   0,  26,   0,   0,   0,
+     45,   0,   0,   0,  26,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     64,   1,   0,   0,   3,   0,   1,   0,
-     76,   1,   0,   0,   2,   0,   1,   0,
-      2,   0,   0,   0,   2,   0,   0,   0,
-      0,   0,   1,   0,   2,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     73,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     68,   1,   0,   0,   3,   0,   1,   0,
-     80,   1,   0,   0,   2,   0,   1,   0,
-      3,   0,   0,   0,   2,   0,   0,   0,
-      0,   0,   1,   0,   3,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     77,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     72,   1,   0,   0,   3,   0,   1,   0,
-     84,   1,   0,   0,   2,   0,   1,   0,
-      4,   0,   0,   0,   3,   0,   0,   0,
-      0,   0,   1,   0,   4,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     81,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     76,   1,   0,   0,   3,   0,   1,   0,
-     88,   1,   0,   0,   2,   0,   1,   0,
-      5,   0,   0,   0,   2,   0,   0,   0,
-      0,   0,   1,   0,   5,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     85,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     80,   1,   0,   0,   3,   0,   1,   0,
-     92,   1,   0,   0,   2,   0,   1,   0,
-      6,   0,   0,   0,   3,   0,   0,   0,
-      0,   0,   1,   0,   6,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     89,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     84,   1,   0,   0,   3,   0,   1,   0,
-     96,   1,   0,   0,   2,   0,   1,   0,
-      7,   0,   0,   0,   8,   0,   0,   0,
-      0,   0,   1,   0,   7,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     93,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     88,   1,   0,   0,   3,   0,   1,   0,
-    100,   1,   0,   0,   2,   0,   1,   0,
-      8,   0,   0,   0,   5,   0,   0,   0,
-      0,   0,   1,   0,   8,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     97,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     92,   1,   0,   0,   3,   0,   1,   0,
-    104,   1,   0,   0,   2,   0,   1,   0,
-      9,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   1,   0,   9,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    101,   1,   0,   0,  26,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     96,   1,   0,   0,   3,   0,   1,   0,
-    108,   1,   0,   0,   2,   0,   1,   0,
-     10,   0,   0,   0,   1,   0,   0,   0,
-      0,   0,   1,   0,  10,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    105,   1,   0,   0,  34,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    100,   1,   0,   0,   3,   0,   1,   0,
-    112,   1,   0,   0,   2,   0,   1,   0,
-     11,   0,   0,   0,   2,   0,   0,   0,
-      0,   0,   1,   0,  11,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    109,   1,   0,   0,  34,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    104,   1,   0,   0,   3,   0,   1,   0,
-    116,   1,   0,   0,   2,   0,   1,   0,
+     40,   0,   0,   0,   3,   0,   1,   0,
+     52,   0,   0,   0,   2,   0,   1,   0,
     102,  48,   0,   0,   0,   0,   0,   0,
       1,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -719,86 +484,6 @@ static const ::capnp::_::AlignedData<203> b_800ca862fbfddd38 = {
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
     102,  49,   0,   0,   0,   0,   0,   0,
-      7,   0,   0,   0,   0,   0,   0,   0,
-      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,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  50,   0,   0,   0,   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,   0,   0,   0,   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,
-    102,  51,   0,   0,   0,   0,   0,   0,
-      8,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      8,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  52,   0,   0,   0,   0,   0,   0,
-      4,   0,   0,   0,   0,   0,   0,   0,
-      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,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  53,   0,   0,   0,   0,   0,   0,
-      9,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      9,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  54,   0,   0,   0,   0,   0,   0,
-      5,   0,   0,   0,   0,   0,   0,   0,
-      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,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  55,   0,   0,   0,   0,   0,   0,
-     10,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     10,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  56,   0,   0,   0,   0,   0,   0,
-     11,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     11,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  57,   0,   0,   0,   0,   0,   0,
-     12,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     12,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  49,  48,   0,   0,   0,   0,   0,
-     13,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     13,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    102,  49,  49,   0,   0,   0,   0,   0,
      18,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -809,11 +494,11 @@ static const ::capnp::_::AlignedData<203> b_800ca862fbfddd38 = {
 };
 ::capnp::word const* const bp_800ca862fbfddd38 = b_800ca862fbfddd38.words;
 #if !CAPNP_LITE
-static const uint16_t m_800ca862fbfddd38[] = {0, 1, 10, 11, 2, 3, 4, 5, 6, 7, 8, 9};
-static const uint16_t i_800ca862fbfddd38[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
+static const uint16_t m_800ca862fbfddd38[] = {0, 1};
+static const uint16_t i_800ca862fbfddd38[] = {0, 1};
 const ::capnp::_::RawSchema s_800ca862fbfddd38 = {
-  0x800ca862fbfddd38, b_800ca862fbfddd38.words, 203, nullptr, m_800ca862fbfddd38,
-  0, 12, i_800ca862fbfddd38, nullptr, nullptr, { &s_800ca862fbfddd38, nullptr, nullptr, 0, 0, nullptr }
+  0x800ca862fbfddd38, b_800ca862fbfddd38.words, 53, nullptr, m_800ca862fbfddd38,
+  0, 2, i_800ca862fbfddd38, nullptr, nullptr, { &s_800ca862fbfddd38, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
 static const ::capnp::_::AlignedData<22> b_8f92ca18632e04d5 = {
diff --git a/runtime/src/test/java/org/capnproto/demo/demo.capnp.h b/runtime/src/test/java/org/capnproto/demo/demo.capnp.h
index c547464..a595334 100644
--- a/runtime/src/test/java/org/capnproto/demo/demo.capnp.h
+++ b/runtime/src/test/java/org/capnproto/demo/demo.capnp.h
@@ -103,7 +103,7 @@ struct Struct0 {
   class Pipeline;
 
   struct _capnpPrivate {
-    CAPNP_DECLARE_STRUCT_HEADER(b1af51b6aef0e7bc, 6, 3)
+    CAPNP_DECLARE_STRUCT_HEADER(b1af51b6aef0e7bc, 1, 0)
     #if !CAPNP_LITE
     static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
     #endif  // !CAPNP_LITE
@@ -172,7 +172,7 @@ struct Iface1::Struct1 {
   class Pipeline;
 
   struct _capnpPrivate {
-    CAPNP_DECLARE_STRUCT_HEADER(800ca862fbfddd38, 6, 3)
+    CAPNP_DECLARE_STRUCT_HEADER(800ca862fbfddd38, 1, 1)
     #if !CAPNP_LITE
     static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
     #endif  // !CAPNP_LITE
@@ -582,31 +582,6 @@ public:
 
   inline bool getF0() const;
 
-  inline  ::uint16_t getF1() const;
-
-  inline  ::int16_t getF2() const;
-
-  inline  ::uint32_t getF3() const;
-
-  inline  ::int32_t getF4() const;
-
-  inline  ::uint64_t getF5() const;
-
-  inline  ::int64_t getF6() const;
-
-  inline float getF7() const;
-
-  inline double getF8() const;
-
-  inline bool hasF9() const;
-  inline  ::capnp::Text::Reader getF9() const;
-
-  inline bool hasF10() const;
-  inline  ::capnp::Data::Reader getF10() const;
-
-  inline bool hasF11() const;
-  inline ::capnp::AnyPointer::Reader getF11() const;
-
 private:
   ::capnp::_::StructReader _reader;
   template <typename, ::capnp::Kind>
@@ -638,48 +613,6 @@ public:
   inline bool getF0();
   inline void setF0(bool value);
 
-  inline  ::uint16_t getF1();
-  inline void setF1( ::uint16_t value);
-
-  inline  ::int16_t getF2();
-  inline void setF2( ::int16_t value);
-
-  inline  ::uint32_t getF3();
-  inline void setF3( ::uint32_t value);
-
-  inline  ::int32_t getF4();
-  inline void setF4( ::int32_t value);
-
-  inline  ::uint64_t getF5();
-  inline void setF5( ::uint64_t value);
-
-  inline  ::int64_t getF6();
-  inline void setF6( ::int64_t value);
-
-  inline float getF7();
-  inline void setF7(float value);
-
-  inline double getF8();
-  inline void setF8(double value);
-
-  inline bool hasF9();
-  inline  ::capnp::Text::Builder getF9();
-  inline void setF9( ::capnp::Text::Reader value);
-  inline  ::capnp::Text::Builder initF9(unsigned int size);
-  inline void adoptF9(::capnp::Orphan< ::capnp::Text>&& value);
-  inline ::capnp::Orphan< ::capnp::Text> disownF9();
-
-  inline bool hasF10();
-  inline  ::capnp::Data::Builder getF10();
-  inline void setF10( ::capnp::Data::Reader value);
-  inline  ::capnp::Data::Builder initF10(unsigned int size);
-  inline void adoptF10(::capnp::Orphan< ::capnp::Data>&& value);
-  inline ::capnp::Orphan< ::capnp::Data> disownF10();
-
-  inline bool hasF11();
-  inline ::capnp::AnyPointer::Builder getF11();
-  inline ::capnp::AnyPointer::Builder initF11();
-
 private:
   ::capnp::_::StructBuilder _builder;
   template <typename, ::capnp::Kind>
@@ -924,30 +857,8 @@ public:
 
   inline bool getF0() const;
 
-  inline  ::uint16_t getF1() const;
-
-  inline  ::int16_t getF2() const;
-
-  inline  ::uint32_t getF3() const;
-
-  inline  ::int32_t getF4() const;
-
-  inline  ::uint64_t getF5() const;
-
-  inline  ::int64_t getF6() const;
-
-  inline float getF7() const;
-
-  inline double getF8() const;
-
-  inline bool hasF9() const;
-  inline  ::capnp::Text::Reader getF9() const;
-
-  inline bool hasF10() const;
-  inline  ::capnp::Data::Reader getF10() const;
-
-  inline bool hasF11() const;
-  inline ::capnp::AnyPointer::Reader getF11() const;
+  inline bool hasF1() const;
+  inline ::capnp::AnyPointer::Reader getF1() const;
 
 private:
   ::capnp::_::StructReader _reader;
@@ -980,47 +891,9 @@ public:
   inline bool getF0();
   inline void setF0(bool value);
 
-  inline  ::uint16_t getF1();
-  inline void setF1( ::uint16_t value);
-
-  inline  ::int16_t getF2();
-  inline void setF2( ::int16_t value);
-
-  inline  ::uint32_t getF3();
-  inline void setF3( ::uint32_t value);
-
-  inline  ::int32_t getF4();
-  inline void setF4( ::int32_t value);
-
-  inline  ::uint64_t getF5();
-  inline void setF5( ::uint64_t value);
-
-  inline  ::int64_t getF6();
-  inline void setF6( ::int64_t value);
-
-  inline float getF7();
-  inline void setF7(float value);
-
-  inline double getF8();
-  inline void setF8(double value);
-
-  inline bool hasF9();
-  inline  ::capnp::Text::Builder getF9();
-  inline void setF9( ::capnp::Text::Reader value);
-  inline  ::capnp::Text::Builder initF9(unsigned int size);
-  inline void adoptF9(::capnp::Orphan< ::capnp::Text>&& value);
-  inline ::capnp::Orphan< ::capnp::Text> disownF9();
-
-  inline bool hasF10();
-  inline  ::capnp::Data::Builder getF10();
-  inline void setF10( ::capnp::Data::Reader value);
-  inline  ::capnp::Data::Builder initF10(unsigned int size);
-  inline void adoptF10(::capnp::Orphan< ::capnp::Data>&& value);
-  inline ::capnp::Orphan< ::capnp::Data> disownF10();
-
-  inline bool hasF11();
-  inline ::capnp::AnyPointer::Builder getF11();
-  inline ::capnp::AnyPointer::Builder initF11();
+  inline bool hasF1();
+  inline ::capnp::AnyPointer::Builder getF1();
+  inline ::capnp::AnyPointer::Builder initF1();
 
 private:
   ::capnp::_::StructBuilder _builder;
@@ -1505,209 +1378,6 @@ inline void Struct0::Builder::setF0(bool value) {
       ::capnp::bounded<0>() * ::capnp::ELEMENTS, value);
 }
 
-inline  ::uint16_t Struct0::Reader::getF1() const {
-  return _reader.getDataField< ::uint16_t>(
-      ::capnp::bounded<1>() * ::capnp::ELEMENTS);
-}
-
-inline  ::uint16_t Struct0::Builder::getF1() {
-  return _builder.getDataField< ::uint16_t>(
-      ::capnp::bounded<1>() * ::capnp::ELEMENTS);
-}
-inline void Struct0::Builder::setF1( ::uint16_t value) {
-  _builder.setDataField< ::uint16_t>(
-      ::capnp::bounded<1>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::int16_t Struct0::Reader::getF2() const {
-  return _reader.getDataField< ::int16_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-
-inline  ::int16_t Struct0::Builder::getF2() {
-  return _builder.getDataField< ::int16_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-inline void Struct0::Builder::setF2( ::int16_t value) {
-  _builder.setDataField< ::int16_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::uint32_t Struct0::Reader::getF3() const {
-  return _reader.getDataField< ::uint32_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-
-inline  ::uint32_t Struct0::Builder::getF3() {
-  return _builder.getDataField< ::uint32_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-inline void Struct0::Builder::setF3( ::uint32_t value) {
-  _builder.setDataField< ::uint32_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::int32_t Struct0::Reader::getF4() const {
-  return _reader.getDataField< ::int32_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS);
-}
-
-inline  ::int32_t Struct0::Builder::getF4() {
-  return _builder.getDataField< ::int32_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS);
-}
-inline void Struct0::Builder::setF4( ::int32_t value) {
-  _builder.setDataField< ::int32_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::uint64_t Struct0::Reader::getF5() const {
-  return _reader.getDataField< ::uint64_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-
-inline  ::uint64_t Struct0::Builder::getF5() {
-  return _builder.getDataField< ::uint64_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-inline void Struct0::Builder::setF5( ::uint64_t value) {
-  _builder.setDataField< ::uint64_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::int64_t Struct0::Reader::getF6() const {
-  return _reader.getDataField< ::int64_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS);
-}
-
-inline  ::int64_t Struct0::Builder::getF6() {
-  return _builder.getDataField< ::int64_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS);
-}
-inline void Struct0::Builder::setF6( ::int64_t value) {
-  _builder.setDataField< ::int64_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS, value);
-}
-
-inline float Struct0::Reader::getF7() const {
-  return _reader.getDataField<float>(
-      ::capnp::bounded<8>() * ::capnp::ELEMENTS);
-}
-
-inline float Struct0::Builder::getF7() {
-  return _builder.getDataField<float>(
-      ::capnp::bounded<8>() * ::capnp::ELEMENTS);
-}
-inline void Struct0::Builder::setF7(float value) {
-  _builder.setDataField<float>(
-      ::capnp::bounded<8>() * ::capnp::ELEMENTS, value);
-}
-
-inline double Struct0::Reader::getF8() const {
-  return _reader.getDataField<double>(
-      ::capnp::bounded<5>() * ::capnp::ELEMENTS);
-}
-
-inline double Struct0::Builder::getF8() {
-  return _builder.getDataField<double>(
-      ::capnp::bounded<5>() * ::capnp::ELEMENTS);
-}
-inline void Struct0::Builder::setF8(double value) {
-  _builder.setDataField<double>(
-      ::capnp::bounded<5>() * ::capnp::ELEMENTS, value);
-}
-
-inline bool Struct0::Reader::hasF9() const {
-  return !_reader.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
-}
-inline bool Struct0::Builder::hasF9() {
-  return !_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
-}
-inline  ::capnp::Text::Reader Struct0::Reader::getF9() const {
-  return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_reader.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS));
-}
-inline  ::capnp::Text::Builder Struct0::Builder::getF9() {
-  return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS));
-}
-inline void Struct0::Builder::setF9( ::capnp::Text::Reader value) {
-  ::capnp::_::PointerHelpers< ::capnp::Text>::set(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS), value);
-}
-inline  ::capnp::Text::Builder Struct0::Builder::initF9(unsigned int size) {
-  return ::capnp::_::PointerHelpers< ::capnp::Text>::init(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS), size);
-}
-inline void Struct0::Builder::adoptF9(
-    ::capnp::Orphan< ::capnp::Text>&& value) {
-  ::capnp::_::PointerHelpers< ::capnp::Text>::adopt(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
-}
-inline ::capnp::Orphan< ::capnp::Text> Struct0::Builder::disownF9() {
-  return ::capnp::_::PointerHelpers< ::capnp::Text>::disown(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS));
-}
-
-inline bool Struct0::Reader::hasF10() const {
-  return !_reader.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS).isNull();
-}
-inline bool Struct0::Builder::hasF10() {
-  return !_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS).isNull();
-}
-inline  ::capnp::Data::Reader Struct0::Reader::getF10() const {
-  return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_reader.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS));
-}
-inline  ::capnp::Data::Builder Struct0::Builder::getF10() {
-  return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS));
-}
-inline void Struct0::Builder::setF10( ::capnp::Data::Reader value) {
-  ::capnp::_::PointerHelpers< ::capnp::Data>::set(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS), value);
-}
-inline  ::capnp::Data::Builder Struct0::Builder::initF10(unsigned int size) {
-  return ::capnp::_::PointerHelpers< ::capnp::Data>::init(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS), size);
-}
-inline void Struct0::Builder::adoptF10(
-    ::capnp::Orphan< ::capnp::Data>&& value) {
-  ::capnp::_::PointerHelpers< ::capnp::Data>::adopt(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS), kj::mv(value));
-}
-inline ::capnp::Orphan< ::capnp::Data> Struct0::Builder::disownF10() {
-  return ::capnp::_::PointerHelpers< ::capnp::Data>::disown(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS));
-}
-
-inline bool Struct0::Reader::hasF11() const {
-  return !_reader.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS).isNull();
-}
-inline bool Struct0::Builder::hasF11() {
-  return !_builder.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS).isNull();
-}
-inline ::capnp::AnyPointer::Reader Struct0::Reader::getF11() const {
-  return ::capnp::AnyPointer::Reader(_reader.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS));
-}
-inline ::capnp::AnyPointer::Builder Struct0::Builder::getF11() {
-  return ::capnp::AnyPointer::Builder(_builder.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS));
-}
-inline ::capnp::AnyPointer::Builder Struct0::Builder::initF11() {
-  auto result = ::capnp::AnyPointer::Builder(_builder.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS));
-  result.clear();
-  return result;
-}
-
 #if !CAPNP_LITE
 inline Iface0::Client::Client(decltype(nullptr))
     : ::capnp::Capability::Client(nullptr) {}
@@ -1832,205 +1502,25 @@ inline void Iface1::Struct1::Builder::setF0(bool value) {
       ::capnp::bounded<0>() * ::capnp::ELEMENTS, value);
 }
 
-inline  ::uint16_t Iface1::Struct1::Reader::getF1() const {
-  return _reader.getDataField< ::uint16_t>(
-      ::capnp::bounded<1>() * ::capnp::ELEMENTS);
-}
-
-inline  ::uint16_t Iface1::Struct1::Builder::getF1() {
-  return _builder.getDataField< ::uint16_t>(
-      ::capnp::bounded<1>() * ::capnp::ELEMENTS);
-}
-inline void Iface1::Struct1::Builder::setF1( ::uint16_t value) {
-  _builder.setDataField< ::uint16_t>(
-      ::capnp::bounded<1>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::int16_t Iface1::Struct1::Reader::getF2() const {
-  return _reader.getDataField< ::int16_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-
-inline  ::int16_t Iface1::Struct1::Builder::getF2() {
-  return _builder.getDataField< ::int16_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-inline void Iface1::Struct1::Builder::setF2( ::int16_t value) {
-  _builder.setDataField< ::int16_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::uint32_t Iface1::Struct1::Reader::getF3() const {
-  return _reader.getDataField< ::uint32_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-
-inline  ::uint32_t Iface1::Struct1::Builder::getF3() {
-  return _builder.getDataField< ::uint32_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-inline void Iface1::Struct1::Builder::setF3( ::uint32_t value) {
-  _builder.setDataField< ::uint32_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::int32_t Iface1::Struct1::Reader::getF4() const {
-  return _reader.getDataField< ::int32_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS);
-}
-
-inline  ::int32_t Iface1::Struct1::Builder::getF4() {
-  return _builder.getDataField< ::int32_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS);
-}
-inline void Iface1::Struct1::Builder::setF4( ::int32_t value) {
-  _builder.setDataField< ::int32_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::uint64_t Iface1::Struct1::Reader::getF5() const {
-  return _reader.getDataField< ::uint64_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-
-inline  ::uint64_t Iface1::Struct1::Builder::getF5() {
-  return _builder.getDataField< ::uint64_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS);
-}
-inline void Iface1::Struct1::Builder::setF5( ::uint64_t value) {
-  _builder.setDataField< ::uint64_t>(
-      ::capnp::bounded<2>() * ::capnp::ELEMENTS, value);
-}
-
-inline  ::int64_t Iface1::Struct1::Reader::getF6() const {
-  return _reader.getDataField< ::int64_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS);
-}
-
-inline  ::int64_t Iface1::Struct1::Builder::getF6() {
-  return _builder.getDataField< ::int64_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS);
-}
-inline void Iface1::Struct1::Builder::setF6( ::int64_t value) {
-  _builder.setDataField< ::int64_t>(
-      ::capnp::bounded<3>() * ::capnp::ELEMENTS, value);
-}
-
-inline float Iface1::Struct1::Reader::getF7() const {
-  return _reader.getDataField<float>(
-      ::capnp::bounded<8>() * ::capnp::ELEMENTS);
-}
-
-inline float Iface1::Struct1::Builder::getF7() {
-  return _builder.getDataField<float>(
-      ::capnp::bounded<8>() * ::capnp::ELEMENTS);
-}
-inline void Iface1::Struct1::Builder::setF7(float value) {
-  _builder.setDataField<float>(
-      ::capnp::bounded<8>() * ::capnp::ELEMENTS, value);
-}
-
-inline double Iface1::Struct1::Reader::getF8() const {
-  return _reader.getDataField<double>(
-      ::capnp::bounded<5>() * ::capnp::ELEMENTS);
-}
-
-inline double Iface1::Struct1::Builder::getF8() {
-  return _builder.getDataField<double>(
-      ::capnp::bounded<5>() * ::capnp::ELEMENTS);
-}
-inline void Iface1::Struct1::Builder::setF8(double value) {
-  _builder.setDataField<double>(
-      ::capnp::bounded<5>() * ::capnp::ELEMENTS, value);
-}
-
-inline bool Iface1::Struct1::Reader::hasF9() const {
+inline bool Iface1::Struct1::Reader::hasF1() const {
   return !_reader.getPointerField(
       ::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
 }
-inline bool Iface1::Struct1::Builder::hasF9() {
+inline bool Iface1::Struct1::Builder::hasF1() {
   return !_builder.getPointerField(
       ::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
 }
-inline  ::capnp::Text::Reader Iface1::Struct1::Reader::getF9() const {
-  return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_reader.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS));
-}
-inline  ::capnp::Text::Builder Iface1::Struct1::Builder::getF9() {
-  return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS));
-}
-inline void Iface1::Struct1::Builder::setF9( ::capnp::Text::Reader value) {
-  ::capnp::_::PointerHelpers< ::capnp::Text>::set(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS), value);
-}
-inline  ::capnp::Text::Builder Iface1::Struct1::Builder::initF9(unsigned int size) {
-  return ::capnp::_::PointerHelpers< ::capnp::Text>::init(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS), size);
-}
-inline void Iface1::Struct1::Builder::adoptF9(
-    ::capnp::Orphan< ::capnp::Text>&& value) {
-  ::capnp::_::PointerHelpers< ::capnp::Text>::adopt(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
-}
-inline ::capnp::Orphan< ::capnp::Text> Iface1::Struct1::Builder::disownF9() {
-  return ::capnp::_::PointerHelpers< ::capnp::Text>::disown(_builder.getPointerField(
-      ::capnp::bounded<0>() * ::capnp::POINTERS));
-}
-
-inline bool Iface1::Struct1::Reader::hasF10() const {
-  return !_reader.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS).isNull();
-}
-inline bool Iface1::Struct1::Builder::hasF10() {
-  return !_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS).isNull();
-}
-inline  ::capnp::Data::Reader Iface1::Struct1::Reader::getF10() const {
-  return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_reader.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS));
-}
-inline  ::capnp::Data::Builder Iface1::Struct1::Builder::getF10() {
-  return ::capnp::_::PointerHelpers< ::capnp::Data>::get(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS));
-}
-inline void Iface1::Struct1::Builder::setF10( ::capnp::Data::Reader value) {
-  ::capnp::_::PointerHelpers< ::capnp::Data>::set(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS), value);
-}
-inline  ::capnp::Data::Builder Iface1::Struct1::Builder::initF10(unsigned int size) {
-  return ::capnp::_::PointerHelpers< ::capnp::Data>::init(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS), size);
-}
-inline void Iface1::Struct1::Builder::adoptF10(
-    ::capnp::Orphan< ::capnp::Data>&& value) {
-  ::capnp::_::PointerHelpers< ::capnp::Data>::adopt(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS), kj::mv(value));
-}
-inline ::capnp::Orphan< ::capnp::Data> Iface1::Struct1::Builder::disownF10() {
-  return ::capnp::_::PointerHelpers< ::capnp::Data>::disown(_builder.getPointerField(
-      ::capnp::bounded<1>() * ::capnp::POINTERS));
-}
-
-inline bool Iface1::Struct1::Reader::hasF11() const {
-  return !_reader.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS).isNull();
-}
-inline bool Iface1::Struct1::Builder::hasF11() {
-  return !_builder.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS).isNull();
-}
-inline ::capnp::AnyPointer::Reader Iface1::Struct1::Reader::getF11() const {
+inline ::capnp::AnyPointer::Reader Iface1::Struct1::Reader::getF1() const {
   return ::capnp::AnyPointer::Reader(_reader.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS));
+      ::capnp::bounded<0>() * ::capnp::POINTERS));
 }
-inline ::capnp::AnyPointer::Builder Iface1::Struct1::Builder::getF11() {
+inline ::capnp::AnyPointer::Builder Iface1::Struct1::Builder::getF1() {
   return ::capnp::AnyPointer::Builder(_builder.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS));
+      ::capnp::bounded<0>() * ::capnp::POINTERS));
 }
-inline ::capnp::AnyPointer::Builder Iface1::Struct1::Builder::initF11() {
+inline ::capnp::AnyPointer::Builder Iface1::Struct1::Builder::initF1() {
   auto result = ::capnp::AnyPointer::Builder(_builder.getPointerField(
-      ::capnp::bounded<2>() * ::capnp::POINTERS));
+      ::capnp::bounded<0>() * ::capnp::POINTERS));
   result.clear();
   return result;
 }