Pass in the right number of parameters to type_container (#295)