diff --git a/src/Tokenizer/ITokenDecorator.cs b/src/Tokenizer/ITokenDecorator.cs
index 29b93b96..3d244dbf 100644
--- a/src/Tokenizer/ITokenDecorator.cs
+++ b/src/Tokenizer/ITokenDecorator.cs
@@ -4,6 +4,4 @@ namespace Tokens;
 /// Defines a class that can modify the matching or transformation of text
 /// on a <see cref="Token"/>.
 /// </summary>
-public interface ITokenDecorator
-{
-}
+public interface ITokenDecorator;
diff --git a/tests/Tokenizer.Tests/Compilation/Binders/FrontMatterBinder.Options.Tests.cs b/tests/Tokenizer.Tests/Compilation/Binders/FrontMatterBinder.Options.Tests.cs
index 9b93cf94..86a6a60b 100644
--- a/tests/Tokenizer.Tests/Compilation/Binders/FrontMatterBinder.Options.Tests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Binders/FrontMatterBinder.Options.Tests.cs
@@ -22,7 +22,7 @@ public void GivenFrontMatter_WhenParsing_ThenSetsOptions()
         Assert.Equal(StringComparison.InvariantCulture, template.Options.TokenStringComparison);
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
     }
@@ -37,7 +37,7 @@ public void GivenFrontMatterWithWindowsLineEndings_WhenParsing_ThenSetsOptions()
         Assert.Equal(StringComparison.InvariantCultureIgnoreCase, template.Options.TokenStringComparison);
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
     }
@@ -51,7 +51,7 @@ public void GivenFrontMatterWithName_WhenParsing_ThenSetsTemplateName()
         // Assert
         Assert.Equal("My Template", template.Name);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
     }
diff --git a/tests/Tokenizer.Tests/Compilation/Nodes/FrontMatterAstTests.cs b/tests/Tokenizer.Tests/Compilation/Nodes/FrontMatterAstTests.cs
index 370fdb92..33906682 100644
--- a/tests/Tokenizer.Tests/Compilation/Nodes/FrontMatterAstTests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Nodes/FrontMatterAstTests.cs
@@ -32,8 +32,8 @@ public void GivenEntries_WhenBuildingBlock_ThenPreservesOrder()
 
         // Assert
         Assert.Equal(2, block.Entries.Count);
-        Assert.Same(e1, block.Entries.First());
-        Assert.Same(e2, block.Entries.Last());
+        Assert.Same(e1, block.Entries[0]);
+        Assert.Same(e2, block.Entries[^1]);
     }
 
     [Fact]
diff --git a/tests/Tokenizer.Tests/Compilation/Parsing/BaseTemplateDefinitionParserTests.cs b/tests/Tokenizer.Tests/Compilation/Parsing/BaseTemplateDefinitionParserTests.cs
index 2e3cc553..007ee2da 100644
--- a/tests/Tokenizer.Tests/Compilation/Parsing/BaseTemplateDefinitionParserTests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Parsing/BaseTemplateDefinitionParserTests.cs
@@ -34,7 +34,7 @@ public void GivenSingleToken_WhenParsing_ThenReturnsCorrectToken()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -59,7 +59,7 @@ public void GivenTwoTokens_WhenParsing_ThenReturnsBothTokens()
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token1 = template.Tokens.First();
+        var token1 = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token1.Preamble);
         Assert.Equal("TokenName", token1.Name);
@@ -67,7 +67,7 @@ public void GivenTwoTokens_WhenParsing_ThenReturnsBothTokens()
         Assert.False(token1.TerminateOnNewLine);
         Assert.False(token1.IsRepeating);
 
-        var token2 = template.Tokens.ElementAt(1);
+        var token2 = template.Tokens[1];
 
         Assert.Equal("Preamble 2 ", token2.Preamble);
         Assert.Equal("TokenName2", token2.Name);
@@ -85,7 +85,7 @@ public void GivenTokenWithNewLineTerminator_WhenParsing_ThenSetsTerminateOnNewLi
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -110,7 +110,7 @@ public void GivenTokenWithOptionalTerminator_WhenParsing_ThenSetsOptional()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -129,7 +129,7 @@ public void GivenTokenWithRequiredTerminator_WhenParsing_ThenSetsRequired()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -163,7 +163,7 @@ public void GivenTokenWithOptionalAndNewLineTerminator_WhenParsing_ThenSetsBothF
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -181,7 +181,7 @@ public void GivenTokenWithDecorator_WhenParsing_ThenAddsDecorator()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -190,7 +190,7 @@ public void GivenTokenWithDecorator_WhenParsing_ThenAddsDecorator()
         Assert.False(token.IsRepeating);
         Assert.Single(token.Decorators);
 
-        var decorator = token.Decorators.First();
+        var decorator = token.Decorators[0];
 
         Assert.Equal("ToDateTime", decorator.Name);
     }
@@ -204,7 +204,7 @@ public void GivenTokenWithMultipleDecorators_WhenParsing_ThenAddsAllDecorators()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -213,11 +213,11 @@ public void GivenTokenWithMultipleDecorators_WhenParsing_ThenAddsAllDecorators()
         Assert.False(token.IsRepeating);
         Assert.Equal(2, token.Decorators.Count);
 
-        var decorator1 = token.Decorators.First();
+        var decorator1 = token.Decorators[0];
 
         Assert.Equal("Trim", decorator1.Name);
 
-        var decorator2 = token.Decorators.ElementAt(1);
+        var decorator2 = token.Decorators[1];
 
         Assert.Equal("IsNotNullOrEmpty", decorator2.Name);
     }
@@ -231,13 +231,13 @@ public void GivenTokenWithDecoratorWithArgument_WhenParsing_ThenAddsDecoratorWit
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
-        var decorator = token.Decorators.First();
+        var token = template.Tokens[0];
+        var decorator = token.Decorators[0];
 
         Assert.Equal("ToDateTime", decorator.Name);
 
         Assert.Single(decorator.Args);
-        Assert.Equal("yyyy-MM-dd", decorator.Args.First());
+        Assert.Equal("yyyy-MM-dd", decorator.Args[0]);
     }
 
     [Fact]
@@ -249,13 +249,13 @@ public void GivenTokenWithDecoratorWithSingleQuotedArgument_WhenParsing_ThenAdds
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
-        var decorator = token.Decorators.First();
+        var token = template.Tokens[0];
+        var decorator = token.Decorators[0];
 
         Assert.Equal("ToDateTime", decorator.Name);
 
         Assert.Single(decorator.Args);
-        Assert.Equal("yyyy-MM-dd", decorator.Args.First());
+        Assert.Equal("yyyy-MM-dd", decorator.Args[0]);
     }
 
     [Fact]
@@ -267,13 +267,13 @@ public void GivenTokenWithDecoratorWithDoubleQuotedArgument_WhenParsing_ThenAdds
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
-        var decorator = token.Decorators.First();
+        var token = template.Tokens[0];
+        var decorator = token.Decorators[0];
 
         Assert.Equal("ToDateTime", decorator.Name);
 
         Assert.Single(decorator.Args);
-        Assert.Equal("yyyy-MM-dd", decorator.Args.First());
+        Assert.Equal("yyyy-MM-dd", decorator.Args[0]);
     }
 
     [Fact]
@@ -285,8 +285,8 @@ public void GivenTokenWithDecoratorWithThreeArguments_WhenParsing_ThenAddsDecora
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
-        var decorator = token.Decorators.First();
+        var token = template.Tokens[0];
+        var decorator = token.Decorators[0];
 
         Assert.Equal("Decorator", decorator.Name);
 
@@ -305,7 +305,7 @@ public void GivenTokenWithTrailingText_WhenParsing_ThenCreatesSecondToken()
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("TokenName", token.Name);
 
         var second = template.Tokens[1];
@@ -322,7 +322,7 @@ public void GivenTokenWithWindowsLineEndings_WhenParsing_ThenConvertsToUnixLineE
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
 
@@ -340,7 +340,7 @@ public void GivenTokenWithUnixLineEndings_WhenParsing_ThenPreservesUnixLineEndin
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
 
@@ -359,7 +359,7 @@ public void GivenFrontMatter_WhenParsing_ThenSetsOptions()
         Assert.Equal(StringComparison.InvariantCulture, template.Options.TokenStringComparison);
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
     }
@@ -374,7 +374,7 @@ public void GivenFrontMatterWithWindowsLineEndings_WhenParsing_ThenSetsOptions()
         Assert.Equal(StringComparison.InvariantCultureIgnoreCase, template.Options.TokenStringComparison);
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
     }
@@ -388,7 +388,7 @@ public void GivenFrontMatterWithName_WhenParsing_ThenSetsTemplateName()
         // Assert
         Assert.Equal("My Template", template.Name);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
     }
@@ -440,7 +440,7 @@ public void GivenTokenWithEscapedBrackets_WhenParsing_ThenUnescapesBrackets()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This {is} the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -475,7 +475,7 @@ public void GivenTokenWithWhitespace_WhenParsing_ThenAllowsWhitespace()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -535,7 +535,7 @@ public void GivenTokenWithRequiredLonghand_WhenParsing_ThenSetsRequired()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -552,7 +552,7 @@ public void GivenTokenWithOptionalLonghand_WhenParsing_ThenSetsOptional()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -569,7 +569,7 @@ public void GivenTokenWithRepeatingLonghand_WhenParsing_ThenSetsRepeating()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -586,7 +586,7 @@ public void GivenTokenWithNewLineLonghand_WhenParsing_ThenSetsTerminateOnNewLine
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -626,7 +626,7 @@ public void GivenTokenWithSetValue_WhenParsing_ThenSetsValue()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -643,7 +643,7 @@ public void GivenTokenWithSetValueAndDecorator_WhenParsing_ThenSetsValueAndDecor
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -675,7 +675,7 @@ public void GivenTokenWithSetValueInDoubleQuotes_WhenParsing_ThenSetsValue()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -692,7 +692,7 @@ public void GivenTokenWithSetValueInSingleQuotes_WhenParsing_ThenSetsValue()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -709,7 +709,7 @@ public void GivenTokenWithSetValueInSingleQuotesAndDecorator_WhenParsing_ThenSet
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -903,7 +903,7 @@ public void GivenNullToken_WhenParsing_ThenSetsIsNull()
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("Null", token.Name);
diff --git a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Basic.Tests.cs b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Basic.Tests.cs
index 9e922e03..666342fa 100644
--- a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Basic.Tests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Basic.Tests.cs
@@ -36,7 +36,7 @@ public void GivenSingleToken_WhenParsing_ThenReturnsCorrectToken()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -54,7 +54,7 @@ public void GivenTwoTokens_WhenParsing_ThenReturnsBothTokens()
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token1 = template.Tokens.First();
+        var token1 = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token1.Preamble);
         Assert.Equal("TokenName", token1.Name);
@@ -62,7 +62,7 @@ public void GivenTwoTokens_WhenParsing_ThenReturnsBothTokens()
         Assert.False(token1.TerminateOnNewLine);
         Assert.False(token1.IsRepeating);
 
-        var token2 = template.Tokens.ElementAt(1);
+        var token2 = template.Tokens[1];
 
         Assert.Equal("Preamble 2 ", token2.Preamble);
         Assert.Equal("TokenName2", token2.Name);
@@ -80,7 +80,7 @@ public void GivenTokenWithTrailingText_WhenParsing_ThenCreatesSecondToken()
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("TokenName", token.Name);
 
         var second = template.Tokens[1];
diff --git a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Decorator.Tests.cs b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Decorator.Tests.cs
index e8d6608d..54c11ea6 100644
--- a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Decorator.Tests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Decorator.Tests.cs
@@ -20,7 +20,7 @@ public void GivenTokenWithDecorator_WhenParsing_ThenAddsDecorator()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -29,7 +29,7 @@ public void GivenTokenWithDecorator_WhenParsing_ThenAddsDecorator()
         Assert.False(token.IsRepeating);
         Assert.Single(token.Decorators);
 
-        var decorator = token.Decorators.First();
+        var decorator = token.Decorators[0];
 
         Assert.Equal("ToDateTime", decorator.Name);
     }
@@ -43,7 +43,7 @@ public void GivenTokenWithMultipleDecorators_WhenParsing_ThenAddsAllDecorators()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -52,11 +52,11 @@ public void GivenTokenWithMultipleDecorators_WhenParsing_ThenAddsAllDecorators()
         Assert.False(token.IsRepeating);
         Assert.Equal(2, token.Decorators.Count);
 
-        var decorator1 = token.Decorators.First();
+        var decorator1 = token.Decorators[0];
 
         Assert.Equal("Trim", decorator1.Name);
 
-        var decorator2 = token.Decorators.ElementAt(1);
+        var decorator2 = token.Decorators[1];
 
         Assert.Equal("IsNotNullOrEmpty", decorator2.Name);
     }
@@ -70,13 +70,13 @@ public void GivenTokenWithDecoratorWithArgument_WhenParsing_ThenAddsDecoratorWit
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
-        var decorator = token.Decorators.First();
+        var token = template.Tokens[0];
+        var decorator = token.Decorators[0];
 
         Assert.Equal("ToDateTime", decorator.Name);
 
         Assert.Single(decorator.Args);
-        Assert.Equal("yyyy-MM-dd", decorator.Args.First());
+        Assert.Equal("yyyy-MM-dd", decorator.Args[0]);
     }
 
     [Fact]
@@ -88,13 +88,13 @@ public void GivenTokenWithDecoratorWithSingleQuotedArgument_WhenParsing_ThenAdds
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
-        var decorator = token.Decorators.First();
+        var token = template.Tokens[0];
+        var decorator = token.Decorators[0];
 
         Assert.Equal("ToDateTime", decorator.Name);
 
         Assert.Single(decorator.Args);
-        Assert.Equal("yyyy-MM-dd", decorator.Args.First());
+        Assert.Equal("yyyy-MM-dd", decorator.Args[0]);
     }
 
     [Fact]
@@ -106,13 +106,13 @@ public void GivenTokenWithDecoratorWithDoubleQuotedArgument_WhenParsing_ThenAdds
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
-        var decorator = token.Decorators.First();
+        var token = template.Tokens[0];
+        var decorator = token.Decorators[0];
 
         Assert.Equal("ToDateTime", decorator.Name);
 
         Assert.Single(decorator.Args);
-        Assert.Equal("yyyy-MM-dd", decorator.Args.First());
+        Assert.Equal("yyyy-MM-dd", decorator.Args[0]);
     }
 
     [Fact]
@@ -124,8 +124,8 @@ public void GivenTokenWithDecoratorWithThreeArguments_WhenParsing_ThenAddsDecora
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
-        var decorator = token.Decorators.First();
+        var token = template.Tokens[0];
+        var decorator = token.Decorators[0];
 
         Assert.Equal("Decorator", decorator.Name);
 
diff --git a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Escape.Tests.cs b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Escape.Tests.cs
index 586da855..06822b85 100644
--- a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Escape.Tests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Escape.Tests.cs
@@ -20,7 +20,7 @@ public void GivenTokenWithEscapedBrackets_WhenParsing_ThenUnescapesBrackets()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This {is} the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
diff --git a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Modifier.Tests.cs b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Modifier.Tests.cs
index 96de99e5..a9c4f7c7 100644
--- a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Modifier.Tests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Modifier.Tests.cs
@@ -27,7 +27,7 @@ public void GivenTokenWithNewLineTerminator_WhenParsing_ThenSetsTerminateOnNewLi
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -52,7 +52,7 @@ public void GivenTokenWithOptionalTerminator_WhenParsing_ThenSetsOptional()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -71,7 +71,7 @@ public void GivenTokenWithRequiredTerminator_WhenParsing_ThenSetsRequired()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -105,7 +105,7 @@ public void GivenTokenWithOptionalAndNewLineTerminator_WhenParsing_ThenSetsBothF
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("Preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -164,7 +164,7 @@ public void GivenTokenWithRequiredLonghand_WhenParsing_ThenSetsRequired()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -181,7 +181,7 @@ public void GivenTokenWithOptionalLonghand_WhenParsing_ThenSetsOptional()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -198,7 +198,7 @@ public void GivenTokenWithRepeatingLonghand_WhenParsing_ThenSetsRepeating()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -215,7 +215,7 @@ public void GivenTokenWithNewLineLonghand_WhenParsing_ThenSetsTerminateOnNewLine
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
diff --git a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Token.Tests.cs b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Token.Tests.cs
index 5d873811..d44374ac 100644
--- a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Token.Tests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Token.Tests.cs
@@ -27,7 +27,7 @@ public void GivenNullToken_WhenParsing_ThenSetsIsNull()
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("Null", token.Name);
@@ -43,7 +43,7 @@ public void GivenTokenWithWhitespace_WhenParsing_ThenAllowsWhitespace()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
diff --git a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Value.Tests.cs b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Value.Tests.cs
index a1e7533d..834915a7 100644
--- a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Value.Tests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Value.Tests.cs
@@ -20,7 +20,7 @@ public void GivenTokenWithSetValue_WhenParsing_ThenSetsValue()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -37,7 +37,7 @@ public void GivenTokenWithSetValueAndDecorator_WhenParsing_ThenSetsValueAndDecor
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -69,7 +69,7 @@ public void GivenTokenWithSetValueInDoubleQuotes_WhenParsing_ThenSetsValue()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -86,7 +86,7 @@ public void GivenTokenWithSetValueInSingleQuotes_WhenParsing_ThenSetsValue()
         // Assert
         Assert.Single(template.Tokens);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
@@ -103,7 +103,7 @@ public void GivenTokenWithSetValueInSingleQuotesAndDecorator_WhenParsing_ThenSet
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
 
         Assert.Equal("This is the preamble", token.Preamble);
         Assert.Equal("TokenName", token.Name);
diff --git a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Whitespace.Tests.cs b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Whitespace.Tests.cs
index 2df580cf..35cefb41 100644
--- a/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Whitespace.Tests.cs
+++ b/tests/Tokenizer.Tests/Compilation/Parsing/TemplateParser.Whitespace.Tests.cs
@@ -37,7 +37,7 @@ public void GivenTokenWithWindowsLineEndings_WhenParsing_ThenConvertsToUnixLineE
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
 
@@ -55,7 +55,7 @@ public void GivenTokenWithUnixLineEndings_WhenParsing_ThenPreservesUnixLineEndin
         // Assert
         Assert.Equal(2, template.Tokens.Count);
 
-        var token = template.Tokens.First();
+        var token = template.Tokens[0];
         Assert.Equal("Preamble\n", token.Preamble);
         Assert.Equal("TokenName", token.Name);
 
diff --git a/tests/Tokenizer.Tests/Compilation/TemplateCompilerTests.cs b/tests/Tokenizer.Tests/Compilation/TemplateCompilerTests.cs
index 98d726a9..8ce4de5c 100644
--- a/tests/Tokenizer.Tests/Compilation/TemplateCompilerTests.cs
+++ b/tests/Tokenizer.Tests/Compilation/TemplateCompilerTests.cs
@@ -19,7 +19,7 @@ public void GivenTemplateWithDecorator_WhenCompiling_ThenTokenHasDecorator()
 
         Assert.Single(token.Decorators);
 
-        var tokenOperator = token.Decorators.First();
+        var tokenOperator = token.Decorators[0];
 
         Assert.Equal(typeof(ToDateTimeTransformer), tokenOperator.DecoratorType);
         Assert.Single(tokenOperator.Parameters);
@@ -37,7 +37,7 @@ public void GivenTemplateWithTrailingNewLine_WhenCompiling_ThenTokenHasDecorator
 
         Assert.Single(token.Decorators);
 
-        var tokenOperator = token.Decorators.First();
+        var tokenOperator = token.Decorators[0];
 
         Assert.Equal(typeof(ToDateTimeTransformer), tokenOperator.DecoratorType);
         Assert.Single(tokenOperator.Parameters);
diff --git a/tests/Tokenizer.Tests/Tokenization/TokenizationEngine.Internal.Tests.cs b/tests/Tokenizer.Tests/Tokenization/TokenizationEngine.Internal.Tests.cs
index 07973e23..14741021 100644
--- a/tests/Tokenizer.Tests/Tokenization/TokenizationEngine.Internal.Tests.cs
+++ b/tests/Tokenizer.Tests/Tokenization/TokenizationEngine.Internal.Tests.cs
@@ -29,7 +29,7 @@ public void GivenRepeatingToken_WhenInputDoesNotMatchRepeat_ThenBacktracks()
         // Assert
         Assert.True(result.Success);
         Assert.Single(result.Tokens.Matches);
-        Assert.Equal("hello", result.Tokens.Matches.First().Value);
+        Assert.Equal("hello", result.Tokens.Matches[0].Value);
     }
 
     [Fact]
diff --git a/tests/Tokenizer.Tests/TokenizerAsyncTests.cs b/tests/Tokenizer.Tests/TokenizerAsyncTests.cs
index ec577bb3..5dbc0425 100644
--- a/tests/Tokenizer.Tests/TokenizerAsyncTests.cs
+++ b/tests/Tokenizer.Tests/TokenizerAsyncTests.cs
@@ -59,7 +59,7 @@ public async Task GivenStream_WhenTokenizeAsync_ThenMatchesTokens()
 
         // Assert
         Assert.True(result.Success);
-        Assert.Equal("Charlie", result.Tokens.Matches.First().Value);
+        Assert.Equal("Charlie", result.Tokens.Matches[0].Value);
     }
 
     [Fact]