Eliminate some variable shadowing