Revert "More refinement of cf_promises_validated."

This reverts commit a5cc07aa8b587df6471ebf04d2784a1f6209b33d.
Revert "Revert "More refinement of cf_promises_validated.""

This reverts commit d15eb42e5591559112df68a8ee9e80017f9ee07c.