Convert arguments to the new generic wizard.

This one is actually a little harder because it's already a wizard, sort of, because argument type gets selected.

The thing is, this is a valid way of doing the wizard, so we should expand the generic method for being able to do that. We've done this before, and it's always annoying, so it's time to help the wizard make this easier.