Totally overhaul run-benchmarks to be more concise