This fixes a bunch of "src" versus "obj" confusions that apparently
existed in my bootsect removal patch.  How embarrassing...