Plus a PyPy fix, now that the tests are running again.
Attach a file by drag & drop or click to upload
