More Makefile cleanup, this will get unified soon.