Simple doc, Makefile, and cherry-pick error fixes.

I can't remember the specifics, besides seeing flags on the command line that I didn't like. Previously it also enforced mangled names like cf-upgrade-cf-upgrade.o. I'll revert and check show the command line is affected.