Fix: block-scoped-var CatchClause handling (fixes #922)

Fixes #922.