change to how namedcnt maintained in lists
Merge branch '21-misc-cleanup' into 23