Fix warning with MSVC14

Microsoft Visual C++ 14 has new variable shadowing warnings. This fixes
"warning C4456: declaration of 'op' hides previous local declaration"