Add wait_for, return events in all higher-level algorithms.