refactor Collect (low priority, no immediate user benefit)

[Guillermo Gutiérrez]

[Hélène Martin]

At the moment it looks unlikely that we'd consider a refactor as an end in itself. Feature areas like adding multiple project support have led to significant refactors and we'll continue letting user need drive those.