Tweaks to match catalog API. Renamed CorrelatedValue to ScopeValue.