Avoid reusing arguments as variable for easier debugging.
Merge pull request #5281 from trek/style-cleanup-test-helpers

Avoid reusing arguments as variable for easier debugging.