Clean up setup.py: part 2.