Merge "BENCHMARK_MAIN now requires a semicolon."