Resolve vars declared in do/while loops #3