I've always wondered why the SB layer was parsing the P2P stuff, when it never really needed to do it. We have a P2P-specific handler for receival that should do it instead. And for sending, it's already serialized before getting to this layer, so that part is redundant.