Christian, would you prefer to submit this as-is to the repository and apply your IntPair type of fix on top of it, or would you prefer to squash your fix into this commit and just note your contribution in the commit message?