BUG:  Adjust logic so event processing state doesn't change during waits.