diff --git a/__tests__/e2e/__snapshots__/01_minimal.ts.snap b/__tests__/e2e/__snapshots__/01_minimal.ts.snap
index 583d9eee..d60ace9c 100644
--- a/__tests__/e2e/__snapshots__/01_minimal.ts.snap
+++ b/__tests__/e2e/__snapshots__/01_minimal.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`01_minimal should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`01_minimal should work with recorded events 1`] = `
 
 exports[`01_minimal should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 14<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 16<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`01_minimal should work with recorded events 2`] = `
 
 exports[`01_minimal should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 46<div><span>Count: 3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: 3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`01_minimal should work with recorded events 3`] = `
 
 exports[`01_minimal should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 62<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 64<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 24<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`01_minimal should work with recorded events 4`] = `
 
 exports[`01_minimal should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 74<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 76<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`01_minimal should work with recorded events 5`] = `
 
 exports[`01_minimal should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 90<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 92<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 30<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 32<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`01_minimal should work with recorded events 6`] = `
 
 exports[`01_minimal should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 102<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 104<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`01_minimal should work with recorded events 7`] = `
 
 exports[`01_minimal should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 118<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 120<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 38<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 40<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`01_minimal should work with recorded events 8`] = `
 
 exports[`01_minimal should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 130<div><span>Count: -3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 132<div><span>Count: -3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: -3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 44<div><span>Count: -3</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`01_minimal should work with recorded events 9`] = `
 
 exports[`01_minimal should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 146<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 148<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`01_minimal should work with recorded events 10`] = `
 
 exports[`01_minimal should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 158<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 160<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 50<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 52<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`01_minimal should work with recorded events 11`] = `
 
 exports[`01_minimal should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 174<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 176<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`01_minimal should work with recorded events 12`] = `
 
 exports[`01_minimal should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 174<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 176<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 6<div><span>Text: hello</span><input value=\\"hello\\"></div></div><div>numRendered: 8<div><span>Text: hello</span><input value=\\"hello\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`01_minimal should work with recorded events 13`] = `
 
 exports[`01_minimal should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 174<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 176<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 186<div><span>Text: hello1</span><input value=\\"hello1\\"></div></div><div>numRendered: 188<div><span>Text: hello1</span><input value=\\"hello1\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 62<div><span>Text: hello1</span><input value=\\"hello1\\"></div></div><div>numRendered: 64<div><span>Text: hello1</span><input value=\\"hello1\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -114,7 +114,7 @@ exports[`01_minimal should work with recorded events 14`] = `
 
 exports[`01_minimal should work with recorded events 15`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 174<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 176<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 202<div><span>Text: hello12</span><input value=\\"hello12\\"></div></div><div>numRendered: 204<div><span>Text: hello12</span><input value=\\"hello12\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 70<div><span>Text: hello12</span><input value=\\"hello12\\"></div></div><div>numRendered: 72<div><span>Text: hello12</span><input value=\\"hello12\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -122,7 +122,7 @@ exports[`01_minimal should work with recorded events 15`] = `
 
 exports[`01_minimal should work with recorded events 16`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 174<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 176<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 214<div><span>Text: hello123</span><input value=\\"hello123\\"></div></div><div>numRendered: 216<div><span>Text: hello123</span><input value=\\"hello123\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>TextBox</h1><div>numRendered: 74<div><span>Text: hello123</span><input value=\\"hello123\\"></div></div><div>numRendered: 76<div><span>Text: hello123</span><input value=\\"hello123\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/02_typescript.ts.snap b/__tests__/e2e/__snapshots__/02_typescript.ts.snap
index a3a0d41f..0104e4a3 100644
--- a/__tests__/e2e/__snapshots__/02_typescript.ts.snap
+++ b/__tests__/e2e/__snapshots__/02_typescript.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`02_typescript should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 20<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 24<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 6<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`02_typescript should work with recorded events 1`] = `
 
 exports[`02_typescript should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 34<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 36<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 12<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 14<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 16<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`02_typescript should work with recorded events 2`] = `
 
 exports[`02_typescript should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 48<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 52<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 14<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 16<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 18<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 20<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`02_typescript should work with recorded events 3`] = `
 
 exports[`02_typescript should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 62<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 64<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 22<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 24<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`02_typescript should work with recorded events 4`] = `
 
 exports[`02_typescript should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 44<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 76<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 80<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 24<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 26<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 28<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`02_typescript should work with recorded events 5`] = `
 
 exports[`02_typescript should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 50<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 52<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 90<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 92<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 30<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 32<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`02_typescript should work with recorded events 6`] = `
 
 exports[`02_typescript should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 58<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 60<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 104<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 108<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 30<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 32<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 34<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 36<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`02_typescript should work with recorded events 7`] = `
 
 exports[`02_typescript should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 118<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 120<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 38<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 40<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`02_typescript should work with recorded events 8`] = `
 
 exports[`02_typescript should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 118<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 120<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>numRendered: 38<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 6<div>numRendered: 40<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`02_typescript should work with recorded events 9`] = `
 
 exports[`02_typescript should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 130<div>numRendered: 132a<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 134<div>numRendered: 136a<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 42<div>numRendered: 44a<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 46<div>numRendered: 48a<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`02_typescript should work with recorded events 10`] = `
 
 exports[`02_typescript should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 146<div>numRendered: 148ab<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"ab\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 150<div>numRendered: 152ab<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"ab\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 54<div>numRendered: 56ab<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"ab\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 58<div>numRendered: 60ab<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"ab\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`02_typescript should work with recorded events 11`] = `
 
 exports[`02_typescript should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 162<div>numRendered: 164abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 166<div>numRendered: 168abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 62<div>numRendered: 64abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 66<div>numRendered: 68abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`02_typescript should work with recorded events 12`] = `
 
 exports[`02_typescript should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 178<div>numRendered: 180abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"d\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 182<div>numRendered: 184abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"d\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 70<div>numRendered: 72abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"d\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 74<div>numRendered: 76abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"d\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`02_typescript should work with recorded events 13`] = `
 
 exports[`02_typescript should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 194<div>numRendered: 196abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"de\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 198<div>numRendered: 200abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"de\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 78<div>numRendered: 80abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"de\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 82<div>numRendered: 84abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"de\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -114,7 +114,7 @@ exports[`02_typescript should work with recorded events 14`] = `
 
 exports[`02_typescript should work with recorded events 15`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 210<div>numRendered: 212abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 214<div>numRendered: 216abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 86<div>numRendered: 88abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 90<div>numRendered: 92abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -122,7 +122,7 @@ exports[`02_typescript should work with recorded events 15`] = `
 
 exports[`02_typescript should work with recorded events 16`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 226<div>numRendered: 228abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 230<div>numRendered: 232abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 94<div>numRendered: 96abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 98<div>numRendered: 100abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -130,7 +130,7 @@ exports[`02_typescript should work with recorded events 16`] = `
 
 exports[`02_typescript should work with recorded events 17`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 242<div>numRendered: 244abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"12\\"></div></div><div>numRendered: 246<div>numRendered: 248abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"12\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 102<div>numRendered: 104abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"12\\"></div></div><div>numRendered: 106<div>numRendered: 108abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"12\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -138,7 +138,7 @@ exports[`02_typescript should work with recorded events 17`] = `
 
 exports[`02_typescript should work with recorded events 18`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 66<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 258<div>numRendered: 260abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"123\\"></div></div><div>numRendered: 262<div>numRendered: 264abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"123\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 110<div>numRendered: 112abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"123\\"></div></div><div>numRendered: 114<div>numRendered: 116abc<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>First Name:<input value=\\"abc\\"></div><div>Last Name:<input value=\\"def\\"></div><div>Age:<input value=\\"123\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/03_usestate.ts.snap b/__tests__/e2e/__snapshots__/03_usestate.ts.snap
index 801b9978..0c97aee5 100644
--- a/__tests__/e2e/__snapshots__/03_usestate.ts.snap
+++ b/__tests__/e2e/__snapshots__/03_usestate.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`03_usestate should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 6<div><span>Count: 1</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`03_usestate should work with recorded events 1`] = `
 
 exports[`03_usestate should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 2</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 20<div><span>Count: 2</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 2</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 12<div><span>Count: 2</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`03_usestate should work with recorded events 2`] = `
 
 exports[`03_usestate should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 3</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 28<div><span>Count: 3</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 14<div><span>Count: 3</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 16<div><span>Count: 3</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`03_usestate should work with recorded events 3`] = `
 
 exports[`03_usestate should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 4</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 36<div><span>Count: 4</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 4</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 20<div><span>Count: 4</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`03_usestate should work with recorded events 4`] = `
 
 exports[`03_usestate should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`03_usestate should work with recorded events 5`] = `
 
 exports[`03_usestate should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`03_usestate should work with recorded events 6`] = `
 
 exports[`03_usestate should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 42<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 44<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`03_usestate should work with recorded events 7`] = `
 
 exports[`03_usestate should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 50<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 52<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 14<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 16<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`03_usestate should work with recorded events 8`] = `
 
 exports[`03_usestate should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 58<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 60<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 18<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 20<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`03_usestate should work with recorded events 9`] = `
 
 exports[`03_usestate should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 66<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 68<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 22<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 24<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`03_usestate should work with recorded events 10`] = `
 
 exports[`03_usestate should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 74<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 76<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 26<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 28<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`03_usestate should work with recorded events 11`] = `
 
 exports[`03_usestate should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 82<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 84<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 30<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 32<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`03_usestate should work with recorded events 12`] = `
 
 exports[`03_usestate should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 90<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 92<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 34<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 36<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`03_usestate should work with recorded events 13`] = `
 
 exports[`03_usestate should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 98<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div><div>numRendered: 100<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 38<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div><div>numRendered: 40<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -114,7 +114,7 @@ exports[`03_usestate should work with recorded events 14`] = `
 
 exports[`03_usestate should work with recorded events 15`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 42<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 44<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 106<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div><div>numRendered: 108<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 22<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><div>numRendered: 24<div><span>Count: 5</span><button type=\\"button\\">+1</button></div></div><h1>Person</h1><div>numRendered: 42<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div><div>numRendered: 44<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/04_selector.ts.snap b/__tests__/e2e/__snapshots__/04_selector.ts.snap
index 6cefd59c..651486ba 100644
--- a/__tests__/e2e/__snapshots__/04_selector.ts.snap
+++ b/__tests__/e2e/__snapshots__/04_selector.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`04_selector should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 6<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`04_selector should work with recorded events 1`] = `
 
 exports[`04_selector should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 12<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`04_selector should work with recorded events 2`] = `
 
 exports[`04_selector should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 26<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 14<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 16<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`04_selector should work with recorded events 3`] = `
 
 exports[`04_selector should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`04_selector should work with recorded events 4`] = `
 
 exports[`04_selector should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`04_selector should work with recorded events 5`] = `
 
 exports[`04_selector should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 34<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 36<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`04_selector should work with recorded events 6`] = `
 
 exports[`04_selector should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 42<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 44<div>First Name:<input value=\\"aa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`04_selector should work with recorded events 7`] = `
 
 exports[`04_selector should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 50<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 52<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`04_selector should work with recorded events 8`] = `
 
 exports[`04_selector should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 58<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 60<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"b\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`04_selector should work with recorded events 9`] = `
 
 exports[`04_selector should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 66<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 68<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`04_selector should work with recorded events 10`] = `
 
 exports[`04_selector should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 74<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 76<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`04_selector should work with recorded events 11`] = `
 
 exports[`04_selector should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 82<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div><div>numRendered: 84<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"1\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`04_selector should work with recorded events 12`] = `
 
 exports[`04_selector should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 90<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div><div>numRendered: 92<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"11\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`04_selector should work with recorded events 13`] = `
 
 exports[`04_selector should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 34<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 98<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div><div>numRendered: 100<div>First Name:<input value=\\"aaa\\"></div><div>Last Name:<input value=\\"bbb\\"></div><div>Age:<input value=\\"111\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 18<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"></div><div>Last Name:<input value=\\"\\"></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/05_container.ts.snap b/__tests__/e2e/__snapshots__/05_container.ts.snap
index f17145ec..efa53848 100644
--- a/__tests__/e2e/__snapshots__/05_container.ts.snap
+++ b/__tests__/e2e/__snapshots__/05_container.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`05_container should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 14<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 16<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`05_container should work with recorded events 1`] = `
 
 exports[`05_container should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 22<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 24<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 14<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 16<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`05_container should work with recorded events 2`] = `
 
 exports[`05_container should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 30<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 32<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 18<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`05_container should work with recorded events 3`] = `
 
 exports[`05_container should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 38<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 40<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 22<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 24<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`05_container should work with recorded events 4`] = `
 
 exports[`05_container should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 26<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 28<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`05_container should work with recorded events 5`] = `
 
 exports[`05_container should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 54<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 30<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 32<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`05_container should work with recorded events 6`] = `
 
 exports[`05_container should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 62<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 64<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 34<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 36<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`05_container should work with recorded events 7`] = `
 
 exports[`05_container should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 70<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 72<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 38<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 40<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`05_container should work with recorded events 8`] = `
 
 exports[`05_container should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 78<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 80<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 42<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 44<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`05_container should work with recorded events 9`] = `
 
 exports[`05_container should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 6<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 8<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`05_container should work with recorded events 10`] = `
 
 exports[`05_container should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 94<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 96<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 50<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 52<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`05_container should work with recorded events 11`] = `
 
 exports[`05_container should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 102<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 104<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 54<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 56<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -98,7 +98,7 @@ exports[`05_container should work with recorded events 12`] = `
 
 exports[`05_container should work with recorded events 13`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 110<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 112<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 58<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 60<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -106,7 +106,7 @@ exports[`05_container should work with recorded events 13`] = `
 
 exports[`05_container should work with recorded events 14`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 118<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 120<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 62<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 64<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -114,7 +114,7 @@ exports[`05_container should work with recorded events 14`] = `
 
 exports[`05_container should work with recorded events 15`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 126<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 128<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 66<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 68<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -122,7 +122,7 @@ exports[`05_container should work with recorded events 15`] = `
 
 exports[`05_container should work with recorded events 16`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 134<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 136<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 70<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 72<div><span>Count: 2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -130,7 +130,7 @@ exports[`05_container should work with recorded events 16`] = `
 
 exports[`05_container should work with recorded events 17`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 142<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 144<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 74<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 76<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -138,7 +138,7 @@ exports[`05_container should work with recorded events 17`] = `
 
 exports[`05_container should work with recorded events 18`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 150<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 152<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 78<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 80<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -146,7 +146,7 @@ exports[`05_container should work with recorded events 18`] = `
 
 exports[`05_container should work with recorded events 19`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 158<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 160<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 82<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 84<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -154,7 +154,7 @@ exports[`05_container should work with recorded events 19`] = `
 
 exports[`05_container should work with recorded events 20`] = `
 "
-    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 166<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 168<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
+    <div id=\\"app\\"><h1>First container</h1><div>numRendered: 46<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 48<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><h1>Second container</h1><div>numRendered: 86<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div><div>numRendered: 88<div><span>Count: -2</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/11_form.ts.snap b/__tests__/e2e/__snapshots__/11_form.ts.snap
index c1a9e8a3..cc594719 100644
--- a/__tests__/e2e/__snapshots__/11_form.ts.snap
+++ b/__tests__/e2e/__snapshots__/11_form.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`11_form should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 20<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 22<div>First Name:<input value=\\"\\">name is required</div></div><h3>Family Name</h3><div>numRendered: 24<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 26<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 12<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 14<div>First Name:<input value=\\"\\">name is required</div></div><h3>Family Name</h3><div>numRendered: 16<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`11_form should work with recorded events 1`] = `
 
 exports[`11_form should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 40<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 42<div>First Name:<input value=\\"1\\"></div></div><h3>Family Name</h3><div>numRendered: 24<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 26<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 22<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 24<div>First Name:<input value=\\"1\\"></div></div><h3>Family Name</h3><div>numRendered: 16<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`11_form should work with recorded events 2`] = `
 
 exports[`11_form should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 54<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 56<div>First Name:<input value=\\"11\\"></div></div><h3>Family Name</h3><div>numRendered: 24<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 26<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 32<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 34<div>First Name:<input value=\\"11\\"></div></div><h3>Family Name</h3><div>numRendered: 16<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`11_form should work with recorded events 3`] = `
 
 exports[`11_form should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 74<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 76<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 24<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 26<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 36<button type=\\"submit\\" disabled=\\"\\">Submit</button><h3>First Name</h3><div>numRendered: 38<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 16<div>Family Name:<input value=\\"\\">name is required</div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`11_form should work with recorded events 4`] = `
 
 exports[`11_form should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 88<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 76<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 90<div>Family Name:<input value=\\"2\\"></div></div><h3>Gender</h3><div>numRendered: 26<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 40<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 38<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 44<div>Family Name:<input value=\\"2\\"></div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`11_form should work with recorded events 5`] = `
 
 exports[`11_form should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 106<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 76<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 110<div>Family Name:<input value=\\"22\\"></div></div><h3>Gender</h3><div>numRendered: 26<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 46<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 38<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 48<div>Family Name:<input value=\\"22\\"></div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`11_form should work with recorded events 6`] = `
 
 exports[`11_form should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 122<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 76<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 124<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 26<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 50<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 38<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 52<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`11_form should work with recorded events 7`] = `
 
 exports[`11_form should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 122<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 76<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 124<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 26<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 50<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 38<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 52<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 18<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`11_form should work with recorded events 8`] = `
 
 exports[`11_form should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 140<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 76<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 124<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 144<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 28<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 54<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 38<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 52<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 58<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 20<div>Teenager:<input type=\\"checkbox\\" value=\\"false\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`11_form should work with recorded events 9`] = `
 
 exports[`11_form should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 156<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 76<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 124<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 144<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 160<div>Teenager:<input type=\\"checkbox\\" value=\\"true\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 60<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 38<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 52<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 58<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 64<div>Teenager:<input type=\\"checkbox\\" value=\\"true\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`11_form should work with recorded events 10`] = `
 
 exports[`11_form should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><form>numRendered: 156<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 76<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 124<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 144<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 160<div>Teenager:<input type=\\"checkbox\\" value=\\"true\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
+    <div id=\\"app\\"><form>numRendered: 60<button type=\\"submit\\">Submit</button><h3>First Name</h3><div>numRendered: 38<div>First Name:<input value=\\"111\\"></div></div><h3>Family Name</h3><div>numRendered: 52<div>Family Name:<input value=\\"222\\"></div></div><h3>Gender</h3><div>numRendered: 58<div>Gender:<select><option value=\\"na\\">N/A</option><option value=\\"male\\">Male</option><option value=\\"female\\">Female</option></select></div></div><h3>Teenager</h3><div>numRendered: 64<div>Teenager:<input type=\\"checkbox\\" value=\\"true\\"></div></div></form><div><a href=\\"https://codesandbox.io/s/react-form-library-stress-test-4luf3\\">Stress Test</a></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
diff --git a/__tests__/e2e/__snapshots__/14_dynamic.ts.snap b/__tests__/e2e/__snapshots__/14_dynamic.ts.snap
index b37cef0f..e0a4e190 100644
--- a/__tests__/e2e/__snapshots__/14_dynamic.ts.snap
+++ b/__tests__/e2e/__snapshots__/14_dynamic.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`14_dynamic should work with recorded events 1`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 6<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -10,7 +10,7 @@ exports[`14_dynamic should work with recorded events 1`] = `
 
 exports[`14_dynamic should work with recorded events 2`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 6<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -18,7 +18,7 @@ exports[`14_dynamic should work with recorded events 2`] = `
 
 exports[`14_dynamic should work with recorded events 3`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 14<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 10<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -26,7 +26,7 @@ exports[`14_dynamic should work with recorded events 3`] = `
 
 exports[`14_dynamic should work with recorded events 4`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -34,7 +34,7 @@ exports[`14_dynamic should work with recorded events 4`] = `
 
 exports[`14_dynamic should work with recorded events 5`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 12<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 8<div><span>Count: 1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"0\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -42,7 +42,7 @@ exports[`14_dynamic should work with recorded events 5`] = `
 
 exports[`14_dynamic should work with recorded events 6`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 26<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 16<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -50,7 +50,7 @@ exports[`14_dynamic should work with recorded events 6`] = `
 
 exports[`14_dynamic should work with recorded events 7`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 26<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 16<div><span>Count: 0</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 2<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 4<div>First Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -58,7 +58,7 @@ exports[`14_dynamic should work with recorded events 7`] = `
 
 exports[`14_dynamic should work with recorded events 8`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 26<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 22<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 24<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 6<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -66,7 +66,7 @@ exports[`14_dynamic should work with recorded events 8`] = `
 
 exports[`14_dynamic should work with recorded events 9`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 26<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 26<div>Last Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 24<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 14<div>Last Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -74,7 +74,7 @@ exports[`14_dynamic should work with recorded events 9`] = `
 
 exports[`14_dynamic should work with recorded events 10`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 26<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 26<div>Last Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 24<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 14<div>Last Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -82,7 +82,7 @@ exports[`14_dynamic should work with recorded events 10`] = `
 
 exports[`14_dynamic should work with recorded events 11`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 26<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 32<div>Last Name:<input value=\\"b\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 24<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 16<div>Last Name:<input value=\\"b\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 8<div>First Name:<input value=\\"a\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
@@ -90,7 +90,7 @@ exports[`14_dynamic should work with recorded events 11`] = `
 
 exports[`14_dynamic should work with recorded events 12`] = `
 "
-    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 26<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 32<div>Last Name:<input value=\\"b\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 38<div>Last Name:<input value=\\"b\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
+    <div id=\\"app\\"><h1>Counter</h1><div>numRendered: 12<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><div>numRendered: 20<div><span>Count: -1</span><button type=\\"button\\">+1</button><button type=\\"button\\">-1</button><input value=\\"1\\"></div></div><h1>Person</h1><div>numRendered: 16<div>Last Name:<input value=\\"b\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div><div>numRendered: 20<div>Last Name:<input value=\\"\\"><button type=\\"button\\">toggle</button></div><div>Age:<input value=\\"0\\"></div></div></div>
   <script src=\\"/main.js\\"></script>
 
 "
diff --git a/package.json b/package.json
index ead938f5..8d34a209 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,10 @@
 {
   "name": "react-tracked",
   "description": "Simple and fast global state with React Context. Eliminate unnecessary re-renders without hassle.",
-  "version": "1.5.1",
+  "version": "2.0.0-alpha.9",
+  "publishConfig": {
+    "tag": "next"
+  },
   "author": "Daishi Kato",
   "repository": {
     "type": "git",
@@ -66,7 +69,7 @@
   "license": "MIT",
   "dependencies": {
     "proxy-compare": "1.1.3",
-    "use-context-selector": "1.3.2"
+    "use-context-selector": "2.0.0-alpha.9"
   },
   "devDependencies": {
     "@testing-library/react": "^11.2.2",
@@ -105,7 +108,7 @@
     "webpack-dev-server": "^3.11.0"
   },
   "peerDependencies": {
-    "react": ">=16.8.0",
-    "scheduler": ">=0.19.0"
+    "react": ">=18.0.0",
+    "scheduler": ">=1.0.0"
   }
 }
diff --git a/src/useSelector.ts b/src/useSelector.ts
index bd369358..827885fe 100644
--- a/src/useSelector.ts
+++ b/src/useSelector.ts
@@ -1,11 +1,11 @@
 import { useDebugValue } from 'react';
-import { Context, useContextSelector } from 'use-context-selector';
+import { Context, useContext } from 'use-context-selector';
 
 export const useSelector = <State, Selected>(
   StateContext: Context<State>,
   selector: (state: State) => Selected,
 ) => {
-  const selected = useContextSelector(StateContext, selector);
+  const selected = useContext(StateContext, selector);
   useDebugValue(selected);
   return selected;
 };
diff --git a/src/useTrackedState.ts b/src/useTrackedState.ts
index bcbbc32a..32c72943 100644
--- a/src/useTrackedState.ts
+++ b/src/useTrackedState.ts
@@ -5,7 +5,7 @@ import {
   useReducer,
   useRef,
 } from 'react';
-import { Context, useContextSelector } from 'use-context-selector';
+import { Context, useContext } from 'use-context-selector';
 import {
   createDeepProxy,
   isDeepChanged,
@@ -89,7 +89,7 @@ export const useTrackedState = <State>(
       return nextState;
     };
   }, [deepChangedMode]);
-  const state = useContextSelector(StateContext, selector);
+  const state = useContext(StateContext, selector);
   if (typeof process === 'object' && process.env.NODE_ENV !== 'production') {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useAffectedDebugValue(state, affected);
diff --git a/yarn.lock b/yarn.lock
index 8fba3ccc..803c4aba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10116,10 +10116,10 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use-context-selector@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/use-context-selector/-/use-context-selector-1.3.2.tgz#326a76875be2914c2d5cabf63349cbd9fda09d34"
-  integrity sha512-XRRlZD8+FIac3RtmOEqq8SizNEQI6oldteuOWu+F+pDooiJPPaFgw+8wckX+/fuJ80DRJB9HP99UdIq8A1YSMA==
+use-context-selector@2.0.0-alpha.9:
+  version "2.0.0-alpha.9"
+  resolved "https://registry.yarnpkg.com/use-context-selector/-/use-context-selector-2.0.0-alpha.9.tgz#bc932267ee5ac19e12f0845a7bcd1cf2b243d43f"
+  integrity sha512-fpkGKvjtdIB599NFCHKrk2wb+1FhuY8OWimBCvGU8GrvTErGPwrcAM1wHXsc8MNkUlsgNPjVHC/x+egtddWeNQ==
 
 use-reducer-async@^2.0.1:
   version "2.0.1"