Better sort diagnostics.