Okay, I fixed all the places where the new scope doesn't include a variable declaration.