Further improve diagnostic failures.