Completed port to single-event-queue mode.