Fix variable shadowing.