Improve a diagnostic ...