Fix buffered channel deadlock once and for all, by adding even more
channels.
Only select from the count channel if we don't already know the
expected_count. This may be a premature optimization.