Move Event Wait into the Thread Loop (Bug #11)

This isn't super necessary, but it seems that if its part of the
While condition, Python 2.6 does something weird.  Its just as
sane to put it in the loop.