Fix short, push trait struct refcnt increment down to lang