Consider changing code where a variable is being re-used to use new variables instead

[sras]

Clarification and motivation

Re-using variable names might make "unused variable" warnings less helpful to spot potential bugs. So in this issue we consider undoing it in places where this pattern is used.

Acceptance criteria

Variable reuse in the same scope is reduced as much as possible.