refactor: Fix gocritic.paramTypeCombine lint issues

[alexandear]

This PR combines function parameters by type (with the help of gocritic.paramTypeCombine). See #3654 (comment)

[gmlewis]

Thank you, @alexandear!
LGTM.
Merging.

[codecov]

Codecov Report

❌ Patch coverage is 92.85714% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 91.25%. Comparing base (ac631dc) to head (c77318b).
⚠️ Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
...xample/codespaces/newreposecretwithxcrypto/main.go	0.00%	2 Missing ⚠️
example/newreposecretwithxcrypto/main.go	0.00%	2 Missing ⚠️
...xample/codespaces/newusersecretwithxcrypto/main.go	0.00%	1 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## master #3655 +/- ##
=======================================
Coverage 91.25% 91.25% =======================================
Files 184 184 Lines 16311 16311 =======================================
Hits 14884 14884 Misses 1245 1245 Partials 182 182 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.