Clean up the Makefile a bit.