Final bits of NodeIdentifier migration