diff --git a/Src/LexText/Interlinear/ChooseAnalysisHander.cs b/Src/LexText/Interlinear/ChooseAnalysisHandler.cs
similarity index 100%
rename from Src/LexText/Interlinear/ChooseAnalysisHander.cs
rename to Src/LexText/Interlinear/ChooseAnalysisHandler.cs
diff --git a/Src/LexText/Interlinear/ITextDll.csproj b/Src/LexText/Interlinear/ITextDll.csproj
index 33471b521f..6f0ff53fce 100644
--- a/Src/LexText/Interlinear/ITextDll.csproj
+++ b/Src/LexText/Interlinear/ITextDll.csproj
@@ -351,7 +351,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="BIRDInterlinearImporter.cs" />
-    <Compile Include="ChooseAnalysisHander.cs">
+    <Compile Include="ChooseAnalysisHandler.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ChooseTextWritingSystemDlg.cs">
diff --git a/Src/LexText/Interlinear/InterlinVc.cs b/Src/LexText/Interlinear/InterlinVc.cs
index 1fcddda4d9..e756c655ff 100644
--- a/Src/LexText/Interlinear/InterlinVc.cs
+++ b/Src/LexText/Interlinear/InterlinVc.cs
@@ -144,7 +144,6 @@ public class InterlinVc : FwBaseVc, IDisposable
 		private InterlinLineChoices m_lineChoices;
 		protected IVwStylesheet m_stylesheet;
 		private IParaDataLoader m_loader;
-		private readonly HashSet<int> m_vernWss; // all vernacular writing systems
 		private readonly int m_selfFlid;
 
 		private int m_leftPadding;
@@ -184,8 +183,7 @@ public InterlinVc(LcmCache cache) : base(cache.DefaultAnalWs)
 			m_tssEmptyPara = TsStringUtils.MakeString(ITextStrings.ksEmptyPara, m_wsAnalysis);
 			m_tssSpace = TsStringUtils.MakeString(" ", m_wsAnalysis);
 			m_msaVc = new MoMorphSynAnalysisUi.MsaVc(m_cache);
-			m_vernWss = WritingSystemServices.GetAllWritingSystems(m_cache, "all vernacular",
-				null, 0, 0);
+
 			// This usually gets overridden, but ensures default behavior if not.
 			m_lineChoices = InterlinLineChoices.DefaultChoices(m_cache.LangProject,
 				WritingSystemServices.kwsVernInParagraph, WritingSystemServices.kwsAnal);
@@ -227,7 +225,8 @@ protected virtual void GetSegmentLevelTags(LcmCache cache)
 		/// </summary>
 		internal bool CanBeAnalyzed(AnalysisOccurrence occurrence)
 		{
-			return !(occurrence.Analysis is IPunctuationForm) && m_vernWss.Contains(occurrence.BaselineWs);
+			return !(occurrence.Analysis is IPunctuationForm) &&
+				WritingSystemServices.GetAllWritingSystems(m_cache, "all vernacular", null, 0, 0).Contains(occurrence.BaselineWs);
 		}
 
 		internal IVwStylesheet StyleSheet