Move PollWait back into main module