Various bits of cleanup; actually examine packets