## Review / Merge checklist - [x] PR title and summary are descriptive
This also gets rid of `Db.collection`, which was another source of circular dependencies.