Makefile cleanups, round 5