Fix compiler warning under ARC
Refactor remaining ARC–MRC blocks