Refactor collection-entries and from-entries into contents and create, generic for <type>.