Evaluator produces confusing locals view while debugging

[swernli]

The evaluator refactoring in #1261 had an unexpected side effect of leaving variables in scope too long, which can cause confusing debugger output:

The y: 1 entry should only be visible while inside the block for the if-expression. The control flow graph will need to be updated to include scope entry and exit markers when running in debug mode.