0.17.8 Use next_argv