Merge "Clean up makefile cruft."