chore: Clean up original code to get typehints passing#2608

kratsg wants to merge 3 commits intomainscikit-hep/pyhf:mainfrom

fix/srcCodescikit-hep/pyhf:fix/srcCodeCopy head branch name to clipboard