From bc347d736ff897c36be9c974307fd7d6ace94a97 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Thu, 23 Mar 2017 16:01:23 -0700
Subject: [PATCH] [Fixes #964] Removed Content property from
 CSharpStatementIRNode

---
 .../PagesPropertyInjectionPass.cs             | 28 +++++---
 .../ViewComponentTagHelperPass.cs             | 14 ++--
 .../DesignTimeCSharpRenderer.cs               | 35 +++++++---
 .../CodeGeneration/RuntimeCSharpRenderer.cs   | 33 ++++++---
 .../DefaultDirectiveIRPass.cs                 | 23 ++++---
 .../DefaultInstrumentationPass.cs             | 22 ++++--
 .../DefaultRazorIRLoweringPhase.cs            | 42 ++++++-----
 .../Intermediate/CSharpStatementIRNode.cs     |  5 +-
 .../RazorDesignTimeIRPass.cs                  | 55 +++++++++------
 .../TestFiles/Output/Runtime/RazorPages.cs    |  1 -
 .../ViewComponentTagHelperPassTest.cs         |  9 ++-
 .../IntegrationTests/RazorIRNodeWriter.cs     |  5 --
 .../Intermediate/RazorIRAssert.cs             | 29 +++++++-
 .../AddTagHelperDirective_DesignTime.ir.txt   | 15 ++--
 ...ibuteTargetingTagHelpers_DesignTime.ir.txt | 15 ++--
 .../Await_DesignTime.ir.txt                   | 39 +++++++----
 .../Await_Runtime.codegen.cs                  |  1 -
 .../Await_Runtime.ir.txt                      | 18 +++--
 .../BasicImports_DesignTime.ir.txt            | 15 ++--
 .../BasicTagHelpers_DesignTime.ir.txt         | 15 ++--
 ...BasicTagHelpers_Prefixed_DesignTime.ir.txt | 15 ++--
 .../Blocks_DesignTime.ir.txt                  | 60 ++++++++++------
 .../Blocks_Runtime.codegen.cs                 | 14 ----
 .../Blocks_Runtime.ir.txt                     | 45 ++++++++----
 .../CodeBlockAtEOF_DesignTime.ir.txt          | 18 +++--
 .../CodeBlockAtEOF_Runtime.ir.txt             |  3 +-
 ...CodeBlockWithTextElement_DesignTime.ir.txt | 24 ++++---
 .../CodeBlockWithTextElement_Runtime.ir.txt   |  9 ++-
 .../CodeBlock_DesignTime.ir.txt               | 18 +++--
 .../CodeBlock_Runtime.codegen.cs              |  1 -
 .../CodeBlock_Runtime.ir.txt                  |  3 +-
 .../ComplexTagHelpers_DesignTime.ir.txt       | 57 ++++++++++-----
 .../ComplexTagHelpers_Runtime.codegen.cs      |  4 --
 .../ComplexTagHelpers_Runtime.ir.txt          | 42 +++++++----
 .../ConditionalAttributes_DesignTime.ir.txt   | 57 ++++++++++-----
 .../ConditionalAttributes_Runtime.codegen.cs  |  1 -
 .../ConditionalAttributes_Runtime.ir.txt      | 12 ++--
 .../DesignTime_DesignTime.ir.txt              | 27 +++++---
 ...icateAttributeTagHelpers_DesignTime.ir.txt | 15 ++--
 ...namicAttributeTagHelpers_DesignTime.ir.txt | 51 +++++++++-----
 .../DynamicAttributeTagHelpers_Runtime.ir.txt | 36 ++++++----
 ...EmptyAttributeTagHelpers_DesignTime.ir.txt | 15 ++--
 .../EmptyCodeBlock_DesignTime.ir.txt          | 18 +++--
 .../EmptyCodeBlock_Runtime.ir.txt             |  3 +-
 .../EmptyExplicitExpression_DesignTime.ir.txt | 15 ++--
 ...ImplicitExpressionInCode_DesignTime.ir.txt | 21 ++++--
 ...ptyImplicitExpressionInCode_Runtime.ir.txt |  6 +-
 .../EmptyImplicitExpression_DesignTime.ir.txt | 15 ++--
 .../EnumTagHelpers_DesignTime.ir.txt          | 18 +++--
 .../EnumTagHelpers_Runtime.codegen.cs         |  1 -
 .../EnumTagHelpers_Runtime.ir.txt             |  3 +-
 .../EscapedTagHelpers_DesignTime.ir.txt       | 15 ++--
 .../ExplicitExpressionAtEOF_DesignTime.ir.txt | 15 ++--
 ...icitExpressionWithMarkup_DesignTime.ir.txt | 15 ++--
 .../ExplicitExpression_DesignTime.ir.txt      | 15 ++--
 .../ExpressionsInCode_DesignTime.ir.txt       | 33 ++++++---
 .../ExpressionsInCode_Runtime.codegen.cs      |  4 --
 .../ExpressionsInCode_Runtime.ir.txt          | 18 +++--
 .../FunctionsBlockMinimal_DesignTime.ir.txt   | 18 +++--
 .../FunctionsBlockMinimal_Runtime.codegen.cs  |  1 -
 .../FunctionsBlockMinimal_Runtime.ir.txt      |  6 +-
 .../FunctionsBlock_DesignTime.ir.txt          | 21 ++++--
 .../FunctionsBlock_Runtime.codegen.cs         |  1 -
 .../FunctionsBlock_Runtime.ir.txt             |  6 +-
 .../HiddenSpansInCode_DesignTime.ir.txt       | 21 ++++--
 .../HiddenSpansInCode_Runtime.codegen.cs      |  1 -
 .../HiddenSpansInCode_Runtime.ir.txt          |  6 +-
 ...lCommentWithQuote_Double_DesignTime.ir.txt | 15 ++--
 ...lCommentWithQuote_Single_DesignTime.ir.txt | 15 ++--
 .../ImplicitExpressionAtEOF_DesignTime.ir.txt | 15 ++--
 .../ImplicitExpression_DesignTime.ir.txt      | 21 ++++--
 .../ImplicitExpression_Runtime.codegen.cs     |  1 -
 .../ImplicitExpression_Runtime.ir.txt         |  6 +-
 .../IncompleteTagHelper_DesignTime.ir.txt     | 15 ++--
 .../Inherits_DesignTime.ir.txt                | 15 ++--
 .../InlineBlocks_DesignTime.ir.txt            | 30 +++++---
 .../InlineBlocks_Runtime.ir.txt               | 15 ++--
 .../Instrumented_DesignTime.ir.txt            | 69 ++++++++++++-------
 .../Instrumented_Runtime.codegen.cs           | 14 ----
 .../Instrumented_Runtime.ir.txt               | 51 +++++++++-----
 .../MarkupInCodeBlock_DesignTime.ir.txt       | 21 ++++--
 .../MarkupInCodeBlock_Runtime.codegen.cs      |  2 -
 .../MarkupInCodeBlock_Runtime.ir.txt          |  6 +-
 .../MinimizedTagHelpers_DesignTime.ir.txt     | 15 ++--
 .../NestedCSharp_DesignTime.ir.txt            | 27 +++++---
 .../NestedCSharp_Runtime.codegen.cs           |  1 -
 .../NestedCSharp_Runtime.ir.txt               | 12 ++--
 .../NestedCodeBlocks_DesignTime.ir.txt        | 24 ++++---
 .../NestedCodeBlocks_Runtime.ir.txt           |  9 ++-
 ...estedScriptTagTagHelpers_DesignTime.ir.txt | 21 ++++--
 ...stedScriptTagTagHelpers_Runtime.codegen.cs |  2 -
 .../NestedScriptTagTagHelpers_Runtime.ir.txt  |  9 ++-
 .../NestedTagHelpers_DesignTime.ir.txt        | 15 ++--
 .../NoLinePragmas_DesignTime.ir.txt           | 63 +++++++++++------
 .../NoLinePragmas_Runtime.codegen.cs          | 14 ----
 .../NoLinePragmas_Runtime.ir.txt              | 48 ++++++++-----
 ...llConditionalExpressions_DesignTime.ir.txt | 30 +++++---
 .../NullConditionalExpressions_Runtime.ir.txt | 15 ++--
 .../OpenedIf_DesignTime.ir.txt                | 24 ++++---
 .../OpenedIf_Runtime.codegen.cs               |  1 -
 .../OpenedIf_Runtime.ir.txt                   |  6 +-
 .../ParserError_DesignTime.ir.txt             | 18 +++--
 .../ParserError_Runtime.ir.txt                |  3 +-
 ...fixedAttributeTagHelpers_DesignTime.ir.txt | 18 +++--
 ...ixedAttributeTagHelpers_Runtime.codegen.cs |  1 -
 ...PrefixedAttributeTagHelpers_Runtime.ir.txt |  3 +-
 .../RazorComments_DesignTime.ir.txt           | 27 +++++---
 .../RazorComments_Runtime.codegen.cs          |  1 -
 .../RazorComments_Runtime.ir.txt              | 12 ++--
 ...RemoveTagHelperDirective_DesignTime.ir.txt | 15 ++--
 .../Sections_DesignTime.ir.txt                | 42 +++++++----
 .../Sections_Runtime.codegen.cs               |  1 -
 .../Sections_Runtime.ir.txt                   | 30 +++++---
 .../SimpleTagHelpers_DesignTime.ir.txt        | 15 ++--
 .../SimpleUnspacedIf_DesignTime.ir.txt        | 21 ++++--
 .../SimpleUnspacedIf_Runtime.codegen.cs       |  1 -
 .../SimpleUnspacedIf_Runtime.ir.txt           |  6 +-
 ...hNewlineBeforeAttributes_DesignTime.ir.txt | 15 ++--
 .../SingleTagHelper_DesignTime.ir.txt         | 15 ++--
 .../StringLiterals_DesignTime.ir.txt          | 27 +++++---
 .../StringLiterals_Runtime.ir.txt             | 12 ++--
 .../SymbolBoundAttributes_DesignTime.ir.txt   | 15 ++--
 .../TagHelpersInSection_Runtime.codegen.cs    |  1 -
 .../TagHelpersInSection_Runtime.ir.txt        |  9 ++-
 ...lpersWithBoundAttributes_DesignTime.ir.txt | 15 ++--
 .../TagHelpersWithPrefix_DesignTime.ir.txt    | 15 ++--
 ...hWeirdlySpacedAttributes_DesignTime.ir.txt | 15 ++--
 .../Templates_DesignTime.ir.txt               | 30 +++++---
 .../Templates_Runtime.codegen.cs              |  1 -
 .../Templates_Runtime.ir.txt                  | 18 +++--
 ...onsInTagHelperAttributes_DesignTime.ir.txt | 18 +++--
 ...nsInTagHelperAttributes_Runtime.codegen.cs |  1 -
 ...itionsInTagHelperAttributes_Runtime.ir.txt |  3 +-
 ...finishedExpressionInCode_DesignTime.ir.txt | 21 ++++--
 .../UnfinishedExpressionInCode_Runtime.ir.txt |  6 +-
 .../Usings_DesignTime.ir.txt                  | 15 ++--
 .../BasicTest.ir.txt                          | 42 +++++++----
 137 files changed, 1555 insertions(+), 842 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs
index f03a1aa678..07ecbf1f7c 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs
@@ -22,18 +22,28 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var @class = visitor.Class;
 
             var viewDataType = $"global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<{modelType}>";
-            var vddProperty = new CSharpStatementIRNode
+            var vddProperty = new CSharpStatementIRNode()
             {
-                Content = $"public {viewDataType} ViewData => ({viewDataType})PageContext?.ViewData;",
-                Parent = @class,
+                Parent = @class
             };
-            var modelProperty = new CSharpStatementIRNode
-            {
-                Content = $"public {modelType} Model => ViewData.Model;",
-                Parent = @class,
-            };
-
+            RazorIRBuilder.Create(vddProperty)
+                .Add(new RazorIRToken()
+                {
+                    Kind = RazorIRToken.TokenKind.CSharp,
+                    Content = $"public {viewDataType} ViewData => ({viewDataType})PageContext?.ViewData;",
+                });
             @class.Children.Add(vddProperty);
+
+            var modelProperty = new CSharpStatementIRNode()
+            {
+                Parent = @class
+            };
+            RazorIRBuilder.Create(modelProperty)
+                .Add(new RazorIRToken()
+                {
+                    Kind = RazorIRToken.TokenKind.CSharp,
+                    Content = $"public {modelType} Model => ViewData.Model;",
+                });
             @class.Children.Add(modelProperty);
         }
 
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
index 3646280938..64218e7d02 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
@@ -46,11 +46,17 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var writer = new CSharpCodeWriter();
             WriteClass(writer, tagHelper);
 
-            @class.Children.Add(new CSharpStatementIRNode()
+            var statement = new CSharpStatementIRNode()
             {
-                Content = writer.Builder.ToString(),
-                Parent = @class,
-            });
+                Parent = @class
+            };
+            RazorIRBuilder.Create(statement)
+                .Add(new RazorIRToken()
+                {
+                    Content = writer.Builder.ToString()
+                });
+
+            @class.Children.Add(statement);
         }
 
         private void RewriteCreateNode(
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/DesignTimeCSharpRenderer.cs b/src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/DesignTimeCSharpRenderer.cs
index 06d9132200..5cf1779931 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/DesignTimeCSharpRenderer.cs
+++ b/src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/DesignTimeCSharpRenderer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using System.Text;
 using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
 using Microsoft.AspNetCore.Razor.Evolution.Legacy;
 
@@ -77,31 +78,47 @@ namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
 
         public override void VisitCSharpStatement(CSharpStatementIRNode node)
         {
+            var isWhitespaceToken = node.Children.All(child =>
+                child is RazorIRToken token && string.IsNullOrWhiteSpace(token.Content));
+
+            IDisposable linePragmaScope = null;
             if (node.Source != null)
             {
-                IDisposable linePragmaScope = null;
-                if (!string.IsNullOrWhiteSpace(node.Content))
+                if (!isWhitespaceToken)
                 {
                     linePragmaScope = Context.Writer.BuildLinePragma(node.Source.Value);
                 }
 
                 var padding = BuildOffsetPadding(0, node.Source.Value, Context);
                 Context.Writer.Write(padding);
-                Context.AddLineMappingFor(node);
-                Context.Writer.Write(node.Content);
+            }
+            else if (isWhitespaceToken)
+            {
+                // Don't write whitespace if there is no line mapping for it.
+                return;
+            }
 
-                if (linePragmaScope != null)
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is RazorIRToken token && token.IsCSharp)
                 {
-                    linePragmaScope.Dispose();
+                    Context.AddLineMappingFor(node);
+                    Context.Writer.Write(token.Content);
                 }
                 else
                 {
-                    Context.Writer.WriteLine();
+                    // There may be something else inside the statement like an extension node.
+                    Visit(node.Children[i]);
                 }
             }
-            else if (!string.IsNullOrWhiteSpace(node.Content))
+
+            if (linePragmaScope != null)
             {
-                Context.Writer.WriteLine(node.Content);
+                linePragmaScope.Dispose();
+            }
+            else
+            {
+                Context.Writer.WriteLine();
             }
         }
 
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/RuntimeCSharpRenderer.cs b/src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/RuntimeCSharpRenderer.cs
index 1d7e494a9b..235c3a5bfa 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/RuntimeCSharpRenderer.cs
+++ b/src/Microsoft.AspNetCore.Razor.Evolution/CodeGeneration/RuntimeCSharpRenderer.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Evolution.Intermediate;
 using Microsoft.AspNetCore.Razor.Evolution.Legacy;
+using System.Text;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
 {
@@ -209,25 +210,41 @@ namespace Microsoft.AspNetCore.Razor.Evolution.CodeGeneration
 
         public override void VisitCSharpStatement(CSharpStatementIRNode node)
         {
-            if (string.IsNullOrWhiteSpace(node.Content))
+            var isWhitespaceToken = node.Children.All(child =>
+                child is RazorIRToken token && string.IsNullOrWhiteSpace(token.Content));
+
+            if (isWhitespaceToken)
             {
                 return;
             }
 
+            IDisposable linePragmaScope = null;
             if (node.Source != null)
             {
-                using (Context.Writer.BuildLinePragma(node.Source.Value))
+                linePragmaScope = Context.Writer.BuildLinePragma(node.Source.Value);
+                var padding = BuildOffsetPadding(0, node.Source.Value, Context);
+                Context.Writer.Write(padding);
+            }
+
+            for (var i = 0; i < node.Children.Count; i++)
+            {
+                if (node.Children[i] is RazorIRToken token && token.IsCSharp)
                 {
-                    var padding = BuildOffsetPadding(0, node.Source.Value, Context);
-                    Context.Writer
-                        .Write(padding)
-                        .WriteLine(node.Content);
+                    Context.Writer.Write(token.Content);
+                }
+                else
+                {
+                    // There may be something else inside the statement like an extension node.
+                    Visit(node.Children[i]);
                 }
             }
-            else
+
+            if (linePragmaScope == null)
             {
-                Context.Writer.WriteLine(node.Content);
+                Context.Writer.WriteLine();
             }
+
+            linePragmaScope?.Dispose();
         }
 
         public override void VisitTagHelper(TagHelperIRNode node)
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultDirectiveIRPass.cs b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultDirectiveIRPass.cs
index 557547a396..0020749bf1 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultDirectiveIRPass.cs
+++ b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultDirectiveIRPass.cs
@@ -48,10 +48,14 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 var sectionIndex = node.Parent.Children.IndexOf(node);
                 node.Parent.Children.Remove(node);
 
-                var defineSectionEndStatement = new CSharpStatementIRNode()
-                {
-                    Content = "});",
-                };
+                var defineSectionEndStatement = new CSharpStatementIRNode();
+                RazorIRBuilder.Create(defineSectionEndStatement)
+                    .Add(new RazorIRToken()
+                    {
+                        Kind = RazorIRToken.TokenKind.CSharp,
+                        Content = "});"
+                    });
+
                 node.Parent.Children.Insert(sectionIndex, defineSectionEndStatement);
 
                 foreach (var child in node.Children.Except(node.Tokens).Reverse())
@@ -61,10 +65,13 @@ namespace Microsoft.AspNetCore.Razor.Evolution
 
                 var lambdaContent = designTime ? "__razor_section_writer" : string.Empty;
                 var sectionName = node.Tokens.FirstOrDefault()?.Content;
-                var defineSectionStartStatement = new CSharpStatementIRNode()
-                {
-                    Content = /* ORIGINAL: DefineSectionMethodName */ $"DefineSection(\"{sectionName}\", async ({lambdaContent}) => {{",
-                };
+                var defineSectionStartStatement = new CSharpStatementIRNode();
+                RazorIRBuilder.Create(defineSectionStartStatement)
+                    .Add(new RazorIRToken()
+                    {
+                        Kind = RazorIRToken.TokenKind.CSharp,
+                        Content = $"DefineSection(\"{sectionName}\", async ({lambdaContent}) => {{"
+                    });
 
                 node.Parent.Children.Insert(sectionIndex, defineSectionStartStatement);
             }
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultInstrumentationPass.cs b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultInstrumentationPass.cs
index e42fe78b43..4f7806106f 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultInstrumentationPass.cs
+++ b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultInstrumentationPass.cs
@@ -31,19 +31,29 @@ namespace Microsoft.AspNetCore.Razor.Evolution
 
             var beginNode = new CSharpStatementIRNode()
             {
-                Content = string.Format("{0}({1}, {2}, {3});",
-                    beginContextMethodName,
-                    item.Source.AbsoluteIndex.ToString(CultureInfo.InvariantCulture),
-                    item.Source.Length.ToString(CultureInfo.InvariantCulture),
-                    item.IsLiteral ? "true" : "false"),
                 Parent = item.Node.Parent
             };
+            RazorIRBuilder.Create(beginNode)
+                .Add(new RazorIRToken()
+                {
+                    Kind = RazorIRToken.TokenKind.CSharp,
+                    Content = string.Format("{0}({1}, {2}, {3});",
+                        beginContextMethodName,
+                        item.Source.AbsoluteIndex.ToString(CultureInfo.InvariantCulture),
+                        item.Source.Length.ToString(CultureInfo.InvariantCulture),
+                        item.IsLiteral ? "true" : "false")
+                });
 
             var endNode = new CSharpStatementIRNode()
             {
-                Content = string.Format("{0}();", endContextMethodName),
                 Parent = item.Node.Parent
             };
+            RazorIRBuilder.Create(endNode)
+                .Add(new RazorIRToken()
+                {
+                    Kind = RazorIRToken.TokenKind.CSharp,
+                    Content = string.Format("{0}();", endContextMethodName)
+                });
 
             var nodeIndex = item.Node.Parent.Children.IndexOf(item.Node);
             item.Node.Parent.Children.Insert(nodeIndex, beginNode);
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs
index d5b2dfeec9..f5c159b29a 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs
+++ b/src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs
@@ -388,11 +388,20 @@ namespace Microsoft.AspNetCore.Razor.Evolution
 
             public override void VisitStatementSpan(StatementChunkGenerator chunkGenerator, Span span)
             {
-                _builder.Add(new CSharpStatementIRNode()
+                var statementNode = new CSharpStatementIRNode()
+                {
+                    Source = BuildSourceSpanFromNode(span)
+                };
+                _builder.Push(statementNode);
+
+                _builder.Add(new RazorIRToken()
                 {
                     Content = span.Content,
+                    Kind = RazorIRToken.TokenKind.CSharp,
                     Source = BuildSourceSpanFromNode(span),
                 });
+
+                _builder.Pop();
             }
 
             public override void VisitMarkupSpan(MarkupChunkGenerator chunkGenerator, Span span)
@@ -437,21 +446,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                     Source = BuildSourceSpanFromNode(span),
                 });
             }
-            private void Combine(HtmlContentIRNode node, Span span)
-            {
-                node.Content = node.Content + span.Content;
-                if (node.Source != null)
-                {
-                    Debug.Assert(node.Source.Value.FilePath != null);
-
-                    node.Source = new SourceSpan(
-                        node.Source.Value.FilePath,
-                        node.Source.Value.AbsoluteIndex,
-                        node.Source.Value.LineIndex,
-                        node.Source.Value.CharacterIndex,
-                        node.Content.Length);
-                }
-            }
 
             public override void VisitTagHelperBlock(TagHelperChunkGenerator chunkGenerator, Block block)
             {
@@ -491,6 +485,22 @@ namespace Microsoft.AspNetCore.Razor.Evolution
                 _builder.Pop(); // Pop TagHelperIRNode
             }
 
+            private void Combine(HtmlContentIRNode node, Span span)
+            {
+                node.Content = node.Content + span.Content;
+                if (node.Source != null)
+                {
+                    Debug.Assert(node.Source.Value.FilePath != null);
+
+                    node.Source = new SourceSpan(
+                        node.Source.Value.FilePath,
+                        node.Source.Value.AbsoluteIndex,
+                        node.Source.Value.LineIndex,
+                        node.Source.Value.CharacterIndex,
+                        node.Content.Length);
+                }
+            }
+
             private void DeclareTagHelperFields(TagHelperBlock block)
             {
                 if (_tagHelperFields == null)
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpStatementIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpStatementIRNode.cs
index 005b2bf9d2..ce881908d3 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpStatementIRNode.cs
+++ b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/CSharpStatementIRNode.cs
@@ -3,20 +3,17 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Evolution.Legacy;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
 {
     public class CSharpStatementIRNode : RazorIRNode
     {
-        public override IList<RazorIRNode> Children { get; } = EmptyArray;
+        public override IList<RazorIRNode> Children { get; } = new List<RazorIRNode>();
 
         public override RazorIRNode Parent { get; set; }
 
         public override SourceSpan? Source { get; set; }
 
-        public string Content { get; set; }
-
         public override void Accept(RazorIRNodeVisitor visitor)
         {
             if (visitor == null)
diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/RazorDesignTimeIRPass.cs b/src/Microsoft.AspNetCore.Razor.Evolution/RazorDesignTimeIRPass.cs
index 9f993e3f2d..2190ebcc84 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/RazorDesignTimeIRPass.cs
+++ b/src/Microsoft.AspNetCore.Razor.Evolution/RazorDesignTimeIRPass.cs
@@ -25,10 +25,13 @@ namespace Microsoft.AspNetCore.Razor.Evolution
 
             public override void VisitClass(ClassDeclarationIRNode node)
             {
-                var designTimeHelperDeclaration = new CSharpStatementIRNode()
-                {
-                    Content = $"private static {typeof(object).FullName} {DesignTimeVariable} = null;",
-                };
+                var designTimeHelperDeclaration = new CSharpStatementIRNode();
+                RazorIRBuilder.Create(designTimeHelperDeclaration)
+                    .Add(new RazorIRToken()
+                    {
+                        Kind = RazorIRToken.TokenKind.CSharp,
+                        Content = $"private static {typeof(object).FullName} {DesignTimeVariable} = null;"
+                    });
 
                 node.Children.Insert(0, designTimeHelperDeclaration);
 
@@ -51,28 +54,40 @@ namespace Microsoft.AspNetCore.Razor.Evolution
 
                 public DirectiveTokenHelperIRNode()
                 {
-                    var disableWarningPragma = new CSharpStatementIRNode()
-                    {
-                        Content = "#pragma warning disable 219",
-                    };
+                    var disableWarningPragma = new CSharpStatementIRNode();
+                    RazorIRBuilder.Create(disableWarningPragma)
+                        .Add(new RazorIRToken()
+                        {
+                            Kind = RazorIRToken.TokenKind.CSharp,
+                            Content = "#pragma warning disable 219",
+                        });
                     Children.Add(disableWarningPragma);
 
-                    var methodStartNode = new CSharpStatementIRNode()
-                    {
-                        Content = "private void " + DirectiveTokenHelperMethodName + "() {"
-                    };
+                    var methodStartNode = new CSharpStatementIRNode();
+                    RazorIRBuilder.Create(methodStartNode)
+                        .Add(new RazorIRToken()
+                        {
+                            Kind = RazorIRToken.TokenKind.CSharp,
+                            Content = "private void " + DirectiveTokenHelperMethodName + "() {"
+                        });
                     Children.Add(methodStartNode);
 
-                    var methodEndNode = new CSharpStatementIRNode()
-                    {
-                        Content = "}"
-                    };
+                    var methodEndNode = new CSharpStatementIRNode();
+                    RazorIRBuilder.Create(methodEndNode)
+                        .Add(new RazorIRToken()
+                        {
+                            Kind = RazorIRToken.TokenKind.CSharp,
+                            Content = "}"
+                        });
                     Children.Add(methodEndNode);
 
-                    var restoreWarningPragma = new CSharpStatementIRNode()
-                    {
-                        Content = "#pragma warning restore 219",
-                    };
+                    var restoreWarningPragma = new CSharpStatementIRNode();
+                    RazorIRBuilder.Create(restoreWarningPragma)
+                        .Add(new RazorIRToken()
+                        {
+                            Kind = RazorIRToken.TokenKind.CSharp,
+                            Content = "#pragma warning restore 219",
+                        });
                     Children.Add(restoreWarningPragma);
                 }
 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/RazorPages.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/RazorPages.cs
index e180075aa2..f168317dab 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/RazorPages.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/Output/Runtime/RazorPages.cs
@@ -203,7 +203,6 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         public string Name { get; set; }
     }
 
-
 #line default
 #line hidden
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs
index 326d382949..be377e9b23 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs
@@ -98,6 +98,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             Assert.Equal(3, @class.Children.Count);
 
             var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
+            var tokenNode = vcthClass.Children[0] as RazorIRToken;
             Assert.Equal(
                 @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
@@ -119,7 +120,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
     }
 }
 ",
-                vcthClass.Content,
+                tokenNode.Content,
                 ignoreLineEndingDifferences: true);
         }
 
@@ -168,6 +169,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
             Assert.Equal(3, @class.Children.Count);
 
             var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
+            var tokenNode = vcthClass.Children[0] as RazorIRToken;
             Assert.Equal(
                 @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
@@ -190,7 +192,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
     }
 }
 ",
-                vcthClass.Content,
+                tokenNode.Content,
                 ignoreLineEndingDifferences: true);
         }
 
@@ -252,6 +254,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
             Assert.Equal(3, @class.Children.Count);
 
             var vcthClass = Assert.IsType<CSharpStatementIRNode>(@class.Children[2]);
+            var tokenNode = vcthClass.Children[0] as RazorIRToken;
             Assert.Equal(
                 @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
@@ -273,7 +276,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
     }
 }
 ",
-                vcthClass.Content,
+                tokenNode.Content,
                 ignoreLineEndingDifferences: true);
         }
 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs
index cb8a192ce3..428d98eb41 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/IntegrationTests/RazorIRNodeWriter.cs
@@ -36,11 +36,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests
             WriteContentNode(node, node.Prefix);
         }
 
-        public override void VisitCSharpStatement(CSharpStatementIRNode node)
-        {
-            WriteContentNode(node, node.Content);
-        }
-
         public override void VisitToken(RazorIRToken node)
         {
             WriteContentNode(node, node.Kind.ToString(), node.Content);
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRAssert.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRAssert.cs
index d3d4610ea6..d2e5c92fa3 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRAssert.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRAssert.cs
@@ -79,7 +79,15 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
             try
             {
                 var statement = Assert.IsType<CSharpStatementIRNode>(node);
-                Assert.Equal(expected, statement.Content);
+                var content = new StringBuilder();
+                for (var i = 0; i < statement.Children.Count; i++)
+                {
+                    var token = Assert.IsType<RazorIRToken>(statement.Children[i]);
+                    Assert.Equal(RazorIRToken.TokenKind.CSharp, token.Kind);
+                    content.Append(token.Content);
+                }
+
+                Assert.Equal(expected, content.ToString());
             }
             catch (XunitException e)
             {
@@ -221,7 +229,15 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
             try
             {
                 var beginNode = Assert.IsType<CSharpStatementIRNode>(node);
-                Assert.Equal($"BeginContext({expected});", beginNode.Content);
+                var content = new StringBuilder();
+                for (var i = 0; i < beginNode.Children.Count; i++)
+                {
+                    var token = Assert.IsType<RazorIRToken>(beginNode.Children[i]);
+                    Assert.Equal(RazorIRToken.TokenKind.CSharp, token.Kind);
+                    content.Append(token.Content);
+                }
+
+                Assert.Equal($"BeginContext({expected});", content.ToString());
             }
             catch (XunitException e)
             {
@@ -234,7 +250,14 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
             try
             {
                 var endNode = Assert.IsType<CSharpStatementIRNode>(node);
-                Assert.Equal("EndContext();", endNode.Content);
+                var content = new StringBuilder();
+                for (var i = 0; i < endNode.Children.Count; i++)
+                {
+                    var token = Assert.IsType<RazorIRToken>(endNode.Children[i]);
+                    Assert.Equal(RazorIRToken.TokenKind.CSharp, token.Kind);
+                    content.Append(token.Content);
+                }
+                Assert.Equal("EndContext();", content.ToString());
             }
             catch (XunitException e)
             {
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt
index 729a9cbc45..cf3b5540d6 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AddTagHelperDirective_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] AddTagHelperDirective.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [2] AddTagHelperDirective.cshtml) - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt
index 38e99c216b..d34b508730 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeTargetingTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeTargetingTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [15] AttributeTargetingTagHelpers.cshtml) - *, TestAssembly
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper - TestNamespace.CatchAllTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (29:0,29 [4] AttributeTargetingTagHelpers.cshtml) - \n\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt
index 1a6982bdd5..f86bf8321c 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Await_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (89:5,1 [102] Await.cshtml) - \n\n<section>\n    <h1>Basic Asynchronous Expression Test</h1>\n    <p>Basic Asynchronous Expression: 
                 CSharpExpression - (192:9,39 [11] Await.cshtml)
@@ -18,14 +23,17 @@ Document -
                 CSharpExpression - (247:10,38 [11] Await.cshtml)
                     RazorIRToken - (247:10,38 [11] Await.cshtml) - CSharp - await Foo()
                 HtmlContent - (259:10,50 [43] Await.cshtml) - </p>\n    <p>Basic Asynchronous Statement: 
-                CSharpStatement - (304:11,39 [14] Await.cshtml) -  await Foo(); 
+                CSharpStatement - (304:11,39 [14] Await.cshtml)
+                    RazorIRToken - (304:11,39 [14] Await.cshtml) - CSharp -  await Foo(); 
                 HtmlContent - (319:11,54 [50] Await.cshtml) - </p>\n    <p>Basic Asynchronous Statement Nested: 
-                CSharpStatement - (371:12,46 [1] Await.cshtml) -  
+                CSharpStatement - (371:12,46 [1] Await.cshtml)
+                    RazorIRToken - (371:12,46 [1] Await.cshtml) - CSharp -  
                 HtmlContent - (372:12,47 [3] Await.cshtml) - <b>
                 CSharpExpression - (376:12,51 [11] Await.cshtml)
                     RazorIRToken - (376:12,51 [11] Await.cshtml) - CSharp - await Foo()
                 HtmlContent - (387:12,62 [4] Await.cshtml) - </b>
-                CSharpStatement - (391:12,66 [1] Await.cshtml) -  
+                CSharpStatement - (391:12,66 [1] Await.cshtml)
+                    RazorIRToken - (391:12,66 [1] Await.cshtml) - CSharp -  
                 HtmlContent - (393:12,68 [54] Await.cshtml) - </p>\n    <p>Basic Incomplete Asynchronous Statement: 
                 CSharpExpression - (448:13,49 [5] Await.cshtml)
                     RazorIRToken - (448:13,49 [5] Await.cshtml) - CSharp - await
@@ -39,18 +47,23 @@ Document -
                 CSharpExpression - (716:20,41 [22] Await.cshtml)
                     RazorIRToken - (716:20,41 [22] Await.cshtml) - CSharp - await Foo("bob", true)
                 HtmlContent - (739:20,64 [46] Await.cshtml) - </p>\n    <p>Advanced Asynchronous Statement: 
-                CSharpStatement - (787:21,42 [39] Await.cshtml) -  await Foo(something, hello: "world"); 
+                CSharpStatement - (787:21,42 [39] Await.cshtml)
+                    RazorIRToken - (787:21,42 [39] Await.cshtml) - CSharp -  await Foo(something, hello: "world"); 
                 HtmlContent - (827:21,82 [55] Await.cshtml) - </p>\n    <p>Advanced Asynchronous Statement Extended: 
-                CSharpStatement - (884:22,51 [21] Await.cshtml) -  await Foo.Bar(1, 2) 
+                CSharpStatement - (884:22,51 [21] Await.cshtml)
+                    RazorIRToken - (884:22,51 [21] Await.cshtml) - CSharp -  await Foo.Bar(1, 2) 
                 HtmlContent - (906:22,73 [53] Await.cshtml) - </p>\n    <p>Advanced Asynchronous Statement Nested: 
-                CSharpStatement - (961:23,49 [1] Await.cshtml) -  
+                CSharpStatement - (961:23,49 [1] Await.cshtml)
+                    RazorIRToken - (961:23,49 [1] Await.cshtml) - CSharp -  
                 HtmlContent - (962:23,50 [3] Await.cshtml) - <b>
                 CSharpExpression - (966:23,54 [27] Await.cshtml)
                     RazorIRToken - (966:23,54 [27] Await.cshtml) - CSharp - await Foo(boolValue: false)
                 HtmlContent - (993:23,81 [4] Await.cshtml) - </b>
-                CSharpStatement - (997:23,85 [1] Await.cshtml) -  
+                CSharpStatement - (997:23,85 [1] Await.cshtml)
+                    RazorIRToken - (997:23,85 [1] Await.cshtml) - CSharp -  
                 HtmlContent - (999:23,87 [57] Await.cshtml) - </p>\n    <p>Advanced Incomplete Asynchronous Statement: 
                 CSharpExpression - (1057:24,52 [19] Await.cshtml)
                     RazorIRToken - (1057:24,52 [19] Await.cshtml) - CSharp - await ("wrrronggg")
                 HtmlContent - (1076:24,71 [16] Await.cshtml) - </p>\n</section>
-            CSharpStatement - (12:0,12 [76] Await.cshtml) - \n    public async Task<string> Foo()\n    {\n        return "Bar";\n    }\n
+            CSharpStatement - (12:0,12 [76] Await.cshtml)
+                RazorIRToken - (12:0,12 [76] Await.cshtml) - CSharp - \n    public async Task<string> Foo()\n    {\n        return "Bar";\n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs
index 3ce77efef7..3116d4d2f7 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs
@@ -95,7 +95,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         return "Bar";
     }
 
-
 #line default
 #line hidden
     }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt
index 3282f4f27a..48ff185be0 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.ir.txt
@@ -12,13 +12,15 @@ Document -
                 CSharpExpression - (247:10,38 [11] Await.cshtml)
                     RazorIRToken - (247:10,38 [11] Await.cshtml) - CSharp - await Foo()
                 HtmlContent - (259:10,50 [43] Await.cshtml) - </p>\n    <p>Basic Asynchronous Statement: 
-                CSharpStatement - (304:11,39 [14] Await.cshtml) -  await Foo(); 
+                CSharpStatement - (304:11,39 [14] Await.cshtml)
+                    RazorIRToken - (304:11,39 [14] Await.cshtml) - CSharp -  await Foo(); 
                 HtmlContent - (319:11,54 [50] Await.cshtml) - </p>\n    <p>Basic Asynchronous Statement Nested: 
                 HtmlContent - (371:12,46 [4] Await.cshtml) -  <b>
                 CSharpExpression - (376:12,51 [11] Await.cshtml)
                     RazorIRToken - (376:12,51 [11] Await.cshtml) - CSharp - await Foo()
                 HtmlContent - (387:12,62 [5] Await.cshtml) - </b> 
-                CSharpStatement - (392:12,67 [0] Await.cshtml) - 
+                CSharpStatement - (392:12,67 [0] Await.cshtml)
+                    RazorIRToken - (392:12,67 [0] Await.cshtml) - CSharp - 
                 HtmlContent - (393:12,68 [54] Await.cshtml) - </p>\n    <p>Basic Incomplete Asynchronous Statement: 
                 CSharpExpression - (448:13,49 [5] Await.cshtml)
                     RazorIRToken - (448:13,49 [5] Await.cshtml) - CSharp - await
@@ -32,17 +34,21 @@ Document -
                 CSharpExpression - (716:20,41 [22] Await.cshtml)
                     RazorIRToken - (716:20,41 [22] Await.cshtml) - CSharp - await Foo("bob", true)
                 HtmlContent - (739:20,64 [46] Await.cshtml) - </p>\n    <p>Advanced Asynchronous Statement: 
-                CSharpStatement - (787:21,42 [39] Await.cshtml) -  await Foo(something, hello: "world"); 
+                CSharpStatement - (787:21,42 [39] Await.cshtml)
+                    RazorIRToken - (787:21,42 [39] Await.cshtml) - CSharp -  await Foo(something, hello: "world"); 
                 HtmlContent - (827:21,82 [55] Await.cshtml) - </p>\n    <p>Advanced Asynchronous Statement Extended: 
-                CSharpStatement - (884:22,51 [21] Await.cshtml) -  await Foo.Bar(1, 2) 
+                CSharpStatement - (884:22,51 [21] Await.cshtml)
+                    RazorIRToken - (884:22,51 [21] Await.cshtml) - CSharp -  await Foo.Bar(1, 2) 
                 HtmlContent - (906:22,73 [53] Await.cshtml) - </p>\n    <p>Advanced Asynchronous Statement Nested: 
                 HtmlContent - (961:23,49 [4] Await.cshtml) -  <b>
                 CSharpExpression - (966:23,54 [27] Await.cshtml)
                     RazorIRToken - (966:23,54 [27] Await.cshtml) - CSharp - await Foo(boolValue: false)
                 HtmlContent - (993:23,81 [5] Await.cshtml) - </b> 
-                CSharpStatement - (998:23,86 [0] Await.cshtml) - 
+                CSharpStatement - (998:23,86 [0] Await.cshtml)
+                    RazorIRToken - (998:23,86 [0] Await.cshtml) - CSharp - 
                 HtmlContent - (999:23,87 [57] Await.cshtml) - </p>\n    <p>Advanced Incomplete Asynchronous Statement: 
                 CSharpExpression - (1057:24,52 [19] Await.cshtml)
                     RazorIRToken - (1057:24,52 [19] Await.cshtml) - CSharp - await ("wrrronggg")
                 HtmlContent - (1076:24,71 [16] Await.cshtml) - </p>\n</section>
-            CSharpStatement - (12:0,12 [76] Await.cshtml) - \n    public async Task<string> Foo()\n    {\n        return "Bar";\n    }\n
+            CSharpStatement - (12:0,12 [76] Await.cshtml)
+                RazorIRToken - (12:0,12 [76] Await.cshtml) - CSharp - \n    public async Task<string> Foo()\n    {\n        return "Bar";\n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt
index 1daab1e1de..9739724c2e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicImports_DesignTime.ir.txt
@@ -8,11 +8,16 @@ Document -
         UsingStatement - (23:1,1 [18] BasicImports_Imports1.cshtml) - System.Text
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicImports_DesignTime - Hello - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (119:4,10 [5] BasicImports_Imports0.cshtml) - Hello
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [18] BasicImports.cshtml) - <p>Hi there!</p>\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt
index a9435751d2..a544a6f94d 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] BasicTagHelpers.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [73] BasicTagHelpers.cshtml) - \n\n<div data-animation="fade" class="randomNonTagHelperAttribute">\n    
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt
index 5f9db9c2e5..6a4508ae66 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicTagHelpers_Prefixed_DesignTime.ir.txt
@@ -5,13 +5,18 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_BasicTagHelpers_Prefixed_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (17:0,17 [5] BasicTagHelpers_Prefixed.cshtml) - "THS"
                 DirectiveToken - (38:1,14 [17] BasicTagHelpers_Prefixed.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (22:0,22 [2] BasicTagHelpers_Prefixed.cshtml) - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt
index 4e157a9a92..e67c98205e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.ir.txt
@@ -5,50 +5,70 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [18] Blocks.cshtml) - \n    int i = 1;\n
+                CSharpStatement - (2:0,2 [18] Blocks.cshtml)
+                    RazorIRToken - (2:0,2 [18] Blocks.cshtml) - CSharp - \n    int i = 1;\n
                 HtmlContent - (23:3,0 [2] Blocks.cshtml) - \n
-                CSharpStatement - (26:4,1 [22] Blocks.cshtml) - while(i <= 10) {\n    
+                CSharpStatement - (26:4,1 [22] Blocks.cshtml)
+                    RazorIRToken - (26:4,1 [22] Blocks.cshtml) - CSharp - while(i <= 10) {\n    
                 HtmlContent - (48:5,4 [19] Blocks.cshtml) - <p>Hello from C#, #
                 CSharpExpression - (69:5,25 [1] Blocks.cshtml)
                     RazorIRToken - (69:5,25 [1] Blocks.cshtml) - CSharp - i
                 HtmlContent - (71:5,27 [4] Blocks.cshtml) - </p>
-                CSharpStatement - (75:5,31 [16] Blocks.cshtml) - \n    i += 1;\n}
+                CSharpStatement - (75:5,31 [16] Blocks.cshtml)
+                    RazorIRToken - (75:5,31 [16] Blocks.cshtml) - CSharp - \n    i += 1;\n}
                 HtmlContent - (91:7,1 [4] Blocks.cshtml) - \n\n
-                CSharpStatement - (96:9,1 [19] Blocks.cshtml) - if(i == 11) {\n    
+                CSharpStatement - (96:9,1 [19] Blocks.cshtml)
+                    RazorIRToken - (96:9,1 [19] Blocks.cshtml) - CSharp - if(i == 11) {\n    
                 HtmlContent - (115:10,4 [25] Blocks.cshtml) - <p>We wrote 10 lines!</p>
-                CSharpStatement - (140:10,29 [3] Blocks.cshtml) - \n}
+                CSharpStatement - (140:10,29 [3] Blocks.cshtml)
+                    RazorIRToken - (140:10,29 [3] Blocks.cshtml) - CSharp - \n}
                 HtmlContent - (143:11,1 [4] Blocks.cshtml) - \n\n
-                CSharpStatement - (148:13,1 [35] Blocks.cshtml) - switch(i) {\n    case 11:\n        
+                CSharpStatement - (148:13,1 [35] Blocks.cshtml)
+                    RazorIRToken - (148:13,1 [35] Blocks.cshtml) - CSharp - switch(i) {\n    case 11:\n        
                 HtmlContent - (183:15,8 [36] Blocks.cshtml) - <p>No really, we wrote 10 lines!</p>
-                CSharpStatement - (219:15,44 [40] Blocks.cshtml) - \n        break;\n    default:\n        
+                CSharpStatement - (219:15,44 [40] Blocks.cshtml)
+                    RazorIRToken - (219:15,44 [40] Blocks.cshtml) - CSharp - \n        break;\n    default:\n        
                 HtmlContent - (259:18,8 [29] Blocks.cshtml) - <p>Actually, we didn't...</p>
-                CSharpStatement - (288:18,37 [19] Blocks.cshtml) - \n        break;\n}
+                CSharpStatement - (288:18,37 [19] Blocks.cshtml)
+                    RazorIRToken - (288:18,37 [19] Blocks.cshtml) - CSharp - \n        break;\n}
                 HtmlContent - (307:20,1 [4] Blocks.cshtml) - \n\n
-                CSharpStatement - (312:22,1 [39] Blocks.cshtml) - for(int j = 1; j <= 10; j += 2) {\n    
+                CSharpStatement - (312:22,1 [39] Blocks.cshtml)
+                    RazorIRToken - (312:22,1 [39] Blocks.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n    
                 HtmlContent - (351:23,4 [25] Blocks.cshtml) - <p>Hello again from C#, #
                 CSharpExpression - (378:23,31 [1] Blocks.cshtml)
                     RazorIRToken - (378:23,31 [1] Blocks.cshtml) - CSharp - j
                 HtmlContent - (380:23,33 [4] Blocks.cshtml) - </p>
-                CSharpStatement - (384:23,37 [3] Blocks.cshtml) - \n}
+                CSharpStatement - (384:23,37 [3] Blocks.cshtml)
+                    RazorIRToken - (384:23,37 [3] Blocks.cshtml) - CSharp - \n}
                 HtmlContent - (387:24,1 [4] Blocks.cshtml) - \n\n
-                CSharpStatement - (392:26,1 [11] Blocks.cshtml) - try {\n    
+                CSharpStatement - (392:26,1 [11] Blocks.cshtml)
+                    RazorIRToken - (392:26,1 [11] Blocks.cshtml) - CSharp - try {\n    
                 HtmlContent - (403:27,4 [35] Blocks.cshtml) - <p>That time, we wrote 5 lines!</p>
-                CSharpStatement - (438:27,39 [31] Blocks.cshtml) - \n} catch(Exception ex) {\n    
+                CSharpStatement - (438:27,39 [31] Blocks.cshtml)
+                    RazorIRToken - (438:27,39 [31] Blocks.cshtml) - CSharp - \n} catch(Exception ex) {\n    
                 HtmlContent - (469:29,4 [29] Blocks.cshtml) - <p>Oh no! An error occurred: 
                 CSharpExpression - (500:29,35 [10] Blocks.cshtml)
                     RazorIRToken - (500:29,35 [10] Blocks.cshtml) - CSharp - ex.Message
                 HtmlContent - (511:29,46 [4] Blocks.cshtml) - </p>
-                CSharpStatement - (515:29,50 [3] Blocks.cshtml) - \n}
+                CSharpStatement - (515:29,50 [3] Blocks.cshtml)
+                    RazorIRToken - (515:29,50 [3] Blocks.cshtml) - CSharp - \n}
                 HtmlContent - (518:30,1 [16] Blocks.cshtml) - \n\n<p>i is now 
                 CSharpExpression - (535:32,13 [1] Blocks.cshtml)
                     RazorIRToken - (535:32,13 [1] Blocks.cshtml) - CSharp - i
                 HtmlContent - (536:32,14 [8] Blocks.cshtml) - </p>\n\n
-                CSharpStatement - (545:34,1 [26] Blocks.cshtml) - lock(new object()) {\n    
+                CSharpStatement - (545:34,1 [26] Blocks.cshtml)
+                    RazorIRToken - (545:34,1 [26] Blocks.cshtml) - CSharp - lock(new object()) {\n    
                 HtmlContent - (571:35,4 [47] Blocks.cshtml) - <p>This block is locked, for your security!</p>
-                CSharpStatement - (618:35,51 [3] Blocks.cshtml) - \n}
+                CSharpStatement - (618:35,51 [3] Blocks.cshtml)
+                    RazorIRToken - (618:35,51 [3] Blocks.cshtml) - CSharp - \n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs
index 7ebecb26ee..f009784a36 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.codegen.cs
@@ -13,14 +13,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
   
     int i = 1;
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
  while(i <= 10) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Hello from C#, #");
@@ -34,21 +32,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
     i += 1;
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
  if(i == 11) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>We wrote 10 lines!</p>\r\n");
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
@@ -56,7 +51,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
  switch(i) {
     case 11:
 
-
 #line default
 #line hidden
             WriteLiteral("        <p>No really, we wrote 10 lines!</p>\r\n");
@@ -64,7 +58,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         break;
     default:
 
-
 #line default
 #line hidden
             WriteLiteral("        <p>Actually, we didn\'t...</p>\r\n");
@@ -72,14 +65,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         break;
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
  for(int j = 1; j <= 10; j += 2) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Hello again from C#, #");
@@ -92,21 +83,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
  try {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>That time, we wrote 5 lines!</p>\r\n");
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
 } catch(Exception ex) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Oh no! An error occurred: ");
@@ -119,7 +107,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 31 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n<p>i is now ");
@@ -132,7 +119,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 35 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks.cshtml"
  lock(new object()) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>This block is locked, for your security!</p>\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt
index 244bbd6356..070ca771e4 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_Runtime.ir.txt
@@ -5,44 +5,59 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Blocks_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [18] Blocks.cshtml) - \n    int i = 1;\n
+                CSharpStatement - (2:0,2 [18] Blocks.cshtml)
+                    RazorIRToken - (2:0,2 [18] Blocks.cshtml) - CSharp - \n    int i = 1;\n
                 HtmlContent - (23:3,0 [2] Blocks.cshtml) - \n
-                CSharpStatement - (26:4,1 [18] Blocks.cshtml) - while(i <= 10) {\n
+                CSharpStatement - (26:4,1 [18] Blocks.cshtml)
+                    RazorIRToken - (26:4,1 [18] Blocks.cshtml) - CSharp - while(i <= 10) {\n
                 HtmlContent - (44:5,0 [23] Blocks.cshtml) -     <p>Hello from C#, #
                 CSharpExpression - (69:5,25 [1] Blocks.cshtml)
                     RazorIRToken - (69:5,25 [1] Blocks.cshtml) - CSharp - i
                 HtmlContent - (71:5,27 [6] Blocks.cshtml) - </p>\n
-                CSharpStatement - (77:6,0 [16] Blocks.cshtml) -     i += 1;\n}\n
+                CSharpStatement - (77:6,0 [16] Blocks.cshtml)
+                    RazorIRToken - (77:6,0 [16] Blocks.cshtml) - CSharp -     i += 1;\n}\n
                 HtmlContent - (93:8,0 [2] Blocks.cshtml) - \n
-                CSharpStatement - (96:9,1 [15] Blocks.cshtml) - if(i == 11) {\n
+                CSharpStatement - (96:9,1 [15] Blocks.cshtml)
+                    RazorIRToken - (96:9,1 [15] Blocks.cshtml) - CSharp - if(i == 11) {\n
                 HtmlContent - (111:10,0 [31] Blocks.cshtml) -     <p>We wrote 10 lines!</p>\n
-                CSharpStatement - (142:11,0 [3] Blocks.cshtml) - }\n
+                CSharpStatement - (142:11,0 [3] Blocks.cshtml)
+                    RazorIRToken - (142:11,0 [3] Blocks.cshtml) - CSharp - }\n
                 HtmlContent - (145:12,0 [2] Blocks.cshtml) - \n
-                CSharpStatement - (148:13,1 [27] Blocks.cshtml) - switch(i) {\n    case 11:\n
+                CSharpStatement - (148:13,1 [27] Blocks.cshtml)
+                    RazorIRToken - (148:13,1 [27] Blocks.cshtml) - CSharp - switch(i) {\n    case 11:\n
                 HtmlContent - (175:15,0 [46] Blocks.cshtml) -         <p>No really, we wrote 10 lines!</p>\n
-                CSharpStatement - (221:16,0 [30] Blocks.cshtml) -         break;\n    default:\n
+                CSharpStatement - (221:16,0 [30] Blocks.cshtml)
+                    RazorIRToken - (221:16,0 [30] Blocks.cshtml) - CSharp -         break;\n    default:\n
                 HtmlContent - (251:18,0 [39] Blocks.cshtml) -         <p>Actually, we didn't...</p>\n
-                CSharpStatement - (290:19,0 [19] Blocks.cshtml) -         break;\n}\n
+                CSharpStatement - (290:19,0 [19] Blocks.cshtml)
+                    RazorIRToken - (290:19,0 [19] Blocks.cshtml) - CSharp -         break;\n}\n
                 HtmlContent - (309:21,0 [2] Blocks.cshtml) - \n
-                CSharpStatement - (312:22,1 [35] Blocks.cshtml) - for(int j = 1; j <= 10; j += 2) {\n
+                CSharpStatement - (312:22,1 [35] Blocks.cshtml)
+                    RazorIRToken - (312:22,1 [35] Blocks.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n
                 HtmlContent - (347:23,0 [29] Blocks.cshtml) -     <p>Hello again from C#, #
                 CSharpExpression - (378:23,31 [1] Blocks.cshtml)
                     RazorIRToken - (378:23,31 [1] Blocks.cshtml) - CSharp - j
                 HtmlContent - (380:23,33 [6] Blocks.cshtml) - </p>\n
-                CSharpStatement - (386:24,0 [3] Blocks.cshtml) - }\n
+                CSharpStatement - (386:24,0 [3] Blocks.cshtml)
+                    RazorIRToken - (386:24,0 [3] Blocks.cshtml) - CSharp - }\n
                 HtmlContent - (389:25,0 [2] Blocks.cshtml) - \n
-                CSharpStatement - (392:26,1 [7] Blocks.cshtml) - try {\n
+                CSharpStatement - (392:26,1 [7] Blocks.cshtml)
+                    RazorIRToken - (392:26,1 [7] Blocks.cshtml) - CSharp - try {\n
                 HtmlContent - (399:27,0 [41] Blocks.cshtml) -     <p>That time, we wrote 5 lines!</p>\n
-                CSharpStatement - (440:28,0 [25] Blocks.cshtml) - } catch(Exception ex) {\n
+                CSharpStatement - (440:28,0 [25] Blocks.cshtml)
+                    RazorIRToken - (440:28,0 [25] Blocks.cshtml) - CSharp - } catch(Exception ex) {\n
                 HtmlContent - (465:29,0 [33] Blocks.cshtml) -     <p>Oh no! An error occurred: 
                 CSharpExpression - (500:29,35 [10] Blocks.cshtml)
                     RazorIRToken - (500:29,35 [10] Blocks.cshtml) - CSharp - ex.Message
                 HtmlContent - (511:29,46 [6] Blocks.cshtml) - </p>\n
-                CSharpStatement - (517:30,0 [3] Blocks.cshtml) - }\n
+                CSharpStatement - (517:30,0 [3] Blocks.cshtml)
+                    RazorIRToken - (517:30,0 [3] Blocks.cshtml) - CSharp - }\n
                 HtmlContent - (520:31,0 [14] Blocks.cshtml) - \n<p>i is now 
                 CSharpExpression - (535:32,13 [1] Blocks.cshtml)
                     RazorIRToken - (535:32,13 [1] Blocks.cshtml) - CSharp - i
                 HtmlContent - (536:32,14 [8] Blocks.cshtml) - </p>\n\n
-                CSharpStatement - (545:34,1 [22] Blocks.cshtml) - lock(new object()) {\n
+                CSharpStatement - (545:34,1 [22] Blocks.cshtml)
+                    RazorIRToken - (545:34,1 [22] Blocks.cshtml) - CSharp - lock(new object()) {\n
                 HtmlContent - (567:35,0 [53] Blocks.cshtml) -     <p>This block is locked, for your security!</p>\n
-                CSharpStatement - (620:36,0 [1] Blocks.cshtml) - }
+                CSharpStatement - (620:36,0 [1] Blocks.cshtml)
+                    RazorIRToken - (620:36,0 [1] Blocks.cshtml) - CSharp - }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt
index 4b9984ea33..fb7f4d3b38 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.ir.txt
@@ -5,10 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [0] CodeBlockAtEOF.cshtml) - 
+                CSharpStatement - (2:0,2 [0] CodeBlockAtEOF.cshtml)
+                    RazorIRToken - (2:0,2 [0] CodeBlockAtEOF.cshtml) - CSharp - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt
index cf3793138f..0ec59a9aca 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_Runtime.ir.txt
@@ -5,4 +5,5 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockAtEOF_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [0] CodeBlockAtEOF.cshtml) - 
+                CSharpStatement - (2:0,2 [0] CodeBlockAtEOF.cshtml)
+                    RazorIRToken - (2:0,2 [0] CodeBlockAtEOF.cshtml) - CSharp - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt
index 49b10b06ed..f92e1ca4b2 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.ir.txt
@@ -5,16 +5,24 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [17] CodeBlockWithTextElement.cshtml) - \n    var a = 1; 
+                CSharpStatement - (2:0,2 [17] CodeBlockWithTextElement.cshtml)
+                    RazorIRToken - (2:0,2 [17] CodeBlockWithTextElement.cshtml) - CSharp - \n    var a = 1; 
                 HtmlContent - (25:1,21 [3] CodeBlockWithTextElement.cshtml) - foo
-                CSharpStatement - (35:1,31 [22] CodeBlockWithTextElement.cshtml) -  		\n    var b = 1;			
+                CSharpStatement - (35:1,31 [22] CodeBlockWithTextElement.cshtml)
+                    RazorIRToken - (35:1,31 [22] CodeBlockWithTextElement.cshtml) - CSharp -  		\n    var b = 1;			
                 HtmlContent - (63:2,23 [4] CodeBlockWithTextElement.cshtml) - bar 
                 CSharpExpression - (69:2,29 [3] CodeBlockWithTextElement.cshtml)
                     RazorIRToken - (69:2,29 [3] CodeBlockWithTextElement.cshtml) - CSharp - a+b
-                CSharpStatement - (80:2,40 [2] CodeBlockWithTextElement.cshtml) - \n
+                CSharpStatement - (80:2,40 [2] CodeBlockWithTextElement.cshtml)
+                    RazorIRToken - (80:2,40 [2] CodeBlockWithTextElement.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt
index 40e9d95146..89080d6d41 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_Runtime.ir.txt
@@ -5,10 +5,13 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlockWithTextElement_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [16] CodeBlockWithTextElement.cshtml) - \n    var a = 1;
+                CSharpStatement - (2:0,2 [16] CodeBlockWithTextElement.cshtml)
+                    RazorIRToken - (2:0,2 [16] CodeBlockWithTextElement.cshtml) - CSharp - \n    var a = 1;
                 HtmlContent - (25:1,21 [3] CodeBlockWithTextElement.cshtml) - foo
-                CSharpStatement - (35:1,31 [19] CodeBlockWithTextElement.cshtml) -  		\n    var b = 1;
+                CSharpStatement - (35:1,31 [19] CodeBlockWithTextElement.cshtml)
+                    RazorIRToken - (35:1,31 [19] CodeBlockWithTextElement.cshtml) - CSharp -  		\n    var b = 1;
                 HtmlContent - (63:2,23 [4] CodeBlockWithTextElement.cshtml) - bar 
                 CSharpExpression - (69:2,29 [3] CodeBlockWithTextElement.cshtml)
                     RazorIRToken - (69:2,29 [3] CodeBlockWithTextElement.cshtml) - CSharp - a+b
-                CSharpStatement - (80:2,40 [2] CodeBlockWithTextElement.cshtml) - \n
+                CSharpStatement - (80:2,40 [2] CodeBlockWithTextElement.cshtml)
+                    RazorIRToken - (80:2,40 [2] CodeBlockWithTextElement.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt
index 503efb0152..55d72bb33b 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.ir.txt
@@ -5,10 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [115] CodeBlock.cshtml) - \n    for(int i = 1; i <= 10; i++) {\n        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");\n    }\n
+                CSharpStatement - (2:0,2 [115] CodeBlock.cshtml)
+                    RazorIRToken - (2:0,2 [115] CodeBlock.cshtml) - CSharp - \n    for(int i = 1; i <= 10; i++) {\n        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");\n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs
index f0a975184d..68c18cd479 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.codegen.cs
@@ -15,7 +15,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");
     }
 
-
 #line default
 #line hidden
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt
index 99285aeace..ceb43e7433 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_Runtime.ir.txt
@@ -5,4 +5,5 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_CodeBlock_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [115] CodeBlock.cshtml) - \n    for(int i = 1; i <= 10; i++) {\n        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");\n    }\n
+                CSharpStatement - (2:0,2 [115] CodeBlock.cshtml)
+                    RazorIRToken - (2:0,2 [115] CodeBlock.cshtml) - CSharp - \n    for(int i = 1; i <= 10; i++) {\n        Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");\n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt
index e09296d519..736045ec50 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.ir.txt
@@ -5,21 +5,28 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ComplexTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] ComplexTagHelpers.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] ComplexTagHelpers.cshtml) - \n\n
-                CSharpStatement - (36:2,1 [52] ComplexTagHelpers.cshtml) - if (true)\n{\n    var checkbox = "checkbox";\n\n    
+                CSharpStatement - (36:2,1 [52] ComplexTagHelpers.cshtml)
+                    RazorIRToken - (36:2,1 [52] ComplexTagHelpers.cshtml) - CSharp - if (true)\n{\n    var checkbox = "checkbox";\n\n    
                 HtmlContent - (88:6,4 [51] ComplexTagHelpers.cshtml) - <div class="randomNonTagHelperAttribute">\n        
                 TagHelper - (139:7,8 [531] ComplexTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
                         HtmlContent - (177:7,46 [46] ComplexTagHelpers.cshtml) - \n            <h1>Set Time:</h1>\n            
-                        CSharpStatement - (224:9,13 [43] ComplexTagHelpers.cshtml) - if (false)\n            {\n                
+                        CSharpStatement - (224:9,13 [43] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (224:9,13 [43] ComplexTagHelpers.cshtml) - CSharp - if (false)\n            {\n                
                         TagHelper - (267:11,16 [83] ComplexTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
                                 HtmlContent - (270:11,19 [10] ComplexTagHelpers.cshtml) - New Time: 
@@ -38,7 +45,8 @@ Document -
                                     ExecuteTagHelpers - 
                             CreateTagHelper -  - TestNamespace.PTagHelper
                             ExecuteTagHelpers - 
-                        CSharpStatement - (350:11,99 [66] ComplexTagHelpers.cshtml) - \n            }\n            else\n            {\n                
+                        CSharpStatement - (350:11,99 [66] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (350:11,99 [66] ComplexTagHelpers.cshtml) - CSharp - \n            }\n            else\n            {\n                
                         TagHelper - (416:15,16 [58] ComplexTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
                                 HtmlContent - (419:15,19 [14] ComplexTagHelpers.cshtml) - Current Time: 
@@ -57,7 +65,8 @@ Document -
                                     ExecuteTagHelpers - 
                             CreateTagHelper -  - TestNamespace.PTagHelper
                             ExecuteTagHelpers - 
-                        CSharpStatement - (474:15,74 [18] ComplexTagHelpers.cshtml) - \n                
+                        CSharpStatement - (474:15,74 [18] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (474:15,74 [18] ComplexTagHelpers.cshtml) - CSharp - \n                
                         TagHelper - (492:16,16 [50] ComplexTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - input - TagMode.SelfClosing
                             CreateTagHelper -  - TestNamespace.InputTagHelper
@@ -69,25 +78,33 @@ Document -
                                 CSharpExpression - (507:16,31 [30] ComplexTagHelpers.cshtml)
                                     RazorIRToken - (507:16,31 [30] ComplexTagHelpers.cshtml) - CSharp - true ? "checkbox" : "anything"
                             ExecuteTagHelpers - 
-                        CSharpStatement - (542:16,66 [18] ComplexTagHelpers.cshtml) - \n                
+                        CSharpStatement - (542:16,66 [18] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (542:16,66 [18] ComplexTagHelpers.cshtml) - CSharp - \n                
                         TagHelper - (560:17,16 [81] ComplexTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - input - TagMode.StartTagOnly
                             CreateTagHelper -  - TestNamespace.InputTagHelper
                             CreateTagHelper -  - TestNamespace.InputTagHelper2
                             SetTagHelperProperty - (573:17,29 [66] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes
-                                CSharpStatement - (574:17,30 [11] ComplexTagHelpers.cshtml) - if(true) { 
+                                CSharpStatement - (574:17,30 [11] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (574:17,30 [11] ComplexTagHelpers.cshtml) - CSharp - if(true) { 
                                 HtmlContent - (591:17,47 [8] ComplexTagHelpers.cshtml) - checkbox
-                                CSharpStatement - (606:17,62 [10] ComplexTagHelpers.cshtml) -  } else { 
+                                CSharpStatement - (606:17,62 [10] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (606:17,62 [10] ComplexTagHelpers.cshtml) - CSharp -  } else { 
                                 HtmlContent - (622:17,78 [8] ComplexTagHelpers.cshtml) - anything
-                                CSharpStatement - (637:17,93 [2] ComplexTagHelpers.cshtml) -  }
+                                CSharpStatement - (637:17,93 [2] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (637:17,93 [2] ComplexTagHelpers.cshtml) - CSharp -  }
                             SetTagHelperProperty - (573:17,29 [66] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes
-                                CSharpStatement - (574:17,30 [11] ComplexTagHelpers.cshtml) - if(true) { 
+                                CSharpStatement - (574:17,30 [11] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (574:17,30 [11] ComplexTagHelpers.cshtml) - CSharp - if(true) { 
                                 HtmlContent - (591:17,47 [8] ComplexTagHelpers.cshtml) - checkbox
-                                CSharpStatement - (606:17,62 [10] ComplexTagHelpers.cshtml) -  } else { 
+                                CSharpStatement - (606:17,62 [10] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (606:17,62 [10] ComplexTagHelpers.cshtml) - CSharp -  } else { 
                                 HtmlContent - (622:17,78 [8] ComplexTagHelpers.cshtml) - anything
-                                CSharpStatement - (637:17,93 [2] ComplexTagHelpers.cshtml) -  }
+                                CSharpStatement - (637:17,93 [2] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (637:17,93 [2] ComplexTagHelpers.cshtml) - CSharp -  }
                             ExecuteTagHelpers - 
-                        CSharpStatement - (641:17,97 [15] ComplexTagHelpers.cshtml) - \n            }
+                        CSharpStatement - (641:17,97 [15] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (641:17,97 [15] ComplexTagHelpers.cshtml) - CSharp - \n            }
                         HtmlContent - (656:18,13 [10] ComplexTagHelpers.cshtml) - \n        
                     CreateTagHelper -  - TestNamespace.PTagHelper
                     AddTagHelperHtmlAttribute -  - time - HtmlAttributeValueStyle.DoubleQuotes
@@ -101,7 +118,8 @@ Document -
                 TagHelper - (680:20,8 [181] ComplexTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
                         HtmlContent - (767:20,95 [14] ComplexTagHelpers.cshtml) - \n            
-                        CSharpStatement - (783:21,14 [21] ComplexTagHelpers.cshtml) -  var @object = false;
+                        CSharpStatement - (783:21,14 [21] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (783:21,14 [21] ComplexTagHelpers.cshtml) - CSharp -  var @object = false;
                         HtmlContent - (807:22,0 [12] ComplexTagHelpers.cshtml) -             
                         TagHelper - (819:22,12 [28] ComplexTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - input - TagMode.StartTagOnly
@@ -212,4 +230,5 @@ Document -
                             ExecuteTagHelpers - 
                     RazorIRToken - (1375:33,78 [1] ComplexTagHelpers.cshtml) - CSharp - )
                 HtmlContent - (1376:33,79 [12] ComplexTagHelpers.cshtml) - \n    </div>
-                CSharpStatement - (1388:34,10 [3] ComplexTagHelpers.cshtml) - \n}
+                CSharpStatement - (1388:34,10 [3] ComplexTagHelpers.cshtml)
+                    RazorIRToken - (1388:34,10 [3] ComplexTagHelpers.cshtml) - CSharp - \n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
index 6453430596..de08d4c4c3 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs
@@ -45,7 +45,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
     var checkbox = "checkbox";
 
 
-
 #line default
 #line hidden
             WriteLiteral("    <div class=\"randomNonTagHelperAttribute\">\r\n        ");
@@ -55,7 +54,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
              if (false)
             {
 
-
 #line default
 #line hidden
                 WriteLiteral("                ");
@@ -98,7 +96,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
             else
             {
 
-
 #line default
 #line hidden
                 WriteLiteral("                ");
@@ -211,7 +208,6 @@ __TestNamespace_InputTagHelper2.Checked = true;
 #line 19 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers.cshtml"
             }
 
-
 #line default
 #line hidden
                 WriteLiteral("        ");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt
index 38f65342fc..083ae43065 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.ir.txt
@@ -15,13 +15,16 @@ Document -
             DeclareTagHelperFields -  - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (33:1,0 [2] ComplexTagHelpers.cshtml) - \n
-                CSharpStatement - (36:2,1 [48] ComplexTagHelpers.cshtml) - if (true)\n{\n    var checkbox = "checkbox";\n\n
+                CSharpStatement - (36:2,1 [48] ComplexTagHelpers.cshtml)
+                    RazorIRToken - (36:2,1 [48] ComplexTagHelpers.cshtml) - CSharp - if (true)\n{\n    var checkbox = "checkbox";\n\n
                 HtmlContent - (84:6,0 [55] ComplexTagHelpers.cshtml) -     <div class="randomNonTagHelperAttribute">\n        
                 TagHelper - (139:7,8 [529] ComplexTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
                         HtmlContent - (177:7,46 [34] ComplexTagHelpers.cshtml) - \n            <h1>Set Time:</h1>\n
-                        CSharpStatement - (211:9,0 [12] ComplexTagHelpers.cshtml) -             
-                        CSharpStatement - (224:9,13 [27] ComplexTagHelpers.cshtml) - if (false)\n            {\n
+                        CSharpStatement - (211:9,0 [12] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (211:9,0 [12] ComplexTagHelpers.cshtml) - CSharp -             
+                        CSharpStatement - (224:9,13 [27] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (224:9,13 [27] ComplexTagHelpers.cshtml) - CSharp - if (false)\n            {\n
                         HtmlContent - (251:11,0 [16] ComplexTagHelpers.cshtml) -                 
                         TagHelper - (267:11,16 [83] ComplexTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
@@ -38,7 +41,8 @@ Document -
                             CreateTagHelper -  - TestNamespace.PTagHelper
                             ExecuteTagHelpers - 
                         HtmlContent - (350:11,99 [2] ComplexTagHelpers.cshtml) - \n
-                        CSharpStatement - (352:12,0 [48] ComplexTagHelpers.cshtml) -             }\n            else\n            {\n
+                        CSharpStatement - (352:12,0 [48] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (352:12,0 [48] ComplexTagHelpers.cshtml) - CSharp -             }\n            else\n            {\n
                         HtmlContent - (400:15,0 [16] ComplexTagHelpers.cshtml) -                 
                         TagHelper - (416:15,16 [58] ComplexTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
@@ -76,20 +80,27 @@ Document -
                             CreateTagHelper -  - TestNamespace.InputTagHelper
                             CreateTagHelper -  - TestNamespace.InputTagHelper2
                             SetTagHelperProperty - (573:17,29 [64] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes
-                                CSharpStatement - (574:17,30 [10] ComplexTagHelpers.cshtml) - if(true) {
+                                CSharpStatement - (574:17,30 [10] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (574:17,30 [10] ComplexTagHelpers.cshtml) - CSharp - if(true) {
                                 HtmlContent - (591:17,47 [8] ComplexTagHelpers.cshtml) - checkbox
-                                CSharpStatement - (606:17,62 [9] ComplexTagHelpers.cshtml) -  } else {
+                                CSharpStatement - (606:17,62 [9] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (606:17,62 [9] ComplexTagHelpers.cshtml) - CSharp -  } else {
                                 HtmlContent - (622:17,78 [8] ComplexTagHelpers.cshtml) - anything
-                                CSharpStatement - (637:17,93 [2] ComplexTagHelpers.cshtml) -  }
+                                CSharpStatement - (637:17,93 [2] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (637:17,93 [2] ComplexTagHelpers.cshtml) - CSharp -  }
                             SetTagHelperProperty - (573:17,29 [64] ComplexTagHelpers.cshtml) - type - Type - HtmlAttributeValueStyle.SingleQuotes
-                                CSharpStatement - (574:17,30 [10] ComplexTagHelpers.cshtml) - if(true) {
+                                CSharpStatement - (574:17,30 [10] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (574:17,30 [10] ComplexTagHelpers.cshtml) - CSharp - if(true) {
                                 HtmlContent - (591:17,47 [8] ComplexTagHelpers.cshtml) - checkbox
-                                CSharpStatement - (606:17,62 [9] ComplexTagHelpers.cshtml) -  } else {
+                                CSharpStatement - (606:17,62 [9] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (606:17,62 [9] ComplexTagHelpers.cshtml) - CSharp -  } else {
                                 HtmlContent - (622:17,78 [8] ComplexTagHelpers.cshtml) - anything
-                                CSharpStatement - (637:17,93 [2] ComplexTagHelpers.cshtml) -  }
+                                CSharpStatement - (637:17,93 [2] ComplexTagHelpers.cshtml)
+                                    RazorIRToken - (637:17,93 [2] ComplexTagHelpers.cshtml) - CSharp -  }
                             ExecuteTagHelpers - 
                         HtmlContent - (641:17,97 [2] ComplexTagHelpers.cshtml) - \n
-                        CSharpStatement - (643:18,0 [15] ComplexTagHelpers.cshtml) -             }\n
+                        CSharpStatement - (643:18,0 [15] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (643:18,0 [15] ComplexTagHelpers.cshtml) - CSharp -             }\n
                         HtmlContent - (658:19,0 [8] ComplexTagHelpers.cshtml) -         
                     CreateTagHelper -  - TestNamespace.PTagHelper
                     AddTagHelperHtmlAttribute -  - time - HtmlAttributeValueStyle.DoubleQuotes
@@ -103,8 +114,10 @@ Document -
                 TagHelper - (680:20,8 [181] ComplexTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
                         HtmlContent - (767:20,95 [2] ComplexTagHelpers.cshtml) - \n
-                        CSharpStatement - (769:21,0 [12] ComplexTagHelpers.cshtml) -             
-                        CSharpStatement - (783:21,14 [21] ComplexTagHelpers.cshtml) -  var @object = false;
+                        CSharpStatement - (769:21,0 [12] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (769:21,0 [12] ComplexTagHelpers.cshtml) - CSharp -             
+                        CSharpStatement - (783:21,14 [21] ComplexTagHelpers.cshtml)
+                            RazorIRToken - (783:21,14 [21] ComplexTagHelpers.cshtml) - CSharp -  var @object = false;
                         HtmlContent - (807:22,0 [12] ComplexTagHelpers.cshtml) -             
                         TagHelper - (819:22,12 [28] ComplexTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - input - TagMode.StartTagOnly
@@ -210,4 +223,5 @@ Document -
                             ExecuteTagHelpers - 
                     RazorIRToken - (1375:33,78 [1] ComplexTagHelpers.cshtml) - CSharp - )
                 HtmlContent - (1376:33,79 [14] ComplexTagHelpers.cshtml) - \n    </div>\n
-                CSharpStatement - (1390:35,0 [1] ComplexTagHelpers.cshtml) - }
+                CSharpStatement - (1390:35,0 [1] ComplexTagHelpers.cshtml)
+                    RazorIRToken - (1390:35,0 [1] ComplexTagHelpers.cshtml) - CSharp - }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt
index 642b6ae0cb..c448ebb267 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.ir.txt
@@ -5,22 +5,30 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [48] ConditionalAttributes.cshtml) - \n    var ch = true;\n    var cls = "bar";\n    
+                CSharpStatement - (2:0,2 [48] ConditionalAttributes.cshtml)
+                    RazorIRToken - (2:0,2 [48] ConditionalAttributes.cshtml) - CSharp - \n    var ch = true;\n    var cls = "bar";\n    
                 HtmlContent - (50:3,4 [16] ConditionalAttributes.cshtml) - <a href="Foo" />
-                CSharpStatement - (66:3,20 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (66:3,20 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (66:3,20 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (72:4,4 [2] ConditionalAttributes.cshtml) - <p
                 HtmlAttribute - (74:4,6 [13] ConditionalAttributes.cshtml) -  class=" - "
                     CSharpAttributeValue - (82:4,14 [4] ConditionalAttributes.cshtml) - 
                         CSharpExpression - (83:4,15 [3] ConditionalAttributes.cshtml)
                             RazorIRToken - (83:4,15 [3] ConditionalAttributes.cshtml) - CSharp - cls
                 HtmlContent - (87:4,19 [3] ConditionalAttributes.cshtml) -  />
-                CSharpStatement - (90:4,22 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (90:4,22 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (90:4,22 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (96:5,4 [2] ConditionalAttributes.cshtml) - <p
                 HtmlAttribute - (98:5,6 [17] ConditionalAttributes.cshtml) -  class=" - "
                     HtmlAttributeValue - (106:5,14 [3] ConditionalAttributes.cshtml) -  - foo
@@ -28,7 +36,8 @@ Document -
                         CSharpExpression - (111:5,19 [3] ConditionalAttributes.cshtml)
                             RazorIRToken - (111:5,19 [3] ConditionalAttributes.cshtml) - CSharp - cls
                 HtmlContent - (115:5,23 [3] ConditionalAttributes.cshtml) -  />
-                CSharpStatement - (118:5,26 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (118:5,26 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (118:5,26 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (124:6,4 [2] ConditionalAttributes.cshtml) - <p
                 HtmlAttribute - (126:6,6 [17] ConditionalAttributes.cshtml) -  class=" - "
                     CSharpAttributeValue - (134:6,14 [4] ConditionalAttributes.cshtml) - 
@@ -36,14 +45,16 @@ Document -
                             RazorIRToken - (135:6,15 [3] ConditionalAttributes.cshtml) - CSharp - cls
                     HtmlAttributeValue - (138:6,18 [4] ConditionalAttributes.cshtml) -   - foo
                 HtmlContent - (143:6,23 [3] ConditionalAttributes.cshtml) -  />
-                CSharpStatement - (146:6,26 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (146:6,26 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (146:6,26 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (152:7,4 [22] ConditionalAttributes.cshtml) - <input type="checkbox"
                 HtmlAttribute - (174:7,26 [14] ConditionalAttributes.cshtml) -  checked=" - "
                     CSharpAttributeValue - (184:7,36 [3] ConditionalAttributes.cshtml) - 
                         CSharpExpression - (185:7,37 [2] ConditionalAttributes.cshtml)
                             RazorIRToken - (185:7,37 [2] ConditionalAttributes.cshtml) - CSharp - ch
                 HtmlContent - (188:7,40 [3] ConditionalAttributes.cshtml) -  />
-                CSharpStatement - (191:7,43 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (191:7,43 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (191:7,43 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (197:8,4 [22] ConditionalAttributes.cshtml) - <input type="checkbox"
                 HtmlAttribute - (219:8,26 [18] ConditionalAttributes.cshtml) -  checked=" - "
                     HtmlAttributeValue - (229:8,36 [3] ConditionalAttributes.cshtml) -  - foo
@@ -51,31 +62,39 @@ Document -
                         CSharpExpression - (234:8,41 [2] ConditionalAttributes.cshtml)
                             RazorIRToken - (234:8,41 [2] ConditionalAttributes.cshtml) - CSharp - ch
                 HtmlContent - (237:8,44 [3] ConditionalAttributes.cshtml) -  />
-                CSharpStatement - (240:8,47 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (240:8,47 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (240:8,47 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (246:9,4 [2] ConditionalAttributes.cshtml) - <p
                 HtmlAttribute - (248:9,6 [34] ConditionalAttributes.cshtml) -  class=" - "
                     CSharpAttributeValue - (256:9,14 [25] ConditionalAttributes.cshtml) - 
-                        CSharpStatement - (257:9,15 [18] ConditionalAttributes.cshtml) - if(cls != null) { 
+                        CSharpStatement - (257:9,15 [18] ConditionalAttributes.cshtml)
+                            RazorIRToken - (257:9,15 [18] ConditionalAttributes.cshtml) - CSharp - if(cls != null) { 
                         CSharpExpression - (276:9,34 [3] ConditionalAttributes.cshtml)
                             RazorIRToken - (276:9,34 [3] ConditionalAttributes.cshtml) - CSharp - cls
-                        CSharpStatement - (279:9,37 [2] ConditionalAttributes.cshtml) -  }
+                        CSharpStatement - (279:9,37 [2] ConditionalAttributes.cshtml)
+                            RazorIRToken - (279:9,37 [2] ConditionalAttributes.cshtml) - CSharp -  }
                 HtmlContent - (282:9,40 [3] ConditionalAttributes.cshtml) -  />
-                CSharpStatement - (285:9,43 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (285:9,43 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (285:9,43 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (291:10,4 [18] ConditionalAttributes.cshtml) - <a href="~/Foo" />
-                CSharpStatement - (309:10,22 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (309:10,22 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (309:10,22 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (315:11,4 [7] ConditionalAttributes.cshtml) - <script
                 HtmlAttribute - (322:11,11 [52] ConditionalAttributes.cshtml) -  src=" - "
                     CSharpAttributeValue - (328:11,17 [45] ConditionalAttributes.cshtml) - 
                         CSharpExpression - (329:11,18 [44] ConditionalAttributes.cshtml)
                             RazorIRToken - (329:11,18 [44] ConditionalAttributes.cshtml) - CSharp - Url.Content("~/Scripts/jquery-1.6.2.min.js")
                 HtmlContent - (374:11,63 [33] ConditionalAttributes.cshtml) -  type="text/javascript"></script>
-                CSharpStatement - (407:11,96 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (407:11,96 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (407:11,96 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (413:12,4 [7] ConditionalAttributes.cshtml) - <script
                 HtmlAttribute - (420:12,11 [68] ConditionalAttributes.cshtml) -  src=" - "
                     CSharpAttributeValue - (426:12,17 [61] ConditionalAttributes.cshtml) - 
                         CSharpExpression - (427:12,18 [60] ConditionalAttributes.cshtml)
                             RazorIRToken - (427:12,18 [60] ConditionalAttributes.cshtml) - CSharp - Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")
                 HtmlContent - (488:12,79 [33] ConditionalAttributes.cshtml) -  type="text/javascript"></script>
-                CSharpStatement - (521:12,112 [6] ConditionalAttributes.cshtml) - \n    
+                CSharpStatement - (521:12,112 [6] ConditionalAttributes.cshtml)
+                    RazorIRToken - (521:12,112 [6] ConditionalAttributes.cshtml) - CSharp - \n    
                 HtmlContent - (527:13,4 [111] ConditionalAttributes.cshtml) - <script src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
-                CSharpStatement - (638:13,115 [2] ConditionalAttributes.cshtml) - \n
+                CSharpStatement - (638:13,115 [2] ConditionalAttributes.cshtml)
+                    RazorIRToken - (638:13,115 [2] ConditionalAttributes.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs
index 55ca08dec8..f4e80bfc7a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.codegen.cs
@@ -14,7 +14,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
     var ch = true;
     var cls = "bar";
 
-
 #line default
 #line hidden
             WriteLiteral("    <a href=\"Foo\" />\r\n    <p");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt
index 3442575e75..df2ea06ed0 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_Runtime.ir.txt
@@ -5,7 +5,8 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ConditionalAttributes_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [44] ConditionalAttributes.cshtml) - \n    var ch = true;\n    var cls = "bar";\n
+                CSharpStatement - (2:0,2 [44] ConditionalAttributes.cshtml)
+                    RazorIRToken - (2:0,2 [44] ConditionalAttributes.cshtml) - CSharp - \n    var ch = true;\n    var cls = "bar";\n
                 HtmlContent - (46:3,0 [28] ConditionalAttributes.cshtml) -     <a href="Foo" />\n    <p
                 HtmlAttribute - (74:4,6 [13] ConditionalAttributes.cshtml) -  class=" - "
                     CSharpAttributeValue - (82:4,14 [4] ConditionalAttributes.cshtml) - 
@@ -37,10 +38,12 @@ Document -
                 HtmlContent - (237:8,44 [11] ConditionalAttributes.cshtml) -  />\n    <p
                 HtmlAttribute - (248:9,6 [34] ConditionalAttributes.cshtml) -  class=" - "
                     CSharpAttributeValue - (256:9,14 [25] ConditionalAttributes.cshtml) - 
-                        CSharpStatement - (257:9,15 [18] ConditionalAttributes.cshtml) - if(cls != null) { 
+                        CSharpStatement - (257:9,15 [18] ConditionalAttributes.cshtml)
+                            RazorIRToken - (257:9,15 [18] ConditionalAttributes.cshtml) - CSharp - if(cls != null) { 
                         CSharpExpression - (276:9,34 [3] ConditionalAttributes.cshtml)
                             RazorIRToken - (276:9,34 [3] ConditionalAttributes.cshtml) - CSharp - cls
-                        CSharpStatement - (279:9,37 [2] ConditionalAttributes.cshtml) -  }
+                        CSharpStatement - (279:9,37 [2] ConditionalAttributes.cshtml)
+                            RazorIRToken - (279:9,37 [2] ConditionalAttributes.cshtml) - CSharp -  }
                 HtmlContent - (282:9,40 [40] ConditionalAttributes.cshtml) -  />\n    <a href="~/Foo" />\n    <script
                 HtmlAttribute - (322:11,11 [52] ConditionalAttributes.cshtml) -  src=" - "
                     CSharpAttributeValue - (328:11,17 [45] ConditionalAttributes.cshtml) - 
@@ -52,4 +55,5 @@ Document -
                         CSharpExpression - (427:12,18 [60] ConditionalAttributes.cshtml)
                             RazorIRToken - (427:12,18 [60] ConditionalAttributes.cshtml) - CSharp - Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")
                 HtmlContent - (488:12,79 [152] ConditionalAttributes.cshtml) -  type="text/javascript"></script>\n    <script src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>\n
-                CSharpStatement - (640:14,0 [0] ConditionalAttributes.cshtml) - 
+                CSharpStatement - (640:14,0 [0] ConditionalAttributes.cshtml)
+                    RazorIRToken - (640:14,0 [0] ConditionalAttributes.cshtml) - CSharp - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt
index 6645d7845b..0a64134642 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.ir.txt
@@ -5,20 +5,27 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DesignTime_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (173:11,9 [6] DesignTime.cshtml) - Footer
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [19] DesignTime.cshtml) - <div>\n            
-                CSharpStatement - (20:1,13 [36] DesignTime.cshtml) - for(int i = 1; i <= 10; i++) {\n    
+                CSharpStatement - (20:1,13 [36] DesignTime.cshtml)
+                    RazorIRToken - (20:1,13 [36] DesignTime.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n    
                 HtmlContent - (56:2,4 [17] DesignTime.cshtml) - <p>This is item #
                 CSharpExpression - (74:2,22 [1] DesignTime.cshtml)
                     RazorIRToken - (74:2,22 [1] DesignTime.cshtml) - CSharp - i
                 HtmlContent - (75:2,23 [4] DesignTime.cshtml) - </p>
-                CSharpStatement - (79:2,27 [15] DesignTime.cshtml) - \n            }
+                CSharpStatement - (79:2,27 [15] DesignTime.cshtml)
+                    RazorIRToken - (79:2,27 [15] DesignTime.cshtml) - CSharp - \n            }
                 HtmlContent - (94:3,13 [17] DesignTime.cshtml) - \n</div>\n\n<p>\n
                 CSharpExpression - (113:7,2 [12] DesignTime.cshtml)
                     RazorIRToken - (113:7,2 [12] DesignTime.cshtml) - CSharp - Foo(Bar.Baz)
@@ -32,9 +39,11 @@ Document -
                         HtmlContent - (145:8,17 [8] DesignTime.cshtml) -  Biz</p>
                     RazorIRToken - (153:8,25 [1] DesignTime.cshtml) - CSharp - )
                 HtmlContent - (154:8,26 [10] DesignTime.cshtml) - \n</p>\n\n
-                CSharpStatement -  - DefineSection("Footer", async (__razor_section_writer) => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("Footer", async (__razor_section_writer) => {
                 HtmlContent - (181:11,17 [22] DesignTime.cshtml) - \n    <p>Foo</p>\n    
                 CSharpExpression - (204:13,5 [3] DesignTime.cshtml)
                     RazorIRToken - (204:13,5 [3] DesignTime.cshtml) - CSharp - bar
                 HtmlContent - (207:13,8 [2] DesignTime.cshtml) - \n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt
index fafb04234d..73fc6d2d3c 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DuplicateAttributeTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DuplicateAttributeTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] DuplicateAttributeTagHelpers.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] DuplicateAttributeTagHelpers.cshtml) - \n\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt
index 13ec2715ce..cad45e2ee6 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_DynamicAttributeTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] DynamicAttributeTagHelpers.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.InputTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] DynamicAttributeTagHelpers.cshtml) - \n\n
@@ -29,13 +34,16 @@ Document -
                     CreateTagHelper -  - TestNamespace.InputTagHelper
                     AddTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
                         CSharpAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - 
-                            CSharpStatement - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - if (true) { 
+                            CSharpStatement - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
                             CSharpExpression - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
-                            CSharpStatement - (121:4,42 [10] DynamicAttributeTagHelpers.cshtml) -  } else { 
+                            CSharpStatement - (121:4,42 [10] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (121:4,42 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
                             CSharpExpression - (132:4,53 [5] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (132:4,53 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
-                            CSharpStatement - (137:4,58 [2] DynamicAttributeTagHelpers.cshtml) -  }
+                            CSharpStatement - (137:4,58 [2] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (137:4,58 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
                         HtmlAttributeValue - (139:4,60 [7] DynamicAttributeTagHelpers.cshtml) -   - suffix
                     ExecuteTagHelpers - 
                 HtmlContent - (150:4,71 [4] DynamicAttributeTagHelpers.cshtml) - \n\n
@@ -62,13 +70,16 @@ Document -
                         CSharpExpression - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml)
                             RazorIRToken - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
                         HtmlContent - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml) -  
-                        CSharpStatement - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) - if (true) { 
+                        CSharpStatement - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml)
+                            RazorIRToken - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
                         CSharpExpression - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml)
                             RazorIRToken - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
-                        CSharpStatement - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) -  } else { 
+                        CSharpStatement - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml)
+                            RazorIRToken - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
                         CSharpExpression - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml)
                             RazorIRToken - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
-                        CSharpStatement - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) -  }
+                        CSharpStatement - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml)
+                            RazorIRToken - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
                         HtmlContent - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) -  
                         CSharpExpression - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml)
                             RazorIRToken - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
@@ -77,13 +88,16 @@ Document -
                             CSharpExpression - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
                         CSharpAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) -  
-                            CSharpStatement - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml) - if (true) { 
+                            CSharpStatement - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
                             CSharpExpression - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
-                            CSharpStatement - (388:9,57 [10] DynamicAttributeTagHelpers.cshtml) -  } else { 
+                            CSharpStatement - (388:9,57 [10] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (388:9,57 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
                             CSharpExpression - (399:9,68 [5] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (399:9,68 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
-                            CSharpStatement - (404:9,73 [2] DynamicAttributeTagHelpers.cshtml) -  }
+                            CSharpStatement - (404:9,73 [2] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (404:9,73 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
                         CSharpAttributeValue - (406:9,75 [14] DynamicAttributeTagHelpers.cshtml) -  
                             CSharpExpression - (408:9,77 [12] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (408:9,77 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
@@ -111,11 +125,14 @@ Document -
                     CreateTagHelper -  - TestNamespace.InputTagHelper
                     AddTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
                         CSharpAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - 
-                            CSharpStatement - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - if (true) { 
+                            CSharpStatement - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
                             CSharpExpression - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
-                            CSharpStatement - (554:13,42 [10] DynamicAttributeTagHelpers.cshtml) -  } else { 
+                            CSharpStatement - (554:13,42 [10] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (554:13,42 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
                             CSharpExpression - (565:13,53 [5] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (565:13,53 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
-                            CSharpStatement - (570:13,58 [2] DynamicAttributeTagHelpers.cshtml) -  }
+                            CSharpStatement - (570:13,58 [2] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (570:13,58 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
                     ExecuteTagHelpers - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt
index 87c159166a..dda15c8fc7 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DynamicAttributeTagHelpers_Runtime.ir.txt
@@ -22,13 +22,16 @@ Document -
                     CreateTagHelper -  - TestNamespace.InputTagHelper
                     AddTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
                         CSharpAttributeValue - (95:4,16 [44] DynamicAttributeTagHelpers.cshtml) - 
-                            CSharpStatement - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - if (true) { 
+                            CSharpStatement - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (96:4,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
                             CSharpExpression - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (109:4,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
-                            CSharpStatement - (121:4,42 [10] DynamicAttributeTagHelpers.cshtml) -  } else { 
+                            CSharpStatement - (121:4,42 [10] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (121:4,42 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
                             CSharpExpression - (132:4,53 [5] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (132:4,53 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
-                            CSharpStatement - (137:4,58 [2] DynamicAttributeTagHelpers.cshtml) -  }
+                            CSharpStatement - (137:4,58 [2] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (137:4,58 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
                         HtmlAttributeValue - (139:4,60 [7] DynamicAttributeTagHelpers.cshtml) -   - suffix
                     ExecuteTagHelpers - 
                 HtmlContent - (150:4,71 [4] DynamicAttributeTagHelpers.cshtml) - \n\n
@@ -55,13 +58,16 @@ Document -
                         CSharpExpression - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml)
                             RazorIRToken - (256:8,15 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
                         HtmlContent - (269:8,28 [1] DynamicAttributeTagHelpers.cshtml) -  
-                        CSharpStatement - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) - if (true) { 
+                        CSharpStatement - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml)
+                            RazorIRToken - (271:8,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
                         CSharpExpression - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml)
                             RazorIRToken - (284:8,43 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
-                        CSharpStatement - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) -  } else { 
+                        CSharpStatement - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml)
+                            RazorIRToken - (296:8,55 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
                         CSharpExpression - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml)
                             RazorIRToken - (307:8,66 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
-                        CSharpStatement - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) -  }
+                        CSharpStatement - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml)
+                            RazorIRToken - (312:8,71 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
                         HtmlContent - (314:8,73 [1] DynamicAttributeTagHelpers.cshtml) -  
                         CSharpExpression - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml)
                             RazorIRToken - (316:8,75 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
@@ -70,13 +76,16 @@ Document -
                             CSharpExpression - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (348:9,17 [13] DynamicAttributeTagHelpers.cshtml) - CSharp - long.MinValue
                         CSharpAttributeValue - (361:9,30 [45] DynamicAttributeTagHelpers.cshtml) -  
-                            CSharpStatement - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml) - if (true) { 
+                            CSharpStatement - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (363:9,32 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
                             CSharpExpression - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (376:9,45 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
-                            CSharpStatement - (388:9,57 [10] DynamicAttributeTagHelpers.cshtml) -  } else { 
+                            CSharpStatement - (388:9,57 [10] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (388:9,57 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
                             CSharpExpression - (399:9,68 [5] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (399:9,68 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
-                            CSharpStatement - (404:9,73 [2] DynamicAttributeTagHelpers.cshtml) -  }
+                            CSharpStatement - (404:9,73 [2] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (404:9,73 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
                         CSharpAttributeValue - (406:9,75 [14] DynamicAttributeTagHelpers.cshtml) -  
                             CSharpExpression - (408:9,77 [12] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (408:9,77 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - int.MaxValue
@@ -104,11 +113,14 @@ Document -
                     CreateTagHelper -  - TestNamespace.InputTagHelper
                     AddTagHelperHtmlAttribute -  - unbound - HtmlAttributeValueStyle.DoubleQuotes
                         CSharpAttributeValue - (528:13,16 [44] DynamicAttributeTagHelpers.cshtml) - 
-                            CSharpStatement - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - if (true) { 
+                            CSharpStatement - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (529:13,17 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - if (true) { 
                             CSharpExpression - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (542:13,30 [12] DynamicAttributeTagHelpers.cshtml) - CSharp - string.Empty
-                            CSharpStatement - (554:13,42 [10] DynamicAttributeTagHelpers.cshtml) -  } else { 
+                            CSharpStatement - (554:13,42 [10] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (554:13,42 [10] DynamicAttributeTagHelpers.cshtml) - CSharp -  } else { 
                             CSharpExpression - (565:13,53 [5] DynamicAttributeTagHelpers.cshtml)
                                 RazorIRToken - (565:13,53 [5] DynamicAttributeTagHelpers.cshtml) - CSharp - false
-                            CSharpStatement - (570:13,58 [2] DynamicAttributeTagHelpers.cshtml) -  }
+                            CSharpStatement - (570:13,58 [2] DynamicAttributeTagHelpers.cshtml)
+                                RazorIRToken - (570:13,58 [2] DynamicAttributeTagHelpers.cshtml) - CSharp -  }
                     ExecuteTagHelpers - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt
index 9e8455b262..3e96ecc8ef 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyAttributeTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [15] EmptyAttributeTagHelpers.cshtml) - *, TestAssembly
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 - TestNamespace.PTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (29:0,29 [15] EmptyAttributeTagHelpers.cshtml) - \n\n<div>\n    
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt
index aa52f92b05..70f7552d9f 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.ir.txt
@@ -5,11 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyCodeBlock_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [18] EmptyCodeBlock.cshtml) - This is markup\n\n
-                CSharpStatement - (20:2,2 [0] EmptyCodeBlock.cshtml) - 
+                CSharpStatement - (20:2,2 [0] EmptyCodeBlock.cshtml)
+                    RazorIRToken - (20:2,2 [0] EmptyCodeBlock.cshtml) - CSharp - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt
index 62db574aad..81bc38c2c1 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_Runtime.ir.txt
@@ -6,4 +6,5 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyCodeBlock_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [18] EmptyCodeBlock.cshtml) - This is markup\n\n
-                CSharpStatement - (20:2,2 [0] EmptyCodeBlock.cshtml) - 
+                CSharpStatement - (20:2,2 [0] EmptyCodeBlock.cshtml)
+                    RazorIRToken - (20:2,2 [0] EmptyCodeBlock.cshtml) - CSharp - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt
index e109f0897d..925e948724 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyExplicitExpression_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [18] EmptyExplicitExpression.cshtml) - This is markup\n\n
                 CSharpExpression - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt
index bf242e74d8..2ea75162db 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.ir.txt
@@ -5,12 +5,19 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) - \n    
+                CSharpStatement - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml)
+                    RazorIRToken - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n    
                 CSharpExpression - 
-                CSharpStatement - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) - \n
+                CSharpStatement - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml)
+                    RazorIRToken - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt
index f96b6ca973..bc09e5ea09 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_Runtime.ir.txt
@@ -5,6 +5,8 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpressionInCode_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) - \n    
+                CSharpStatement - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml)
+                    RazorIRToken - (2:0,2 [6] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n    
                 CSharpExpression - 
-                CSharpStatement - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) - \n
+                CSharpStatement - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml)
+                    RazorIRToken - (9:1,5 [2] EmptyImplicitExpressionInCode.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt
index 488071cd95..45f9461905 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EmptyImplicitExpression_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [18] EmptyImplicitExpression.cshtml) - This is markup\n\n
                 CSharpExpression - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt
index 49535acafa..0d14e84c49 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_DesignTime.ir.txt
@@ -5,16 +5,22 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EnumTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] EnumTagHelpers.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.InputTagHelper - TestNamespace.CatchAllTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] EnumTagHelpers.cshtml) - \n\n
-                CSharpStatement - (37:2,2 [39] EnumTagHelpers.cshtml) - \n    var enumValue = MyEnum.MyValue;\n
+                CSharpStatement - (37:2,2 [39] EnumTagHelpers.cshtml)
+                    RazorIRToken - (37:2,2 [39] EnumTagHelpers.cshtml) - CSharp - \n    var enumValue = MyEnum.MyValue;\n
                 HtmlContent - (79:5,0 [2] EnumTagHelpers.cshtml) - \n
                 TagHelper - (81:6,0 [33] EnumTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - input - TagMode.SelfClosing
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
index ecd5d27b5a..636f7f8515 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.codegen.cs
@@ -34,7 +34,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
   
     var enumValue = MyEnum.MyValue;
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt
index 2adffd74d5..424f7b2e9f 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EnumTagHelpers_Runtime.ir.txt
@@ -7,7 +7,8 @@ Document -
             DeclareTagHelperFields -  - TestNamespace.InputTagHelper - TestNamespace.CatchAllTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (33:1,0 [2] EnumTagHelpers.cshtml) - \n
-                CSharpStatement - (37:2,2 [39] EnumTagHelpers.cshtml) - \n    var enumValue = MyEnum.MyValue;\n
+                CSharpStatement - (37:2,2 [39] EnumTagHelpers.cshtml)
+                    RazorIRToken - (37:2,2 [39] EnumTagHelpers.cshtml) - CSharp - \n    var enumValue = MyEnum.MyValue;\n
                 HtmlContent - (79:5,0 [2] EnumTagHelpers.cshtml) - \n
                 TagHelper - (81:6,0 [33] EnumTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - input - TagMode.SelfClosing
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt
index 099d2ec13b..d5ec7f37d5 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_EscapedTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [15] EscapedTagHelpers.cshtml) - *, TestAssembly
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (29:0,29 [5] EscapedTagHelpers.cshtml) - \n\n<
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt
index cded7b916d..ac0f573a83 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionAtEOF_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [18] ExplicitExpressionAtEOF.cshtml) - This is markup\n\n
                 CSharpExpression - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt
index 2ba1df1357..dea53e05c5 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpressionWithMarkup_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [5] ExplicitExpressionWithMarkup.cshtml) - <div>
                 CSharpExpression - (8:0,8 [6] ExplicitExpressionWithMarkup.cshtml)
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt
index 26034b4d78..65105a5ede 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExplicitExpression_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [8] ExplicitExpression.cshtml) - 1 + 1 = 
                 CSharpExpression - (10:0,10 [3] ExplicitExpression.cshtml)
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt
index acd2c43275..904bcf72b4 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.ir.txt
@@ -5,23 +5,34 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [51] ExpressionsInCode.cshtml) - \n    object foo = null;\n    string bar = "Foo";\n
+                CSharpStatement - (2:0,2 [51] ExpressionsInCode.cshtml)
+                    RazorIRToken - (2:0,2 [51] ExpressionsInCode.cshtml) - CSharp - \n    object foo = null;\n    string bar = "Foo";\n
                 HtmlContent - (56:4,0 [2] ExpressionsInCode.cshtml) - \n
-                CSharpStatement - (59:5,1 [23] ExpressionsInCode.cshtml) - if(foo != null) {\n    
+                CSharpStatement - (59:5,1 [23] ExpressionsInCode.cshtml)
+                    RazorIRToken - (59:5,1 [23] ExpressionsInCode.cshtml) - CSharp - if(foo != null) {\n    
                 CSharpExpression - (83:6,5 [3] ExpressionsInCode.cshtml)
                     RazorIRToken - (83:6,5 [3] ExpressionsInCode.cshtml) - CSharp - foo
-                CSharpStatement - (86:6,8 [16] ExpressionsInCode.cshtml) - \n} else {\n    
+                CSharpStatement - (86:6,8 [16] ExpressionsInCode.cshtml)
+                    RazorIRToken - (86:6,8 [16] ExpressionsInCode.cshtml) - CSharp - \n} else {\n    
                 HtmlContent - (102:8,4 [19] ExpressionsInCode.cshtml) - <p>Foo is Null!</p>
-                CSharpStatement - (121:8,23 [3] ExpressionsInCode.cshtml) - \n}
+                CSharpStatement - (121:8,23 [3] ExpressionsInCode.cshtml)
+                    RazorIRToken - (121:8,23 [3] ExpressionsInCode.cshtml) - CSharp - \n}
                 HtmlContent - (124:9,1 [9] ExpressionsInCode.cshtml) - \n\n<p>\n
-                CSharpStatement - (134:12,1 [38] ExpressionsInCode.cshtml) - if(!String.IsNullOrEmpty(bar)) {\n    
+                CSharpStatement - (134:12,1 [38] ExpressionsInCode.cshtml)
+                    RazorIRToken - (134:12,1 [38] ExpressionsInCode.cshtml) - CSharp - if(!String.IsNullOrEmpty(bar)) {\n    
                 CSharpExpression - (174:13,6 [21] ExpressionsInCode.cshtml)
                     RazorIRToken - (174:13,6 [21] ExpressionsInCode.cshtml) - CSharp - bar.Replace("F", "B")
-                CSharpStatement - (196:13,28 [3] ExpressionsInCode.cshtml) - \n}
+                CSharpStatement - (196:13,28 [3] ExpressionsInCode.cshtml)
+                    RazorIRToken - (196:13,28 [3] ExpressionsInCode.cshtml) - CSharp - \n}
                 HtmlContent - (199:14,1 [6] ExpressionsInCode.cshtml) - \n</p>
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs
index 4d6ad557fd..48ada699ca 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.codegen.cs
@@ -14,7 +14,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
     object foo = null;
     string bar = "Foo";
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
@@ -33,14 +32,12 @@ Write(foo);
         
 } else {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Foo is Null!</p>\r\n");
 #line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n<p>\r\n");
@@ -59,7 +56,6 @@ Write(bar.Replace("F", "B"));
                             
 }
 
-
 #line default
 #line hidden
             WriteLiteral("</p>");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt
index 415c756ff0..6d030af8fd 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_Runtime.ir.txt
@@ -5,17 +5,23 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ExpressionsInCode_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [51] ExpressionsInCode.cshtml) - \n    object foo = null;\n    string bar = "Foo";\n
+                CSharpStatement - (2:0,2 [51] ExpressionsInCode.cshtml)
+                    RazorIRToken - (2:0,2 [51] ExpressionsInCode.cshtml) - CSharp - \n    object foo = null;\n    string bar = "Foo";\n
                 HtmlContent - (56:4,0 [2] ExpressionsInCode.cshtml) - \n
-                CSharpStatement - (59:5,1 [23] ExpressionsInCode.cshtml) - if(foo != null) {\n    
+                CSharpStatement - (59:5,1 [23] ExpressionsInCode.cshtml)
+                    RazorIRToken - (59:5,1 [23] ExpressionsInCode.cshtml) - CSharp - if(foo != null) {\n    
                 CSharpExpression - (83:6,5 [3] ExpressionsInCode.cshtml)
                     RazorIRToken - (83:6,5 [3] ExpressionsInCode.cshtml) - CSharp - foo
-                CSharpStatement - (86:6,8 [12] ExpressionsInCode.cshtml) - \n} else {\n
+                CSharpStatement - (86:6,8 [12] ExpressionsInCode.cshtml)
+                    RazorIRToken - (86:6,8 [12] ExpressionsInCode.cshtml) - CSharp - \n} else {\n
                 HtmlContent - (98:8,0 [25] ExpressionsInCode.cshtml) -     <p>Foo is Null!</p>\n
-                CSharpStatement - (123:9,0 [3] ExpressionsInCode.cshtml) - }\n
+                CSharpStatement - (123:9,0 [3] ExpressionsInCode.cshtml)
+                    RazorIRToken - (123:9,0 [3] ExpressionsInCode.cshtml) - CSharp - }\n
                 HtmlContent - (126:10,0 [7] ExpressionsInCode.cshtml) - \n<p>\n
-                CSharpStatement - (134:12,1 [38] ExpressionsInCode.cshtml) - if(!String.IsNullOrEmpty(bar)) {\n    
+                CSharpStatement - (134:12,1 [38] ExpressionsInCode.cshtml)
+                    RazorIRToken - (134:12,1 [38] ExpressionsInCode.cshtml) - CSharp - if(!String.IsNullOrEmpty(bar)) {\n    
                 CSharpExpression - (174:13,6 [21] ExpressionsInCode.cshtml)
                     RazorIRToken - (174:13,6 [21] ExpressionsInCode.cshtml) - CSharp - bar.Replace("F", "B")
-                CSharpStatement - (196:13,28 [5] ExpressionsInCode.cshtml) - \n}\n
+                CSharpStatement - (196:13,28 [5] ExpressionsInCode.cshtml)
+                    RazorIRToken - (196:13,28 [5] ExpressionsInCode.cshtml) - CSharp - \n}\n
                 HtmlContent - (201:15,0 [4] ExpressionsInCode.cshtml) - </p>
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt
index f7d710452c..d9bf8c7489 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.ir.txt
@@ -5,11 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlockMinimal_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [5] FunctionsBlockMinimal.cshtml) - \n\n	
-            CSharpStatement - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - \nstring foo(string input) {\n	return input + "!";\n}\n
+            CSharpStatement - (16:2,12 [55] FunctionsBlockMinimal.cshtml)
+                RazorIRToken - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - CSharp - \nstring foo(string input) {\n	return input + "!";\n}\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs
index fab5b13e6a..9dc6bdae2c 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.codegen.cs
@@ -18,7 +18,6 @@ string foo(string input) {
 	return input + "!";
 }
 
-
 #line default
 #line hidden
     }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
index bcfde47569..5b139bd43a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_Runtime.ir.txt
@@ -6,5 +6,7 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlockMinimal_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [4] FunctionsBlockMinimal.cshtml) - \n\n
-            CSharpStatement - (4:2,0 [1] FunctionsBlockMinimal.cshtml) - 	
-            CSharpStatement - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - \nstring foo(string input) {\n	return input + "!";\n}\n
+            CSharpStatement - (4:2,0 [1] FunctionsBlockMinimal.cshtml)
+                RazorIRToken - (4:2,0 [1] FunctionsBlockMinimal.cshtml) - CSharp - 	
+            CSharpStatement - (16:2,12 [55] FunctionsBlockMinimal.cshtml)
+                RazorIRToken - (16:2,12 [55] FunctionsBlockMinimal.cshtml) - CSharp - \nstring foo(string input) {\n	return input + "!";\n}\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt
index 32d14adb1c..6f819739f9 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.ir.txt
@@ -5,15 +5,22 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_FunctionsBlock_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (17:2,1 [4] FunctionsBlock.cshtml) - \n\n
                 HtmlContent - (138:9,1 [28] FunctionsBlock.cshtml) - \n\nHere's a random number: 
                 CSharpExpression - (167:11,25 [11] FunctionsBlock.cshtml)
                     RazorIRToken - (167:11,25 [11] FunctionsBlock.cshtml) - CSharp - RandomInt()
-            CSharpStatement - (12:0,12 [4] FunctionsBlock.cshtml) - \n\n
-            CSharpStatement - (33:4,12 [104] FunctionsBlock.cshtml) - \n    Random _rand = new Random();\n    private int RandomInt() {\n        return _rand.Next();\n    }\n
+            CSharpStatement - (12:0,12 [4] FunctionsBlock.cshtml)
+                RazorIRToken - (12:0,12 [4] FunctionsBlock.cshtml) - CSharp - \n\n
+            CSharpStatement - (33:4,12 [104] FunctionsBlock.cshtml)
+                RazorIRToken - (33:4,12 [104] FunctionsBlock.cshtml) - CSharp - \n    Random _rand = new Random();\n    private int RandomInt() {\n        return _rand.Next();\n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs
index fb3f88cd3b..9621fcd53a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.codegen.cs
@@ -25,7 +25,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         return _rand.Next();
     }
 
-
 #line default
 #line hidden
     }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt
index cb7f6c5a74..6e4d833808 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_Runtime.ir.txt
@@ -9,5 +9,7 @@ Document -
                 HtmlContent - (140:10,0 [26] FunctionsBlock.cshtml) - \nHere's a random number: 
                 CSharpExpression - (167:11,25 [11] FunctionsBlock.cshtml)
                     RazorIRToken - (167:11,25 [11] FunctionsBlock.cshtml) - CSharp - RandomInt()
-            CSharpStatement - (12:0,12 [4] FunctionsBlock.cshtml) - \n\n
-            CSharpStatement - (33:4,12 [104] FunctionsBlock.cshtml) - \n    Random _rand = new Random();\n    private int RandomInt() {\n        return _rand.Next();\n    }\n
+            CSharpStatement - (12:0,12 [4] FunctionsBlock.cshtml)
+                RazorIRToken - (12:0,12 [4] FunctionsBlock.cshtml) - CSharp - \n\n
+            CSharpStatement - (33:4,12 [104] FunctionsBlock.cshtml)
+                RazorIRToken - (33:4,12 [104] FunctionsBlock.cshtml) - CSharp - \n    Random _rand = new Random();\n    private int RandomInt() {\n        return _rand.Next();\n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt
index c5d358d58d..8f4db5e1f1 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.ir.txt
@@ -5,11 +5,18 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [6] HiddenSpansInCode.cshtml) - \n    
-                CSharpStatement - (9:1,5 [5] HiddenSpansInCode.cshtml) - @Da\n
+                CSharpStatement - (2:0,2 [6] HiddenSpansInCode.cshtml)
+                    RazorIRToken - (2:0,2 [6] HiddenSpansInCode.cshtml) - CSharp - \n    
+                CSharpStatement - (9:1,5 [5] HiddenSpansInCode.cshtml)
+                    RazorIRToken - (9:1,5 [5] HiddenSpansInCode.cshtml) - CSharp - @Da\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs
index ba64b3bca7..b849c9277e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs
@@ -12,7 +12,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode.cshtml"
      @Da
 
-
 #line default
 #line hidden
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt
index 423722eded..7027e32736 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.ir.txt
@@ -5,5 +5,7 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HiddenSpansInCode_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [6] HiddenSpansInCode.cshtml) - \n    
-                CSharpStatement - (9:1,5 [5] HiddenSpansInCode.cshtml) - @Da\n
+                CSharpStatement - (2:0,2 [6] HiddenSpansInCode.cshtml)
+                    RazorIRToken - (2:0,2 [6] HiddenSpansInCode.cshtml) - CSharp - \n    
+                CSharpStatement - (9:1,5 [5] HiddenSpansInCode.cshtml)
+                    RazorIRToken - (9:1,5 [5] HiddenSpansInCode.cshtml) - CSharp - @Da\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt
index 9a03df7edd..cdd98e4849 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Double_DesignTime.ir.txt
@@ -5,10 +5,15 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Double_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [45] HtmlCommentWithQuote_Double.cshtml) - <!-- " -->\n<img src="~/images/submit.png" />
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt
index 0d16265367..fb5d0414bd 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HtmlCommentWithQuote_Single_DesignTime.ir.txt
@@ -5,10 +5,15 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_HtmlCommentWithQuote_Single_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [45] HtmlCommentWithQuote_Single.cshtml) - <!-- ' -->\n<img src="~/images/submit.png" />
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt
index 48704ef099..b19b703b54 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpressionAtEOF_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [18] ImplicitExpressionAtEOF.cshtml) - This is markup\n\n
                 CSharpExpression - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt
index afc66511fd..5d703fac3a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.ir.txt
@@ -5,15 +5,22 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (1:0,1 [36] ImplicitExpression.cshtml) - for(int i = 1; i <= 10; i++) {\n    
+                CSharpStatement - (1:0,1 [36] ImplicitExpression.cshtml)
+                    RazorIRToken - (1:0,1 [36] ImplicitExpression.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n    
                 HtmlContent - (37:1,4 [17] ImplicitExpression.cshtml) - <p>This is item #
                 CSharpExpression - (55:1,22 [1] ImplicitExpression.cshtml)
                     RazorIRToken - (55:1,22 [1] ImplicitExpression.cshtml) - CSharp - i
                 HtmlContent - (56:1,23 [4] ImplicitExpression.cshtml) - </p>
-                CSharpStatement - (60:1,27 [3] ImplicitExpression.cshtml) - \n}
+                CSharpStatement - (60:1,27 [3] ImplicitExpression.cshtml)
+                    RazorIRToken - (60:1,27 [3] ImplicitExpression.cshtml) - CSharp - \n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs
index a2da126220..a4f32d3c87 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.codegen.cs
@@ -12,7 +12,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression.cshtml"
  for(int i = 1; i <= 10; i++) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>This is item #");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt
index 8f26f8b34b..d1cfc00836 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_Runtime.ir.txt
@@ -5,9 +5,11 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ImplicitExpression_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (1:0,1 [32] ImplicitExpression.cshtml) - for(int i = 1; i <= 10; i++) {\n
+                CSharpStatement - (1:0,1 [32] ImplicitExpression.cshtml)
+                    RazorIRToken - (1:0,1 [32] ImplicitExpression.cshtml) - CSharp - for(int i = 1; i <= 10; i++) {\n
                 HtmlContent - (33:1,0 [21] ImplicitExpression.cshtml) -     <p>This is item #
                 CSharpExpression - (55:1,22 [1] ImplicitExpression.cshtml)
                     RazorIRToken - (55:1,22 [1] ImplicitExpression.cshtml) - CSharp - i
                 HtmlContent - (56:1,23 [6] ImplicitExpression.cshtml) - </p>\n
-                CSharpStatement - (62:2,0 [1] ImplicitExpression.cshtml) - }
+                CSharpStatement - (62:2,0 [1] ImplicitExpression.cshtml)
+                    RazorIRToken - (62:2,0 [1] ImplicitExpression.cshtml) - CSharp - }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt
index 5af0d4f0dd..fc9f07924b 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteTagHelper_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteTagHelper_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] IncompleteTagHelper.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] IncompleteTagHelper.cshtml) - \n\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt
index 83bb815eb8..341b7b67d1 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inherits_DesignTime - foo.bar<baz<biz>>.boz - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (20:2,10 [21] Inherits.cshtml) - foo.bar<baz<biz>>.boz
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 CSharpExpression - (1:0,1 [5] Inherits.cshtml)
                     RazorIRToken - (1:0,1 [5] Inherits.cshtml) - CSharp - foo()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt
index 0682f3649b..676833b985 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.ir.txt
@@ -5,22 +5,32 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (9:0,9 [4] InlineBlocks.cshtml) - Link
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement -  - DefineSection("Link", async (__razor_section_writer) => {
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("Link", async (__razor_section_writer) => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (13:0,13 [23] InlineBlocks.cshtml) - (string link) {\n    <a
                 HtmlAttribute - (36:1,6 [59] InlineBlocks.cshtml) -  href=" - "
                     CSharpAttributeValue - (43:1,13 [51] InlineBlocks.cshtml) - 
-                        CSharpStatement - (44:1,14 [19] InlineBlocks.cshtml) - if(link != null) { 
+                        CSharpStatement - (44:1,14 [19] InlineBlocks.cshtml)
+                            RazorIRToken - (44:1,14 [19] InlineBlocks.cshtml) - CSharp - if(link != null) { 
                         CSharpExpression - (64:1,34 [4] InlineBlocks.cshtml)
                             RazorIRToken - (64:1,34 [4] InlineBlocks.cshtml) - CSharp - link
-                        CSharpStatement - (68:1,38 [10] InlineBlocks.cshtml) -  } else { 
+                        CSharpStatement - (68:1,38 [10] InlineBlocks.cshtml)
+                            RazorIRToken - (68:1,38 [10] InlineBlocks.cshtml) - CSharp -  } else { 
                         HtmlContent - (84:1,54 [1] InlineBlocks.cshtml) - #
-                        CSharpStatement - (92:1,62 [2] InlineBlocks.cshtml) -  }
+                        CSharpStatement - (92:1,62 [2] InlineBlocks.cshtml)
+                            RazorIRToken - (92:1,62 [2] InlineBlocks.cshtml) - CSharp -  }
                 HtmlContent - (95:1,65 [6] InlineBlocks.cshtml) -  />\n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
index 96b3a45755..0b59f25adb 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_Runtime.ir.txt
@@ -5,15 +5,20 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InlineBlocks_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement -  - DefineSection("Link", async () => {
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("Link", async () => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (13:0,13 [23] InlineBlocks.cshtml) - (string link) {\n    <a
                 HtmlAttribute - (36:1,6 [58] InlineBlocks.cshtml) -  href=" - "
                     CSharpAttributeValue - (43:1,13 [50] InlineBlocks.cshtml) - 
-                        CSharpStatement - (44:1,14 [19] InlineBlocks.cshtml) - if(link != null) { 
+                        CSharpStatement - (44:1,14 [19] InlineBlocks.cshtml)
+                            RazorIRToken - (44:1,14 [19] InlineBlocks.cshtml) - CSharp - if(link != null) { 
                         CSharpExpression - (64:1,34 [4] InlineBlocks.cshtml)
                             RazorIRToken - (64:1,34 [4] InlineBlocks.cshtml) - CSharp - link
-                        CSharpStatement - (68:1,38 [9] InlineBlocks.cshtml) -  } else {
+                        CSharpStatement - (68:1,38 [9] InlineBlocks.cshtml)
+                            RazorIRToken - (68:1,38 [9] InlineBlocks.cshtml) - CSharp -  } else {
                         HtmlContent - (84:1,54 [1] InlineBlocks.cshtml) - #
-                        CSharpStatement - (92:1,62 [2] InlineBlocks.cshtml) -  }
+                        CSharpStatement - (92:1,62 [2] InlineBlocks.cshtml)
+                            RazorIRToken - (92:1,62 [2] InlineBlocks.cshtml) - CSharp -  }
                 HtmlContent - (95:1,65 [6] InlineBlocks.cshtml) -  />\n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt
index 063cb791e8..74ec0a4141 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.ir.txt
@@ -5,54 +5,77 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Instrumented_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [32] Instrumented.cshtml) - \n    int i = 1;\n    var foo = 
+                CSharpStatement - (2:0,2 [32] Instrumented.cshtml)
+                    RazorIRToken - (2:0,2 [32] Instrumented.cshtml) - CSharp - \n    int i = 1;\n    var foo = 
                 Template - (35:2,15 [10] Instrumented.cshtml)
                     HtmlContent - (35:2,15 [10] Instrumented.cshtml) - <p>Bar</p>
-                CSharpStatement - (45:2,25 [7] Instrumented.cshtml) - ;\n    
+                CSharpStatement - (45:2,25 [7] Instrumented.cshtml)
+                    RazorIRToken - (45:2,25 [7] Instrumented.cshtml) - CSharp - ;\n    
                 HtmlContent - (54:3,6 [14] Instrumented.cshtml) - Hello, World\n
-                CSharpStatement - (68:4,0 [4] Instrumented.cshtml) -     
+                CSharpStatement - (68:4,0 [4] Instrumented.cshtml)
+                    RazorIRToken - (68:4,0 [4] Instrumented.cshtml) - CSharp -     
                 HtmlContent - (72:4,4 [19] Instrumented.cshtml) - <p>Hello, World</p>
-                CSharpStatement - (91:4,23 [2] Instrumented.cshtml) - \n
+                CSharpStatement - (91:4,23 [2] Instrumented.cshtml)
+                    RazorIRToken - (91:4,23 [2] Instrumented.cshtml) - CSharp - \n
                 HtmlContent - (96:6,0 [2] Instrumented.cshtml) - \n
-                CSharpStatement - (99:7,1 [22] Instrumented.cshtml) - while(i <= 10) {\n    
+                CSharpStatement - (99:7,1 [22] Instrumented.cshtml)
+                    RazorIRToken - (99:7,1 [22] Instrumented.cshtml) - CSharp - while(i <= 10) {\n    
                 HtmlContent - (121:8,4 [19] Instrumented.cshtml) - <p>Hello from C#, #
                 CSharpExpression - (142:8,25 [1] Instrumented.cshtml)
                     RazorIRToken - (142:8,25 [1] Instrumented.cshtml) - CSharp - i
                 HtmlContent - (144:8,27 [4] Instrumented.cshtml) - </p>
-                CSharpStatement - (148:8,31 [16] Instrumented.cshtml) - \n    i += 1;\n}
+                CSharpStatement - (148:8,31 [16] Instrumented.cshtml)
+                    RazorIRToken - (148:8,31 [16] Instrumented.cshtml) - CSharp - \n    i += 1;\n}
                 HtmlContent - (164:10,1 [4] Instrumented.cshtml) - \n\n
-                CSharpStatement - (169:12,1 [19] Instrumented.cshtml) - if(i == 11) {\n    
+                CSharpStatement - (169:12,1 [19] Instrumented.cshtml)
+                    RazorIRToken - (169:12,1 [19] Instrumented.cshtml) - CSharp - if(i == 11) {\n    
                 HtmlContent - (188:13,4 [25] Instrumented.cshtml) - <p>We wrote 10 lines!</p>
-                CSharpStatement - (213:13,29 [3] Instrumented.cshtml) - \n}
+                CSharpStatement - (213:13,29 [3] Instrumented.cshtml)
+                    RazorIRToken - (213:13,29 [3] Instrumented.cshtml) - CSharp - \n}
                 HtmlContent - (216:14,1 [4] Instrumented.cshtml) - \n\n
-                CSharpStatement - (221:16,1 [35] Instrumented.cshtml) - switch(i) {\n    case 11:\n        
+                CSharpStatement - (221:16,1 [35] Instrumented.cshtml)
+                    RazorIRToken - (221:16,1 [35] Instrumented.cshtml) - CSharp - switch(i) {\n    case 11:\n        
                 HtmlContent - (256:18,8 [36] Instrumented.cshtml) - <p>No really, we wrote 10 lines!</p>
-                CSharpStatement - (292:18,44 [40] Instrumented.cshtml) - \n        break;\n    default:\n        
+                CSharpStatement - (292:18,44 [40] Instrumented.cshtml)
+                    RazorIRToken - (292:18,44 [40] Instrumented.cshtml) - CSharp - \n        break;\n    default:\n        
                 HtmlContent - (332:21,8 [29] Instrumented.cshtml) - <p>Actually, we didn't...</p>
-                CSharpStatement - (361:21,37 [19] Instrumented.cshtml) - \n        break;\n}
+                CSharpStatement - (361:21,37 [19] Instrumented.cshtml)
+                    RazorIRToken - (361:21,37 [19] Instrumented.cshtml) - CSharp - \n        break;\n}
                 HtmlContent - (380:23,1 [4] Instrumented.cshtml) - \n\n
-                CSharpStatement - (385:25,1 [39] Instrumented.cshtml) - for(int j = 1; j <= 10; j += 2) {\n    
+                CSharpStatement - (385:25,1 [39] Instrumented.cshtml)
+                    RazorIRToken - (385:25,1 [39] Instrumented.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n    
                 HtmlContent - (424:26,4 [25] Instrumented.cshtml) - <p>Hello again from C#, #
                 CSharpExpression - (451:26,31 [1] Instrumented.cshtml)
                     RazorIRToken - (451:26,31 [1] Instrumented.cshtml) - CSharp - j
                 HtmlContent - (453:26,33 [4] Instrumented.cshtml) - </p>
-                CSharpStatement - (457:26,37 [3] Instrumented.cshtml) - \n}
+                CSharpStatement - (457:26,37 [3] Instrumented.cshtml)
+                    RazorIRToken - (457:26,37 [3] Instrumented.cshtml) - CSharp - \n}
                 HtmlContent - (460:27,1 [4] Instrumented.cshtml) - \n\n
-                CSharpStatement - (465:29,1 [11] Instrumented.cshtml) - try {\n    
+                CSharpStatement - (465:29,1 [11] Instrumented.cshtml)
+                    RazorIRToken - (465:29,1 [11] Instrumented.cshtml) - CSharp - try {\n    
                 HtmlContent - (476:30,4 [35] Instrumented.cshtml) - <p>That time, we wrote 5 lines!</p>
-                CSharpStatement - (511:30,39 [31] Instrumented.cshtml) - \n} catch(Exception ex) {\n    
+                CSharpStatement - (511:30,39 [31] Instrumented.cshtml)
+                    RazorIRToken - (511:30,39 [31] Instrumented.cshtml) - CSharp - \n} catch(Exception ex) {\n    
                 HtmlContent - (542:32,4 [29] Instrumented.cshtml) - <p>Oh no! An error occurred: 
                 CSharpExpression - (573:32,35 [10] Instrumented.cshtml)
                     RazorIRToken - (573:32,35 [10] Instrumented.cshtml) - CSharp - ex.Message
                 HtmlContent - (584:32,46 [4] Instrumented.cshtml) - </p>
-                CSharpStatement - (588:32,50 [3] Instrumented.cshtml) - \n}
+                CSharpStatement - (588:32,50 [3] Instrumented.cshtml)
+                    RazorIRToken - (588:32,50 [3] Instrumented.cshtml) - CSharp - \n}
                 HtmlContent - (591:33,1 [4] Instrumented.cshtml) - \n\n
-                CSharpStatement - (596:35,1 [26] Instrumented.cshtml) - lock(new object()) {\n    
+                CSharpStatement - (596:35,1 [26] Instrumented.cshtml)
+                    RazorIRToken - (596:35,1 [26] Instrumented.cshtml) - CSharp - lock(new object()) {\n    
                 HtmlContent - (622:36,4 [47] Instrumented.cshtml) - <p>This block is locked, for your security!</p>
-                CSharpStatement - (669:36,51 [3] Instrumented.cshtml) - \n}
+                CSharpStatement - (669:36,51 [3] Instrumented.cshtml)
+                    RazorIRToken - (669:36,51 [3] Instrumented.cshtml) - CSharp - \n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs
index 9fb4d00ade..36efc36c31 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.codegen.cs
@@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
                          ;
 
-
 #line default
 #line hidden
             WriteLiteral("    ");
@@ -32,7 +31,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
  while(i <= 10) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Hello from C#, #");
@@ -46,21 +44,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
     i += 1;
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
  if(i == 11) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>We wrote 10 lines!</p>\r\n");
 #line 15 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
@@ -68,7 +63,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
  switch(i) {
     case 11:
 
-
 #line default
 #line hidden
             WriteLiteral("        <p>No really, we wrote 10 lines!</p>\r\n");
@@ -76,7 +70,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         break;
     default:
 
-
 #line default
 #line hidden
             WriteLiteral("        <p>Actually, we didn\'t...</p>\r\n");
@@ -84,14 +77,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         break;
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 26 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
  for(int j = 1; j <= 10; j += 2) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Hello again from C#, #");
@@ -104,21 +95,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 28 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 30 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
  try {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>That time, we wrote 5 lines!</p>\r\n");
 #line 32 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
 } catch(Exception ex) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Oh no! An error occurred: ");
@@ -131,14 +119,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 34 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented.cshtml"
  lock(new object()) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>This block is locked, for your security!</p>\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt
index 943603fca8..7a1078dfea 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_Runtime.ir.txt
@@ -5,47 +5,64 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Instrumented_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [32] Instrumented.cshtml) - \n    int i = 1;\n    var foo = 
+                CSharpStatement - (2:0,2 [32] Instrumented.cshtml)
+                    RazorIRToken - (2:0,2 [32] Instrumented.cshtml) - CSharp - \n    int i = 1;\n    var foo = 
                 Template - (35:2,15 [10] Instrumented.cshtml)
                     HtmlContent - (35:2,15 [10] Instrumented.cshtml) - <p>Bar</p>
-                CSharpStatement - (45:2,25 [3] Instrumented.cshtml) - ;\n
+                CSharpStatement - (45:2,25 [3] Instrumented.cshtml)
+                    RazorIRToken - (45:2,25 [3] Instrumented.cshtml) - CSharp - ;\n
                 HtmlContent - (48:3,0 [4] Instrumented.cshtml) -     
                 HtmlContent - (54:3,6 [39] Instrumented.cshtml) - Hello, World\n    <p>Hello, World</p>\n
-                CSharpStatement - (93:5,0 [0] Instrumented.cshtml) - 
+                CSharpStatement - (93:5,0 [0] Instrumented.cshtml)
+                    RazorIRToken - (93:5,0 [0] Instrumented.cshtml) - CSharp - 
                 HtmlContent - (96:6,0 [2] Instrumented.cshtml) - \n
-                CSharpStatement - (99:7,1 [18] Instrumented.cshtml) - while(i <= 10) {\n
+                CSharpStatement - (99:7,1 [18] Instrumented.cshtml)
+                    RazorIRToken - (99:7,1 [18] Instrumented.cshtml) - CSharp - while(i <= 10) {\n
                 HtmlContent - (117:8,0 [23] Instrumented.cshtml) -     <p>Hello from C#, #
                 CSharpExpression - (142:8,25 [1] Instrumented.cshtml)
                     RazorIRToken - (142:8,25 [1] Instrumented.cshtml) - CSharp - i
                 HtmlContent - (144:8,27 [6] Instrumented.cshtml) - </p>\n
-                CSharpStatement - (150:9,0 [16] Instrumented.cshtml) -     i += 1;\n}\n
+                CSharpStatement - (150:9,0 [16] Instrumented.cshtml)
+                    RazorIRToken - (150:9,0 [16] Instrumented.cshtml) - CSharp -     i += 1;\n}\n
                 HtmlContent - (166:11,0 [2] Instrumented.cshtml) - \n
-                CSharpStatement - (169:12,1 [15] Instrumented.cshtml) - if(i == 11) {\n
+                CSharpStatement - (169:12,1 [15] Instrumented.cshtml)
+                    RazorIRToken - (169:12,1 [15] Instrumented.cshtml) - CSharp - if(i == 11) {\n
                 HtmlContent - (184:13,0 [31] Instrumented.cshtml) -     <p>We wrote 10 lines!</p>\n
-                CSharpStatement - (215:14,0 [3] Instrumented.cshtml) - }\n
+                CSharpStatement - (215:14,0 [3] Instrumented.cshtml)
+                    RazorIRToken - (215:14,0 [3] Instrumented.cshtml) - CSharp - }\n
                 HtmlContent - (218:15,0 [2] Instrumented.cshtml) - \n
-                CSharpStatement - (221:16,1 [27] Instrumented.cshtml) - switch(i) {\n    case 11:\n
+                CSharpStatement - (221:16,1 [27] Instrumented.cshtml)
+                    RazorIRToken - (221:16,1 [27] Instrumented.cshtml) - CSharp - switch(i) {\n    case 11:\n
                 HtmlContent - (248:18,0 [46] Instrumented.cshtml) -         <p>No really, we wrote 10 lines!</p>\n
-                CSharpStatement - (294:19,0 [30] Instrumented.cshtml) -         break;\n    default:\n
+                CSharpStatement - (294:19,0 [30] Instrumented.cshtml)
+                    RazorIRToken - (294:19,0 [30] Instrumented.cshtml) - CSharp -         break;\n    default:\n
                 HtmlContent - (324:21,0 [39] Instrumented.cshtml) -         <p>Actually, we didn't...</p>\n
-                CSharpStatement - (363:22,0 [19] Instrumented.cshtml) -         break;\n}\n
+                CSharpStatement - (363:22,0 [19] Instrumented.cshtml)
+                    RazorIRToken - (363:22,0 [19] Instrumented.cshtml) - CSharp -         break;\n}\n
                 HtmlContent - (382:24,0 [2] Instrumented.cshtml) - \n
-                CSharpStatement - (385:25,1 [35] Instrumented.cshtml) - for(int j = 1; j <= 10; j += 2) {\n
+                CSharpStatement - (385:25,1 [35] Instrumented.cshtml)
+                    RazorIRToken - (385:25,1 [35] Instrumented.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n
                 HtmlContent - (420:26,0 [29] Instrumented.cshtml) -     <p>Hello again from C#, #
                 CSharpExpression - (451:26,31 [1] Instrumented.cshtml)
                     RazorIRToken - (451:26,31 [1] Instrumented.cshtml) - CSharp - j
                 HtmlContent - (453:26,33 [6] Instrumented.cshtml) - </p>\n
-                CSharpStatement - (459:27,0 [3] Instrumented.cshtml) - }\n
+                CSharpStatement - (459:27,0 [3] Instrumented.cshtml)
+                    RazorIRToken - (459:27,0 [3] Instrumented.cshtml) - CSharp - }\n
                 HtmlContent - (462:28,0 [2] Instrumented.cshtml) - \n
-                CSharpStatement - (465:29,1 [7] Instrumented.cshtml) - try {\n
+                CSharpStatement - (465:29,1 [7] Instrumented.cshtml)
+                    RazorIRToken - (465:29,1 [7] Instrumented.cshtml) - CSharp - try {\n
                 HtmlContent - (472:30,0 [41] Instrumented.cshtml) -     <p>That time, we wrote 5 lines!</p>\n
-                CSharpStatement - (513:31,0 [25] Instrumented.cshtml) - } catch(Exception ex) {\n
+                CSharpStatement - (513:31,0 [25] Instrumented.cshtml)
+                    RazorIRToken - (513:31,0 [25] Instrumented.cshtml) - CSharp - } catch(Exception ex) {\n
                 HtmlContent - (538:32,0 [33] Instrumented.cshtml) -     <p>Oh no! An error occurred: 
                 CSharpExpression - (573:32,35 [10] Instrumented.cshtml)
                     RazorIRToken - (573:32,35 [10] Instrumented.cshtml) - CSharp - ex.Message
                 HtmlContent - (584:32,46 [6] Instrumented.cshtml) - </p>\n
-                CSharpStatement - (590:33,0 [3] Instrumented.cshtml) - }\n
+                CSharpStatement - (590:33,0 [3] Instrumented.cshtml)
+                    RazorIRToken - (590:33,0 [3] Instrumented.cshtml) - CSharp - }\n
                 HtmlContent - (593:34,0 [2] Instrumented.cshtml) - \n
-                CSharpStatement - (596:35,1 [22] Instrumented.cshtml) - lock(new object()) {\n
+                CSharpStatement - (596:35,1 [22] Instrumented.cshtml)
+                    RazorIRToken - (596:35,1 [22] Instrumented.cshtml) - CSharp - lock(new object()) {\n
                 HtmlContent - (618:36,0 [53] Instrumented.cshtml) -     <p>This block is locked, for your security!</p>\n
-                CSharpStatement - (671:37,0 [1] Instrumented.cshtml) - }
+                CSharpStatement - (671:37,0 [1] Instrumented.cshtml)
+                    RazorIRToken - (671:37,0 [1] Instrumented.cshtml) - CSharp - }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt
index a1a460012a..d18089929a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.ir.txt
@@ -5,15 +5,22 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [46] MarkupInCodeBlock.cshtml) - \n    for(int i = 1; i <= 10; i++) {\n        
+                CSharpStatement - (2:0,2 [46] MarkupInCodeBlock.cshtml)
+                    RazorIRToken - (2:0,2 [46] MarkupInCodeBlock.cshtml) - CSharp - \n    for(int i = 1; i <= 10; i++) {\n        
                 HtmlContent - (48:2,8 [19] MarkupInCodeBlock.cshtml) - <p>Hello from C#, #
                 CSharpExpression - (69:2,29 [12] MarkupInCodeBlock.cshtml)
                     RazorIRToken - (69:2,29 [12] MarkupInCodeBlock.cshtml) - CSharp - i.ToString()
                 HtmlContent - (82:2,42 [4] MarkupInCodeBlock.cshtml) - </p>
-                CSharpStatement - (86:2,46 [9] MarkupInCodeBlock.cshtml) - \n    }\n
+                CSharpStatement - (86:2,46 [9] MarkupInCodeBlock.cshtml)
+                    RazorIRToken - (86:2,46 [9] MarkupInCodeBlock.cshtml) - CSharp - \n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs
index 8afd9c864e..41c165fc76 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.codegen.cs
@@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
   
     for(int i = 1; i <= 10; i++) {
 
-
 #line default
 #line hidden
             WriteLiteral("        <p>Hello from C#, #");
@@ -26,7 +25,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock.cshtml"
     }
 
-
 #line default
 #line hidden
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt
index e9c7602979..68c797c972 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_Runtime.ir.txt
@@ -5,9 +5,11 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MarkupInCodeBlock_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [38] MarkupInCodeBlock.cshtml) - \n    for(int i = 1; i <= 10; i++) {\n
+                CSharpStatement - (2:0,2 [38] MarkupInCodeBlock.cshtml)
+                    RazorIRToken - (2:0,2 [38] MarkupInCodeBlock.cshtml) - CSharp - \n    for(int i = 1; i <= 10; i++) {\n
                 HtmlContent - (40:2,0 [27] MarkupInCodeBlock.cshtml) -         <p>Hello from C#, #
                 CSharpExpression - (69:2,29 [12] MarkupInCodeBlock.cshtml)
                     RazorIRToken - (69:2,29 [12] MarkupInCodeBlock.cshtml) - CSharp - i.ToString()
                 HtmlContent - (82:2,42 [6] MarkupInCodeBlock.cshtml) - </p>\n
-                CSharpStatement - (88:3,0 [7] MarkupInCodeBlock.cshtml) -     }\n
+                CSharpStatement - (88:3,0 [7] MarkupInCodeBlock.cshtml)
+                    RazorIRToken - (88:3,0 [7] MarkupInCodeBlock.cshtml) - CSharp -     }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt
index b83b585622..e20f1426f7 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MinimizedTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MinimizedTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] MinimizedTagHelpers.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.CatchAllTagHelper - TestNamespace.InputTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] MinimizedTagHelpers.cshtml) - \n\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt
index ab48043faa..733f699225 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.ir.txt
@@ -5,17 +5,26 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [6] NestedCSharp.cshtml) - \n    
-                CSharpStatement - (9:1,5 [53] NestedCSharp.cshtml) - foreach (var result in (dynamic)Url)\n    {\n        
+                CSharpStatement - (2:0,2 [6] NestedCSharp.cshtml)
+                    RazorIRToken - (2:0,2 [6] NestedCSharp.cshtml) - CSharp - \n    
+                CSharpStatement - (9:1,5 [53] NestedCSharp.cshtml)
+                    RazorIRToken - (9:1,5 [53] NestedCSharp.cshtml) - CSharp - foreach (var result in (dynamic)Url)\n    {\n        
                 HtmlContent - (62:3,8 [19] NestedCSharp.cshtml) - <div>\n            
                 CSharpExpression - (82:4,13 [16] NestedCSharp.cshtml)
                     RazorIRToken - (82:4,13 [16] NestedCSharp.cshtml) - CSharp - result.SomeValue
                 HtmlContent - (98:4,29 [17] NestedCSharp.cshtml) - .\n        </div>
-                CSharpStatement - (115:5,14 [7] NestedCSharp.cshtml) - \n    }
-                CSharpStatement - (122:6,5 [2] NestedCSharp.cshtml) - \n
+                CSharpStatement - (115:5,14 [7] NestedCSharp.cshtml)
+                    RazorIRToken - (115:5,14 [7] NestedCSharp.cshtml) - CSharp - \n    }
+                CSharpStatement - (122:6,5 [2] NestedCSharp.cshtml)
+                    RazorIRToken - (122:6,5 [2] NestedCSharp.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs
index d1104a9b6a..512decead0 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.codegen.cs
@@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
      foreach (var result in (dynamic)Url)
     {
 
-
 #line default
 #line hidden
             WriteLiteral("        <div>\r\n            ");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt
index 02593d51d0..00e0a0a174 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_Runtime.ir.txt
@@ -5,11 +5,15 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCSharp_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [6] NestedCSharp.cshtml) - \n    
-                CSharpStatement - (9:1,5 [45] NestedCSharp.cshtml) - foreach (var result in (dynamic)Url)\n    {\n
+                CSharpStatement - (2:0,2 [6] NestedCSharp.cshtml)
+                    RazorIRToken - (2:0,2 [6] NestedCSharp.cshtml) - CSharp - \n    
+                CSharpStatement - (9:1,5 [45] NestedCSharp.cshtml)
+                    RazorIRToken - (9:1,5 [45] NestedCSharp.cshtml) - CSharp - foreach (var result in (dynamic)Url)\n    {\n
                 HtmlContent - (54:3,0 [27] NestedCSharp.cshtml) -         <div>\n            
                 CSharpExpression - (82:4,13 [16] NestedCSharp.cshtml)
                     RazorIRToken - (82:4,13 [16] NestedCSharp.cshtml) - CSharp - result.SomeValue
                 HtmlContent - (98:4,29 [19] NestedCSharp.cshtml) - .\n        </div>\n
-                CSharpStatement - (117:6,0 [5] NestedCSharp.cshtml) -     }
-                CSharpStatement - (122:6,5 [2] NestedCSharp.cshtml) - \n
+                CSharpStatement - (117:6,0 [5] NestedCSharp.cshtml)
+                    RazorIRToken - (117:6,0 [5] NestedCSharp.cshtml) - CSharp -     }
+                CSharpStatement - (122:6,5 [2] NestedCSharp.cshtml)
+                    RazorIRToken - (122:6,5 [2] NestedCSharp.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt
index f355ae730c..4ecc878bcb 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.ir.txt
@@ -5,12 +5,20 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (1:0,1 [15] NestedCodeBlocks.cshtml) - if(foo) {\n    
-                CSharpStatement - (17:1,5 [16] NestedCodeBlocks.cshtml) - if(bar) {\n    }
-                CSharpStatement - (33:2,5 [3] NestedCodeBlocks.cshtml) - \n}
+                CSharpStatement - (1:0,1 [15] NestedCodeBlocks.cshtml)
+                    RazorIRToken - (1:0,1 [15] NestedCodeBlocks.cshtml) - CSharp - if(foo) {\n    
+                CSharpStatement - (17:1,5 [16] NestedCodeBlocks.cshtml)
+                    RazorIRToken - (17:1,5 [16] NestedCodeBlocks.cshtml) - CSharp - if(bar) {\n    }
+                CSharpStatement - (33:2,5 [3] NestedCodeBlocks.cshtml)
+                    RazorIRToken - (33:2,5 [3] NestedCodeBlocks.cshtml) - CSharp - \n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt
index 46c135c2bc..1d934f6c2e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_Runtime.ir.txt
@@ -5,6 +5,9 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedCodeBlocks_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (1:0,1 [15] NestedCodeBlocks.cshtml) - if(foo) {\n    
-                CSharpStatement - (17:1,5 [16] NestedCodeBlocks.cshtml) - if(bar) {\n    }
-                CSharpStatement - (33:2,5 [3] NestedCodeBlocks.cshtml) - \n}
+                CSharpStatement - (1:0,1 [15] NestedCodeBlocks.cshtml)
+                    RazorIRToken - (1:0,1 [15] NestedCodeBlocks.cshtml) - CSharp - if(foo) {\n    
+                CSharpStatement - (17:1,5 [16] NestedCodeBlocks.cshtml)
+                    RazorIRToken - (17:1,5 [16] NestedCodeBlocks.cshtml) - CSharp - if(bar) {\n    }
+                CSharpStatement - (33:2,5 [3] NestedCodeBlocks.cshtml)
+                    RazorIRToken - (33:2,5 [3] NestedCodeBlocks.cshtml) - CSharp - \n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt
index a6136ba75a..e5d92314b6 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_DesignTime.ir.txt
@@ -5,19 +5,25 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedScriptTagTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] NestedScriptTagTagHelpers.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [108] NestedScriptTagTagHelpers.cshtml) - \n\n<script type="text/html">\n    <div data-animation="fade" class="randomNonTagHelperAttribute">\n        
                 TagHelper - (139:4,8 [433] NestedScriptTagTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
                         HtmlContent - (180:4,49 [14] NestedScriptTagTagHelpers.cshtml) - \n            
-                        CSharpStatement - (195:5,13 [46] NestedScriptTagTagHelpers.cshtml) - for(var i = 0; i < 5; i++) {\n                
+                        CSharpStatement - (195:5,13 [46] NestedScriptTagTagHelpers.cshtml)
+                            RazorIRToken - (195:5,13 [46] NestedScriptTagTagHelpers.cshtml) - CSharp - for(var i = 0; i < 5; i++) {\n                
                         HtmlContent - (241:6,16 [68] NestedScriptTagTagHelpers.cshtml) - <script id="nestedScriptTag" type="text/html">\n                    
                         TagHelper - (309:7,20 [86] NestedScriptTagTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - input - TagMode.StartTagOnly
@@ -36,7 +42,8 @@ Document -
                                 HtmlContent - (389:7,100 [4] NestedScriptTagTagHelpers.cshtml) - true
                             ExecuteTagHelpers - 
                         HtmlContent - (395:7,106 [27] NestedScriptTagTagHelpers.cshtml) - \n                </script>
-                        CSharpStatement - (422:8,25 [15] NestedScriptTagTagHelpers.cshtml) - \n            }
+                        CSharpStatement - (422:8,25 [15] NestedScriptTagTagHelpers.cshtml)
+                            RazorIRToken - (422:8,25 [15] NestedScriptTagTagHelpers.cshtml) - CSharp - \n            }
                         HtmlContent - (437:9,13 [131] NestedScriptTagTagHelpers.cshtml) - \n            <script type="text/javascript">\n                var tag = '<input checked="true">';\n            </script>\n        
                     CreateTagHelper -  - TestNamespace.PTagHelper
                     AddTagHelperHtmlAttribute -  - class - HtmlAttributeValueStyle.DoubleQuotes
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
index f4115f1139..9d69727177 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.codegen.cs
@@ -39,7 +39,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
              for(var i = 0; i < 5; i++) {
 
-
 #line default
 #line hidden
                 WriteLiteral("                <script id=\"nestedScriptTag\" type=\"text/html\">\r\n                    ");
@@ -81,7 +80,6 @@ __TestNamespace_InputTagHelper2.Checked = true;
 #line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers.cshtml"
             }
 
-
 #line default
 #line hidden
                 WriteLiteral("            <script type=\"text/javascript\">\r\n                var tag = \'<input checked=\"true\">\';\r\n            </script>\r\n        ");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt
index f23c389fa7..518a19b43d 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedScriptTagTagHelpers_Runtime.ir.txt
@@ -13,8 +13,10 @@ Document -
                 TagHelper - (139:4,8 [433] NestedScriptTagTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
                         HtmlContent - (180:4,49 [2] NestedScriptTagTagHelpers.cshtml) - \n
-                        CSharpStatement - (182:5,0 [12] NestedScriptTagTagHelpers.cshtml) -             
-                        CSharpStatement - (195:5,13 [30] NestedScriptTagTagHelpers.cshtml) - for(var i = 0; i < 5; i++) {\n
+                        CSharpStatement - (182:5,0 [12] NestedScriptTagTagHelpers.cshtml)
+                            RazorIRToken - (182:5,0 [12] NestedScriptTagTagHelpers.cshtml) - CSharp -             
+                        CSharpStatement - (195:5,13 [30] NestedScriptTagTagHelpers.cshtml)
+                            RazorIRToken - (195:5,13 [30] NestedScriptTagTagHelpers.cshtml) - CSharp - for(var i = 0; i < 5; i++) {\n
                         HtmlContent - (225:6,0 [84] NestedScriptTagTagHelpers.cshtml) -                 <script id="nestedScriptTag" type="text/html">\n                    
                         TagHelper - (309:7,20 [86] NestedScriptTagTagHelpers.cshtml)
                             InitializeTagHelperStructure -  - input - TagMode.StartTagOnly
@@ -31,7 +33,8 @@ Document -
                                 HtmlContent - (389:7,100 [4] NestedScriptTagTagHelpers.cshtml) - true
                             ExecuteTagHelpers - 
                         HtmlContent - (395:7,106 [29] NestedScriptTagTagHelpers.cshtml) - \n                </script>\n
-                        CSharpStatement - (424:9,0 [15] NestedScriptTagTagHelpers.cshtml) -             }\n
+                        CSharpStatement - (424:9,0 [15] NestedScriptTagTagHelpers.cshtml)
+                            RazorIRToken - (424:9,0 [15] NestedScriptTagTagHelpers.cshtml) - CSharp -             }\n
                         HtmlContent - (439:10,0 [129] NestedScriptTagTagHelpers.cshtml) -             <script type="text/javascript">\n                var tag = '<input checked="true">';\n            </script>\n        
                     CreateTagHelper -  - TestNamespace.PTagHelper
                     AddPreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt
index 3e7ad2bbf8..a74b56cb73 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NestedTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [15] NestedTagHelpers.cshtml) - *, TestAssembly
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - SpanTagHelper - DivTagHelper - InputTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (29:0,29 [2] NestedTagHelpers.cshtml) - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt
index 4e5cc65121..d269563325 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.ir.txt
@@ -5,51 +5,72 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [18] NoLinePragmas.cshtml) - \n    int i = 1;\n
+                CSharpStatement - (2:0,2 [18] NoLinePragmas.cshtml)
+                    RazorIRToken - (2:0,2 [18] NoLinePragmas.cshtml) - CSharp - \n    int i = 1;\n
                 HtmlContent - (23:3,0 [2] NoLinePragmas.cshtml) - \n
-                CSharpStatement - (26:4,1 [22] NoLinePragmas.cshtml) - while(i <= 10) {\n    
+                CSharpStatement - (26:4,1 [22] NoLinePragmas.cshtml)
+                    RazorIRToken - (26:4,1 [22] NoLinePragmas.cshtml) - CSharp - while(i <= 10) {\n    
                 HtmlContent - (48:5,4 [19] NoLinePragmas.cshtml) - <p>Hello from C#, #
                 CSharpExpression - (69:5,25 [1] NoLinePragmas.cshtml)
                     RazorIRToken - (69:5,25 [1] NoLinePragmas.cshtml) - CSharp - i
                 HtmlContent - (71:5,27 [4] NoLinePragmas.cshtml) - </p>
-                CSharpStatement - (75:5,31 [16] NoLinePragmas.cshtml) - \n    i += 1;\n}
+                CSharpStatement - (75:5,31 [16] NoLinePragmas.cshtml)
+                    RazorIRToken - (75:5,31 [16] NoLinePragmas.cshtml) - CSharp - \n    i += 1;\n}
                 HtmlContent - (91:7,1 [4] NoLinePragmas.cshtml) - \n\n
-                CSharpStatement - (96:9,1 [19] NoLinePragmas.cshtml) - if(i == 11) {\n    
+                CSharpStatement - (96:9,1 [19] NoLinePragmas.cshtml)
+                    RazorIRToken - (96:9,1 [19] NoLinePragmas.cshtml) - CSharp - if(i == 11) {\n    
                 HtmlContent - (115:10,4 [25] NoLinePragmas.cshtml) - <p>We wrote 10 lines!</p>
-                CSharpStatement - (140:10,29 [3] NoLinePragmas.cshtml) - \n}
+                CSharpStatement - (140:10,29 [3] NoLinePragmas.cshtml)
+                    RazorIRToken - (140:10,29 [3] NoLinePragmas.cshtml) - CSharp - \n}
                 HtmlContent - (143:11,1 [4] NoLinePragmas.cshtml) - \n\n
-                CSharpStatement - (148:13,1 [35] NoLinePragmas.cshtml) - switch(i) {\n    case 11:\n        
+                CSharpStatement - (148:13,1 [35] NoLinePragmas.cshtml)
+                    RazorIRToken - (148:13,1 [35] NoLinePragmas.cshtml) - CSharp - switch(i) {\n    case 11:\n        
                 HtmlContent - (183:15,8 [36] NoLinePragmas.cshtml) - <p>No really, we wrote 10 lines!</p>
-                CSharpStatement - (219:15,44 [40] NoLinePragmas.cshtml) - \n        break;\n    default:\n        
+                CSharpStatement - (219:15,44 [40] NoLinePragmas.cshtml)
+                    RazorIRToken - (219:15,44 [40] NoLinePragmas.cshtml) - CSharp - \n        break;\n    default:\n        
                 HtmlContent - (259:18,8 [29] NoLinePragmas.cshtml) - <p>Actually, we didn't...</p>
-                CSharpStatement - (288:18,37 [19] NoLinePragmas.cshtml) - \n        break;\n}
+                CSharpStatement - (288:18,37 [19] NoLinePragmas.cshtml)
+                    RazorIRToken - (288:18,37 [19] NoLinePragmas.cshtml) - CSharp - \n        break;\n}
                 HtmlContent - (307:20,1 [4] NoLinePragmas.cshtml) - \n\n
-                CSharpStatement - (312:22,1 [39] NoLinePragmas.cshtml) - for(int j = 1; j <= 10; j += 2) {\n    
+                CSharpStatement - (312:22,1 [39] NoLinePragmas.cshtml)
+                    RazorIRToken - (312:22,1 [39] NoLinePragmas.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n    
                 HtmlContent - (351:23,4 [25] NoLinePragmas.cshtml) - <p>Hello again from C#, #
                 CSharpExpression - (378:23,31 [1] NoLinePragmas.cshtml)
                     RazorIRToken - (378:23,31 [1] NoLinePragmas.cshtml) - CSharp - j
                 HtmlContent - (380:23,33 [4] NoLinePragmas.cshtml) - </p>
-                CSharpStatement - (384:23,37 [3] NoLinePragmas.cshtml) - \n}
+                CSharpStatement - (384:23,37 [3] NoLinePragmas.cshtml)
+                    RazorIRToken - (384:23,37 [3] NoLinePragmas.cshtml) - CSharp - \n}
                 HtmlContent - (387:24,1 [4] NoLinePragmas.cshtml) - \n\n
-                CSharpStatement - (392:26,1 [11] NoLinePragmas.cshtml) - try {\n    
+                CSharpStatement - (392:26,1 [11] NoLinePragmas.cshtml)
+                    RazorIRToken - (392:26,1 [11] NoLinePragmas.cshtml) - CSharp - try {\n    
                 HtmlContent - (403:27,4 [35] NoLinePragmas.cshtml) - <p>That time, we wrote 5 lines!</p>
-                CSharpStatement - (438:27,39 [31] NoLinePragmas.cshtml) - \n} catch(Exception ex) {\n    
+                CSharpStatement - (438:27,39 [31] NoLinePragmas.cshtml)
+                    RazorIRToken - (438:27,39 [31] NoLinePragmas.cshtml) - CSharp - \n} catch(Exception ex) {\n    
                 HtmlContent - (469:29,4 [29] NoLinePragmas.cshtml) - <p>Oh no! An error occurred: 
                 CSharpExpression - (500:29,35 [10] NoLinePragmas.cshtml)
                     RazorIRToken - (500:29,35 [10] NoLinePragmas.cshtml) - CSharp - ex.Message
                 HtmlContent - (511:29,46 [4] NoLinePragmas.cshtml) - </p>
-                CSharpStatement - (515:29,50 [7] NoLinePragmas.cshtml) - \n}\n\n
-                CSharpStatement - (556:32,34 [0] NoLinePragmas.cshtml) - 
+                CSharpStatement - (515:29,50 [7] NoLinePragmas.cshtml)
+                    RazorIRToken - (515:29,50 [7] NoLinePragmas.cshtml) - CSharp - \n}\n\n
+                CSharpStatement - (556:32,34 [0] NoLinePragmas.cshtml)
+                    RazorIRToken - (556:32,34 [0] NoLinePragmas.cshtml) - CSharp - 
                 HtmlContent - (556:32,34 [14] NoLinePragmas.cshtml) - \n<p>i is now 
                 CSharpExpression - (571:33,13 [1] NoLinePragmas.cshtml)
                     RazorIRToken - (571:33,13 [1] NoLinePragmas.cshtml) - CSharp - i
                 HtmlContent - (572:33,14 [8] NoLinePragmas.cshtml) - </p>\n\n
-                CSharpStatement - (581:35,1 [26] NoLinePragmas.cshtml) - lock(new object()) {\n    
+                CSharpStatement - (581:35,1 [26] NoLinePragmas.cshtml)
+                    RazorIRToken - (581:35,1 [26] NoLinePragmas.cshtml) - CSharp - lock(new object()) {\n    
                 HtmlContent - (607:36,4 [47] NoLinePragmas.cshtml) - <p>This block is locked, for your security!</p>
-                CSharpStatement - (654:36,51 [3] NoLinePragmas.cshtml) - \n}
+                CSharpStatement - (654:36,51 [3] NoLinePragmas.cshtml)
+                    RazorIRToken - (654:36,51 [3] NoLinePragmas.cshtml) - CSharp - \n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs
index 3e01a1782b..23489d920f 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.codegen.cs
@@ -13,14 +13,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
   
     int i = 1;
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
  while(i <= 10) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Hello from C#, #");
@@ -34,21 +32,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
     i += 1;
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
  if(i == 11) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>We wrote 10 lines!</p>\r\n");
 #line 12 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
@@ -56,7 +51,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
  switch(i) {
     case 11:
 
-
 #line default
 #line hidden
             WriteLiteral("        <p>No really, we wrote 10 lines!</p>\r\n");
@@ -64,7 +58,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         break;
     default:
 
-
 #line default
 #line hidden
             WriteLiteral("        <p>Actually, we didn\'t...</p>\r\n");
@@ -72,14 +65,12 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         break;
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 23 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
  for(int j = 1; j <= 10; j += 2) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Hello again from C#, #");
@@ -92,21 +83,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
 }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
 #line 27 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
  try {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>That time, we wrote 5 lines!</p>\r\n");
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
 } catch(Exception ex) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>Oh no! An error occurred: ");
@@ -120,7 +108,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 }
 
 
-
 #line default
 #line hidden
             WriteLiteral("<p>i is now ");
@@ -133,7 +120,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 36 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas.cshtml"
  lock(new object()) {
 
-
 #line default
 #line hidden
             WriteLiteral("    <p>This block is locked, for your security!</p>\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt
index f81a404a97..4de23018cf 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_Runtime.ir.txt
@@ -5,45 +5,61 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NoLinePragmas_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [18] NoLinePragmas.cshtml) - \n    int i = 1;\n
+                CSharpStatement - (2:0,2 [18] NoLinePragmas.cshtml)
+                    RazorIRToken - (2:0,2 [18] NoLinePragmas.cshtml) - CSharp - \n    int i = 1;\n
                 HtmlContent - (23:3,0 [2] NoLinePragmas.cshtml) - \n
-                CSharpStatement - (26:4,1 [18] NoLinePragmas.cshtml) - while(i <= 10) {\n
+                CSharpStatement - (26:4,1 [18] NoLinePragmas.cshtml)
+                    RazorIRToken - (26:4,1 [18] NoLinePragmas.cshtml) - CSharp - while(i <= 10) {\n
                 HtmlContent - (44:5,0 [23] NoLinePragmas.cshtml) -     <p>Hello from C#, #
                 CSharpExpression - (69:5,25 [1] NoLinePragmas.cshtml)
                     RazorIRToken - (69:5,25 [1] NoLinePragmas.cshtml) - CSharp - i
                 HtmlContent - (71:5,27 [6] NoLinePragmas.cshtml) - </p>\n
-                CSharpStatement - (77:6,0 [16] NoLinePragmas.cshtml) -     i += 1;\n}\n
+                CSharpStatement - (77:6,0 [16] NoLinePragmas.cshtml)
+                    RazorIRToken - (77:6,0 [16] NoLinePragmas.cshtml) - CSharp -     i += 1;\n}\n
                 HtmlContent - (93:8,0 [2] NoLinePragmas.cshtml) - \n
-                CSharpStatement - (96:9,1 [15] NoLinePragmas.cshtml) - if(i == 11) {\n
+                CSharpStatement - (96:9,1 [15] NoLinePragmas.cshtml)
+                    RazorIRToken - (96:9,1 [15] NoLinePragmas.cshtml) - CSharp - if(i == 11) {\n
                 HtmlContent - (111:10,0 [31] NoLinePragmas.cshtml) -     <p>We wrote 10 lines!</p>\n
-                CSharpStatement - (142:11,0 [3] NoLinePragmas.cshtml) - }\n
+                CSharpStatement - (142:11,0 [3] NoLinePragmas.cshtml)
+                    RazorIRToken - (142:11,0 [3] NoLinePragmas.cshtml) - CSharp - }\n
                 HtmlContent - (145:12,0 [2] NoLinePragmas.cshtml) - \n
-                CSharpStatement - (148:13,1 [27] NoLinePragmas.cshtml) - switch(i) {\n    case 11:\n
+                CSharpStatement - (148:13,1 [27] NoLinePragmas.cshtml)
+                    RazorIRToken - (148:13,1 [27] NoLinePragmas.cshtml) - CSharp - switch(i) {\n    case 11:\n
                 HtmlContent - (175:15,0 [46] NoLinePragmas.cshtml) -         <p>No really, we wrote 10 lines!</p>\n
-                CSharpStatement - (221:16,0 [30] NoLinePragmas.cshtml) -         break;\n    default:\n
+                CSharpStatement - (221:16,0 [30] NoLinePragmas.cshtml)
+                    RazorIRToken - (221:16,0 [30] NoLinePragmas.cshtml) - CSharp -         break;\n    default:\n
                 HtmlContent - (251:18,0 [39] NoLinePragmas.cshtml) -         <p>Actually, we didn't...</p>\n
-                CSharpStatement - (290:19,0 [19] NoLinePragmas.cshtml) -         break;\n}\n
+                CSharpStatement - (290:19,0 [19] NoLinePragmas.cshtml)
+                    RazorIRToken - (290:19,0 [19] NoLinePragmas.cshtml) - CSharp -         break;\n}\n
                 HtmlContent - (309:21,0 [2] NoLinePragmas.cshtml) - \n
-                CSharpStatement - (312:22,1 [35] NoLinePragmas.cshtml) - for(int j = 1; j <= 10; j += 2) {\n
+                CSharpStatement - (312:22,1 [35] NoLinePragmas.cshtml)
+                    RazorIRToken - (312:22,1 [35] NoLinePragmas.cshtml) - CSharp - for(int j = 1; j <= 10; j += 2) {\n
                 HtmlContent - (347:23,0 [29] NoLinePragmas.cshtml) -     <p>Hello again from C#, #
                 CSharpExpression - (378:23,31 [1] NoLinePragmas.cshtml)
                     RazorIRToken - (378:23,31 [1] NoLinePragmas.cshtml) - CSharp - j
                 HtmlContent - (380:23,33 [6] NoLinePragmas.cshtml) - </p>\n
-                CSharpStatement - (386:24,0 [3] NoLinePragmas.cshtml) - }\n
+                CSharpStatement - (386:24,0 [3] NoLinePragmas.cshtml)
+                    RazorIRToken - (386:24,0 [3] NoLinePragmas.cshtml) - CSharp - }\n
                 HtmlContent - (389:25,0 [2] NoLinePragmas.cshtml) - \n
-                CSharpStatement - (392:26,1 [7] NoLinePragmas.cshtml) - try {\n
+                CSharpStatement - (392:26,1 [7] NoLinePragmas.cshtml)
+                    RazorIRToken - (392:26,1 [7] NoLinePragmas.cshtml) - CSharp - try {\n
                 HtmlContent - (399:27,0 [41] NoLinePragmas.cshtml) -     <p>That time, we wrote 5 lines!</p>\n
-                CSharpStatement - (440:28,0 [25] NoLinePragmas.cshtml) - } catch(Exception ex) {\n
+                CSharpStatement - (440:28,0 [25] NoLinePragmas.cshtml)
+                    RazorIRToken - (440:28,0 [25] NoLinePragmas.cshtml) - CSharp - } catch(Exception ex) {\n
                 HtmlContent - (465:29,0 [33] NoLinePragmas.cshtml) -     <p>Oh no! An error occurred: 
                 CSharpExpression - (500:29,35 [10] NoLinePragmas.cshtml)
                     RazorIRToken - (500:29,35 [10] NoLinePragmas.cshtml) - CSharp - ex.Message
                 HtmlContent - (511:29,46 [6] NoLinePragmas.cshtml) - </p>\n
-                CSharpStatement - (517:30,0 [5] NoLinePragmas.cshtml) - }\n\n
-                CSharpStatement - (556:32,34 [2] NoLinePragmas.cshtml) - \n
+                CSharpStatement - (517:30,0 [5] NoLinePragmas.cshtml)
+                    RazorIRToken - (517:30,0 [5] NoLinePragmas.cshtml) - CSharp - }\n\n
+                CSharpStatement - (556:32,34 [2] NoLinePragmas.cshtml)
+                    RazorIRToken - (556:32,34 [2] NoLinePragmas.cshtml) - CSharp - \n
                 HtmlContent - (558:33,0 [12] NoLinePragmas.cshtml) - <p>i is now 
                 CSharpExpression - (571:33,13 [1] NoLinePragmas.cshtml)
                     RazorIRToken - (571:33,13 [1] NoLinePragmas.cshtml) - CSharp - i
                 HtmlContent - (572:33,14 [8] NoLinePragmas.cshtml) - </p>\n\n
-                CSharpStatement - (581:35,1 [22] NoLinePragmas.cshtml) - lock(new object()) {\n
+                CSharpStatement - (581:35,1 [22] NoLinePragmas.cshtml)
+                    RazorIRToken - (581:35,1 [22] NoLinePragmas.cshtml) - CSharp - lock(new object()) {\n
                 HtmlContent - (603:36,0 [53] NoLinePragmas.cshtml) -     <p>This block is locked, for your security!</p>\n
-                CSharpStatement - (656:37,0 [1] NoLinePragmas.cshtml) - }
+                CSharpStatement - (656:37,0 [1] NoLinePragmas.cshtml)
+                    RazorIRToken - (656:37,0 [1] NoLinePragmas.cshtml) - CSharp - }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt
index e871619c52..9a2c04a7a9 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.ir.txt
@@ -5,25 +5,35 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [6] NullConditionalExpressions.cshtml) - \n    
+                CSharpStatement - (2:0,2 [6] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (2:0,2 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
                 CSharpExpression - (9:1,5 [13] NullConditionalExpressions.cshtml)
                     RazorIRToken - (9:1,5 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data
-                CSharpStatement - (22:1,18 [6] NullConditionalExpressions.cshtml) - \n    
+                CSharpStatement - (22:1,18 [6] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (22:1,18 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
                 CSharpExpression - (29:2,5 [22] NullConditionalExpressions.cshtml)
                     RazorIRToken - (29:2,5 [22] NullConditionalExpressions.cshtml) - CSharp - ViewBag.IntIndexer?[0]
-                CSharpStatement - (51:2,27 [6] NullConditionalExpressions.cshtml) - \n    
+                CSharpStatement - (51:2,27 [6] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (51:2,27 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
                 CSharpExpression - (58:3,5 [26] NullConditionalExpressions.cshtml)
                     RazorIRToken - (58:3,5 [26] NullConditionalExpressions.cshtml) - CSharp - ViewBag.StrIndexer?["key"]
-                CSharpStatement - (84:3,31 [6] NullConditionalExpressions.cshtml) - \n    
+                CSharpStatement - (84:3,31 [6] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (84:3,31 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
                 CSharpExpression - (91:4,5 [41] NullConditionalExpressions.cshtml)
                     RazorIRToken - (91:4,5 [41] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Method(Value?[23]?.More)?["key"]
-                CSharpStatement - (132:4,46 [2] NullConditionalExpressions.cshtml) - \n
+                CSharpStatement - (132:4,46 [2] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (132:4,46 [2] NullConditionalExpressions.cshtml) - CSharp - \n
                 HtmlContent - (137:6,0 [2] NullConditionalExpressions.cshtml) - \n
                 CSharpExpression - (140:7,1 [13] NullConditionalExpressions.cshtml)
                     RazorIRToken - (140:7,1 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt
index efdb734e26..11c75c675e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_Runtime.ir.txt
@@ -5,19 +5,24 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_NullConditionalExpressions_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [6] NullConditionalExpressions.cshtml) - \n    
+                CSharpStatement - (2:0,2 [6] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (2:0,2 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
                 CSharpExpression - (9:1,5 [13] NullConditionalExpressions.cshtml)
                     RazorIRToken - (9:1,5 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data
-                CSharpStatement - (22:1,18 [6] NullConditionalExpressions.cshtml) - \n    
+                CSharpStatement - (22:1,18 [6] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (22:1,18 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
                 CSharpExpression - (29:2,5 [22] NullConditionalExpressions.cshtml)
                     RazorIRToken - (29:2,5 [22] NullConditionalExpressions.cshtml) - CSharp - ViewBag.IntIndexer?[0]
-                CSharpStatement - (51:2,27 [6] NullConditionalExpressions.cshtml) - \n    
+                CSharpStatement - (51:2,27 [6] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (51:2,27 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
                 CSharpExpression - (58:3,5 [26] NullConditionalExpressions.cshtml)
                     RazorIRToken - (58:3,5 [26] NullConditionalExpressions.cshtml) - CSharp - ViewBag.StrIndexer?["key"]
-                CSharpStatement - (84:3,31 [6] NullConditionalExpressions.cshtml) - \n    
+                CSharpStatement - (84:3,31 [6] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (84:3,31 [6] NullConditionalExpressions.cshtml) - CSharp - \n    
                 CSharpExpression - (91:4,5 [41] NullConditionalExpressions.cshtml)
                     RazorIRToken - (91:4,5 [41] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Method(Value?[23]?.More)?["key"]
-                CSharpStatement - (132:4,46 [2] NullConditionalExpressions.cshtml) - \n
+                CSharpStatement - (132:4,46 [2] NullConditionalExpressions.cshtml)
+                    RazorIRToken - (132:4,46 [2] NullConditionalExpressions.cshtml) - CSharp - \n
                 HtmlContent - (137:6,0 [2] NullConditionalExpressions.cshtml) - \n
                 CSharpExpression - (140:7,1 [13] NullConditionalExpressions.cshtml)
                     RazorIRToken - (140:7,1 [13] NullConditionalExpressions.cshtml) - CSharp - ViewBag?.Data
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt
index eaef5fcb2f..f27432b4cf 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.ir.txt
@@ -5,15 +5,23 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_OpenedIf_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [16] OpenedIf.cshtml) - <html>\n<body>\n
-                CSharpStatement - (17:2,1 [14] OpenedIf.cshtml) - if (true) { \n
+                CSharpStatement - (17:2,1 [14] OpenedIf.cshtml)
+                    RazorIRToken - (17:2,1 [14] OpenedIf.cshtml) - CSharp - if (true) { \n
                 HtmlContent - (31:3,0 [7] OpenedIf.cshtml) - </body>
-                CSharpStatement - (38:3,7 [2] OpenedIf.cshtml) - \n
+                CSharpStatement - (38:3,7 [2] OpenedIf.cshtml)
+                    RazorIRToken - (38:3,7 [2] OpenedIf.cshtml) - CSharp - \n
                 HtmlContent - (40:4,0 [7] OpenedIf.cshtml) - </html>
-                CSharpStatement - (47:4,7 [0] OpenedIf.cshtml) - 
+                CSharpStatement - (47:4,7 [0] OpenedIf.cshtml)
+                    RazorIRToken - (47:4,7 [0] OpenedIf.cshtml) - CSharp - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs
index 2a43374e20..e88a7894ab 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs
@@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf.cshtml"
  if (true) { 
 
-
 #line default
 #line hidden
             WriteLiteral("</body>\r\n</html>");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt
index 9c6047c6f1..23754693d2 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.ir.txt
@@ -6,6 +6,8 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_OpenedIf_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [16] OpenedIf.cshtml) - <html>\n<body>\n
-                CSharpStatement - (17:2,1 [14] OpenedIf.cshtml) - if (true) { \n
+                CSharpStatement - (17:2,1 [14] OpenedIf.cshtml)
+                    RazorIRToken - (17:2,1 [14] OpenedIf.cshtml) - CSharp - if (true) { \n
                 HtmlContent - (31:3,0 [16] OpenedIf.cshtml) - </body>\n</html>
-                CSharpStatement - (47:4,7 [0] OpenedIf.cshtml) - 
+                CSharpStatement - (47:4,7 [0] OpenedIf.cshtml)
+                    RazorIRToken - (47:4,7 [0] OpenedIf.cshtml) - CSharp - 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt
index 0fd06bc136..a0337479e3 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.ir.txt
@@ -5,10 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [31] ParserError.cshtml) - \n/*\nint i =10;\nint j =20;\n}
+                CSharpStatement - (2:0,2 [31] ParserError.cshtml)
+                    RazorIRToken - (2:0,2 [31] ParserError.cshtml) - CSharp - \n/*\nint i =10;\nint j =20;\n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt
index ffdbfae972..9ae5975ee1 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.ir.txt
@@ -5,4 +5,5 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ParserError_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [31] ParserError.cshtml) - \n/*\nint i =10;\nint j =20;\n}
+                CSharpStatement - (2:0,2 [31] ParserError.cshtml)
+                    RazorIRToken - (2:0,2 [31] ParserError.cshtml) - CSharp - \n/*\nint i =10;\nint j =20;\n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt
index 96cbb51982..9f5272c849 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_DesignTime.ir.txt
@@ -5,16 +5,22 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PrefixedAttributeTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] PrefixedAttributeTagHelpers.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.InputTagHelper1 - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] PrefixedAttributeTagHelpers.cshtml) - \n\n
-                CSharpStatement - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) - \n    var literate = "or illiterate";\n    var intDictionary = new Dictionary<string, int>\n    {\n        { "three", 3 },\n    };\n    var stringDictionary = new SortedDictionary<string, string>\n    {\n        { "name", "value" },\n    };\n
+                CSharpStatement - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml)
+                    RazorIRToken - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) - CSharp - \n    var literate = "or illiterate";\n    var intDictionary = new Dictionary<string, int>\n    {\n        { "three", 3 },\n    };\n    var stringDictionary = new SortedDictionary<string, string>\n    {\n        { "name", "value" },\n    };\n
                 HtmlContent - (282:13,0 [49] PrefixedAttributeTagHelpers.cshtml) - \n<div class="randomNonTagHelperAttribute">\n    
                 TagHelper - (331:15,4 [92] PrefixedAttributeTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - input - TagMode.SelfClosing
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
index 75e8545cf5..5f0d1f81e1 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.codegen.cs
@@ -49,7 +49,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         { "name", "value" },
     };
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n<div class=\"randomNonTagHelperAttribute\">\r\n    ");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt
index e208a57e2a..447d3ab5e2 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PrefixedAttributeTagHelpers_Runtime.ir.txt
@@ -14,7 +14,8 @@ Document -
             DeclareTagHelperFields -  - TestNamespace.InputTagHelper1 - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (33:1,0 [2] PrefixedAttributeTagHelpers.cshtml) - \n
-                CSharpStatement - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) - \n    var literate = "or illiterate";\n    var intDictionary = new Dictionary<string, int>\n    {\n        { "three", 3 },\n    };\n    var stringDictionary = new SortedDictionary<string, string>\n    {\n        { "name", "value" },\n    };\n
+                CSharpStatement - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml)
+                    RazorIRToken - (37:2,2 [242] PrefixedAttributeTagHelpers.cshtml) - CSharp - \n    var literate = "or illiterate";\n    var intDictionary = new Dictionary<string, int>\n    {\n        { "three", 3 },\n    };\n    var stringDictionary = new SortedDictionary<string, string>\n    {\n        { "name", "value" },\n    };\n
                 HtmlContent - (282:13,0 [49] PrefixedAttributeTagHelpers.cshtml) - \n<div class="randomNonTagHelperAttribute">\n    
                 TagHelper - (331:15,4 [92] PrefixedAttributeTagHelpers.cshtml)
                     InitializeTagHelperStructure -  - input - TagMode.SelfClosing
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
index 75b7b3474d..d8a5755810 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.ir.txt
@@ -5,19 +5,28 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorComments_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (36:0,36 [17] RazorComments.cshtml) - \n<p>This should 
                 HtmlContent - (62:1,24 [17] RazorComments.cshtml) -  be shown</p>\n\n
-                CSharpStatement - (81:3,2 [6] RazorComments.cshtml) - \n    
-                CSharpStatement - (122:4,39 [22] RazorComments.cshtml) - \n    Exception foo = 
-                CSharpStatement - (173:5,49 [58] RazorComments.cshtml) -  null;\n    if(foo != null) {\n        throw foo;\n    }\n
+                CSharpStatement - (81:3,2 [6] RazorComments.cshtml)
+                    RazorIRToken - (81:3,2 [6] RazorComments.cshtml) - CSharp - \n    
+                CSharpStatement - (122:4,39 [22] RazorComments.cshtml)
+                    RazorIRToken - (122:4,39 [22] RazorComments.cshtml) - CSharp - \n    Exception foo = 
+                CSharpStatement - (173:5,49 [58] RazorComments.cshtml)
+                    RazorIRToken - (173:5,49 [58] RazorComments.cshtml) - CSharp -  null;\n    if(foo != null) {\n        throw foo;\n    }\n
                 HtmlContent - (234:10,0 [2] RazorComments.cshtml) - \n
-                CSharpStatement - (238:11,2 [24] RazorComments.cshtml) -  var bar = "@* bar *@"; 
+                CSharpStatement - (238:11,2 [24] RazorComments.cshtml)
+                    RazorIRToken - (238:11,2 [24] RazorComments.cshtml) - CSharp -  var bar = "@* bar *@"; 
                 HtmlContent - (265:12,0 [44] RazorComments.cshtml) - <p>But this should show the comment syntax: 
                 CSharpExpression - (310:12,45 [3] RazorComments.cshtml)
                     RazorIRToken - (310:12,45 [3] RazorComments.cshtml) - CSharp - bar
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
index a13d5273e9..607469653c 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.codegen.cs
@@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
         throw foo;
     }
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
index 8c8dbce5b9..07b533def8 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_Runtime.ir.txt
@@ -7,11 +7,15 @@ Document -
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (36:0,36 [17] RazorComments.cshtml) - \n<p>This should 
                 HtmlContent - (62:1,24 [17] RazorComments.cshtml) -  be shown</p>\n\n
-                CSharpStatement - (81:3,2 [6] RazorComments.cshtml) - \n    
-                CSharpStatement - (122:4,39 [22] RazorComments.cshtml) - \n    Exception foo = 
-                CSharpStatement - (173:5,49 [58] RazorComments.cshtml) -  null;\n    if(foo != null) {\n        throw foo;\n    }\n
+                CSharpStatement - (81:3,2 [6] RazorComments.cshtml)
+                    RazorIRToken - (81:3,2 [6] RazorComments.cshtml) - CSharp - \n    
+                CSharpStatement - (122:4,39 [22] RazorComments.cshtml)
+                    RazorIRToken - (122:4,39 [22] RazorComments.cshtml) - CSharp - \n    Exception foo = 
+                CSharpStatement - (173:5,49 [58] RazorComments.cshtml)
+                    RazorIRToken - (173:5,49 [58] RazorComments.cshtml) - CSharp -  null;\n    if(foo != null) {\n        throw foo;\n    }\n
                 HtmlContent - (234:10,0 [2] RazorComments.cshtml) - \n
-                CSharpStatement - (238:11,2 [24] RazorComments.cshtml) -  var bar = "@* bar *@"; 
+                CSharpStatement - (238:11,2 [24] RazorComments.cshtml)
+                    RazorIRToken - (238:11,2 [24] RazorComments.cshtml) - CSharp -  var bar = "@* bar *@"; 
                 HtmlContent - (265:12,0 [44] RazorComments.cshtml) - <p>But this should show the comment syntax: 
                 CSharpExpression - (310:12,45 [3] RazorComments.cshtml)
                     RazorIRToken - (310:12,45 [3] RazorComments.cshtml) - CSharp - bar
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt
index eda8fc329d..af499a1cba 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.ir.txt
@@ -5,11 +5,16 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RemoveTagHelperDirective_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (17:0,17 [15] RemoveTagHelperDirective.cshtml) - *, TestAssembly
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (32:0,32 [2] RemoveTagHelperDirective.cshtml) - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
index c0a6faaa1b..589ee4f7ad 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.ir.txt
@@ -5,18 +5,25 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (89:6,9 [8] Sections.cshtml) - Section2
                 DirectiveToken - (172:10,9 [8] Sections.cshtml) - Section1
                 DirectiveToken - (235:14,9 [15] Sections.cshtml) - NestedDelegates
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [44] Sections.cshtml) - \n    Layout = "_SectionTestLayout.cshtml"\n
+                CSharpStatement - (2:0,2 [44] Sections.cshtml)
+                    RazorIRToken - (2:0,2 [44] Sections.cshtml) - CSharp - \n    Layout = "_SectionTestLayout.cshtml"\n
                 HtmlContent - (49:3,0 [31] Sections.cshtml) - \n<div>This is in the Body>\n\n
-                CSharpStatement -  - DefineSection("Section2", async (__razor_section_writer) => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("Section2", async (__razor_section_writer) => {
                 HtmlContent - (99:6,19 [10] Sections.cshtml) - \n    <div
                 HtmlAttribute - (109:7,8 [20] Sections.cshtml) -  class=" - "
                     HtmlAttributeValue - (117:7,16 [4] Sections.cshtml) -  - some
@@ -24,19 +31,26 @@ Document -
                         CSharpExpression - (123:7,22 [5] Sections.cshtml)
                             RazorIRToken - (123:7,22 [5] Sections.cshtml) - CSharp - thing
                 HtmlContent - (129:7,28 [29] Sections.cshtml) - >This is in Section 2</div>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (159:8,1 [4] Sections.cshtml) - \n\n
-                CSharpStatement -  - DefineSection("Section1", async (__razor_section_writer) => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("Section1", async (__razor_section_writer) => {
                 HtmlContent - (182:10,19 [39] Sections.cshtml) - \n    <div>This is in Section 1</div>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (222:12,1 [4] Sections.cshtml) - \n\n
-                CSharpStatement -  - DefineSection("NestedDelegates", async (__razor_section_writer) => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("NestedDelegates", async (__razor_section_writer) => {
                 HtmlContent - (252:14,26 [6] Sections.cshtml) - \n    
-                CSharpStatement - (260:15,6 [27] Sections.cshtml) -  Func<dynamic, object> f = 
+                CSharpStatement - (260:15,6 [27] Sections.cshtml)
+                    RazorIRToken - (260:15,6 [27] Sections.cshtml) - CSharp -  Func<dynamic, object> f = 
                 Template - (288:15,34 [17] Sections.cshtml)
                     HtmlContent - (288:15,34 [6] Sections.cshtml) - <span>
                     CSharpExpression - (295:15,41 [4] Sections.cshtml)
                         RazorIRToken - (295:15,41 [4] Sections.cshtml) - CSharp - item
                     HtmlContent - (299:15,45 [7] Sections.cshtml) - </span>
-                CSharpStatement - (306:15,52 [2] Sections.cshtml) - ; 
-                CSharpStatement -  - });
+                CSharpStatement - (306:15,52 [2] Sections.cshtml)
+                    RazorIRToken - (306:15,52 [2] Sections.cshtml) - CSharp - ; 
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
index 3e458fffac..971b3bf4f5 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
   
     Layout = "_SectionTestLayout.cshtml"
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n<div>This is in the Body>\r\n\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
index 93b8d9caa5..b46840c529 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -5,9 +5,11 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [44] Sections.cshtml) - \n    Layout = "_SectionTestLayout.cshtml"\n
+                CSharpStatement - (2:0,2 [44] Sections.cshtml)
+                    RazorIRToken - (2:0,2 [44] Sections.cshtml) - CSharp - \n    Layout = "_SectionTestLayout.cshtml"\n
                 HtmlContent - (49:3,0 [31] Sections.cshtml) - \n<div>This is in the Body>\n\n
-                CSharpStatement -  - DefineSection("Section2", async () => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("Section2", async () => {
                 HtmlContent - (99:6,19 [10] Sections.cshtml) - \n    <div
                 HtmlAttribute - (109:7,8 [20] Sections.cshtml) -  class=" - "
                     HtmlAttributeValue - (117:7,16 [4] Sections.cshtml) -  - some
@@ -15,20 +17,28 @@ Document -
                         CSharpExpression - (123:7,22 [5] Sections.cshtml)
                             RazorIRToken - (123:7,22 [5] Sections.cshtml) - CSharp - thing
                 HtmlContent - (129:7,28 [29] Sections.cshtml) - >This is in Section 2</div>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (161:9,0 [2] Sections.cshtml) - \n
-                CSharpStatement -  - DefineSection("Section1", async () => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("Section1", async () => {
                 HtmlContent - (182:10,19 [39] Sections.cshtml) - \n    <div>This is in Section 1</div>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (224:13,0 [2] Sections.cshtml) - \n
-                CSharpStatement -  - DefineSection("NestedDelegates", async () => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("NestedDelegates", async () => {
                 HtmlContent - (252:14,26 [2] Sections.cshtml) - \n
-                CSharpStatement - (254:15,0 [4] Sections.cshtml) -     
-                CSharpStatement - (260:15,6 [27] Sections.cshtml) -  Func<dynamic, object> f = 
+                CSharpStatement - (254:15,0 [4] Sections.cshtml)
+                    RazorIRToken - (254:15,0 [4] Sections.cshtml) - CSharp -     
+                CSharpStatement - (260:15,6 [27] Sections.cshtml)
+                    RazorIRToken - (260:15,6 [27] Sections.cshtml) - CSharp -  Func<dynamic, object> f = 
                 Template - (288:15,34 [17] Sections.cshtml)
                     HtmlContent - (288:15,34 [6] Sections.cshtml) - <span>
                     CSharpExpression - (295:15,41 [4] Sections.cshtml)
                         RazorIRToken - (295:15,41 [4] Sections.cshtml) - CSharp - item
                     HtmlContent - (299:15,45 [7] Sections.cshtml) - </span>
-                CSharpStatement - (306:15,52 [2] Sections.cshtml) - ; 
-                CSharpStatement -  - });
+                CSharpStatement - (306:15,52 [2] Sections.cshtml)
+                    RazorIRToken - (306:15,52 [2] Sections.cshtml) - CSharp - ; 
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt
index 547abac5c6..d93cb8e677 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleTagHelpers_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleTagHelpers_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [15] SimpleTagHelpers.cshtml) - *, TestAssembly
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - InputTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (29:0,29 [27] SimpleTagHelpers.cshtml) - \n<p>Hola</p>\n<form>\n    
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt
index b46d220c4c..3504bb576c 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.ir.txt
@@ -5,12 +5,19 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (1:0,1 [15] SimpleUnspacedIf.cshtml) - if (true)\n{\n	
+                CSharpStatement - (1:0,1 [15] SimpleUnspacedIf.cshtml)
+                    RazorIRToken - (1:0,1 [15] SimpleUnspacedIf.cshtml) - CSharp - if (true)\n{\n	
                 HtmlContent - (16:2,1 [11] SimpleUnspacedIf.cshtml) - <div></div>
-                CSharpStatement - (27:2,12 [3] SimpleUnspacedIf.cshtml) - \n}
+                CSharpStatement - (27:2,12 [3] SimpleUnspacedIf.cshtml)
+                    RazorIRToken - (27:2,12 [3] SimpleUnspacedIf.cshtml) - CSharp - \n}
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs
index f7135ff6bb..a6d76ad5f8 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.codegen.cs
@@ -13,7 +13,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
  if (true)
 {
 
-
 #line default
 #line hidden
             WriteLiteral("\t<div></div>\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt
index c1681734d9..6399e8c292 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_Runtime.ir.txt
@@ -5,6 +5,8 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SimpleUnspacedIf_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (1:0,1 [14] SimpleUnspacedIf.cshtml) - if (true)\n{\n
+                CSharpStatement - (1:0,1 [14] SimpleUnspacedIf.cshtml)
+                    RazorIRToken - (1:0,1 [14] SimpleUnspacedIf.cshtml) - CSharp - if (true)\n{\n
                 HtmlContent - (15:2,0 [14] SimpleUnspacedIf.cshtml) - 	<div></div>\n
-                CSharpStatement - (29:3,0 [1] SimpleUnspacedIf.cshtml) - }
+                CSharpStatement - (29:3,0 [1] SimpleUnspacedIf.cshtml)
+                    RazorIRToken - (29:3,0 [1] SimpleUnspacedIf.cshtml) - CSharp - }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt
index 22eb427b68..f09be288fb 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelperWithNewlineBeforeAttributes_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelperWithNewlineBeforeAttributes_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] SingleTagHelperWithNewlineBeforeAttributes.cshtml) - \n\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt
index d740e95b3e..3c339ce4ab 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleTagHelper_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SingleTagHelper_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] SingleTagHelper.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] SingleTagHelper.cshtml) - \n\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt
index b6b125bd66..2574ec1ba3 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.ir.txt
@@ -5,20 +5,29 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_StringLiterals_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (2022:85,9 [21] StringLiterals.cshtml) - WriteLiteralsToInHere
                 DirectiveToken - (5701:205,9 [25] StringLiterals.cshtml) - WriteLiteralsToInHereAlso
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [2013] StringLiterals.cshtml) - <p>This is line 1</p>\n<p>This is line 2</p>\n<p>This is line 3</p>\n<p>This is line 4</p>\n<p>This is line 5</p>\n<p>This is line 6</p>\n<p>This is line 7</p>\n<p>This is line 8</p>\n<p>This is line 9</p>\n<p>This is line 10</p>\n<p>This is line 11</p>\n<p>This is line 12</p>\n<p>This is line 13</p>\n<p>This is line 14</p>\n<p>This is line 15</p>\n<p>This is line 16</p>\n<p>This is line 17</p>\n<p>This is line 18</p>\n<p>This is line 19</p>\n<p>This is line 20</p>\n<p>This is line 21</p>\n<p>This is line 22</p>\n<p>This is line 23</p>\n<p>This is line 24</p>\n<p>This is line 25</p>\n<p>This is line 26</p>\n<p>This is line 27</p>\n<p>This is line 28</p>\n<p>This is line 29</p>\n<p>This is line 30</p>\n<p>This is line 31</p>\n<p>This is line 32</p>\n<p>This is line 33</p>\n<p>This is line 34</p>\n<p>This is line 35</p>\n<p>This is line 36</p>\n<p>This is line 37</p>\n<p>This is line 38</p>\n<p>This is line 39</p>\n<p>This is line 40</p>\n<p>This is line 41</p>\n<p>This is line 42</p>\n<p>This is line 43</p>\n<p>This is line 44</p>\n<p>This is line 45</p>\n<p>This is line 46</p>\n<p>This is line 47</p>\n<p>This is line 48</p>\n<p>This is line 49</p>\n<p>This is line 50</p>\n<p>This is line 51</p>\n<p>This is line 52</p>\n<p>This is line 53</p>\n<p>This is line 54</p>\n<p>This is line 55</p>\n<p>This is line 56</p>\n<p>This is line 57</p>\n<p>This is line 58</p>\n<p>This is line 59</p>\n<p>This is line 60</p>\n<p>This is line 61</p>\n<p>This is line 62</p>\n<p>This is line 63</p>\n<p>This is line 64</p>\n<p>This is line 65</p>\n<p>This is line 66</p>\n<p>This is line 67</p>\n<p>This is line 68</p>\n<p>This is line 69</p>\n<p>This is line 70</p>\n<p>This is line 71</p>\n<p>This is line 72</p>\n<p>This is line 73</p>\n<p>This is line 74</p>\n<p>This is line 75</p>\n<p>This is line 76</p>\n<p>This is line 77</p>\n<p>This is line 78</p>\n<p>This is line 79</p>\n<p>This is line 80</p>\n<p>This is line 81</p>\n<p>This is line 82</p>\n<p>This is line 83</p>\n<p>This is line 84</p><br>\n\n
-                CSharpStatement -  - DefineSection("WriteLiteralsToInHere", async (__razor_section_writer) => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("WriteLiteralsToInHere", async (__razor_section_writer) => {
                 HtmlContent - (2045:85,32 [2618] StringLiterals.cshtml) - \n    <p>This is line 1 nested</p>\n    <p>This is line 2 nested</p>\n    <p>This is line 3 nested</p>\n    <p>This is line 4 nested</p>\n    <p>This is line 5 nested</p>\n    <p>This is line 6 nested</p>\n    <p>This is line 7 nested</p>\n    <p>This is line 8 nested</p>\n    <p>This is line 9 nested</p>\n    <p>This is line 10 nested</p>\n    <p>This is line 11 nested</p>\n    <p>This is line 12 nested</p>\n    <p>This is line 13 nested</p>\n    <p>This is line 14 nested</p>\n    <p>This is line 15 nested</p>\n    <p>This is line 16 nested</p>\n    <p>This is line 17 nested</p>\n    <p>This is line 18 nested</p>\n    <p>This is line 19 nested</p>\n    <p>This is line 20 nested</p>\n    <p>This is line 21 nested</p>\n    <p>This is line 22 nested</p>\n    <p>This is line 23 nested</p>\n    <p>This is line 24 nested</p>\n    <p>This is line 25 nested</p>\n    <p>This is line 26 nested</p>\n    <p>This is line 27 nested</p>\n    <p>This is line 28 nested</p>\n    <p>This is line 29 nested</p>\n    <p>This is line 30 nested</p>\n    <p>This is line 31 nested</p>\n    <p>This is line 32 nested</p>\n    <p>This is line 33 nested</p>\n    <p>This is line 34 nested</p>\n    <p>This is line 35 nested</p>\n    <p>This is line 36 nested</p>\n    <p>This is line 37 nested</p>\n    <p>This is line 38 nested</p>\n    <p>This is line 39 nested</p>\n    <p>This is line 40 nested</p>\n    <p>This is line 41 nested</p>\n    <p>This is line 42 nested</p>\n    <p>This is line 43 nested</p>\n    <p>This is line 44 nested</p>\n    <p>This is line 45 nested</p>\n    <p>This is line 46 nested</p>\n    <p>This is line 47 nested</p>\n    <p>This is line 48 nested</p>\n    <p>This is line 49 nested</p>\n    <p>This is line 50 nested</p>\n    <p>This is line 51 nested</p>\n    <p>This is line 52 nested</p>\n    <p>This is line 53 nested</p>\n    <p>This is line 54 nested</p>\n    <p>This is line 55 nested</p>\n    <p>This is line 56 nested</p>\n    <p>This is line 57 nested</p>\n    <p>This is line 58 nested</p>\n    <p>This is line 59 nested</p>\n    <p>This is line 60 nested</p>\n    <p>This is line 61 nested</p>\n    <p>This is line 62 nested</p>\n    <p>This is line 63 nested</p>\n    <p>This is line 64 nested</p>\n    <p>This is line 65 nested</p>\n    <p>This is line 66 nested</p>\n    <p>This is line 67 nested</p>\n    <p>This is line 68 nested</p>\n    <p>This is line 69 nested</p>\n    <p>This is line 70 nested</p>\n    <p>This is line 71 nested</p>\n    <p>This is line 72 nested</p>\n    <p>This is line 73 nested</p>\n    <p>This is line 74 nested</p>\n    <p>This is line 75 nested</p>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (4664:161,1 [1028] StringLiterals.cshtml) - \n<p>This is line 1</p>\n<p>This is line 2</p>\n<p>This is line 3</p>\n<p>This is line 4</p>\n<p>This is line 5</p>\n<p>This is line 6</p>\n<p>This is line 7</p>\n<p>This is line 8</p>\n<p>This is line 9</p>\n<p>This is line 10</p>\n<p>This is line 11</p>\n<p>This is line 12</p>\n<p>This is line 13</p>\n<p>This is line 14</p>\n<p>This is line 15</p>\n<p>This is line 16</p>\n<p>This is line 17</p>\n<p>This is line 18</p>\n<p>This is line 19</p>\n<p>This is line 20</p>\n<p>This is line 21</p>\n<p>This is line 22</p>\n<p>This is line 23</p>\n<p>This is line 24</p>\n<p>This is line 25</p>\n<p>This is line 26</p>\n<p>This is line 27</p>\n<p>This is line 28</p>\n<p>This is line 29</p>\n<p>This is line 30</p>\n<p>This is line 31</p>\n<p>This is line 32</p>\n<p>This is line 33</p>\n<p>This is line 34</p>\n<p>This is line 35</p>\n<p>This is line 36</p>\n<p>This is line 37</p>\n<p>This is line 38</p>\n<p>This is line 39</p>\n<p>This is line 40</p>\n<p>This is line 41</p>\n<p>This is line 42</p>\n<p>This is line 43</p>hi!\n
-                CSharpStatement -  - DefineSection("WriteLiteralsToInHereAlso", async (__razor_section_writer) => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("WriteLiteralsToInHereAlso", async (__razor_section_writer) => {
                 HtmlContent - (5728:205,36 [1023] StringLiterals.cshtml) - \n    <p>This is line 1 nested</p>\n    <p>This is line 2 nested</p>\n    <p>This is line 3 nested</p>\n    <p>This is line 4 nested</p>\n    <p>This is line 5 nested</p>\n    <p>This is line 6 nested</p>\n    <p>This is line 7 nested</p>\n    <p>This is line 8 nested</p>\n    <p>This is line 9 nested</p>\n    <p>This is line 10 nested</p>\n    <p>This is line 11 nested</p>\n    <p>This is line 12 nested</p>\n    <p>This is line 13 nested</p>\n    <p>This is line 14 nested</p>\n    <p>This is line 15 nested</p>\n    <p>This is line 16 nested</p>\n    <p>This is line 17 nested</p>\n    <p>This is line 18 nested</p>\n    <p>This is line 19 nested</p>\n    <p>This is line 20 nested</p>\n    <p>This is line 21 nested</p>\n    <p>This is line 22 nested</p>\n    <p>This is line 23 nested</p>\n    <p>This is line 24 nested</p>\n    <p>This is line 25 nested</p>\n    <p>This is line 26 nested</p>\n    <p>This is line 27 nested</p>\n    <p>This is line 28 nested</p>\n    <p>This is line 29 nested</p>\n    <p>30</p>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (6752:236,1 [1] StringLiterals.cshtml) - !
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt
index a99c78a10f..4bf64a444c 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_Runtime.ir.txt
@@ -6,11 +6,15 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_StringLiterals_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (0:0,0 [2013] StringLiterals.cshtml) - <p>This is line 1</p>\n<p>This is line 2</p>\n<p>This is line 3</p>\n<p>This is line 4</p>\n<p>This is line 5</p>\n<p>This is line 6</p>\n<p>This is line 7</p>\n<p>This is line 8</p>\n<p>This is line 9</p>\n<p>This is line 10</p>\n<p>This is line 11</p>\n<p>This is line 12</p>\n<p>This is line 13</p>\n<p>This is line 14</p>\n<p>This is line 15</p>\n<p>This is line 16</p>\n<p>This is line 17</p>\n<p>This is line 18</p>\n<p>This is line 19</p>\n<p>This is line 20</p>\n<p>This is line 21</p>\n<p>This is line 22</p>\n<p>This is line 23</p>\n<p>This is line 24</p>\n<p>This is line 25</p>\n<p>This is line 26</p>\n<p>This is line 27</p>\n<p>This is line 28</p>\n<p>This is line 29</p>\n<p>This is line 30</p>\n<p>This is line 31</p>\n<p>This is line 32</p>\n<p>This is line 33</p>\n<p>This is line 34</p>\n<p>This is line 35</p>\n<p>This is line 36</p>\n<p>This is line 37</p>\n<p>This is line 38</p>\n<p>This is line 39</p>\n<p>This is line 40</p>\n<p>This is line 41</p>\n<p>This is line 42</p>\n<p>This is line 43</p>\n<p>This is line 44</p>\n<p>This is line 45</p>\n<p>This is line 46</p>\n<p>This is line 47</p>\n<p>This is line 48</p>\n<p>This is line 49</p>\n<p>This is line 50</p>\n<p>This is line 51</p>\n<p>This is line 52</p>\n<p>This is line 53</p>\n<p>This is line 54</p>\n<p>This is line 55</p>\n<p>This is line 56</p>\n<p>This is line 57</p>\n<p>This is line 58</p>\n<p>This is line 59</p>\n<p>This is line 60</p>\n<p>This is line 61</p>\n<p>This is line 62</p>\n<p>This is line 63</p>\n<p>This is line 64</p>\n<p>This is line 65</p>\n<p>This is line 66</p>\n<p>This is line 67</p>\n<p>This is line 68</p>\n<p>This is line 69</p>\n<p>This is line 70</p>\n<p>This is line 71</p>\n<p>This is line 72</p>\n<p>This is line 73</p>\n<p>This is line 74</p>\n<p>This is line 75</p>\n<p>This is line 76</p>\n<p>This is line 77</p>\n<p>This is line 78</p>\n<p>This is line 79</p>\n<p>This is line 80</p>\n<p>This is line 81</p>\n<p>This is line 82</p>\n<p>This is line 83</p>\n<p>This is line 84</p><br>\n\n
-                CSharpStatement -  - DefineSection("WriteLiteralsToInHere", async () => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("WriteLiteralsToInHere", async () => {
                 HtmlContent - (2045:85,32 [2618] StringLiterals.cshtml) - \n    <p>This is line 1 nested</p>\n    <p>This is line 2 nested</p>\n    <p>This is line 3 nested</p>\n    <p>This is line 4 nested</p>\n    <p>This is line 5 nested</p>\n    <p>This is line 6 nested</p>\n    <p>This is line 7 nested</p>\n    <p>This is line 8 nested</p>\n    <p>This is line 9 nested</p>\n    <p>This is line 10 nested</p>\n    <p>This is line 11 nested</p>\n    <p>This is line 12 nested</p>\n    <p>This is line 13 nested</p>\n    <p>This is line 14 nested</p>\n    <p>This is line 15 nested</p>\n    <p>This is line 16 nested</p>\n    <p>This is line 17 nested</p>\n    <p>This is line 18 nested</p>\n    <p>This is line 19 nested</p>\n    <p>This is line 20 nested</p>\n    <p>This is line 21 nested</p>\n    <p>This is line 22 nested</p>\n    <p>This is line 23 nested</p>\n    <p>This is line 24 nested</p>\n    <p>This is line 25 nested</p>\n    <p>This is line 26 nested</p>\n    <p>This is line 27 nested</p>\n    <p>This is line 28 nested</p>\n    <p>This is line 29 nested</p>\n    <p>This is line 30 nested</p>\n    <p>This is line 31 nested</p>\n    <p>This is line 32 nested</p>\n    <p>This is line 33 nested</p>\n    <p>This is line 34 nested</p>\n    <p>This is line 35 nested</p>\n    <p>This is line 36 nested</p>\n    <p>This is line 37 nested</p>\n    <p>This is line 38 nested</p>\n    <p>This is line 39 nested</p>\n    <p>This is line 40 nested</p>\n    <p>This is line 41 nested</p>\n    <p>This is line 42 nested</p>\n    <p>This is line 43 nested</p>\n    <p>This is line 44 nested</p>\n    <p>This is line 45 nested</p>\n    <p>This is line 46 nested</p>\n    <p>This is line 47 nested</p>\n    <p>This is line 48 nested</p>\n    <p>This is line 49 nested</p>\n    <p>This is line 50 nested</p>\n    <p>This is line 51 nested</p>\n    <p>This is line 52 nested</p>\n    <p>This is line 53 nested</p>\n    <p>This is line 54 nested</p>\n    <p>This is line 55 nested</p>\n    <p>This is line 56 nested</p>\n    <p>This is line 57 nested</p>\n    <p>This is line 58 nested</p>\n    <p>This is line 59 nested</p>\n    <p>This is line 60 nested</p>\n    <p>This is line 61 nested</p>\n    <p>This is line 62 nested</p>\n    <p>This is line 63 nested</p>\n    <p>This is line 64 nested</p>\n    <p>This is line 65 nested</p>\n    <p>This is line 66 nested</p>\n    <p>This is line 67 nested</p>\n    <p>This is line 68 nested</p>\n    <p>This is line 69 nested</p>\n    <p>This is line 70 nested</p>\n    <p>This is line 71 nested</p>\n    <p>This is line 72 nested</p>\n    <p>This is line 73 nested</p>\n    <p>This is line 74 nested</p>\n    <p>This is line 75 nested</p>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (4666:162,0 [1026] StringLiterals.cshtml) - <p>This is line 1</p>\n<p>This is line 2</p>\n<p>This is line 3</p>\n<p>This is line 4</p>\n<p>This is line 5</p>\n<p>This is line 6</p>\n<p>This is line 7</p>\n<p>This is line 8</p>\n<p>This is line 9</p>\n<p>This is line 10</p>\n<p>This is line 11</p>\n<p>This is line 12</p>\n<p>This is line 13</p>\n<p>This is line 14</p>\n<p>This is line 15</p>\n<p>This is line 16</p>\n<p>This is line 17</p>\n<p>This is line 18</p>\n<p>This is line 19</p>\n<p>This is line 20</p>\n<p>This is line 21</p>\n<p>This is line 22</p>\n<p>This is line 23</p>\n<p>This is line 24</p>\n<p>This is line 25</p>\n<p>This is line 26</p>\n<p>This is line 27</p>\n<p>This is line 28</p>\n<p>This is line 29</p>\n<p>This is line 30</p>\n<p>This is line 31</p>\n<p>This is line 32</p>\n<p>This is line 33</p>\n<p>This is line 34</p>\n<p>This is line 35</p>\n<p>This is line 36</p>\n<p>This is line 37</p>\n<p>This is line 38</p>\n<p>This is line 39</p>\n<p>This is line 40</p>\n<p>This is line 41</p>\n<p>This is line 42</p>\n<p>This is line 43</p>hi!\n
-                CSharpStatement -  - DefineSection("WriteLiteralsToInHereAlso", async () => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("WriteLiteralsToInHereAlso", async () => {
                 HtmlContent - (5728:205,36 [1023] StringLiterals.cshtml) - \n    <p>This is line 1 nested</p>\n    <p>This is line 2 nested</p>\n    <p>This is line 3 nested</p>\n    <p>This is line 4 nested</p>\n    <p>This is line 5 nested</p>\n    <p>This is line 6 nested</p>\n    <p>This is line 7 nested</p>\n    <p>This is line 8 nested</p>\n    <p>This is line 9 nested</p>\n    <p>This is line 10 nested</p>\n    <p>This is line 11 nested</p>\n    <p>This is line 12 nested</p>\n    <p>This is line 13 nested</p>\n    <p>This is line 14 nested</p>\n    <p>This is line 15 nested</p>\n    <p>This is line 16 nested</p>\n    <p>This is line 17 nested</p>\n    <p>This is line 18 nested</p>\n    <p>This is line 19 nested</p>\n    <p>This is line 20 nested</p>\n    <p>This is line 21 nested</p>\n    <p>This is line 22 nested</p>\n    <p>This is line 23 nested</p>\n    <p>This is line 24 nested</p>\n    <p>This is line 25 nested</p>\n    <p>This is line 26 nested</p>\n    <p>This is line 27 nested</p>\n    <p>This is line 28 nested</p>\n    <p>This is line 29 nested</p>\n    <p>30</p>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
                 HtmlContent - (6752:236,1 [1] StringLiterals.cshtml) - !
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt
index 31191d7861..715030963f 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SymbolBoundAttributes_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_SymbolBoundAttributes_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [15] SymbolBoundAttributes.cshtml) - *, TestAssembly
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.CatchAllTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (29:0,29 [255] SymbolBoundAttributes.cshtml) - \n\n<ul [item]="items"></ul>\n<ul [(item)]="items"></ul>\n<button (click)="doSomething()">Click Me</button>\n<button (^click)="doSomething()">Click Me</button>\n<template *something="value">\n</template>\n<div #local></div>\n<div #local="value"></div>\n\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
index 931412b894..8089b4ad81 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.codegen.cs
@@ -34,7 +34,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
   
     var code = "some code";
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt
index ba86c056ce..42289ac328 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersInSection_Runtime.ir.txt
@@ -7,9 +7,11 @@ Document -
             DeclareTagHelperFields -  - TestNamespace.MyTagHelper - TestNamespace.NestedTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (33:1,0 [2] TagHelpersInSection.cshtml) - \n
-                CSharpStatement - (37:2,2 [31] TagHelpersInSection.cshtml) - \n    var code = "some code";\n
+                CSharpStatement - (37:2,2 [31] TagHelpersInSection.cshtml)
+                    RazorIRToken - (37:2,2 [31] TagHelpersInSection.cshtml) - CSharp - \n    var code = "some code";\n
                 HtmlContent - (71:5,0 [2] TagHelpersInSection.cshtml) - \n
-                CSharpStatement -  - DefineSection("MySection", async () => {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - DefineSection("MySection", async () => {
                 HtmlContent - (93:6,20 [21] TagHelpersInSection.cshtml) - \n    <div>\n        
                 TagHelper - (114:8,8 [245] TagHelpersInSection.cshtml)
                     InitializeTagHelperStructure -  - mytaghelper - TagMode.StartTagAndEndTag
@@ -35,4 +37,5 @@ Document -
                                 RazorIRToken - (203:8,97 [12] TagHelpersInSection.cshtml) - CSharp - DateTime.Now
                     ExecuteTagHelpers - 
                 HtmlContent - (359:11,22 [14] TagHelpersInSection.cshtml) - \n    </div>\n
-                CSharpStatement -  - });
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - });
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt
index b0fedae995..3c64a6a19b 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithBoundAttributes_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithBoundAttributes_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [15] TagHelpersWithBoundAttributes.cshtml) - *, TestAssembly
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - InputTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (29:0,29 [14] TagHelpersWithBoundAttributes.cshtml) - \n<form>\n    
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt
index f0af8c8eef..cc3390c274 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithPrefix_DesignTime.ir.txt
@@ -5,13 +5,18 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithPrefix_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [15] TagHelpersWithPrefix.cshtml) - *, TestAssembly
                 DirectiveToken - (48:1,17 [5] TagHelpersWithPrefix.cshtml) - cool:
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - InputTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (29:0,29 [2] TagHelpersWithPrefix.cshtml) - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
index 5e19c09d66..97f6acc157 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
@@ -5,12 +5,17 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TagHelpersWithWeirdlySpacedAttributes_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] TagHelpersWithWeirdlySpacedAttributes.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - \n\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt
index 0680701131..83344196a0 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.ir.txt
@@ -5,23 +5,31 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Templates_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (278:8,1 [4] Templates.cshtml) - \n\n
-                CSharpStatement - (284:10,2 [34] Templates.cshtml) - \n    Func<dynamic, object> foo = 
+                CSharpStatement - (284:10,2 [34] Templates.cshtml)
+                    RazorIRToken - (284:10,2 [34] Templates.cshtml) - CSharp - \n    Func<dynamic, object> foo = 
                 Template - (325:11,39 [16] Templates.cshtml)
                     HtmlContent - (325:11,39 [11] Templates.cshtml) - This works 
                     CSharpExpression - (337:11,51 [4] Templates.cshtml)
                         RazorIRToken - (337:11,51 [4] Templates.cshtml) - CSharp - item
                     HtmlContent - (341:11,55 [1] Templates.cshtml) - !
-                CSharpStatement - (349:11,63 [7] Templates.cshtml) - ;\n    
+                CSharpStatement - (349:11,63 [7] Templates.cshtml)
+                    RazorIRToken - (349:11,63 [7] Templates.cshtml) - CSharp - ;\n    
                 CSharpExpression - (357:12,5 [7] Templates.cshtml)
                     RazorIRToken - (357:12,5 [7] Templates.cshtml) - CSharp - foo("")
-                CSharpStatement - (364:12,12 [2] Templates.cshtml) - \n
+                CSharpStatement - (364:12,12 [2] Templates.cshtml)
+                    RazorIRToken - (364:12,12 [2] Templates.cshtml) - CSharp - \n
                 HtmlContent - (369:14,0 [8] Templates.cshtml) - \n<ul>\n
                 CSharpExpression - (379:16,2 [31] Templates.cshtml)
                     RazorIRToken - (379:16,2 [11] Templates.cshtml) - CSharp - Repeat(10, 
@@ -66,9 +74,11 @@ Document -
                         CSharpExpression - (688:40,15 [4] Templates.cshtml)
                             RazorIRToken - (688:40,15 [4] Templates.cshtml) - CSharp - item
                         HtmlContent - (692:40,19 [10] Templates.cshtml) - \n        
-                        CSharpStatement - (704:41,10 [18] Templates.cshtml) - var parent = item;
+                        CSharpStatement - (704:41,10 [18] Templates.cshtml)
+                            RazorIRToken - (704:41,10 [18] Templates.cshtml) - CSharp - var parent = item;
                         HtmlContent - (725:42,0 [53] Templates.cshtml) -         <ul>\n            <li>Child Items... ?</li>\n
                         HtmlContent - (839:45,0 [24] Templates.cshtml) -         </ul>\n    </li>
                     RazorIRToken - (863:46,9 [1] Templates.cshtml) - CSharp - )
                 HtmlContent - (864:46,10 [8] Templates.cshtml) - \n</ul> 
-            CSharpStatement - (12:0,12 [265] Templates.cshtml) - \n    public HelperResult Repeat(int times, Func<int, object> template) {\n        return new HelperResult((writer) => {\n            for(int i = 0; i < times; i++) {\n                ((HelperResult)template(i)).WriteTo(writer);\n            }\n        });\n    }\n
+            CSharpStatement - (12:0,12 [265] Templates.cshtml)
+                RazorIRToken - (12:0,12 [265] Templates.cshtml) - CSharp - \n    public HelperResult Repeat(int times, Func<int, object> template) {\n        return new HelperResult((writer) => {\n            for(int i = 0; i < times; i++) {\n                ((HelperResult)template(i)).WriteTo(writer);\n            }\n        });\n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs
index 0ac8d076a4..943429489a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.codegen.cs
@@ -135,7 +135,6 @@ WriteTo(__razor_template_writer, item);
         });
     }
 
-
 #line default
 #line hidden
     }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt
index 0b74cb58c7..62033998ad 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_Runtime.ir.txt
@@ -6,16 +6,19 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Templates_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (280:9,0 [2] Templates.cshtml) - \n
-                CSharpStatement - (284:10,2 [34] Templates.cshtml) - \n    Func<dynamic, object> foo = 
+                CSharpStatement - (284:10,2 [34] Templates.cshtml)
+                    RazorIRToken - (284:10,2 [34] Templates.cshtml) - CSharp - \n    Func<dynamic, object> foo = 
                 Template - (325:11,39 [16] Templates.cshtml)
                     HtmlContent - (325:11,39 [11] Templates.cshtml) - This works 
                     CSharpExpression - (337:11,51 [4] Templates.cshtml)
                         RazorIRToken - (337:11,51 [4] Templates.cshtml) - CSharp - item
                     HtmlContent - (341:11,55 [1] Templates.cshtml) - !
-                CSharpStatement - (349:11,63 [7] Templates.cshtml) - ;\n    
+                CSharpStatement - (349:11,63 [7] Templates.cshtml)
+                    RazorIRToken - (349:11,63 [7] Templates.cshtml) - CSharp - ;\n    
                 CSharpExpression - (357:12,5 [7] Templates.cshtml)
                     RazorIRToken - (357:12,5 [7] Templates.cshtml) - CSharp - foo("")
-                CSharpStatement - (364:12,12 [2] Templates.cshtml) - \n
+                CSharpStatement - (364:12,12 [2] Templates.cshtml)
+                    RazorIRToken - (364:12,12 [2] Templates.cshtml) - CSharp - \n
                 HtmlContent - (369:14,0 [8] Templates.cshtml) - \n<ul>\n
                 CSharpExpression - (379:16,2 [31] Templates.cshtml)
                     RazorIRToken - (379:16,2 [11] Templates.cshtml) - CSharp - Repeat(10, 
@@ -60,10 +63,13 @@ Document -
                         CSharpExpression - (688:40,15 [4] Templates.cshtml)
                             RazorIRToken - (688:40,15 [4] Templates.cshtml) - CSharp - item
                         HtmlContent - (692:40,19 [2] Templates.cshtml) - \n
-                        CSharpStatement - (694:41,0 [8] Templates.cshtml) -         
-                        CSharpStatement - (704:41,10 [18] Templates.cshtml) - var parent = item;
+                        CSharpStatement - (694:41,0 [8] Templates.cshtml)
+                            RazorIRToken - (694:41,0 [8] Templates.cshtml) - CSharp -         
+                        CSharpStatement - (704:41,10 [18] Templates.cshtml)
+                            RazorIRToken - (704:41,10 [18] Templates.cshtml) - CSharp - var parent = item;
                         HtmlContent - (725:42,0 [53] Templates.cshtml) -         <ul>\n            <li>Child Items... ?</li>\n
                         HtmlContent - (839:45,0 [24] Templates.cshtml) -         </ul>\n    </li>
                     RazorIRToken - (863:46,9 [1] Templates.cshtml) - CSharp - )
                 HtmlContent - (864:46,10 [8] Templates.cshtml) - \n</ul> 
-            CSharpStatement - (12:0,12 [265] Templates.cshtml) - \n    public HelperResult Repeat(int times, Func<int, object> template) {\n        return new HelperResult((writer) => {\n            for(int i = 0; i < times; i++) {\n                ((HelperResult)template(i)).WriteTo(writer);\n            }\n        });\n    }\n
+            CSharpStatement - (12:0,12 [265] Templates.cshtml)
+                RazorIRToken - (12:0,12 [265] Templates.cshtml) - CSharp - \n    public HelperResult Repeat(int times, Func<int, object> template) {\n        return new HelperResult((writer) => {\n            for(int i = 0; i < times; i++) {\n                ((HelperResult)template(i)).WriteTo(writer);\n            }\n        });\n    }\n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt
index 391c861012..2565b0e83f 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.ir.txt
@@ -5,16 +5,22 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_TransitionsInTagHelperAttributes_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
                 DirectiveToken - (14:0,14 [17] TransitionsInTagHelperAttributes.cshtml) - "*, TestAssembly"
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             DeclareTagHelperFields -  - TestNamespace.PTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [2] TransitionsInTagHelperAttributes.cshtml) - \n
-                CSharpStatement - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) -  \n    var @class = "container-fluid";\n    var @int = 1;\n
+                CSharpStatement - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml)
+                    RazorIRToken - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) - CSharp -  \n    var @class = "container-fluid";\n    var @int = 1;\n
                 HtmlContent - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml) - \n
                 TagHelper - (99:6,0 [44] TransitionsInTagHelperAttributes.cshtml)
                     InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
index d1bac4b71c..5d550f018b 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs
@@ -34,7 +34,6 @@ namespace Microsoft.AspNetCore.Razor.Evolution.IntegrationTests.TestFiles
     var @class = "container-fluid";
     var @int = 1;
 
-
 #line default
 #line hidden
             WriteLiteral("\r\n");
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt
index cbb06f718e..7491130f1a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.ir.txt
@@ -7,7 +7,8 @@ Document -
             DeclarePreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0 - class - test - HtmlAttributeValueStyle.DoubleQuotes
             DeclareTagHelperFields -  - TestNamespace.PTagHelper
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) -  \n    var @class = "container-fluid";\n    var @int = 1;\n
+                CSharpStatement - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml)
+                    RazorIRToken - (35:1,2 [59] TransitionsInTagHelperAttributes.cshtml) - CSharp -  \n    var @class = "container-fluid";\n    var @int = 1;\n
                 HtmlContent - (97:5,0 [2] TransitionsInTagHelperAttributes.cshtml) - \n
                 TagHelper - (99:6,0 [44] TransitionsInTagHelperAttributes.cshtml)
                     InitializeTagHelperStructure -  - p - TagMode.StartTagAndEndTag
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt
index 4fbfbe0917..b1a0d42ccb 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.ir.txt
@@ -5,13 +5,20 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) - \n
+                CSharpStatement - (2:0,2 [2] UnfinishedExpressionInCode.cshtml)
+                    RazorIRToken - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n
                 CSharpExpression - (5:1,1 [9] UnfinishedExpressionInCode.cshtml)
                     RazorIRToken - (5:1,1 [9] UnfinishedExpressionInCode.cshtml) - CSharp - DateTime.
-                CSharpStatement - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) - \n
+                CSharpStatement - (14:1,10 [2] UnfinishedExpressionInCode.cshtml)
+                    RazorIRToken - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt
index 1fede8d027..995ef87c13 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.ir.txt
@@ -5,7 +5,9 @@ Document -
         UsingStatement -  - System.Threading.Tasks
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_UnfinishedExpressionInCode_Runtime -  - 
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) - \n
+                CSharpStatement - (2:0,2 [2] UnfinishedExpressionInCode.cshtml)
+                    RazorIRToken - (2:0,2 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n
                 CSharpExpression - (5:1,1 [9] UnfinishedExpressionInCode.cshtml)
                     RazorIRToken - (5:1,1 [9] UnfinishedExpressionInCode.cshtml) - CSharp - DateTime.
-                CSharpStatement - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) - \n
+                CSharpStatement - (14:1,10 [2] UnfinishedExpressionInCode.cshtml)
+                    RazorIRToken - (14:1,10 [2] UnfinishedExpressionInCode.cshtml) - CSharp - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt
index 0cd17d6065..63cc99fa5a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.ir.txt
@@ -10,11 +10,16 @@ Document -
         UsingStatement - (123:6,1 [41] Usings.cshtml) - static global::System.Text.Encoding
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Usings_DesignTime -  - 
             DirectiveTokenHelper - 
-                CSharpStatement -  - #pragma warning disable 219
-                CSharpStatement -  - private void __RazorDirectiveTokenHelpers__() {
-                CSharpStatement -  - }
-                CSharpStatement -  - #pragma warning restore 219
-            CSharpStatement -  - private static System.Object __o = null;
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning disable 219
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - private void __RazorDirectiveTokenHelpers__() {
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - }
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - #pragma warning restore 219
+            CSharpStatement - 
+                RazorIRToken -  - CSharp - private static System.Object __o = null;
             RazorMethodDeclaration -  - public - async - System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (16:0,16 [2] Usings.cshtml) - \n
                 HtmlContent - (51:1,33 [2] Usings.cshtml) - \n
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
index 39cde717f5..53a8abbf80 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.ir.txt
@@ -9,21 +9,29 @@ Document -
             DeclarePreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2 - unbound - foo - HtmlAttributeValueStyle.DoubleQuotes
             DeclareTagHelperFields -  - FormTagHelper - InputTagHelper
             RazorMethodDeclaration -  - public - async, override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpStatement -  - BeginContext(31, 28, true);
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - BeginContext(31, 28, true);
                 HtmlContent - (31:1,0 [28] BasicTest.cshtml) - <span someattr>Hola</span>\n
-                CSharpStatement -  - EndContext();
-                CSharpStatement -  - BeginContext(61, 7, false);
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - EndContext();
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - BeginContext(61, 7, false);
                 CSharpExpression - (61:2,2 [7] BasicTest.cshtml)
                     RazorIRToken - (61:2,2 [7] BasicTest.cshtml) - CSharp - "Hello"
-                CSharpStatement -  - EndContext();
-                CSharpStatement -  - BeginContext(69, 2, true);
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - EndContext();
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - BeginContext(69, 2, true);
                 HtmlContent - (69:2,10 [2] BasicTest.cshtml) - \n
-                CSharpStatement -  - EndContext();
+                CSharpStatement - 
+                    RazorIRToken -  - CSharp - EndContext();
                 TagHelper - (71:3,0 [87] BasicTest.cshtml)
                     InitializeTagHelperStructure -  - form - TagMode.StartTagAndEndTag
-                        CSharpStatement -  - BeginContext(91, 6, true);
+                        CSharpStatement - 
+                            RazorIRToken -  - CSharp - BeginContext(91, 6, true);
                         HtmlContent - (91:3,20 [6] BasicTest.cshtml) - \n    
-                        CSharpStatement -  - EndContext();
+                        CSharpStatement - 
+                            RazorIRToken -  - CSharp - EndContext();
                         TagHelper - (97:4,4 [52] BasicTest.cshtml)
                             InitializeTagHelperStructure -  - input - TagMode.SelfClosing
                             CreateTagHelper -  - InputTagHelper
@@ -32,14 +40,20 @@ Document -
                                 CSharpExpression - (122:4,29 [12] BasicTest.cshtml)
                                     RazorIRToken - (122:4,29 [12] BasicTest.cshtml) - CSharp - DateTime.Now
                             AddPreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
-                            CSharpStatement -  - BeginContext(97, 52, false);
+                            CSharpStatement - 
+                                RazorIRToken -  - CSharp - BeginContext(97, 52, false);
                             ExecuteTagHelpers - 
-                            CSharpStatement -  - EndContext();
-                        CSharpStatement -  - BeginContext(149, 2, true);
+                            CSharpStatement - 
+                                RazorIRToken -  - CSharp - EndContext();
+                        CSharpStatement - 
+                            RazorIRToken -  - CSharp - BeginContext(149, 2, true);
                         HtmlContent - (149:4,56 [2] BasicTest.cshtml) - \n
-                        CSharpStatement -  - EndContext();
+                        CSharpStatement - 
+                            RazorIRToken -  - CSharp - EndContext();
                     CreateTagHelper -  - FormTagHelper
                     AddPreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
-                    CSharpStatement -  - BeginContext(71, 87, false);
+                    CSharpStatement - 
+                        RazorIRToken -  - CSharp - BeginContext(71, 87, false);
                     ExecuteTagHelpers - 
-                    CSharpStatement -  - EndContext();
+                    CSharpStatement - 
+                        RazorIRToken -  - CSharp - EndContext();