> improving this is within scope of this fix.    You are right, that's going beyond the fix.    The code here seems pretty old, and was written before span came around. So there could be a general overhaul -- but I don't know the plans here and if it is worth, as such an upgrade comes with cost and this code seems to be battle-tested, which a re-write has to prove first.