Better.
Many Makefile changes. Small changes to unsafe_optparse callsites.