Roll back bad indentation changes from commit d0e01ca.
Avoid collecting a set of argument numbers for later iteration.

Instead, just inspect each argument of interest as we find it.
Match indentation and brace placement to our preferred style.