Futher simplification of when_any implementation