stubgen: fixes and simplifications#15232

JelleZijlstra merged 2 commits intopython:masterpython/mypy:masterfrom

hamdanal:stubgen-fixhamdanal/mypy:stubgen-fixCopy head branch name to clipboard