More 'make bench' improvements.