Yes, the if predates the while. I'll clean it up.