Bugfixes for handling pairs in desmond.