Use scopes in (do-)while as well