But did it poorly, because I didn't want to change the external
interface that the Janos code uses.  This code needs a quick
cleanup pass to merge the two add* routines.