Bring in a small change from team/russell/chan_refcount