Thanks, I've committed that last version. It's certainly an improvement. ;)

The only thing you could have done better, was to send a patch with commit
message generated by "git format-patch". That way I could have applied this
using one command.

Yes, I'm lazy. ;)

Thanks again!