Sync with ports for pypy-2.0.b1.