WIP: Fix up collections

* Reset the collections hash on #reset. (Fixes #2234.)