Jiggle things around so that we can unbreak a test in PyPy.

There is a corresponding patch in PyPy.