This masks an underlying PyPy bug referenced in the changelog, so it's still not as efficient as it
could be, but it's the best we can do on currently released PyPy.

Impact for CPython2 appears negligible (and none at all for CPython 3, since we don't support PyPy3).