Cleaned up dissector for potential early submission to wireshark