gh-59956: Fix Function Groupings in pystate.c#101172

ericsnowcurrently merged 3 commits intopython:mainpython/cpython:mainfrom

ericsnowcurrently:pystate-cleanupericsnowcurrently/cpython:pystate-cleanupCopy head branch name to clipboard