Further improvements to bytecode branch testing. Fix cases where the