Simplifies logic for parameterized decorator

[elijahbenizzy]

This has been a long time coming. Previously, we were looping through all the replacements and modifying the kwargs. Now, we just loop through all the expected inputs, and create their results from the kwargs or the literal values. In the case of "grouped", we do the same -- we just repeat some of the previous stuff. There's room for more simplification (breaking this out into a function), which could reduce the complexity of the code, but for now its OK.

[Short description explaining the high-level reason for the pull request]

Changes

How I tested this

Notes

Checklist

• PR has an informative and human-readable title (this will be pulled into the release notes)
• Changes are limited to a single goal (no scope creep)
• Code passed the pre-commit check & code is left cleaner/nicer than when first encountered.
• Any change in functionality is tested
• New functions are documented (with a description, list of inputs, and expected output)
• Placeholder code is flagged / future TODOs are captured in comments
• Project documentation has been updated if adding/changing functionality.