@Andrew Resch: Is the patch in comment #10 more to your liking, would you care to accept this upstream?
@Andrew Resch: Is the patch in comment #10 more to your liking, would you care to accept this upstream?