Daniel Jacobowitz (drow@false.org):

> I assume you meant to delete the code at the bottom and the retry
> label.  OK with that change.

Right, thanks. Applied (final patch in attachement).