A bunch more changes related to ARC implementation.