Cleanup: Move code to consolidate private section.
Cleanup: Move code to consolidate private section.

This commit is a pure move, to clean up after the previous commit.

mologie/capnproto,mologie/capnproto,mologie/capnproto