More work on switching pypo to use setuptools