More setup.py tweaks.