Collector now handles multiple choices correctly.