More work on the collections editing.