WhileLoop improvements.