Fix and simplify error de-duplication#19247

ilevkivskyi merged 4 commits intopython:masterpython/mypy:masterfrom

ilevkivskyi:better-dedupilevkivskyi/mypy:better-dedupCopy head branch name to clipboard