jgarzik Merge pull request #42 from jgarzik/2017-remove-pair