Actual conversion to ARC and other updates to use the modern stuff.