Merge "Makefile cleanup/fix after refactoring."