diff --git a/__snapshots__/JSONStringifyExtension.test.ts.js b/__snapshots__/JSONStringifyExtension.test.ts.js
index 24d4f931..5d302416 100644
--- a/__snapshots__/JSONStringifyExtension.test.ts.js
+++ b/__snapshots__/JSONStringifyExtension.test.ts.js
@@ -14,7 +14,7 @@ exports['JSONStringifyExtension should print the script for a click step 1'] = `
   ]
 }
 
-`;
+`
 
 exports['JSONStringifyExtension should print an entire script 1'] = `
 {
@@ -52,4 +52,4 @@ exports['JSONStringifyExtension should print an entire script 1'] = `
 }
 //# recorderSourceMap=BDORO
 
-`;
+`
diff --git a/__snapshots__/JSONUtils.test.ts.js b/__snapshots__/JSONUtils.test.ts.js
index 28bc1b7d..7b8a6502 100644
--- a/__snapshots__/JSONUtils.test.ts.js
+++ b/__snapshots__/JSONUtils.test.ts.js
@@ -39,8 +39,8 @@ exports['JSONUtils should format JSON as JS 1'] = `
   otherTest: 1.234,
   nullTest: null
 }
-`;
+`
 
 exports['JSONUtils should properly escape <script> 1'] = `
 '\\x3Cscript>test\\x3C/script>\\x3Cscript>test\\x3C/script>\\x3Cscript>test\\x3C/script>'
-`;
+`
diff --git a/__snapshots__/LighthouseStringifyExtension.test.ts.js b/__snapshots__/LighthouseStringifyExtension.test.ts.js
index 607a37e1..55a35c91 100644
--- a/__snapshots__/LighthouseStringifyExtension.test.ts.js
+++ b/__snapshots__/LighthouseStringifyExtension.test.ts.js
@@ -54,7 +54,7 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
   fs.writeFileSync(__dirname + '/flow.report.html', lhFlowReport)
 
   await 
-`;
+`
 
 exports['LighthouseStringifyExtension handles ending navigation 1'] = `
 const fs = require('fs');
@@ -124,11 +124,9 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
   fs.writeFileSync(__dirname + '/flow.report.html', lhFlowReport)
 
   await 
-`;
+`
 
-exports[
-  'LighthouseStringifyExtension handles multiple sequential navigations 1'
-] = `
+exports['LighthouseStringifyExtension handles multiple sequential navigations 1'] = `
 const fs = require('fs');
 const puppeteer = require('puppeteer'); // v20.7.4 or later
 
@@ -190,4 +188,4 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
   fs.writeFileSync(__dirname + '/flow.report.html', lhFlowReport)
 
   await 
-`;
+`
diff --git a/__snapshots__/PuppeteerReplayStringifyExtension.test.ts.js b/__snapshots__/PuppeteerReplayStringifyExtension.test.ts.js
index 431fc2bc..003d32ae 100644
--- a/__snapshots__/PuppeteerReplayStringifyExtension.test.ts.js
+++ b/__snapshots__/PuppeteerReplayStringifyExtension.test.ts.js
@@ -1,6 +1,4 @@
-exports[
-  'PuppeteerReplayStringifyExtension should print the script for a click step 1'
-] = `
+exports['PuppeteerReplayStringifyExtension should print the script for a click step 1'] = `
 await runner.runStep({
   type: 'click',
   target: 'main',
@@ -16,7 +14,7 @@ await runner.runStep({
   ]
 });
 
-`;
+`
 
 exports['PuppeteerReplayStringifyExtension should print an entire script 1'] = `
 import url from 'url';
@@ -50,4 +48,4 @@ if (process && import.meta.url === url.pathToFileURL(process.argv[1]).href) {
 }
 //# recorderSourceMap=BIO
 
-`;
+`
diff --git a/__snapshots__/PuppeteerStringifyExtension.test.ts.js b/__snapshots__/PuppeteerStringifyExtension.test.ts.js
index 3ec5aec0..9857146e 100644
--- a/__snapshots__/PuppeteerStringifyExtension.test.ts.js
+++ b/__snapshots__/PuppeteerStringifyExtension.test.ts.js
@@ -1,6 +1,4 @@
-exports[
-  'PuppeteerStringifyExtension should print the correct script for a click step 1'
-] = `
+exports['PuppeteerStringifyExtension should print the correct script for a click step 1'] = `
 {
   const targetPage = page;
   await puppeteer.Locator.race([
@@ -15,11 +13,9 @@ exports[
     });
 }
 
-`;
+`
 
-exports[
-  'PuppeteerStringifyExtension should print the correct script for asserted events 1'
-] = `
+exports['PuppeteerStringifyExtension should print the correct script for asserted events 1'] = `
 {
   const targetPage = page;
   const promises = [];
@@ -40,11 +36,9 @@ exports[
   await Promise.all(promises);
 }
 
-`;
+`
 
-exports[
-  'PuppeteerStringifyExtension should print the correct script with a chain selector 1'
-] = `
+exports['PuppeteerStringifyExtension should print the correct script with a chain selector 1'] = `
 {
   const targetPage = page;
   await puppeteer.Locator.race([
@@ -59,11 +53,9 @@ exports[
     });
 }
 
-`;
+`
 
-exports[
-  'PuppeteerStringifyExtension should print the correct script for a change step 1'
-] = `
+exports['PuppeteerStringifyExtension should print the correct script for a change step 1'] = `
 {
   const targetPage = page;
   await puppeteer.Locator.race([
@@ -73,11 +65,9 @@ exports[
     .fill('Hello World');
 }
 
-`;
+`
 
-exports[
-  'PuppeteerStringifyExtension should print the correct script for a change step for non-text inputs 1'
-] = `
+exports['PuppeteerStringifyExtension should print the correct script for a change step for non-text inputs 1'] = `
 {
   const targetPage = page;
   await puppeteer.Locator.race([
@@ -87,4 +77,4 @@ exports[
     .fill('#333333');
 }
 
-`;
+`
diff --git a/__snapshots__/SchemaUtils.test.ts.js b/__snapshots__/SchemaUtils.test.ts.js
index 00dd5c21..05c97d0f 100644
--- a/__snapshots__/SchemaUtils.test.ts.js
+++ b/__snapshots__/SchemaUtils.test.ts.js
@@ -1,53 +1,35 @@
-exports[
-  'SchemaUtils Selectors selectorToPElementSelector should convert .cls > div #id 1'
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert .cls > div #id 1'] = `
 .cls > div #id
-`;
+`
 
-exports[
-  'SchemaUtils Selectors selectorToPElementSelector should convert .cls > div #id,.cls > div #id 1'
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert .cls > div #id,.cls > div #id 1'] = `
 .cls > div #id >>>> .cls > div #id
-`;
+`
 
-exports[
-  'SchemaUtils Selectors selectorToPElementSelector should convert text/my text ("my text") 1'
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert text/my text ("my text") 1'] = `
 ::-p-text(my text \\(\\"my text\\"\\))
-`;
+`
 
-exports[
-  'SchemaUtils Selectors selectorToPElementSelector should convert text/my text ("my text"),aria/Test my test[role="button"] 1'
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert text/my text ("my text"),aria/Test my test[role="button"] 1'] = `
 ::-p-text(my text \\(\\"my text\\"\\)) >>>> ::-p-aria(Test my test[role=\\"button\\"])
-`;
+`
 
-exports[
-  'SchemaUtils Selectors selectorToPElementSelector should convert text/my) 1'
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert text/my) 1'] = `
 ::-p-text(my\\))
-`;
+`
 
-exports[
-  'SchemaUtils Selectors selectorToPElementSelector should convert text/my() 1'
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert text/my() 1'] = `
 ::-p-text(my\\(\\))
-`;
+`
 
-exports[
-  'SchemaUtils Selectors selectorToPElementSelector should convert text/" 1'
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert text/" 1'] = `
 ::-p-text(\\")
-`;
+`
 
-exports[
-  "SchemaUtils Selectors selectorToPElementSelector should convert text/' 1"
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert text/\' 1'] = `
 ::-p-text(\\')
-`;
+`
 
-exports[
-  'SchemaUtils Selectors selectorToPElementSelector should convert xpath///*[@id="id"] 1'
-] = `
+exports['SchemaUtils Selectors selectorToPElementSelector should convert xpath///*[@id="id"] 1'] = `
 ::-p-xpath(//*[@id=\\"id\\"])
-`;
+`
diff --git a/__snapshots__/lighthouse.test.ts.js b/__snapshots__/lighthouse.test.ts.js
index a498d191..c3b06653 100644
--- a/__snapshots__/lighthouse.test.ts.js
+++ b/__snapshots__/lighthouse.test.ts.js
@@ -1,6 +1,4 @@
-exports[
-  'Lighthouse user flow run via stringify produces a valid desktop flow report 1'
-] = `
+exports['Lighthouse user flow run via stringify produces a valid desktop flow report 1'] = `
 const fs = require('fs');
 const puppeteer = require('puppeteer'); // v20.7.4 or later
 
@@ -87,137 +85,10 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BRHYGePtBO7BW
 
-`;
+`
diff --git a/__snapshots__/stringify.test.ts.js b/__snapshots__/stringify.test.ts.js
index c638cd67..e6fc5563 100644
--- a/__snapshots__/stringify.test.ts.js
+++ b/__snapshots__/stringify.test.ts.js
@@ -14,144 +14,15 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIE
 
-`;
+`
 
-exports[
-  'stringify should print the correct script for a emulateNetworkCondition step 1'
-] = `
+exports['stringify should print the correct script for a emulateNetworkCondition step 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
 
 (async () => {
@@ -172,144 +43,15 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIJ
 
-`;
+`
 
-exports[
-  'stringify should print the correct script if the target is not the main page 1'
-] = `
+exports['stringify should print the correct script if the target is not the main page 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
 
 (async () => {
@@ -336,140 +78,13 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIP
 
-`;
+`
 
 exports['stringify should use step and flow timeouts 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
@@ -499,144 +114,15 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIQ
 
-`;
+`
 
-exports[
-  'stringify should print the correct script if the step is within an iframe 1'
-] = `
+exports['stringify should print the correct script if the step is within an iframe 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
 
 (async () => {
@@ -664,140 +150,13 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIQ
 
-`;
+`
 
 exports['stringify should print the correct script for a keydown step 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
@@ -815,140 +174,13 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIE
 
-`;
+`
 
 exports['stringify should print the correct script for a keyup step 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
@@ -964,142 +196,15 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
     await targetPage.keyboard.up('E');
   }
 
-  await browser.close();
-
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
+  await browser.close();
+
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIE
 
-`;
+`
 
 exports['stringify should print the correct script for scroll events 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
@@ -1125,144 +230,15 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIIQE
 
-`;
+`
 
-exports[
-  'stringify should print the correct script for waitForElement steps 1'
-] = `
+exports['stringify should print the correct script for waitForElement steps 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
 
 (async () => {
@@ -1416,11 +392,9 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 });
 //# recorderSourceMap=BIJ
 
-`;
+`
 
-exports[
-  'stringify should print the correct script for waitForExpression steps 1'
-] = `
+exports['stringify should print the correct script for waitForExpression steps 1'] = `
 const puppeteer = require('puppeteer'); // v20.7.4 or later
 
 (async () => {
@@ -1436,139 +410,16 @@ const puppeteer = require('puppeteer'); // v20.7.4 or later
 
   await browser.close();
 
-  async function waitForElement(step, frame, timeout) {
-    const {
-      count = 1,
-      operator = '>=',
-      visible = true,
-      properties,
-      attributes,
-    } = step;
-    const compFn = {
-      '==': (a, b) => a === b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-    }[operator];
-    await waitForFunction(async () => {
-      const elements = await querySelectorsAll(step.selectors, frame);
-      let result = compFn(elements.length, count);
-      const elementsHandle = await frame.evaluateHandle((...elements) => {
-        return elements;
-      }, ...elements);
-      await Promise.all(elements.map((element) => element.dispose()));
-      if (result && (properties || attributes)) {
-        result = await elementsHandle.evaluate(
-          (elements, properties, attributes) => {
-            for (const element of elements) {
-              if (attributes) {
-                for (const [name, value] of Object.entries(attributes)) {
-                  if (element.getAttribute(name) !== value) {
-                    return false;
-                  }
-                }
-              }
-              if (properties) {
-                if (!isDeepMatch(properties, element)) {
-                  return false;
-                }
-              }
-            }
-            return true;
-
-            function isDeepMatch(a, b) {
-              if (a === b) {
-                return true;
-              }
-              if ((a && !b) || (!a && b)) {
-                return false;
-              }
-              if (!(a instanceof Object) || !(b instanceof Object)) {
-                return false;
-              }
-              for (const [key, value] of Object.entries(a)) {
-                if (!isDeepMatch(value, b[key])) {
-                  return false;
-                }
-              }
-              return true;
-            }
-          },
-          properties,
-          attributes
-        );
-      }
-      await elementsHandle.dispose();
-      return result === visible;
-    }, timeout);
-  }
-
-  async function querySelectorsAll(selectors, frame) {
-    for (const selector of selectors) {
-      const result = await querySelectorAll(selector, frame);
-      if (result.length) {
-        return result;
-      }
-    }
-    return [];
-  }
-
-  async function querySelectorAll(selector, frame) {
-    if (!Array.isArray(selector)) {
-      selector = [selector];
-    }
-    if (!selector.length) {
-      throw new Error('Empty selector provided to querySelectorAll');
-    }
-    let elements = [];
-    for (let i = 0; i < selector.length; i++) {
-      const part = selector[i];
-      if (i === 0) {
-        elements = await frame.$$(part);
-      } else {
-        const tmpElements = elements;
-        elements = [];
-        for (const el of tmpElements) {
-          elements.push(...(await el.$$(part)));
-        }
-      }
-      if (elements.length === 0) {
-        return [];
-      }
-      if (i < selector.length - 1) {
-        const tmpElements = [];
-        for (const el of elements) {
-          const newEl = (await el.evaluateHandle(el => el.shadowRoot ? el.shadowRoot : el)).asElement();
-          if (newEl) {
-            tmpElements.push(newEl);
-          }
-        }
-        elements = tmpElements;
-      }
-    }
-    return elements;
-  }
-
-  async function waitForFunction(fn, timeout) {
-    let isActive = true;
-    const timeoutId = setTimeout(() => {
-      isActive = false;
-    }, timeout);
-    while (isActive) {
-      const result = await fn();
-      if (result) {
-        clearTimeout(timeoutId);
-        return;
-      }
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
-    throw new Error('Timed out');
-  }
 })().catch(err => {
   console.error(err);
   process.exit(1);
 });
 //# recorderSourceMap=BIE
 
-`;
+`
 
-exports['stringify should produce a source map 1'] = [1, 8, 9];
+exports['stringify should produce a source map 1'] = [
+  1,
+  8,
+  9
+]
diff --git a/__snapshots__/stringifyStep.test.ts.js b/__snapshots__/stringifyStep.test.ts.js
index a2c9207b..69dc9c86 100644
--- a/__snapshots__/stringifyStep.test.ts.js
+++ b/__snapshots__/stringifyStep.test.ts.js
@@ -4,4 +4,4 @@ exports['stringifyStep should stringify a single step 1'] = `
   await targetPage.goto('https://localhost/');
 }
 
-`;
+`
diff --git a/src/PuppeteerStringifyExtension.ts b/src/PuppeteerStringifyExtension.ts
index a4afe874..e2448689 100644
--- a/src/PuppeteerStringifyExtension.ts
+++ b/src/PuppeteerStringifyExtension.ts
@@ -45,6 +45,8 @@ import {
 import { formatJSONAsJS } from './JSONUtils.js';
 
 export class PuppeteerStringifyExtension extends StringifyExtension {
+  #shouldAppendHelpers = false;
+
   override async beforeAllSteps(out: LineWriter, flow: UserFlow) {
     out.appendLine(
       "const puppeteer = require('puppeteer'); // v20.7.4 or later"
@@ -58,14 +60,17 @@ export class PuppeteerStringifyExtension extends StringifyExtension {
     out.appendLine(`const timeout = ${flow.timeout || defaultTimeout};`);
     out.appendLine('page.setDefaultTimeout(timeout);');
     out.appendLine('');
+    this.#shouldAppendHelpers = false;
   }
 
   override async afterAllSteps(out: LineWriter, flow: UserFlow) {
     out.appendLine('');
     out.appendLine('await browser.close();');
     out.appendLine('');
-    for (const line of helpers.split('\n')) {
-      out.appendLine(line);
+    if (this.#shouldAppendHelpers) {
+      for (const line of helpers.split('\n')) {
+        out.appendLine(line);
+      }
     }
     out.endBlock().appendLine('})().catch(err => {').startBlock();
     out.appendLine('console.error(err);');
@@ -332,6 +337,7 @@ export class PuppeteerStringifyExtension extends StringifyExtension {
   }
 
   #appendWaitForElementStep(out: LineWriter, step: WaitForElementStep): void {
+    this.#shouldAppendHelpers = true;
     out.appendLine(
       `await waitForElement(${formatJSONAsJS(step, out.getIndent())}, ${
         step.frame ? 'frame' : 'targetPage'