Import cleanup.
Deduplicate new-style packet handling.