Work around goofyness in cm's use of branches.