PyPy-2.2: Feedback from sthen@.