Restructure some logic in gather_args to avoid redundant computation.
This may also make the code easier to read.
Authored by: david_costanzo 2023-12-01
Parent: [r5993]
Child: [r5995]
