Made it easier to add event listeners to waiters.