Makefile cleanups...