Simplify ZMQ_STREAM socket implementation, part II