GH-100000: Cleanup and polish various watchers code#99998

markshannon merged 7 commits intopython:mainpython/cpython:mainfrom

itamaro:watchers-polishitamaro/cpython:watchers-polishCopy head branch name to clipboard