Miscellaneous cleanup

The Makefile changes are subjective.