tcg: Clean up local variable shadowing