Update as needed by the recent(ish) PyPy/RPython split.

This was less painful than I expected.