tree-optimization/93891 - improve same-store disambiguation