Replace assign::make_container in one place