Scala Collector: Refactor. (#446)