Improve test diagnostics and improve derivable argument evaluation.