Tally no counts dups more correctly, but more debugging to do.

I think I need to represent the data structures more explicitly.