Address Said's comments on the benchmark, and do some clean up.