Cleaner handling of our own multicast queries