[PFS] Simplify use of PFS sets