Sync with CPython