Add a second round of For/While loop cleanup