Handle wait timeouts in the callback and not the event to fix selftest failures.