Improved 'make bench'.