Does this PR (without a test) to PyPy make sense? https://foss.heptapod.net/pypy/pypy/merge_requests/644/diffs ?