Merge "Remove makefile cruft."