improve ->'s source location tracking

closes PR 13514