Move some concerns off TCF+InstanceBuilder onto the model.