find-or-add now evaluates to the dao object and predicate indicating whether a new entry was created.
Changed make-upsert in add-other to make-dao. Upsert not needed.