Merge "Minor makefile cleanup."