ARP-related improvements.