Make the calculator schema more usable.
Make the calculator schema more usable.

This is a backwards-compatible change on the wire level, but getting rid
of the extra nesting makes things generally more pleasant.

zenhack/haskell-capnp