Additional cleanup for WhileStmt in BasicBlock and DeadCode