* Fixes bug that collator wasn't sending `Declare` message

* Apply suggestions from code review

I'm an idiot