Tweaked previous commits to match IPv6 (AAAA) queries.