Additional fixes for while loops and other misbehaving statements.