Remove unnecessary variable shadowing.
More structure-sharing optimizations.