Makefile cleanups.