Renumber errors, cleanup.