Makefile cleanups, round 2