Clean up makefiles a bit.