(Also fix some cosmetic garbage added by autoconf, automake, or CVS merges to get our files closer to the FSF versions.)