More with pair, fst, snd
remove rPair remnants
remove rVar remnants