Make my debugger-ridden life just a tiny bit simpler
Fix #944: Seems we have a new kind of local Scope
Issue #944: Fix test
Issue #943: The test passes for me, so I assume it's been fixed