More minor rearrangements for setup.py