Fix unintentional local variable shadowing.