Renumber events initially, too.