Reduce scope of some variable.

Two instances found by Cppcheck (variableScope).
Reduced variable scope and put together variable declaration
and initialization in surrounding code.