Fix lexical scoping in type checker

[emilsoman]

I think we should take out the scope map outside of env and create new scope for inner blocks.