Make a bit more ARC friendly