A little cleanup of ExtendedPacket and pulling it up into a separate
class.