Adjustments for the NEG->BNOT change.