Refactor benchmarks, measure both legacy and loopless core tests