More ARC compatibility. Code cleanup.