Cleaned up more Makefile and build implementation.