Restructured arp-caching to reflect comments in sr_arpcache.h; other fixes