I have reworked this patch taking your comments into account, and minimized
the amount of code change. Instead of regenerating the full patch set again,
I have attached just the current one so that we can work through one patch at
a time.

Jiri.