I think this would read nicer if the collection cases are always written after the non-collection cases, instead of this way around.