Patch Set 5: I would prefer that you didn't submit this; IP review completed

LGTM, this is a huge improvement :-)

Only thing left from my POV:
- please rebase and update the commit message (it's outdated by now), I think it's ready for inclusion then