Revert "Remove helper macros for cfPS promise result filtering in packages"

Hacks all the way down

This reverts commit 98d11917adb853570cbcf34f2af084c97c2c21ce.