Replace a lot of assign::make_container