Sync collab code with non-collab code.

I failed to notice this before because I wasn't building with 0MQ. Am now!