Fixed up CaliperBenchmark.