Add evaluation rules for do-expressions
Fix scopes in do-expressions