Scala Collector: Refactoring for #446