Fixing up handling of FacePairs