Makefile cleanups, round 3