A few more code cleanups to the benchmark code.