WIP. Simplify Thrift wrappers & wrapper builders
WIP