Update for the real pypy 2.4.0 final