Cleaned up more Makefile and build configurations.