Cleaned-up benchmarks some more