[WIP] Fixes #1158 -- Initial bits of code for testing on pypy3