[PFS] Simplify use of PFS sets - try #2