Testsuite: Improve diagnostics for conditionals.