Fix arg list generation