Some pypy3 stuff is in the main tree