[PATCH 0/8] Clean ups and speed ups to benchmarks