Rejig context handling in benchmarks to add queue finishing