Update the while-statement grammar and add tests for it.