Renumber and cleanup cctools-809 patches