Remove return heuristics from the static branch probabilities, and