Merge pull request #1349 from vtbassmatt/unify-pypy

Remove special-casing for PyPy