Makefile cleanups, round 4