Fix more shadowed variables

Clang didn't complain about these, but GCC did.