partial application of some PyPy related changes as far as they are uncontroversial and helpful for further utility code refactorings

--HG--
extra : transplant_source : %F8%87%C7%8B%90w%7E%8EG%04C%A9%89%9B%3E%FB%8CCp%F9