This makes blib2to3's tree output valid again (which was broken by the previous fiddling with INDENT and DEDENT nodes). Fixes #334
# fmt: off
This removes the hacky exception-based handling that didn't work across statement boundaries. Fixes #335