Tweaks to benchmarking stuff

/cc @arfon