Fix circular dependency

[will123195]

Fixes #58

Also prevents emitting undefined events, i.e. renaming a collection.