Code cleanups in preparation for 2.0 work. Ripped out v1.1 ARP syntax remnants....