improve stub-psi-mismatch diagnostic