Make packet and frame types into unions