gh-106290: Fix edge cases around uops#106319

gvanrossum merged 13 commits intopython:mainpython/cpython:mainfrom

gvanrossum:tweak-uopsgvanrossum/cpython:tweak-uopsCopy head branch name to clipboard