This avoids the need for a separate argument struct in a few cases and generally makes the remapping friendlier to use with lambdas.
This avoids the need for a separate argument struct in a few cases and generally makes the remapping friendlier to use with lambdas.