These are few harmless changes in setup.py taken from !1009 and !1022 to be merged before working on more dangerous things in setup.py (after talking with @marmoute).