Closes #114. Just reverting the relevant erroneous commit as it's consistent with the explicit use of var's hoisting behaviour elsewhere in the codebase and because I don't personally find any of the other options more readable.