Improve output of Old Bird NFC wrangler.