Fixed things that got broken in BaseLocalSRMetric and MostSimilarDisambiguator. Not sure what we're going to do with MostSimilarDisambiguator.