Eliminate the other half of the BRCOND optimization, and update