MAILBOX-235 rework Collector so that everything is immutable - patch contributed by Matthieu Baechlor