Removed more Sonar violations: Empty While Stmts.