Further fixes for correctness benchmark output.