Fix snap/xlog, move to msgpack diagrams