Merge "Remove some non-unused makefile generality."