Replaced old low-level predicates (psc_*-type) with more standard ones.
Authored by: dwarren 2019-01-31
Parent: [r9491]
Child: [r9493]
