The tests now pass all combinations of -O/-OO and -B.  See also #7071
and #6292 for previous variations on the same theme.