Remove more zeromq branching defines.