Update to better support ARC.