OLD/NEW swap, fix get_api10_arguments too