Cherry-pick 6c8a197 (T-Local-String (partial) fix)
Skip free vars while doing deep-equal.