Align collection converter code
Bug 390240: partial collection converters