Minor clean-up of eventWaitList validation