More Makefile cleanup-ish.