More clean up on ARC compatibility.