Re-structure benchmarks for efficiency; thanks, Philippe!