Additional refinements of auto-bench stuff.