Closes getlantern/lantern#1766

Yeah makes sense. I think I'm bought in on this approach. It feels a little clunky, but I'm a big fan of being explicit to make things clears, and relying on the somewhat obtuse merge scheme (i.e. the marshaling and unmarshaling) would expend mental energy each time we looked at the code. That is to say, I'm on board =).