More fixes for previously overzealous changes to setup.py