Merge "Fix variable shadowing."