Thank you for the patch!

It appears that every piece of middleware I've ever written is broken in the
same way.

I'll apply this and make a new release after I write tests for your
wrap_generator function and the bit that calls it.  If you have tests, don't be
shy about committing them. ;-)