Once #873 is merged, do we still need this separate pass through the args, or can this be merged into the later one?

Figuring out which pass an argument needs to be handled in is tricky when there are 3 passes...