I figured out how it should have done it.

Author: johnml1135

src/SIL.Machine/Corpora/ScriptureRefUsfmParserHandlerBase.cs

@@ -155,9 +155,9 @@ public override void EndSidebar(UsfmParserState state, string marker, bool close
         public override void StartSubComponent(UsfmParserState state, string marker, string caller, string category)
         {
             if (_curVerseRef.IsDefault)
-                UpdateVerseRef(state.VerseRef, marker, startAsChildElement: true);
+                UpdateVerseRef(state.VerseRef, marker);
 
-            if (CurrentTextType != ScriptureTextType.None && !_duplicateVerse)
+            if (!_duplicateVerse)
             {
                 // if we hit a note in a verse paragraph and we aren't in a verse, then start a non-verse segment
                 CheckConvertVerseParaToNonVerse(state);
@@ -240,13 +240,12 @@ private void EndNonVerseText(UsfmParserState state)
             _curTextType.Pop();
         }
 
-        private void UpdateVerseRef(VerseRef verseRef, string marker, bool startAsChildElement = false)
+        private void UpdateVerseRef(VerseRef verseRef, string marker)
         {
             if (!VerseRef.AreOverlappingVersesRanges(verseRef, _curVerseRef))
             {
                 _curElements.Clear();
-                int position = startAsChildElement ? 1 : 0;
-                _curElements.Push(new ScriptureElement(position, marker));
+                _curElements.Push(new ScriptureElement(0, marker));
             }
             _curVerseRef = verseRef;
         }

tests/SIL.Machine.Tests/Corpora/UsfmMemoryTextTests.cs

@@ -168,7 +168,7 @@ public void GetRows_VersePara_CommentFirst()
         Assert.That(rows[0].Text, Is.EqualTo("World"));
         Assert.That(rows[0].Ref, Is.EqualTo(ScriptureRef.Parse("MAT 1:0/1:f")));
         Assert.That(rows[1].Text, Is.EqualTo("This is a comment"));
-        Assert.That(rows[2].Ref, Is.EqualTo(ScriptureRef.Parse("MAT 1:0:2/ip")));
+        Assert.That(rows[2].Ref, Is.EqualTo(ScriptureRef.Parse("MAT 1:0/2:ip")));
         Assert.That(rows, Has.Length.EqualTo(3), string.Join(",", rows.Select(tr => tr.Text)));
     }
 

tests/SIL.Machine.Tests/Corpora/UsfmTokenizerTests.cs

@@ -11,30 +11,30 @@ public void Tokenize()
         string usfm = ReadUsfm();
         var tokenizer = new UsfmTokenizer();
         IReadOnlyList<UsfmToken> tokens = tokenizer.Tokenize(usfm);
-        Assert.That(tokens, Has.Count.EqualTo(240));
+        Assert.That(tokens, Has.Count.EqualTo(236));
 
         Assert.That(tokens[0].Type, Is.EqualTo(UsfmTokenType.Book));
         Assert.That(tokens[0].Marker, Is.EqualTo("id"));
         Assert.That(tokens[0].Data, Is.EqualTo("MAT"));
         Assert.That(tokens[0].LineNumber, Is.EqualTo(1));
         Assert.That(tokens[0].ColumnNumber, Is.EqualTo(1));
 
-        Assert.That(tokens[37].Type, Is.EqualTo(UsfmTokenType.Text));
-        Assert.That(tokens[37].Text, Is.EqualTo("Chapter One "));
-        Assert.That(tokens[37].LineNumber, Is.EqualTo(10));
-        Assert.That(tokens[37].ColumnNumber, Is.EqualTo(4));
+        Assert.That(tokens[30].Type, Is.EqualTo(UsfmTokenType.Text));
+        Assert.That(tokens[30].Text, Is.EqualTo("Chapter One "));
+        Assert.That(tokens[30].LineNumber, Is.EqualTo(9));
+        Assert.That(tokens[30].ColumnNumber, Is.EqualTo(4));
 
-        Assert.That(tokens[38].Type, Is.EqualTo(UsfmTokenType.Verse));
-        Assert.That(tokens[38].Marker, Is.EqualTo("v"));
-        Assert.That(tokens[38].Data, Is.EqualTo("1"));
-        Assert.That(tokens[38].LineNumber, Is.EqualTo(11));
-        Assert.That(tokens[38].ColumnNumber, Is.EqualTo(1));
+        Assert.That(tokens[31].Type, Is.EqualTo(UsfmTokenType.Verse));
+        Assert.That(tokens[31].Marker, Is.EqualTo("v"));
+        Assert.That(tokens[31].Data, Is.EqualTo("1"));
+        Assert.That(tokens[31].LineNumber, Is.EqualTo(10));
+        Assert.That(tokens[31].ColumnNumber, Is.EqualTo(1));
 
-        Assert.That(tokens[47].Type, Is.EqualTo(UsfmTokenType.SubComponent));
-        Assert.That(tokens[47].Marker, Is.EqualTo("f"));
-        Assert.That(tokens[47].Data, Is.EqualTo("+"));
-        Assert.That(tokens[47].LineNumber, Is.EqualTo(11));
-        Assert.That(tokens[47].ColumnNumber, Is.EqualTo(52));
+        Assert.That(tokens[40].Type, Is.EqualTo(UsfmTokenType.SubComponent));
+        Assert.That(tokens[40].Marker, Is.EqualTo("f"));
+        Assert.That(tokens[40].Data, Is.EqualTo("+"));
+        Assert.That(tokens[40].LineNumber, Is.EqualTo(10));
+        Assert.That(tokens[40].ColumnNumber, Is.EqualTo(48));
     }
 
     [Test]