Touch-ups to the benchmarking code

Based on @tyoshino's comments on #170.