Try to further decrease code complexity in the ARP module