Changes in preparation for conversion to ARC.