Fix and clean up PMF_PUSHED logic.