it really is about time we rename OC_F_PASS -> OC_F_HFM, but
my recent cleanup attempt included too much change before the release