Rebuild if necessary for tests
Remove elseBlock ambiguity
While loops