partially add back vector support for pypy