Improve best-mention substitution and eval output tools.