This will need revisiting once the Vclock encoding is merged! Add a TODO note somewhere. We're going to merge that one today.