> Whoops -- this is actually a lie now :-|. If you merge this before I push up a fix, I'll send you another PR.

Sure, I'll just wait for it.  Can you pull over my changes from this morning in the process too?