[PFS] Simplify use of PFS sets
Merge pull request #162 from mjmeans/pfs

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