This fixes a couple of duplicates that had crept in, and also
renumbers everything so that they are monotonically increasing
through the file.