md-poc: credance-poc: Cleanup ObjectBuilder
md-poc: credance-poc: Tried to make builders type safe