ZMQ: Don't leak persist name in source and minimal refactor in destination