Some Makefile cleanup.