simplify rabbit_queue_consumers:deliver even further
turns out we can ditch another parameter to both that function and the
FetchFun we pass on.

Also reverted state shrinking in attempt_delivery call site. While it
is the right thing in principle, I am not convinced the resulting code
is actually easier to grok.