Fix problem with self not being found crying wolf
Use new "samewith" functionality in (classify|categorize)-list