Remove busy looping.

I forget why I was busy looping before (bug), but I seem to have fixed it. All tests pass...