Bench-suite improvements.