Removing loop contexts from do..while and while