Rescope some local variables