Fixing up variable hoisting.