This looks sane to me, and should fix corner cases that can occur even without includes (e.g., same var twice in the same file). I wondered if this would conflict with the multivar lookup, but that seems to follow another code path, which is good. :+1: