Tidy up nick registration; track nick changes.