Borja, I don't understand your argument.

Also, I prefer to not have that in the middle of that patch; please file a new bug for this change.