Minor updates

The change in `BenchmarkInfo.cpp` is to shut up a `Wreorder` warning from `clang 3.4`.