Setup.py and makefile cleanup.