More work converting to use of AFNetworking 2.0