Rewriting of collectors. Better interoperability between collapsing,
join, distance and scoring.