Remove final unsafe_unretained uses

Change-Id: I35b73e3902b6741699813ce0bb843d3fd37bf701