concurrency: Rename wait-timeout to timed-out-error for clarity. Add the timer that timed out to the error tuple.
extra: use map-sum in a few places.