I have the fear that when I start modifiying this change we have to restart the IP-review process on bugzilla bug (291083). Since this fixes for the change are not that easy (long vs. intpair) I suggest that we first try to get this change through without modifications. And and do my fixes in a new changes which succeeds this one.
I'll remove also my bug-fix attachment for the bugzilla.