Minor cleanup, added handling for nick changes.