More changes to cpython code