Update objects / method signatures for the new CF Thresholds, to better match what the other CF bits expose where