Add fallback range to more typars

[Smaug123]

And a sneaky removal of trailing whitespace, and a reordering of a pair of args to help in pipelines.

This adds a backup range in more cases, and it turns out to be enough for #13298 .

[Smaug123]

I haven't done an explicit formatting; that was my editor trimming whitespace. I can undo it if you want.

[nojaf]

I had some nitpicks on some names, this looks fine, however.