As discussed on irc with Benoit and Dirkjan, we'll start out by discussing what protocol needs we have now and in the future, before extending or unifying anything. I'll open a separate thread for that on the list :) This patch will not be pushed. /Sune