improved PyPy plugin