Tweak to the variable declaration rules