Bit of comment and if nesting cleanup in PacketDecoder.